From 9f2377f6f5113d4aecd8749d62d290b4584194f9 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Thu, 9 May 2024 19:58:19 -0400
Subject: [PATCH 1/9] Cut down on dev themes and theme choices. Initial

---
 src/CSS/themes.css | 147 ---------------------------------------------
 src/index.html     |   6 --
 2 files changed, 153 deletions(-)

diff --git a/src/CSS/themes.css b/src/CSS/themes.css
index 1c7879e74..453ba57ac 100644
--- a/src/CSS/themes.css
+++ b/src/CSS/themes.css
@@ -2,30 +2,6 @@
  * @author James Oswald
  */
 
-/* Default Theme, Huda-Tiwari Nature Theme*/
-:root {
-    --global-background : #ffffff;
-    --p-text : #000000;
-    --canvas-items : #000000;
-    --good-placement : #00FF00;
-    --bad-placement : #FF0000;
-    --header-border: 2px solid #000000;
-    --header-bg : #a6b6d9;
-    --toolbar-border: 2px solid black;
-    --toolbar-bg: #94b09c;
-    --subbar-border: 2px solid black;
-    --subbar-bg: #bed7be;
-    --sidebar-border: 2px solid #000000;
-    --sidebar-bg: #526D82;
-    --mode-btn-border: 2px solid #000000;
-    --mode-btn-bg: buttonface;
-    --mode-btn-icon-color : #000000;
-    --mode-btn-radius: 25%;
-    --mode-btn-hover-bg: #d4e8f5;
-    --mode-btn-shadow: 1px 2px 1px #000000;
-    --mode-btn-press-shadow: inset 0px 0px 5px #000000; 
-}
-
 [data-theme="Wireframe"] {
     --global-background : #ffffff;
     --p-text : #000000;
@@ -75,127 +51,4 @@
     --mode-btn-hover-bg: none;
     --mode-btn-shadow: none;
     --mode-btn-press-shadow: none; 
-}
-
-[data-theme="vs-code"] {
-    --p-text : #dcdcaa;
-    --canvas-bg : #1f1f1f;
-    --canvas-items : #9cdcfe;
-    --good-placement : #73c991;
-    --bad-placement : #f44747;
-    --header-border: 1px solid #cccccc;
-    --header-bg : #2b2b2b;
-    --toolbar-border: 1px solid #cccccc;
-    --toolbar-bg: #2b2b2b;
-    --subbar-border: 1px solid #cccccc;
-    --subbar-bg: #2b2b2b;
-    --sidebar-border: 1px solid #cccccc;
-    --sidebar-bg: #2b2b2b;
-    --mode-btn-border: 1px solid #cccccc;
-    --mode-btn-bg: #2b2b2b;
-    --mode-btn-icon-color : #868686;
-    --mode-btn-radius: 10%;
-    --mode-btn-hover-bg: none;
-    --mode-btn-shadow: none;
-    --mode-btn-press-shadow: none; 
-}
-
-/* Ryan Theme */
-[data-theme="Peirced-from-Within"] {
-    --dark-highlights : #b11d20;
-    --p-text : #f5d51d;
-    --canvas-bg : #07140e;
-    --canvas-items : #f4f3cd;
-    --good-placement : #46ff00;
-    --bad-placement : #c60003;
-    --header-border: 1px solid #0a1e0a;
-    --header-bg : #151715;
-    --toolbar-border: 1px solid #02281c;
-    --toolbar-bg: #150f12;
-    --subbar-border: 1px solid #05281c;
-    --subbar-bg: #201412;
-    --sidebar-border: 1px solid #05281c;
-    --sidebar-bg: #05141d;
-    --mode-btn-border: 1px solid #05281c;
-    --mode-btn-bg: r#2b2b2b;
-    --mode-btn-icon-color : #868686;
-    --mode-btn-radius: 0%;
-    --mode-btn-hover-bg: none;
-    --mode-btn-shadow: none;
-    --mode-btn-press-shadow: none; 
-}
-
-/* Dawn Theme */
-[data-theme="Vampire-Core"] {
-    --global-background : #ffffff;
-    --p-text : #ffffff;
-    --canvas-bg : #a00404;
-    --canvas-items : #000000;
-    --good-placement : #ffffff;
-    --bad-placement : #e480c6;
-    --header-border: 2px solid #ffffff;
-    --header-bg : #000000;
-    --toolbar-border: 2px solid #ffffff;
-    --toolbar-bg: #000000;
-    --subbar-border: 2px solid #ffffff;
-    --subbar-bg: #000000;
-    --sidebar-border: 2px solid #ffffff;
-    --sidebar-bg: #000000;
-    --mode-btn-border: 2px solid #a00404;
-    --mode-btn-bg: #a00404;;
-    --mode-btn-icon-color :#ffffff;
-    --mode-btn-radius: 25%;
-    --mode-btn-hover-bg: none;
-    --mode-btn-shadow: none;
-    --mode-btn-press-shadow: inset 0px 0px 5px #ffffff; 
-}
-
-/* Anusha Theme */
-[data-theme="Peircing-the-Galaxy"] {
-    --global-background : #ffffff;
-    --p-text : #85d8ff;
-    --canvas-bg : #34034a;
-    --canvas-items : #ffffff;
-    --good-placement : #85d8ff;
-    --bad-placement : #f59696;
-    --header-border: 2px solid #000000;
-    --header-bg : #270968;
-    --toolbar-border: 2px solid #000000;
-    --toolbar-bg: #2b0962;
-    --subbar-border: 2px solid #000000;
-    --subbar-bg: #350953;
-    --sidebar-border: 2px solid #000000;
-    --sidebar-bg: #470d60;
-    --mode-btn-border: 2px solid #000000;
-    --mode-btn-bg: #6c2da2;;
-    --mode-btn-icon-color :#ffffff;
-    --mode-btn-radius: 25%;
-    --mode-btn-hover-bg: none;
-    --mode-btn-shadow: 1px 2px 1px #000000;
-    --mode-btn-press-shadow: inset 0px 0px 5px #000000;
-}
-
-/* Subrina Theme */
-[data-theme="Ocean-Pearl"] {
-    --global-background : #ffffff;
-    --p-text : #ffffff;
-    --canvas-bg : #e2b3ef;
-    --canvas-items : #5d95a3;
-    --good-placement : #ffffff;
-    --bad-placement : #8dc4d2;
-    --header-border: 2px solid #ffffff;
-    --header-bg : #8dc4d2;
-    --toolbar-border: 2px solid #ffffff;
-    --toolbar-bg: #8dc4d2;
-    --subbar-border: 2px solid #ffffff;
-    --subbar-bg: #8dc4d2;
-    --sidebar-border: 2px solid #ffffff;
-    --sidebar-bg: #8dc4d2;
-    --mode-btn-border: 2px solid #bb77ce;
-    --mode-btn-bg: #bb77ce;;
-    --mode-btn-icon-color :#ffffff;
-    --mode-btn-radius: 25%;
-    --mode-btn-hover-bg: none;
-    --mode-btn-shadow: none;
-    --mode-btn-press-shadow: inset 0px 0px 5px #ffffff; 
 }
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 351871c6f..c2e3a63d9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -142,14 +142,8 @@
             <p>Theme:</p>
           </div>
           <select id="theme-select" name="theme-select" data-choose-theme>
-            <option value="">Nature</option>
             <option value="Wireframe">Wireframe</option>
             <option value="Dark-Wireframe">Dark-Wireframe</option>
-            <option value="vs-code">VS-Code</option>
-            <option value="Peirced-from-Within">Peirced-from-Within</option>
-            <option value="Vampire-Core">Vampire-Core</option>
-            <option value="Peircing-the-Galaxy">Peircing-the-Galaxy</option>
-            <option value="Ocean-Pearl">Ocean-Pearl</option>
           </select>
           <button type="button" onclick="saveMode()" title="Save File" class="toolButton">
             <i class="fa fa-floppy-o" aria-hidden="true"></i>

From f9a0956b0a7ab0899656c15f3279a3c82a69636f Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Fri, 10 May 2024 05:13:07 -0400
Subject: [PATCH 2/9] Light and dark colorblind modes

---
 src/CSS/themes.css | 53 +++++++++++++++++++++++++++++++++++++++++++++-
 src/index.html     |  4 +++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/CSS/themes.css b/src/CSS/themes.css
index 453ba57ac..ba94a8609 100644
--- a/src/CSS/themes.css
+++ b/src/CSS/themes.css
@@ -2,7 +2,7 @@
  * @author James Oswald
  */
 
-[data-theme="Wireframe"] {
+[data-theme="Light-Wireframe"] {
     --global-background : #ffffff;
     --p-text : #000000;
     --canvas-bg : #ffffff;
@@ -51,4 +51,55 @@
     --mode-btn-hover-bg: none;
     --mode-btn-shadow: none;
     --mode-btn-press-shadow: none; 
+}
+
+/* Following two schemes altered according this link: 
+https://davidmathlogic.com/colorblind/#%23000000-%23E69F00-%2356B4E9-%23009E73-%23F0E442-%230072B2-%23D55E00-%23CC79A7 */
+[data-theme="Light-Colorblind"] {
+    --global-background : #ffffff;
+    --p-text : #000000;
+    --canvas-bg : #ffffff;
+    --canvas-items : #000000;
+    --good-placement : #009E73;
+    --bad-placement : #D55E00;
+    --header-border: 2px solid #000000;
+    --header-bg : #ffffff;
+    --toolbar-border: 2px solid #000000;
+    --toolbar-bg: #ffffff;
+    --subbar-border: 2px solid #000000;
+    --subbar-bg: #ffffff;
+    --sidebar-border: 2px solid #000000;
+    --sidebar-bg: #ffffff;
+    --mode-btn-border: 2px solid #000000;
+    --mode-btn-bg: buttonface;
+    --mode-btn-icon-color : #000000;
+    --mode-btn-radius: 0%;
+    --mode-btn-hover-bg: none;
+    --mode-btn-shadow: none;
+    --mode-btn-press-shadow: inset 0px 0px 5px #552898; 
+}
+
+[data-theme="Dark-Colorblind"] {
+    --dark-highlights : #762eac;
+    --global-background : #000000;
+    --p-text : var(--dark-highlights);
+    --canvas-bg : #000000;
+    --canvas-items : var(--dark-highlights);
+    --good-placement : #009E73;
+    --bad-placement : #D55E00;
+    --header-border: 2px solid var(--dark-highlights);
+    --header-bg : #000000;
+    --toolbar-border: 2px solid var(--dark-highlights);
+    --toolbar-bg: #000000;
+    --subbar-border: 2px solid var(--dark-highlights);
+    --subbar-bg: #000000;
+    --sidebar-border: 2px solid var(--dark-highlights);
+    --sidebar-bg: #000000;
+    --mode-btn-border: 2px solid var(--dark-highlights);
+    --mode-btn-bg: #000000;
+    --mode-btn-icon-color : var(--dark-highlights);
+    --mode-btn-radius: 50%;
+    --mode-btn-hover-bg: none;
+    --mode-btn-shadow: none;
+    --mode-btn-press-shadow: none; 
 }
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index c2e3a63d9..c0cd91ae7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -142,8 +142,10 @@
             <p>Theme:</p>
           </div>
           <select id="theme-select" name="theme-select" data-choose-theme>
-            <option value="Wireframe">Wireframe</option>
+            <option value="Light-Wireframe">Light-Wireframe</option>
             <option value="Dark-Wireframe">Dark-Wireframe</option>
+            <option value="Light-Colorblind">Light-Colorblind</option>
+            <option value="Dark-Colorblind">Dark-Colorblind</option>
           </select>
           <button type="button" onclick="saveMode()" title="Save File" class="toolButton">
             <i class="fa fa-floppy-o" aria-hidden="true"></i>

From baa7b7a55441af76d6ccd91f14708e3bf7a70582 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Fri, 10 May 2024 09:01:54 -0400
Subject: [PATCH 3/9] Differing colors based on parity. Some visual bugs

---
 src/CSS/themes.css               |  4 ++++
 src/SharedToolUtils/DrawUtils.ts | 16 +++++++++++++++-
 src/Themes.ts                    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/CSS/themes.css b/src/CSS/themes.css
index ba94a8609..a4e26a58c 100644
--- a/src/CSS/themes.css
+++ b/src/CSS/themes.css
@@ -6,6 +6,7 @@
     --global-background : #ffffff;
     --p-text : #000000;
     --canvas-bg : #ffffff;
+    --canvas-odd-bg : #c3c3c3;
     --canvas-items : #000000;
     --good-placement : #00FF00;
     --bad-placement : #FF0000;
@@ -33,6 +34,7 @@
     --global-background : #000000;
     --p-text : var(--dark-highlights);
     --canvas-bg : #000000;
+    --canvas-odd-bg : #6b6b6b;
     --canvas-items : var(--dark-highlights);
     --good-placement : #00ff00;
     --bad-placement : #ff0000;
@@ -59,6 +61,7 @@ https://davidmathlogic.com/colorblind/#%23000000-%23E69F00-%2356B4E9-%23009E73-%
     --global-background : #ffffff;
     --p-text : #000000;
     --canvas-bg : #ffffff;
+    --canvas-odd-bg : #c3c3c3;
     --canvas-items : #000000;
     --good-placement : #009E73;
     --bad-placement : #D55E00;
@@ -84,6 +87,7 @@ https://davidmathlogic.com/colorblind/#%23000000-%23E69F00-%2356B4E9-%23009E73-%
     --global-background : #000000;
     --p-text : var(--dark-highlights);
     --canvas-bg : #000000;
+    --canvas-odd-bg : #6b6b6b;
     --canvas-items : var(--dark-highlights);
     --good-placement : #009E73;
     --bad-placement : #D55E00;
diff --git a/src/SharedToolUtils/DrawUtils.ts b/src/SharedToolUtils/DrawUtils.ts
index dc100a2a3..c236e14d9 100644
--- a/src/SharedToolUtils/DrawUtils.ts
+++ b/src/SharedToolUtils/DrawUtils.ts
@@ -11,7 +11,7 @@ import {AtomNode} from "../AEG/AtomNode";
 import {CutNode} from "../AEG/CutNode";
 import {Ellipse} from "../AEG/Ellipse";
 import {offset} from "./DragTool";
-import {legalColor, placedColor} from "../Themes";
+import {cssVar, legalColor, placedColor} from "../Themes";
 import {Point} from "../AEG/Point";
 import {TreeContext} from "../TreeContext";
 
@@ -55,7 +55,14 @@ export function drawCut(thisCut: CutNode, color: string): void {
             0,
             2 * Math.PI
         );
+        ctx.globalCompositeOperation = "destination-over";
         ctx.stroke();
+        ctx.fillStyle =
+            TreeContext.tree.getLevel(thisCut) % 2 === 0
+                ? cssVar("--canvas-odd-bg")
+                : cssVar("--canvas-bg");
+        ctx.fill();
+        ctx.globalCompositeOperation = "source-over";
     }
 }
 
@@ -203,7 +210,14 @@ function redrawCut(incomingNode: CutNode, color?: string): void {
             0,
             2 * Math.PI
         );
+        ctx.globalCompositeOperation = "destination-over";
         ctx.stroke();
+        ctx.fillStyle =
+            TreeContext.tree.getLevel(incomingNode) % 2 === 0
+                ? cssVar("--canvas-odd-bg")
+                : cssVar("--canvas-bg");
+        ctx.fill();
+        ctx.globalCompositeOperation = "source-over";
     }
 }
 
diff --git a/src/Themes.ts b/src/Themes.ts
index 4b80d08be..87988571a 100644
--- a/src/Themes.ts
+++ b/src/Themes.ts
@@ -25,7 +25,7 @@ let placedColorStr: string = cssVar("--canvas-items");
  * @param varName Variable from a CSS Style Sheet.
  * @returns Property value of varName in string form.
  */
-function cssVar(varName: string): string {
+export function cssVar(varName: string): string {
     return getComputedStyle(document.body).getPropertyValue(varName);
 }
 

From bce3315e9d1e87278eb91e6d9db069fff9315432 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Fri, 10 May 2024 09:27:25 -0400
Subject: [PATCH 4/9] Much better fill/stroke composition

---
 src/SharedToolUtils/DrawUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SharedToolUtils/DrawUtils.ts b/src/SharedToolUtils/DrawUtils.ts
index c236e14d9..f4a19c107 100644
--- a/src/SharedToolUtils/DrawUtils.ts
+++ b/src/SharedToolUtils/DrawUtils.ts
@@ -56,13 +56,13 @@ export function drawCut(thisCut: CutNode, color: string): void {
             2 * Math.PI
         );
         ctx.globalCompositeOperation = "destination-over";
-        ctx.stroke();
         ctx.fillStyle =
             TreeContext.tree.getLevel(thisCut) % 2 === 0
                 ? cssVar("--canvas-odd-bg")
                 : cssVar("--canvas-bg");
         ctx.fill();
         ctx.globalCompositeOperation = "source-over";
+        ctx.stroke();
     }
 }
 
@@ -211,13 +211,13 @@ function redrawCut(incomingNode: CutNode, color?: string): void {
             2 * Math.PI
         );
         ctx.globalCompositeOperation = "destination-over";
-        ctx.stroke();
         ctx.fillStyle =
             TreeContext.tree.getLevel(incomingNode) % 2 === 0
                 ? cssVar("--canvas-odd-bg")
                 : cssVar("--canvas-bg");
         ctx.fill();
         ctx.globalCompositeOperation = "source-over";
+        ctx.stroke();
     }
 }
 

From 6de2d14992de2ca13acbbd3b69d2399f183a921a Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Fri, 10 May 2024 10:42:54 -0400
Subject: [PATCH 5/9] Parity based levels appear in Proof Mode

---
 package-lock.json                | 233 +++++++++++++++++--------------
 src/SharedToolUtils/DrawUtils.ts |  12 +-
 2 files changed, 128 insertions(+), 117 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 412a7698e..0ea6280eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,15 +24,6 @@
         "vitest": "^1.6.0"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.2",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
@@ -47,21 +38,21 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+      "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
+      "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.5",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -664,9 +655,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.2.tgz",
-      "integrity": "sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
+      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
       "cpu": [
         "arm"
       ],
@@ -677,9 +668,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.2.tgz",
-      "integrity": "sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
+      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
       "cpu": [
         "arm64"
       ],
@@ -690,9 +681,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.2.tgz",
-      "integrity": "sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
       "cpu": [
         "arm64"
       ],
@@ -703,9 +694,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.2.tgz",
-      "integrity": "sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
+      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
       "cpu": [
         "x64"
       ],
@@ -716,9 +707,22 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.2.tgz",
-      "integrity": "sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
+      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
+      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
       "cpu": [
         "arm"
       ],
@@ -729,9 +733,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.2.tgz",
-      "integrity": "sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
+      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
       "cpu": [
         "arm64"
       ],
@@ -742,9 +746,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.2.tgz",
-      "integrity": "sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
+      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
       "cpu": [
         "arm64"
       ],
@@ -755,11 +759,11 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.13.2.tgz",
-      "integrity": "sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
+      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
       "cpu": [
-        "ppc64le"
+        "ppc64"
       ],
       "dev": true,
       "optional": true,
@@ -768,9 +772,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.2.tgz",
-      "integrity": "sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
+      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
       "cpu": [
         "riscv64"
       ],
@@ -781,9 +785,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.13.2.tgz",
-      "integrity": "sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
+      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
       "cpu": [
         "s390x"
       ],
@@ -794,9 +798,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.2.tgz",
-      "integrity": "sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
+      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
       "cpu": [
         "x64"
       ],
@@ -807,9 +811,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.2.tgz",
-      "integrity": "sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
+      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
       "cpu": [
         "x64"
       ],
@@ -820,9 +824,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.2.tgz",
-      "integrity": "sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
+      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
       "cpu": [
         "arm64"
       ],
@@ -833,9 +837,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.2.tgz",
-      "integrity": "sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
+      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
       "cpu": [
         "ia32"
       ],
@@ -846,9 +850,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.2.tgz",
-      "integrity": "sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
+      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
       "cpu": [
         "x64"
       ],
@@ -1510,6 +1514,12 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
+    "node_modules/confbox": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+      "dev": true
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2896,15 +2906,15 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
-      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz",
+      "integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.2"
+        "pkg-types": "^1.1.0",
+        "ufo": "^1.5.3"
       }
     },
     "node_modules/ms": {
@@ -3010,17 +3020,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3180,14 +3190,14 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+      "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
       "dev": true,
       "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
+        "confbox": "^0.1.7",
+        "mlly": "^1.7.0",
+        "pathe": "^1.1.2"
       }
     },
     "node_modules/postcss": {
@@ -3543,9 +3553,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.2.tgz",
-      "integrity": "sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
+      "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -3558,21 +3568,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.13.2",
-        "@rollup/rollup-android-arm64": "4.13.2",
-        "@rollup/rollup-darwin-arm64": "4.13.2",
-        "@rollup/rollup-darwin-x64": "4.13.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.13.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.13.2",
-        "@rollup/rollup-linux-arm64-musl": "4.13.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.13.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.13.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.13.2",
-        "@rollup/rollup-linux-x64-gnu": "4.13.2",
-        "@rollup/rollup-linux-x64-musl": "4.13.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.13.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.13.2",
-        "@rollup/rollup-win32-x64-msvc": "4.13.2",
+        "@rollup/rollup-android-arm-eabi": "4.17.2",
+        "@rollup/rollup-android-arm64": "4.17.2",
+        "@rollup/rollup-darwin-arm64": "4.17.2",
+        "@rollup/rollup-darwin-x64": "4.17.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
+        "@rollup/rollup-linux-arm64-musl": "4.17.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
+        "@rollup/rollup-linux-x64-gnu": "4.17.2",
+        "@rollup/rollup-linux-x64-musl": "4.17.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
+        "@rollup/rollup-win32-x64-msvc": "4.17.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -3627,13 +3638,10 @@
       "dev": true
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -3889,15 +3897,15 @@
       "dev": true
     },
     "node_modules/tinybench": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.6.0.tgz",
-      "integrity": "sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+      "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
       "dev": true
     },
     "node_modules/tinypool": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz",
-      "integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
+      "integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
@@ -4407,6 +4415,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/src/SharedToolUtils/DrawUtils.ts b/src/SharedToolUtils/DrawUtils.ts
index f4a19c107..731f4c4a7 100644
--- a/src/SharedToolUtils/DrawUtils.ts
+++ b/src/SharedToolUtils/DrawUtils.ts
@@ -55,13 +55,6 @@ export function drawCut(thisCut: CutNode, color: string): void {
             0,
             2 * Math.PI
         );
-        ctx.globalCompositeOperation = "destination-over";
-        ctx.fillStyle =
-            TreeContext.tree.getLevel(thisCut) % 2 === 0
-                ? cssVar("--canvas-odd-bg")
-                : cssVar("--canvas-bg");
-        ctx.fill();
-        ctx.globalCompositeOperation = "source-over";
         ctx.stroke();
     }
 }
@@ -191,7 +184,7 @@ export function redrawTree(tree: AEGTree, color?: string): void {
  * @param color Incoming color string. Defaults to the color of a valid placement if not passed in.
  */
 function redrawCut(incomingNode: CutNode, color?: string): void {
-    for (let i = 0; incomingNode.children.length > i; i++) {
+    for (let i = 0; i < incomingNode.children.length; i++) {
         if (incomingNode.children[i] instanceof AtomNode) {
             redrawAtom(<AtomNode>incomingNode.children[i]);
         } else {
@@ -212,7 +205,8 @@ function redrawCut(incomingNode: CutNode, color?: string): void {
         );
         ctx.globalCompositeOperation = "destination-over";
         ctx.fillStyle =
-            TreeContext.tree.getLevel(incomingNode) % 2 === 0
+            TreeContext.tree.getLevel(incomingNode) % 2 === 0 ||
+            TreeContext.getLastProofStep().tree.getLevel(incomingNode) % 2 === 0
                 ? cssVar("--canvas-odd-bg")
                 : cssVar("--canvas-bg");
         ctx.fill();

From cddad594fba208cfbb85b55e03f43bfde68d1408 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Sat, 11 May 2024 09:34:23 -0400
Subject: [PATCH 6/9] Fixed proof=>draw=>proof mode parity color bug

---
 src/SharedToolUtils/DrawUtils.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SharedToolUtils/DrawUtils.ts b/src/SharedToolUtils/DrawUtils.ts
index 7cba81f21..198a3a1d4 100644
--- a/src/SharedToolUtils/DrawUtils.ts
+++ b/src/SharedToolUtils/DrawUtils.ts
@@ -204,9 +204,12 @@ function redrawCut(incomingNode: CutNode, color?: string): void {
             2 * Math.PI
         );
         ctx.globalCompositeOperation = "destination-over";
+
         ctx.fillStyle =
-            TreeContext.tree.getLevel(incomingNode) % 2 === 0 ||
-            TreeContext.getLastProofStep().tree.getLevel(incomingNode) % 2 === 0
+            (TreeContext.modeState === "Draw" &&
+                TreeContext.tree.getLevel(incomingNode) % 2 === 0) ||
+            (TreeContext.modeState === "Proof" &&
+                TreeContext.currentProofStep!.tree.getLevel(incomingNode) % 2 === 0)
                 ? cssVar("--canvas-odd-bg")
                 : cssVar("--canvas-bg");
         ctx.fill();

From 4a50641b64acdbc70a090501d81fea8ebb34fafc Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Sat, 11 May 2024 10:04:02 -0400
Subject: [PATCH 7/9] Fixed movement tool visual bugs

---
 src/ProofTools/ProofMoveMultiTool.ts  | 4 ++--
 src/ProofTools/ProofMoveSingleTool.ts | 4 ++--
 src/ProofTools/ProofResizeTool.ts     | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ProofTools/ProofMoveMultiTool.ts b/src/ProofTools/ProofMoveMultiTool.ts
index c54ffdc58..8ef1b9ede 100644
--- a/src/ProofTools/ProofMoveMultiTool.ts
+++ b/src/ProofTools/ProofMoveMultiTool.ts
@@ -61,7 +61,7 @@ export function proofMoveMultiMouseDown(event: MouseEvent): void {
             currentParent.remove(startingPoint);
         }
         legalNode = true;
-        redrawTree(currentProofTree);
+        redrawTree(TreeContext.currentProofStep!.tree);
         highlightNode(currentNode, legalColor());
     } else {
         legalNode = false;
@@ -84,7 +84,7 @@ export function proofMoveMultiMouseMove(event: MouseEvent): void {
             event.y - startingPoint.y
         );
 
-        redrawTree(currentProofTree);
+        redrawTree(TreeContext.currentProofStep!.tree);
         if (currentNode instanceof CutNode) {
             const tempCut: CutNode = alterCutChildren(currentNode, moveDifference);
             const color = isMoveLegal(currentProofTree, tempCut) ? legalColor() : illegalColor();
diff --git a/src/ProofTools/ProofMoveSingleTool.ts b/src/ProofTools/ProofMoveSingleTool.ts
index dd9f58354..4ff48029a 100644
--- a/src/ProofTools/ProofMoveSingleTool.ts
+++ b/src/ProofTools/ProofMoveSingleTool.ts
@@ -70,7 +70,7 @@ export function proofMoveSingleMouseDown(event: MouseEvent): void {
         }
         legalNode = true;
 
-        redrawTree(currentProofTree);
+        redrawTree(TreeContext.currentProofStep!.tree);
         if (currentNode instanceof AtomNode) {
             drawAtom(currentNode, legalColor(), true);
         } else {
@@ -94,7 +94,7 @@ export function proofMoveSingleMouseMove(event: MouseEvent): void {
             event.y - startingPoint.y
         );
 
-        redrawTree(currentProofTree);
+        redrawTree(TreeContext.currentProofStep!.tree);
         if (currentNode instanceof CutNode) {
             const tempCut: CutNode = alterCut(currentNode, moveDifference);
             const color = isMoveLegal(currentProofTree, tempCut) ? legalColor() : illegalColor();
diff --git a/src/ProofTools/ProofResizeTool.ts b/src/ProofTools/ProofResizeTool.ts
index 67297c3a3..d9e147956 100644
--- a/src/ProofTools/ProofResizeTool.ts
+++ b/src/ProofTools/ProofResizeTool.ts
@@ -19,7 +19,6 @@ import {
     determineDirection,
     drawCut,
     redrawProof,
-    redrawTree,
 } from "../SharedToolUtils/DrawUtils";
 import {CutNode} from "../AEG/CutNode";
 import {ellipseLargeEnough, resizeCut} from "../SharedToolUtils/EditModeUtils";
@@ -94,7 +93,7 @@ export function proofResizeMouseMove(event: MouseEvent): void {
         if (currentNode instanceof CutNode) {
             const tempCut: CutNode = resizeCut(currentNode, moveDifference, direction);
             if (tempCut.ellipse !== null) {
-                redrawTree(currentProofTree);
+                redrawProof();
                 const color = isValid(tempCut) ? legalColor() : illegalColor();
                 drawCut(tempCut, color);
                 determineAndChangeCursorStyle(color, "cursor: crosshair", "cursor: no-drop");

From f21e117cf5d148f8305399f3322f7f5011d17cf9 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Mon, 22 Jul 2024 08:28:40 -0400
Subject: [PATCH 8/9] Ran npm install

---
 package-lock.json | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2aff6ac3c..40b19ba5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,19 @@
         "vitest": "^2.0.2"
       }
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.2",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
@@ -1362,12 +1375,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1518,12 +1531,6 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
-      "dev": true
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2173,9 +2180,9 @@
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"

From 41a3ca87ef7bbe20f19e0e22f778054b8a3410f2 Mon Sep 17 00:00:00 2001
From: Ryan Reilly <ryanreilly703@gmail.com>
Date: Mon, 22 Jul 2024 09:00:32 -0400
Subject: [PATCH 9/9] Parity layering quirks w/ Proof Mode delete tools

---
 src/ProofTools/DeiterationTool.ts       | 3 +--
 src/ProofTools/DoubleCutDeletionTool.ts | 3 +--
 src/ProofTools/ErasureTool.ts           | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ProofTools/DeiterationTool.ts b/src/ProofTools/DeiterationTool.ts
index c1d2afcd5..bc8347199 100644
--- a/src/ProofTools/DeiterationTool.ts
+++ b/src/ProofTools/DeiterationTool.ts
@@ -9,7 +9,7 @@ import {AEGTree} from "../AEG/AEGTree";
 import {AtomNode} from "../AEG/AtomNode";
 import {CutNode} from "../AEG/CutNode";
 import {getCurrentProofTree} from "./ProofToolUtils";
-import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUtils";
+import {highlightNode, redrawProof} from "../SharedToolUtils/DrawUtils";
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
@@ -118,7 +118,6 @@ function determineLegalityAndHighlightAsIllegal(): void {
         if (tempParent !== null) {
             tempParent.remove(currentPoint);
         }
-        redrawTree(tempTree);
         highlightNode(currentNode, illegalColor());
         tempTree.insert(currentNode);
     } else {
diff --git a/src/ProofTools/DoubleCutDeletionTool.ts b/src/ProofTools/DoubleCutDeletionTool.ts
index 0fdf3466b..6796086e9 100644
--- a/src/ProofTools/DoubleCutDeletionTool.ts
+++ b/src/ProofTools/DoubleCutDeletionTool.ts
@@ -8,7 +8,7 @@
 import {AEGTree} from "../AEG/AEGTree";
 import {AtomNode} from "../AEG/AtomNode";
 import {CutNode} from "../AEG/CutNode";
-import {drawCut, redrawProof, redrawTree} from "../SharedToolUtils/DrawUtils";
+import {drawCut, redrawProof} from "../SharedToolUtils/DrawUtils";
 import {getCurrentProofTree} from "./ProofToolUtils";
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
@@ -152,7 +152,6 @@ function determineLegalityAndHighlightAsIllegal(): void {
             tempLower.children = [];
         }
 
-        redrawTree(tempTree);
         highlightDoubleCutAsIllegal(currentNode);
     } else {
         legalNode = false;
diff --git a/src/ProofTools/ErasureTool.ts b/src/ProofTools/ErasureTool.ts
index 8b62344dd..30f3c6128 100644
--- a/src/ProofTools/ErasureTool.ts
+++ b/src/ProofTools/ErasureTool.ts
@@ -10,7 +10,7 @@ import {AEGTree} from "../AEG/AEGTree";
 import {AtomNode} from "../AEG/AtomNode";
 import {CutNode} from "../AEG/CutNode";
 import {getCurrentProofTree} from "./ProofToolUtils";
-import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUtils";
+import {highlightNode, redrawProof} from "../SharedToolUtils/DrawUtils";
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
@@ -122,7 +122,6 @@ function determineLegalityAndHighlightAsIllegal(): void {
             tempParent.remove(currentPoint);
         }
 
-        redrawTree(tempTree);
         highlightNode(currentNode, illegalColor());
         tempTree.insert(currentNode);
     } else {