diff --git a/.gitignore b/.gitignore
index 466563a..4c9d926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 __pycache__
 /.idea
 /output
-.DS_Store
\ No newline at end of file
+.DS_Store
+/venv/
diff --git a/colors/classic.yaml b/colors/classic.yaml
index bdd490c..b1a0e81 100644
--- a/colors/classic.yaml
+++ b/colors/classic.yaml
@@ -4,20 +4,27 @@ name: Monokai Pro (Classic)
 colors:
   # primary colors
   red: "#f92672"
+  errorRed: "#990909"
   orange: "#fd971f"
   yellow: "#a9dc76"
+  darkYellow: "#5aa90e"
   green: "#a6e22e"
+  darkGreen: "#117e00"
   blue: "#66d9ef"
+  darkBlue: "#0050bb"
   purple: "#ab9df2"
   # base colors, sorted from darkest to lightest
-  base0: "#161613"
-  base1: "#1d1e19"
-  base2: "#272822"
-  base3: "#3b3c35"
-  base4: "#57584f"
-  base5: "#6e7066"
-  base6: "#919288"
-  base7: "#c0c1b5"
-  base8: "#fdfff1"
+  base0: "#13130f"
+  base1: "#1e1e1a"
+  base2: "#20211c"
+  base3: "#272822"
+  base4: "#2c2d27"
+  base5: "#3c3d35"
+  base6: "#515247"
+  base7: "#6e7066"
+  base8: "#8b8c81"
+  base9: "#b1b2a5"
+  base10: "#dadacf"
+  base11: "#fdffed"
   # variants (for when transparency isn't supported)
   base8x0c: "#32332c" # using base2 as bg
diff --git a/colors/default.yaml b/colors/default.yaml
index 4a87fe3..0f610f0 100644
--- a/colors/default.yaml
+++ b/colors/default.yaml
@@ -4,20 +4,27 @@ name: Monokai Pro
 colors:
   # primary colors
   red: "#ff6188"
+  errorRed: "#990909"
   orange: "#fc9867"
   yellow: "#ffd866"
+  darkYellow: "#d7a916"
   green: "#a9dc76"
+  darkGreen: "#117e00"
   blue: "#78dce8"
+  darkBlue: "#0050bb"
   purple: "#ab9df2"
   # base colors, sorted from darkest to lightest
-  base0: "#19181a"
-  base1: "#221f22"
-  base2: "#2d2a2e"
-  base3: "#403e41"
-  base4: "#5b595c"
-  base5: "#727072"
-  base6: "#939293"
-  base7: "#c1c0c0"
-  base8: "#fcfcfa"
+  base0: "#120f13"
+  base1: "#221d23"
+  base2: "#251f26"
+  base3: "#2d2a2e"
+  base4: "#322e33"
+  base5: "#403b41"
+  base6: "#605f62"
+  base7: "#727072"
+  base8: "#939293"
+  base9: "#aba5ab"
+  base10: "#cecec3"
+  base11: "#fcfcfa"
   # variants (for when transparency isn't supported)
   base8x0c: "#363337" # using base2 as bg
diff --git a/colors/machine.yaml b/colors/machine.yaml
index 33466bf..e25da69 100644
--- a/colors/machine.yaml
+++ b/colors/machine.yaml
@@ -3,20 +3,27 @@ name: Monokai Pro (Filter Machine)
 colors:
   # primary colors
   red: "#ff6d7e"
+  errorRed: "#990909"
   orange: "#ffb270"
   yellow: "#ffed72"
+  darkYellow: "#d7a916"
   green: "#a2e57b"
+  darkGreen: "#117e00"
   blue: "#7cd5f1"
+  darkBlue: "#0050bb"
   purple: "#baa0f8"
   # base colors
-  base0: "#161b1e"
-  base1: "#1d2528"
-  base2: "#273136"
-  base3: "#3a4449"
-  base4: "#545f62"
-  base5: "#6b7678"
-  base6: "#798384"
-  base7: "#b8c4c3"
-  base8: "#f2fffc"
+  base0: "#131e1f"
+  base1: "#1f262a"
+  base2: "#212a2d"
+  base3: "#273136"
+  base4: "#293336"
+  base5: "#3f4c50"
+  base6: "#505d60"
+  base7: "#6b7678"
+  base8: "#798384"
+  base9: "#98abaa"
+  base10: "#c8d9d5"
+  base11: "#f2fffc"
   # variants
   base8x0c: "#303a3e"
\ No newline at end of file
diff --git a/colors/octagon.yaml b/colors/octagon.yaml
index 67d0e48..5ad51c5 100644
--- a/colors/octagon.yaml
+++ b/colors/octagon.yaml
@@ -3,20 +3,27 @@ name: Monokai Pro (Filter Octagon)
 colors:
   # primary colors
   red: "#ff657a"
+  errorRed: "#990909"
   orange: "#ff9b5e"
   yellow: "#ffd76d"
+  darkYellow: "#d7a916"
   green: "#bad761"
+  darkGreen: "#117e00"
   blue: "#9cd1bb"
+  darkBlue: "#0050bb"
   purple: "#c39ac9"
   # base colors
-  base0: "#161821"
-  base1: "#1e1f2b"
-  base2: "#282a3a"
-  base3: "#3a3d4b"
-  base4: "#535763"
-  base5: "#696d77"
-  base6: "#767b81"
-  base7: "#b2b9bd"
-  base8: "#eaf2f1"
+  base0: "#141225"
+  base1: "#1c1a2c"
+  base2: "#1f1f33"
+  base3: "#282a3a"
+  base4: "#2f3244"
+  base5: "#3d4252"
+  base6: "#58636c"
+  base7: "#696d77"
+  base8: "#767b81"
+  base9: "#8b989d"
+  base10: "#b3c1c4"
+  base11: "#eaf2f1"
   # variants
   base8x0c: "#303342"
\ No newline at end of file
diff --git a/colors/ristretto.yaml b/colors/ristretto.yaml
index 6e3903a..cd866b9 100644
--- a/colors/ristretto.yaml
+++ b/colors/ristretto.yaml
@@ -3,20 +3,27 @@ name: Monokai Pro (Filter Ristretto)
 colors:
   # primary colors
   red: "#fd6883"
+  errorRed: "#990909"
   orange: "#f38d70"
   yellow: "#f9cc6c"
+  darkYellow: "#d7a916"
   green: "#adda78"
+  darkGreen: "#117e00"
   blue: "#85dacc"
+  darkBlue: "#0050bb"
   purple: "#a8a9eb"
   # base colors
-  base0: "#191515"
+  base0: "#231818"
   base1: "#211c1c"
-  base2: "#2c2525"
-  base3: "#403838"
-  base4: "#5b5353"
-  base5: "#72696a"
-  base6: "#8c8384"
-  base7: "#c3b7b8"
-  base8: "#fff1f3"
+  base2: "#231c1c"
+  base3: "#2c2525"
+  base4: "#312c2c"
+  base5: "#4d4141"
+  base6: "#5b5353"
+  base7: "#72696a"
+  base8: "#8c8384"
+  base9: "#b7aaab"
+  base10: "#d7c5c6"
+  base11: "#ffdedd"
   # variants
-  base8x0c: "#352e2e"
\ No newline at end of file
+  base8x0c: "#3d3535"
\ No newline at end of file
diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml
index e4f2caa..8328b75 100644
--- a/colors/spectrum.yaml
+++ b/colors/spectrum.yaml
@@ -3,20 +3,27 @@ name: Monokai Pro (Filter Spectrum)
 colors:
   # primary colors
   red: "#fc618d"
+  errorRed: "#a10909"
   orange: "#fd9353"
   yellow: "#fce566"
+  darkYellow: "#d7a916"
   green: "#7bd88f"
+  darkGreen: "#117e00"
   blue: "#5ad4e6"
+  darkBlue: "#0050bb"
   purple: "#948ae3"
   # base colors
   base0: "#131313"
   base1: "#191919"
-  base2: "#222222"
-  base3: "#363537"
-  base4: "#525053"
-  base5: "#69676c"
-  base6: "#8b888f"
-  base7: "#bab6c0"
-  base8: "#f7f1ff"
+  base2: "#202020"
+  base3: "#222222"
+  base4: "#292929"
+  base5: "#363537"   # This color needs to be modified such that it matches with base8x0c but is brighter than it (Lesser than base4).
+  base6: "#525053"
+  base7: "#69676c"
+  base8: "#8b888f"
+  base9: "#bab6c0"
+  base10: "#cdcdcd"
+  base11: "#f7f1ff"
   # variants
   base8x0c: "#2b2b2b"
diff --git a/theme/jetbrains/resources/META-INF/pluginIcon.svg b/theme/jetbrains/resources/META-INF/pluginIcon.svg
index e564bd1..f5f0b9b 100644
--- a/theme/jetbrains/resources/META-INF/pluginIcon.svg
+++ b/theme/jetbrains/resources/META-INF/pluginIcon.svg
@@ -1,11 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80">
     <g fill="none" fill-rule="evenodd">
-        <polygon fill="#c1c0c0" fill-rule="nonzero" points="7 21 7 59 40 78 73 59 73 21 40 2"/>
-        <polygon fill="#fd6883" fill-rule="nonzero" points="7 21 40 40 40 2"/>
-        <polygon fill="#f38d70" fill-rule="nonzero" points="40 40 7 21 7 59"/>
-        <polygon fill="#f9cc6c" fill-rule="nonzero" points="40 40 7 59 40 78"/>
-        <polygon fill="#adda78" fill-rule="nonzero" points="40 40 40 78 73 59"/>
-        <polygon fill="#85dacc" fill-rule="nonzero" points="73 21 40 40 73 59"/>
-        <polygon fill="#a8a9eb" fill-rule="nonzero" points="40 2 40 40 73 21"/>
+        <polygon fill="#c1c0c0" points="7 21 7 59 40 78 73 59 73 21 40 2"/>
+        <polygon fill="#fd6883" points="7 21 40 40 40 2"/>
+        <polygon fill="#f38d70" points="40 40 7 21 7 59"/>
+        <polygon fill="#f9cc6c" points="40 40 7 59 40 78"/>
+        <polygon fill="#adda78" points="40 40 40 78 73 59"/>
+        <polygon fill="#85dacc" points="73 21 40 40 73 59"/>
+        <polygon fill="#a8a9eb" points="40 2 40 40 73 21"/>
     </g>
 </svg>
\ No newline at end of file
diff --git a/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg b/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg
index e564bd1..f5f0b9b 100644
--- a/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg
+++ b/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg
@@ -1,11 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80">
     <g fill="none" fill-rule="evenodd">
-        <polygon fill="#c1c0c0" fill-rule="nonzero" points="7 21 7 59 40 78 73 59 73 21 40 2"/>
-        <polygon fill="#fd6883" fill-rule="nonzero" points="7 21 40 40 40 2"/>
-        <polygon fill="#f38d70" fill-rule="nonzero" points="40 40 7 21 7 59"/>
-        <polygon fill="#f9cc6c" fill-rule="nonzero" points="40 40 7 59 40 78"/>
-        <polygon fill="#adda78" fill-rule="nonzero" points="40 40 40 78 73 59"/>
-        <polygon fill="#85dacc" fill-rule="nonzero" points="73 21 40 40 73 59"/>
-        <polygon fill="#a8a9eb" fill-rule="nonzero" points="40 2 40 40 73 21"/>
+        <polygon fill="#c1c0c0" points="7 21 7 59 40 78 73 59 73 21 40 2"/>
+        <polygon fill="#fd6883" points="7 21 40 40 40 2"/>
+        <polygon fill="#f38d70" points="40 40 7 21 7 59"/>
+        <polygon fill="#f9cc6c" points="40 40 7 59 40 78"/>
+        <polygon fill="#adda78" points="40 40 40 78 73 59"/>
+        <polygon fill="#85dacc" points="73 21 40 40 73 59"/>
+        <polygon fill="#a8a9eb" points="40 2 40 40 73 21"/>
     </g>
 </svg>
\ No newline at end of file
diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json
index fe315cc..dbfeac1 100644
--- a/theme/jetbrains/templates/theme.json
+++ b/theme/jetbrains/templates/theme.json
@@ -6,78 +6,148 @@
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "{{theme.colors.yellow}}",
-      "background": "{{theme.colors.base2}}",
-      "borderColor": "{{theme.colors.base8x0c}}",
+      "background": "{{theme.colors.base3}}",
+      "borderColor": "{{theme.colors.base5}}",
       "disabledBackground": "{{theme.colors.base1}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "focusColor": "{{theme.colors.base4}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "disabledText": "{{theme.colors.base6}}",
+      "focusColor": "{{theme.colors.base6}}",
       "focusedBorderColor": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
+      "foreground": "{{theme.colors.base10}}",
       "inactiveBackground": "{{theme.colors.base1}}",
-      "inactiveForeground": "{{theme.colors.base6}}",
-      "infoForeground": "{{theme.colors.base6}}",
-      "selectionBackground": "{{theme.colors.base3}}",
-      "selectionBackgroundInactive": "{{theme.colors.base3}}",
+      "inactiveForeground": "{{theme.colors.base8}}",
+      "infoForeground": "{{theme.colors.base8}}",
+      "selectionBackground": "{{theme.colors.base4}}",
+      "selectionBackgroundInactive": "{{theme.colors.base4}}",
       "selectionForeground": "{{theme.colors.yellow}}",
-      "selectionInactiveBackground": "{{theme.colors.base3}}",
+      "selectionInactiveBackground": "{{theme.colors.base4}}",
       "selectionInactiveForeground": "{{theme.colors.yellow}}",
-      "separatorColor": "{{theme.colors.base2}}"
+      "separatorColor": "{{theme.colors.base5}}"
     },
     "ActionButton": {
-      "hoverBackground": "{{theme.colors.base8x0c}}",
-      "hoverBorderColor": "{{theme.colors.base8x0c}}",
-      "pressedBackground": "{{theme.colors.base8x0c}}",
-      "pressedBorderColor": "{{theme.colors.base8x0c}}"
+      "hoverBackground": "{{theme.colors.base4}}",
+      "hoverBorderColor": "{{theme.colors.base8}}",
+      "pressedBackground": "{{theme.colors.darkBlue}}",
+      "pressedBorderColor": "{{theme.colors.blue}}"
+    },
+    "Banner": {
+      "warningBorderColor": "",
+      "warningBackground": "",
+      "successBorderColor": "",
+      "successBackground": "",
+      "infoBorderColor": "",
+      "infoBackground": "",
+      "errorBorderColor": "",
+      "errorBackground": ""
+    },
+    "BigSpinner": {
+      "background": ""
+    },
+    "Bookmark": {
+      "iconBackground": "{{theme.colors.base3}}",
+      "Mnemonic": {
+        "iconForeground": "{{theme.colors.base11}}"
+      },
+      "MnemonicAssigned": {
+        "background": "{{theme.colors.red}}",
+        "foreground": "{{theme.colors.base0}}"
+      },
+      "MnemonicAvailable": {
+        "background": "{{theme.colors.base3}}",
+        "borderColor": "{{theme.colors.base6}}",
+        "foreground": "{{theme.colors.base9}}"
+      },
+      "MnemonicCurrent": {
+        "background": "{{theme.colors.green}}",
+        "foreground": "{{theme.colors.base0}}"
+      }
     },
     "Borders": {
       "ContrastBorderColor": "{{theme.colors.base8x0c}}",
-      "color": "{{theme.colors.base8x0c}}"
+      "color": "{{theme.colors.base5}}"
+    },
+    "Breakpoint": {
+      "iconHoverAlpha": 0.55
     },
     "Button": {
-      "arc": 0,
-      "background": "{{theme.colors.base3}}",
+      "arc": 10,
+      "background": "{{theme.colors.base5}}",
       "default": {
-        "endBackground": "{{theme.colors.base3}}",
-        "endBorderColor": "{{theme.colors.base3}}",
+        "endBackground": "{{theme.colors.base5}}",
+        "endBorderColor": "{{theme.colors.base5}}",
         "foreground": "{{theme.colors.yellow}}",
         "focusColor": "{{theme.colors.yellow}}",
-        "focusedBorderColor": "{{theme.colors.base3}}",
-        "shadowColor": "{{theme.colors.base3}}",
-        "startBackground": "{{theme.colors.base3}}",
-        "startBorderColor": "{{theme.colors.base3}}"
-      },
-      "disabledBorderColor": "{{theme.colors.base3}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "endBackground": "{{theme.colors.base3}}",
-      "endBorderColor": "{{theme.colors.base3}}",
-      "focusedBorderColor": "{{theme.colors.base3}}",
-      "foreground": "{{theme.colors.base8}}",
-      "shadowColor": "{{theme.colors.base3}}",
+        "focusedBorderColor": "{{theme.colors.base5}}",
+        "shadowColor": "{{theme.colors.base5}}",
+        "startBackground": "{{theme.colors.base5}}",
+        "startBorderColor": "{{theme.colors.base5}}"
+      },
+      "disabledBorderColor": "{{theme.colors.base5}}",
+      "disabledText": "{{theme.colors.base8}}",
+      "endBackground": "{{theme.colors.base5}}",
+      "endBorderColor": "{{theme.colors.base5}}",
+      "focusedBorderColor": "{{theme.colors.darkBlue}}",
+      "foreground": "{{theme.colors.base11}}",
+      "shadowColor": "{{theme.colors.base5}}",
       "shadowWidth": 0,
-      "startBackground": "{{theme.colors.base3}}",
-      "startBorderColor": "{{theme.colors.base3}}"
+      "startBackground": "{{theme.colors.base5}}",
+      "startBorderColor": "{{theme.colors.base5}}"
     },
     "CheckBox": {
-      "background": "{{theme.colors.base2}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "select": "{{theme.colors.yellow}}"
+      "background": "{{theme.colors.base3}}",
+      "disabledText": "{{theme.colors.base5}}",
+      "foreground": "{{theme.colors.base10}}",
+      "select": "{{theme.colors.orange}}"
     },
     "CheckBoxMenuItem": {
-      "acceleratorForeground": "{{theme.colors.base6}}",
-      "acceleratorSelectionForeground": "{{theme.colors.base6}}",
-      "background": "{{theme.colors.base2}}",
-      "disabledBackground": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "selectionBackground": "{{theme.colors.base3}}",
+      "acceleratorForeground": "{{theme.colors.base8}}",
+      "acceleratorSelectionForeground": "{{theme.colors.base8}}",
+      "background": "{{theme.colors.base3}}",
+      "disabledBackground": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "selectionBackground": "{{theme.colors.base4}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
+    "CodeWithMe": {
+      "AccessDisabled": {
+        "accessDot": ""
+      },
+      "Avatar": {
+        "foreground": "",
+        "hover": ""
+      },
+      "Users": {
+        "1": {
+          "Background": "",
+          "Foreground": ""
+        },
+        "2": {
+          "Background": "",
+          "Foreground": ""
+        },
+        "3": {
+          "Background": "",
+          "Foreground": ""
+        },
+        "4": {
+          "Background": "",
+          "Foreground": ""
+        },
+        "5": {
+          "Background": "",
+          "Foreground": ""
+        },
+        "6": {
+          "Background": "",
+          "Foreground": ""
+        }
+      }
+    },
     "ColorChooser": {
-      "background": "{{theme.colors.base2}}",
-      "foreground": "{{theme.colors.base8}}",
-      "swatchesDefaultRecentColor": "{{theme.colors.base8}}"
+      "background": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base10}}",
+      "swatchesDefaultRecentColor": "{{theme.colors.base10}}"
     },
     "ComboBoxButton": {
       "background": "{{theme.colors.base8x0c}}"
@@ -85,389 +155,643 @@
     "ComboBox": {
       "ArrowButton": {
         "background": "{{theme.colors.base3}}",
-        "disabledIconColor": "{{theme.colors.base4}}",
-        "iconColor": "{{theme.colors.base8}}",
-        "nonEditableBackground": "{{theme.colors.base2}}"
+        "nonEditableBackground": "{{theme.colors.base3}}",
+        "iconColor": "{{theme.colors.base10}}",
+        "disabledIconColor": "{{theme.colors.base5}}"
       },
       "background": "{{theme.colors.base8x0c}}",
-      "disabledBackground": "{{theme.colors.base1}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "modifiedItemForeground": "{{theme.colors.yellow}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "modifiedItemForeground": "{{theme.colors.blue}}",
       "nonEditableBackground": "{{theme.colors.base8x0c}}",
-      "selectionBackground": "{{theme.colors.base2}}",
-      "selectionForeground": "{{theme.colors.yellow}}"
+      "selectionBackground": "{{theme.colors.blue}}",
+      "selectionForeground": "{{theme.colors.base1}}"
     },
     "ComboPopup": {
-      "border": "{{theme.colors.base2}}"
+      "border": "0,0,0,0,000000"
     },
     "CompletionPopup": {
-      "foreground": "{{theme.colors.base8}}",
+      "Body": {
+        "insets": ""
+      },
+      "Advertiser": {
+        "background": "{{theme.colors.base3}}",
+        "borderInsets": "",
+        "fontSizeOffset": "",
+        "foreground": "{{theme.colors.base9}}"
+      },
+      "foreground": "{{theme.colors.red}}",
       "matchForeground": "{{theme.colors.yellow}}",
       "selectionInactiveBackground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base4}}"
+      "selectionBackground": "{{theme.colors.base4}}",
+      "nonFocusedMask": "",
+      "selectionInnerInsets": ""
+    },
+    "ComplexPopup": {
+      "Header": {
+        "background": "{{theme.colors.base8x0c}}",
+        "insets": ""
+      },
+      "TextField": {
+        "borderInsets": "",
+        "inputInsets": ""
+      }
     },
     "Component": {
-      "arc": 4,
-      "borderColor": "{{theme.colors.base8x0c}}",
+      "arc": 10,
+      "borderColor": "{{theme.colors.base6}}",
+      "infoForeground": "{{theme.colors.base7}}",
       "disabledBorderColor": "{{theme.colors.base8x0c}}",
-      "focusColor": "{{theme.colors.yellow}}",
-      "focusedBorderColor": "{{theme.colors.yellow}}",
+      "focusColor": "{{theme.colors.blue}}",
+      "focusedBorderColor": "{{theme.colors.darkBlue}}",
+      "focusWidth": 1,
       "hoverIconColor": "{{theme.colors.yellow}}",
-      "infoForeground": "{{theme.colors.base6}}",
-      "iconColor": "{{theme.colors.base8}}"
+      "iconColor": "{{theme.colors.base10}}",
+      "errorFocusColor": "{{theme.colors.red}}",
+      "inactiveErrorFocusColor": "{{theme.colors.errorRed}}",
+      "warningFocusColor": "{{theme.colors.yellow}}",
+      "inactiveWarningFocusColor": "{{theme.colors.darkYellow}}"
     },
     "Counter": {
       "background": "{{theme.colors.yellow}}",
       "foreground": "{{theme.colors.base0}}"
     },
     "Debugger": {
+      "EvaluateExpression": {
+        "background": ""
+      },
       "Variables": {
-        "collectingDataForeground": "{{theme.colors.base6}}",
-        "changedValueForeground": "{{theme.colors.yellow}}",
-        "errorMessageForeground": "{{theme.colors.red}}",
-        "evaluatingExpressionForeground": "{{theme.colors.base6}}",
-        "exceptionForeground": "{{theme.colors.blue}}",
+        "changedValueForeground": "{{theme.colors.base7}}",
+        "collectingDataForeground": "{{theme.colors.base8}}",
+        "errorMessageForeground": "{{theme.colors.errorRed}}",
+        "evaluatingExpressionForeground": "{{theme.colors.base8}}",
+        "exceptionForeground": "{{theme.colors.errorRed}}",
         "modifyingValueForeground": "{{theme.colors.yellow}}",
-        "valueForeground": "{{theme.colors.yellow}}"
+        "typeForeground": "{{theme.colors.base8}}",
+        "valueForeground": "{{theme.colors.base10}}"
       }
     },
     "DebuggerTabs": {
-      "underlinedTabBackground": "{{theme.colors.base4}}"
+      "underlinedTabBackground": "{{theme.colors.base6}}"
     },
     "DebuggerPopup": {
-      "borderColor": "{{theme.colors.base4}}"
+      "borderColor": "{{theme.colors.base6}}"
     },
     "DefaultTabs": {
-      "background": "{{theme.colors.base2}}",
-      "borderColor": "{{theme.colors.base2}}",
+      "background": "{{theme.colors.base3}}",
+      "borderColor": "{{theme.colors.base3}}",
       "hoverBackground": "{{theme.colors.base8x0c}}",
       "inactiveUnderlineColor": "{{theme.colors.yellow}}",
       "underlineColor": "{{theme.colors.yellow}}",
-      "underlinedTabBackground": "{{theme.colors.base2}}",
+      "underlinedTabBackground": "{{theme.colors.base3}}",
       "underlineHeight": 2
     },
     "DragAndDrop": {
-      "areaBackground": "{{theme.colors.base2}}",
-      "areaBorderColor": "{{theme.colors.base2}}",
-      "areaForeground": "{{theme.colors.base8}}"
+      "areaBackground": "{{theme.colors.base3}}",
+      "areaForeground": "{{theme.colors.base10}}",
+      "rowBackground": "{{theme.colors.base6}}",
+      "borderColor": ""
     },
     "Editor": {
       "background": "{{theme.colors.base1}}",
-      "foreground": "{{theme.colors.base8}}",
-      "shortcutForeground": "{{theme.colors.base6}}"
+      "foreground": "{{theme.colors.base9}}",
+      "shortcutForeground": "{{theme.colors.base7}}",
+      "SearchField": {
+        "background": "{{theme.colors.base1}}",
+        "borderInsets": ""
+      },
+      "Toolbar": {
+        "borderColor": "{{theme.colors.base5}}"
+      }
     },
     "EditorPane": {
       "background": "{{theme.colors.base1}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveBackground": "{{theme.colors.base2}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base3}}",
-      "selectionForeground": "{{theme.colors.yellow}}"
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveBackground": "{{theme.colors.base4}}",
+      "inactiveForeground": "{{theme.colors.base3}}",
+      "selectionBackground": "{{theme.colors.base1}}",
+      "selectionForeground": "{{theme.colors.yellow}}",
+      "splitBorder": "{{theme.colors.base7}}"
     },
     "EditorTabs": {
-      "borderColor": "{{theme.colors.base8x0c}}",
+      "borderColor": "{{theme.colors.base5}}",
       "inactiveUnderlineColor": "{{theme.colors.yellow}}",
+      "underlineHeight": 1,
       "underlineColor": "{{theme.colors.yellow}}",
       "underlinedTabBackground": "{{theme.colors.base8x0c}}",
-      "underlinedTabForeground": "{{theme.colors.base7}}"
+      "underlinedTabForeground": "{{theme.colors.base9}}",
+      "tabInsets": "",
+      "background": "{{theme.colors.base3}}",
+      "hoverBackground": "{{theme.colors.base0}}",
+      "inactiveColoredFileBackground": ""
     },
     "FileColor": {
-      "Yellow": "00000000"
+      "Blue": "#273e3e",
+      "Gray": "#363636",
+      "Green": "#27321f",
+      "Orange": "#44342a",
+      "Rose": "#4c2936",
+      "Violet": "#2f223b",
+      "Yellow": "#39331e"
     },
     "FormattedTextField": {
       "background": "{{theme.colors.base8x0c}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveBackground": "{{theme.colors.base3}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveBackground": "{{theme.colors.base4}}",
+      "inactiveForeground": "{{theme.colors.base6}}",
       "selectionForeground": "{{theme.colors.yellow}}",
-      "selectionBackground": "{{theme.colors.base3}}"
+      "selectionBackground": "{{theme.colors.base4}}"
+    },
+    "GotItTooltip": {
+      "foreground": "",
+      "background": "",
+      "linkForeground": "",
+      "borderColor": "",
+      "shortcutForeground": ""
     },
     "Group": {
-      "disabledSeparatorColor": "{{theme.colors.base2}}",
-      "separatorColor": "{{theme.colors.base2}}"
+      "disabledSeparatorColor": "{{theme.colors.base4}}",
+      "separatorColor": "{{theme.colors.base5}}"
     },
     "GutterTooltip": {
-      "infoForeground": "{{theme.colors.base8}}",
-      "lineSeparatorColor": "{{theme.colors.base2}}"
+      "infoForeground": "{{theme.colors.base11}}",
+      "lineSeparatorColor": "{{theme.colors.base8x0c}}"
     },
     "HelpTooltip": {
-      "borderColor": "{{theme.colors.base2}}",
-      "infoForeground": "{{theme.colors.base6}}"
+      "borderColor": "{{theme.colors.base3}}"
+    },
+    "IconBadge": {
+      "errorBackground": "{{theme.colors.errorRed}}",
+      "infoBackground": "{{theme.colors.blue}}",
+      "warningBackground": "{{theme.colors.yellow}}",
+      "successBackground": "{{theme.colors.green}}",
+      "borderWidth": 1,
+      "dotRadius": 5,
+      "dotX": "",
+      "dotY": ""
     },
     "InformationHint": {
-      "borderColor": "{{theme.colors.base2}}"
+      "borderColor": "{{theme.colors.base3}}"
     },
     "InplaceRefactoringPopup": {
-      "borderColor": "{{theme.colors.base2}}"
+      "borderColor": "{{theme.colors.base3}}"
     },
     "Label": {
-      "background": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base6}}",
-      "infoForeground": "{{theme.colors.base6}}",
+      "background": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "disabledText": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base9}}",
+      "infoForeground": "{{theme.colors.base8}}",
       "selectedForeground": "{{theme.colors.yellow}}"
     },
+    "Lesson": {
+      "Badge": {
+        "newLessonBackground": "",
+        "newLessonForeground": ""
+      },
+      "shortcutBackground": "",
+      "stepNumberForeground": ""
+    },
     "Link": {
       "activeForeground": "{{theme.colors.yellow}}",
       "hoverForeground": "{{theme.colors.yellow}}",
       "pressedForeground": "{{theme.colors.yellow}}",
-      "secondaryForeground": "{{theme.colors.base6}}",
+      "secondaryForeground": "{{theme.colors.base8}}",
       "visitedForeground": "{{theme.colors.yellow}}"
     },
     "List": {
-      "background": "{{theme.colors.base1}}",
-      "foreground": "{{theme.colors.base8}}",
+      "Button": {
+        "hoverBackground": "",
+        "leftRightInset": "",
+        "separatorColor": "",
+        "separatorInset": ""
+      },
+      "Tag": {
+        "background": "",
+        "foreground": ""
+      },
+      "Line": {
+        "hoverBackground": ""
+      },
+      "background": "{{theme.colors.base2}}",
+      "foreground": "{{theme.colors.base10}}",
       "selectionBackground": "{{theme.colors.base8x0c}}",
       "selectionForeground": "{{theme.colors.yellow}}",
       "selectionInactiveBackground": "{{theme.colors.base8x0c}}",
-      "selectionInactiveForeground": "{{theme.colors.yellow}}"
+      "selectionInactiveForeground": "{{theme.colors.base8}}",
+      "dropLineColor": "",
+      "hoverBackground": "",
+      "hoverInactiveBackground": ""
+    },
+    "MainToolbar": {
+      "separatorColor": "{{theme.colors.base6}}"
     },
     "MemoryIndicator": {
-      "allocatedBackground": "{{theme.colors.base3}}",
-      "usedBackground": "{{theme.colors.base4}}"
+      "allocatedBackground": "{{theme.colors.base0}}",
+      "usedBackground": "{{theme.colors.errorRed}}"
     },
     "Menu": {
-      "acceleratorForeground": "{{theme.colors.base6}}",
-      "acceleratorSelectionForeground": "{{theme.colors.base8}}",
-      "background": "{{theme.colors.base2}}",
-      "borderColor": "{{theme.colors.base8x0c}}",
+      "foreground": "{{theme.colors.base10}}",
+      "background": "{{theme.colors.base3}}",
+      "separatorColor": "{{theme.colors.base5}}",
+      "borderInsets": "",
+      "borderColor": "{{theme.colors.base5}}",
+      "selectionBackground": "{{theme.colors.base5}}",
+      "selectionForeground": "{{theme.colors.yellow}}",
+      "acceleratorForeground": "{{theme.colors.base8}}",
+      "acceleratorSelectionForeground": "{{theme.colors.base10}}",
       "disabledBackground": "{{theme.colors.base3}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "separatorColor": "{{theme.colors.base2}}",
-      "selectionForeground": "{{theme.colors.yellow}}"
+      "disabledForeground": "{{theme.colors.base6}}",
+      "Selection": {
+        "arc": 7,
+        "innerInsets": "",
+        "outerInsets": ""
+      }
     },
     "MenuBar": {
-      "borderColor": "{{theme.colors.base8x0c}}",
-      "disabledBackground": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "highlight": "{{theme.colors.base2}}",
-      "selectionBackground": "{{theme.colors.base3}}",
+      "borderColor": "{{theme.colors.base5}}",
+      "disabledBackground": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "highlight": "{{theme.colors.base3}}",
+      "selectionBackground": "{{theme.colors.base4}}",
       "selectionForeground": "{{theme.colors.yellow}}",
       "shadow": "{{theme.colors.base1}}"
     },
     "MenuItem": {
-      "acceleratorForeground": "{{theme.colors.base6}}",
-      "background": "{{theme.colors.base2}}",
-      "disabledBackground": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "selectionBackground": "{{theme.colors.base3}}",
+      "acceleratorForeground": "{{theme.colors.base8}}",
+      "background": "{{theme.colors.base3}}",
+      "disabledBackground": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "selectionBackground": "{{theme.colors.base5}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
     "NavBar": {
       "borderColor": "{{theme.colors.base8x0c}}"
     },
     "Notification": {
+      "arc": 10,
       "background": "{{theme.colors.base8x0c}}",
-      "borderColor": "{{theme.colors.base1}}",
-      "errorBackground": "{{theme.colors.base1}}",
-      "errorBorderColor": "{{theme.colors.base1}}",
-      "foreground": "{{theme.colors.base8}}",
+      "foreground": "{{theme.colors.base10}}",
+      "borderColor": "{{theme.colors.base6}}",
+      "borderInsets": "",
+      "contentActionsInset": "",
+      "errorBackground": "{{theme.colors.red}}",
+      "errorBorderColor": "{{theme.colors.errorRed}}",
+      "errorForeground": "{{theme.colors.base0}}",
+      "Button": {
+        "background": "",
+        "borderColor": "",
+        "foreground": ""
+      },
       "MoreButton": {
-        "background": "{{theme.colors.base3}}",
-        "foreground": "{{theme.colors.base8}}",
+        "background": "{{theme.colors.base4}}",
+        "foreground": "{{theme.colors.base10}}",
         "innerBorderColor": "{{theme.colors.base8x0c}}"
       },
       "ToolWindow": {
         "errorBackground": "{{theme.colors.base8x0c}}",
         "errorBorderColor": "{{theme.colors.base8x0c}}",
+        "errorForeground": "{{theme.colors.base0}}",
         "informativeBackground": "{{theme.colors.base8x0c}}",
         "informativeBorderColor": "{{theme.colors.base8x0c}}",
+        "informativeForeground": "{{theme.colors.base10}}",
         "warningBackground": "{{theme.colors.base8x0c}}",
-        "warningBorderColor": "{{theme.colors.base8x0c}}"
+        "warningBorderColor": "{{theme.colors.base8x0c}}",
+        "warningForeground": "{{theme.colors.base10}}"
+      },
+      "titleActionsInset": "",
+      "titleContentInset": "",
+      "iconOffsetSize": "",
+      "linkForeground": "{{theme.colors.yellow}}"
+    },
+    "NotificationsToolwindow": {
+      "newNotification": {
+        "background": "",
+        "hoverBackground": ""
+      },
+      "Notification": {
+        "hoverBackground": ""
       }
     },
+    "OnePixelDivider": {
+      "background": ""
+    },
+    "OptionButton": {
+      "default": {
+        "separatorColor": ""
+      },
+      "separatorColor": ""
+    },
     "OptionPane": {
-      "background": "{{theme.colors.base2}}",
-      "foreground": "{{theme.colors.base8}}",
-      "messageForeground": "{{theme.colors.base8}}"
+      "background": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base10}}",
+      "messageForeground": "{{theme.colors.base10}}"
+    },
+    "PackageSearch": {
+      "PackagesList": {
+        "rowHeight": ""
+      },
+      "PackageTag": {
+        "hoverBackground": "",
+        "background": "",
+        "foreground": "",
+        "selectedBackground": "",
+        "selectedForeground": ""
+      },
+      "SearchResult": {
+        "background": "",
+        "hoverBackground": "",
+        "PackageTag": {
+          "hoverBackground": "",
+          "selectedForeground": "",
+          "selectedBackground": "",
+          "foreground": "",
+          "background": ""
+        }
+      }
     },
     "Panel": {
-      "background": "{{theme.colors.base2}}",
-      "foreground": "{{theme.colors.base6}}"
+      "background": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base8}}",
+      "mouseShortcutBackground": ""
     },
     "ParameterInfo": {
-      "background": "{{theme.colors.base3}}",
+      "background": "{{theme.colors.base4}}",
       "borderColor": "{{theme.colors.base8x0c}}",
-      "currentOverloadBackground": "{{theme.colors.base3}}",
+      "currentOverloadBackground": "{{theme.colors.base4}}",
       "currentParameterForeground": "{{theme.colors.yellow}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "infoForeground": "{{theme.colors.base6}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "infoForeground": "{{theme.colors.base8}}",
       "lineSeparatorColor": "{{theme.colors.base8x0c}}"
     },
     "PasswordField": {
-      "background": "{{theme.colors.base3}}",
+      "background": "{{theme.colors.base4}}",
       "capsLockIconColor": "{{theme.colors.yellow}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base4}}",
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveForeground": "{{theme.colors.base6}}",
+      "selectionBackground": "{{theme.colors.base6}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
     "Plugins": {
-      "background": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base6}}",
-      "eapTagBackground": "{{theme.colors.base4}}",
+      "background": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base8}}",
+      "eapTagBackground": "{{theme.colors.base6}}",
       "lightSelectionBackground": "{{theme.colors.base8x0c}}",
       "hoverBackground": "{{theme.colors.base8x0c}}",
       "tagForeground": "{{theme.colors.yellow}}",
-      "tagBackground": "{{theme.colors.base4}}",
+      "tagBackground": "{{theme.colors.base6}}",
       "Button": {
         "installBackground": "{{theme.colors.base1}}",
         "installBorderColor": "{{theme.colors.base1}}",
-        "installForeground": "{{theme.colors.base8}}",
+        "installForeground": "{{theme.colors.base10}}",
         "installFocusedBackground": "{{theme.colors.base1}}",
-        "installFillForeground": "{{theme.colors.base6}}",
+        "installFillForeground": "{{theme.colors.base8}}",
         "installFillBackground": "{{theme.colors.base1}}",
         "updateBackground": "{{theme.colors.base1}}",
         "updateBorderColor": "{{theme.colors.base1}}",
-        "updateForeground": "{{theme.colors.base8}}"
+        "updateForeground": "{{theme.colors.base10}}"
       },
       "SearchField": {
-        "background": "{{theme.colors.base8x0c}}",
-        "borderColor": "{{theme.colors.base8x0c}}"
+        "background": "{{theme.colors.base8x0c}}"
       },
       "SectionHeader": {
-        "background": "{{theme.colors.base2}}",
-        "foreground": "{{theme.colors.base6}}"
+        "background": "{{theme.colors.base3}}",
+        "foreground": "{{theme.colors.base8}}"
       },
       "Tab": {
         "hoverBackground": "{{theme.colors.base8x0c}}",
-        "selectedForeground": "{{theme.colors.base8}}",
+        "selectedForeground": "{{theme.colors.base10}}",
         "selectedBackground": "{{theme.colors.base8x0c}}"
       }
     },
     "Popup": {
       "Advertiser": {
-        "background": "{{theme.colors.base2}}",
-        "borderColor": "{{theme.colors.base2}}",
+        "background": "{{theme.colors.base3}}",
+        "borderColor": "{{theme.colors.base3}}",
         "foreground": "{{theme.colors.yellow}}"
       },
       "borderColor": "{{theme.colors.base1}}",
-      "inactiveBorderColor": "{{theme.colors.base2}}",
-      "innerBorderColor": "{{theme.colors.base2}}",
+      "inactiveBorderColor": "{{theme.colors.base3}}",
+      "innerBorderColor": "{{theme.colors.base3}}",
       "Header": {
-        "activeBackground": "{{theme.colors.base2}}",
+        "activeBackground": "{{theme.colors.base3}}",
         "inactiveBackground": "{{theme.colors.base1}}"
       },
       "paintBorder": true,
-      "separatorForeground": "{{theme.colors.base8}}",
-      "separatorColor": "{{theme.colors.base2}}",
+      "separatorForeground": "{{theme.colors.base10}}",
+      "separatorColor": "{{theme.colors.base3}}",
       "Toolbar": {
         "background": "{{theme.colors.base1}}",
         "borderColor": "{{theme.colors.base8x0c}}"
       }
     },
     "PopupMenu": {
-      "background": "{{theme.colors.base2}}",
-      "foreground": "{{theme.colors.base8}}",
-      "translucentBackground": "{{theme.colors.base2}}",
-      "selectionBackground": "{{theme.colors.base3}}"
+      "background": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base10}}",
+      "translucentBackground": "{{theme.colors.base3}}",
+      "selectionBackground": "{{theme.colors.base4}}"
     },
     "PopupMenuSeparator": {
       "height": 10,
       "stripeIndent": 5
     },
     "ProgressBar": {
-      "background": "{{theme.colors.base2}}",
+      "background": "{{theme.colors.base3}}",
       "foreground": "{{theme.colors.yellow}}",
       "indeterminateEndColor": "{{theme.colors.yellow}}",
-      "indeterminateStartColor": "{{theme.colors.yellow}}",
-      "progressColor": "{{theme.colors.yellow}}",
-      "selectionBackground": "{{theme.colors.base4}}",
-      "trackColor": "{{theme.colors.base4}}"
+      "indeterminateStartColor": "{{theme.colors.base7}}",
+      "passedEndColor": "{{theme.colors.green}}",
+      "passedColor": "{{theme.colors.base6}}",
+      "warningEndColor": "{{theme.colors.darkYellow}}",
+      "warningColor": "{{theme.colors.base4}}",
+      "failedEndColor": "{{theme.colors.errorRed}}",
+      "failedColor": "{{theme.colors.red}}",
+      "progressColor": "{{theme.colors.blue}}",
+      "selectionBackground": "{{theme.colors.base6}}",
+      "selectionForeground": "{{theme.colors.base3}}",
+      "trackColor": "{{theme.colors.base6}}"
     },
     "RadioButton": {
-      "background": "{{theme.colors.base2}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}"
+      "background": "{{theme.colors.base3}}",
+      "disabledText": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}"
     },
     "RadioButtonMenuItem": {
-      "acceleratorForeground": "{{theme.colors.base6}}",
-      "acceleratorSelectionForeground": "{{theme.colors.base6}}",
-      "background": "{{theme.colors.base2}}",
-      "disabledBackground": "{{theme.colors.base2}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "selectionBackground": "{{theme.colors.base3}}",
+      "acceleratorForeground": "{{theme.colors.base8}}",
+      "acceleratorSelectionForeground": "{{theme.colors.base8}}",
+      "background": "{{theme.colors.base3}}",
+      "disabledBackground": "{{theme.colors.base3}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "selectionBackground": "{{theme.colors.base4}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
+    "RunToolbar": {
+      "Debug": {
+        "activeBackground": ""
+      },
+      "Profile": {
+        "activeBackground": ""
+      },
+      "Run": {
+        "activeBackground": ""
+      }
+    },
+    "RunWidget": {
+      "background": "{{theme.colors.darkBlue}}",
+      "foreground": "{{theme.colors.base11}}",
+      "hoverBackground": "{{theme.colors.base8x0c}}",
+      "separatorColor": "{{theme.colors.blue}}",
+      "pressedBackground": "{{theme.colors.base8x0c}}",
+      "runningBackground": "{{theme.colors.darkGreen}}"
+    },
+    "ScrollBar": {
+      "background": "",
+      "hoverThumbBorderColor": "",
+      "hoverThumbColor": "",
+      "hoverTrackColor": "",
+      "thumb": "",
+      "thumbBorderColor": "",
+      "thumbColor": "",
+      "thumbDarkShadow": "",
+      "thumbHighlight": "",
+      "thumbShadow": "",
+      "trackHighlight": "",
+      "track": "",
+      "trackColor": "",
+      "Transparent": {
+        "trackColor": "{{theme.colors.base2}}",
+        "thumbColor": "{{theme.colors.base5}}",
+        "thumbBorderColor": "{{theme.colors.base5}}",
+        "hoverTrackColor": "{{theme.colors.base1}}",
+        "hoverThumbColor": "{{theme.colors.base6}}",
+        "hoverThumbBorderColor": "{{theme.colors.base6}}"
+      }
+    },
+    "ScrollPane": {
+      "background": "",
+      "foreground": ""
+    },
+    "SearchField": {
+      "errorBackground": "",
+      "errorForeground": ""
+    },
     "SearchEverywhere": {
       "Advertiser": {
         "background": "{{theme.colors.base1}}",
-        "foreground": "{{theme.colors.base6}}"
+        "foreground": "{{theme.colors.base8}}"
       },
       "Header": {
-        "background": "{{theme.colors.base2}}"
+        "background": "{{theme.colors.base3}}"
       },
       "List": {
-        "separatorColor": "{{theme.colors.base2}}",
-        "separatorForeground": "{{theme.colors.base6}}"
+        "separatorColor": "{{theme.colors.base3}}",
+        "separatorForeground": "{{theme.colors.base8}}"
       },
       "SearchField": {
-        "background": "{{theme.colors.base2}}",
+        "background": "{{theme.colors.base3}}",
         "borderColor": "{{theme.colors.base1}}",
-        "infoForeground": "{{theme.colors.base6}}"
+        "infoForeground": "{{theme.colors.base8}}"
       },
       "Tab": {
         "selectedForeground": "{{theme.colors.yellow}}",
-        "selectedBackground": "{{theme.colors.base4}}"
+        "selectedBackground": "{{theme.colors.base6}}"
       }
     },
     "SearchMatch": {
       "endBackground": "{{theme.colors.yellow}}",
       "startBackground": "{{theme.colors.yellow}}"
     },
+    "SearchOption": {
+      "selectedBackground": "",
+      "selectedHoveredBackground": "",
+      "selectedPressedBackground": ""
+    },
+    "SegmentedButton": {
+      "focusedSelectedButtonColor": "{{theme.colors.base6}}",
+      "selectedButtonColor": "{{theme.colors.base6}}",
+      "selectedEndBorderColor": "{{theme.colors.base8}}",
+      "selectedStartBorderColor": "{{theme.colors.base8}}"
+    },
     "Separator": {
-      "separatorColor": "{{theme.colors.base8x0c}}"
+      "separatorColor": "{{theme.colors.base6}}"
+    },
+    "Settings": {
+      "Spotlight": {
+        "borderColor": "{{theme.colors.green}}"
+      }
+    },
+    "SettingsTree": {
+      "rowHeight": 22
     },
     "SidePanel": {
       "background": "{{theme.colors.base1}}"
     },
     "Slider": {
-      "background": "{{theme.colors.base2}}",
-      "buttonBorderColor": "{{theme.colors.yellow}}",
+      "background": "{{theme.colors.base3}}",
+      "buttonBorderColor": "{{theme.colors.orange}}",
       "buttonColor": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "tickColor": "{{theme.colors.base3}}",
-      "trackColor": "{{theme.colors.base3}}"
+      "foreground": "{{theme.colors.base10}}",
+      "tickColor": "{{theme.colors.base4}}",
+      "trackColor": "{{theme.colors.base5}}"
+    },
+    "Space": {
+      "Chat": {
+        "Emoji": {
+          "Picker": {
+            "hoverBackground": ""
+          }
+        },
+        "Reaction": {
+          "background": "",
+          "hoverBackground": ""
+        }
+      },
+      "Review": {
+        "acceptedOutline": "",
+        "diffAnchorBackground": "",
+        "waitForResponseOutline": "",
+        "workingOutline": ""
+      }
     },
     "SpeedSearch": {
-      "background": "{{theme.colors.base4}}",
-      "borderColor": "{{theme.colors.base2}}",
-      "errorForeground": "{{theme.colors.base8}}",
-      "foreground": "{{theme.colors.base8}}"
+      "background": "{{theme.colors.base5}}",
+      "borderColor": "{{theme.colors.base6}}",
+      "errorForeground": "{{theme.colors.red}}",
+      "foreground": "{{theme.colors.base11}}"
     },
     "Spinner": {
-      "background": "{{theme.colors.base2}}"
+      "background": "{{theme.colors.base3}}"
     },
     "SplitPane": {
-      "background": "{{theme.colors.base2}}",
+      "background": "{{theme.colors.base3}}",
       "highlight": "{{theme.colors.base1}}"
     },
     "SplitPaneDivider": {
-      "draggingColor": "{{theme.colors.base3}}"
+      "draggingColor": "{{theme.colors.base4}}"
+    },
+    "SshRemoteRun": {
+      "successfulConnectionInfoLabel": ""
     },
     "StatusBar": {
-      "borderColor": "{{theme.colors.base8x0c}}",
-      "hoverBackground": "{{theme.colors.base8x0c}}"
+      "borderColor": "{{theme.colors.base8x0c}}"
     },
     "TabbedPane": {
-      "background": "{{theme.colors.base2}}",
-      "contentAreaColor": "{{theme.colors.base4}}",
-      "disabledForeground": "{{theme.colors.base4}}",
-      "disabledUnderlineColor": "{{theme.colors.base4}}",
-      "focus": "{{theme.colors.base3}}",
-      "focusColor": "{{theme.colors.base3}}",
-      "foreground": "{{theme.colors.base8}}",
+      "background": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base10}}",
+      "contentAreaColor": "{{theme.colors.base6}}",
+      "disabledForeground": "{{theme.colors.base6}}",
+      "disabledUnderlineColor": "{{theme.colors.base6}}",
+      "focus": "{{theme.colors.base8x0c}}",
+      "focusColor": "{{theme.colors.base8x0c}}",
       "hoverColor": "{{theme.colors.base8x0c}}",
+      "tabSelectionArc": 1,
       "tabSelectionHeight": 2,
       "underlineColor": "{{theme.colors.yellow}}"
     },
@@ -477,87 +801,98 @@
       "dropLineShortColor": "{{theme.colors.yellow}}",
       "focusCellBackground": "{{theme.colors.base1}}",
       "focusCellForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
+      "foreground": "{{theme.colors.base10}}",
       "gridColor": "{{theme.colors.base1}}",
       "lightSelectionForeground": "{{theme.colors.yellow}}",
-      "lightSelectionInactiveForeground": "{{theme.colors.base8}}",
+      "lightSelectionInactiveForeground": "{{theme.colors.base10}}",
       "lightSelectionInactiveBackground": "{{theme.colors.base8x0c}}",
       "selectionBackground": "{{theme.colors.base8x0c}}",
       "selectionForeground": "{{theme.colors.yellow}}",
       "selectionInactiveBackground": "{{theme.colors.base8x0c}}",
-      "selectionInactiveForeground": "{{theme.colors.base8}}",
-      "sortIconColor": "{{theme.colors.base8}}",
+      "selectionInactiveForeground": "{{theme.colors.base10}}",
+      "sortIconColor": "{{theme.colors.base10}}",
       "stripeColor": "{{theme.colors.base1}}"
     },
     "TableHeader": {
-      "background": "{{theme.colors.base2}}",
+      "background": "{{theme.colors.base3}}",
       "bottomSeparatorColor": "{{theme.colors.base8x0c}}",
       "cellBorder": "4,0,4,0",
-      "foreground": "{{theme.colors.base8}}",
-      "focusCellBackground": "{{theme.colors.base3}}",
+      "foreground": "{{theme.colors.base10}}",
+      "focusCellBackground": "{{theme.colors.base4}}",
       "separatorColor": "{{theme.colors.base8x0c}}"
     },
-    "textText": "{{theme.colors.base6}}",
+    "Tag": {
+      "background": ""
+    },
     "TextArea": {
       "background": "{{theme.colors.base8x0c}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base4}}",
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveForeground": "{{theme.colors.base6}}",
+      "selectionBackground": "{{theme.colors.base6}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
+    "TextComponent": {
+      "selectionBackgroundInactive": ""
+    },
     "TextField": {
       "background": "{{theme.colors.base8x0c}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base4}}",
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveForeground": "{{theme.colors.base6}}",
+      "selectionBackground": "{{theme.colors.base6}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
     "TextPane": {
       "background": "{{theme.colors.base8x0c}}",
       "caretForeground": "{{theme.colors.yellow}}",
-      "foreground": "{{theme.colors.base8}}",
-      "inactiveForeground": "{{theme.colors.base4}}",
-      "selectionBackground": "{{theme.colors.base4}}",
+      "foreground": "{{theme.colors.base10}}",
+      "inactiveForeground": "{{theme.colors.base6}}",
+      "selectionBackground": "{{theme.colors.base6}}",
       "selectionForeground": "{{theme.colors.yellow}}"
     },
-    "TitlePane": {
-      "background": "{{theme.colors.base1}}",
-      "Button.hoverBackground": "{{theme.colors.base4}}",
-      "inactiveBackground": "{{theme.colors.base2}}",
-      "infoForeground": "{{theme.colors.base6}}",
-      "inactiveInfoForeground": "{{theme.colors.base6}}"
+    "textText": "{{theme.colors.base8}}",
+    "TipOfTheDay": {
+      "Image": {
+        "borderColor": "{{theme.colors.base5}}"
+      }
     },
     "TitledBorder": {
-      "titleColor": "{{theme.colors.base6}}"
+      "titleColor": "{{theme.colors.base8}}"
+    },
+    "TitlePane": {
+      "background": "{{theme.colors.base1}}",
+      "Button.hoverBackground": "{{theme.colors.base6}}",
+      "inactiveBackground": "{{theme.colors.base3}}",
+      "infoForeground": "{{theme.colors.base8}}",
+      "inactiveInfoForeground": "{{theme.colors.base8}}"
     },
     "ToggleButton": {
-      "borderColor": "{{theme.colors.base3}}",
-      "buttonColor": "{{theme.colors.base8}}",
-      "disabledText": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base6}}",
-      "offForeground": "{{theme.colors.base2}}",
-      "offBackground": "{{theme.colors.base2}}",
+      "borderColor": "{{theme.colors.base4}}",
+      "buttonColor": "{{theme.colors.base10}}",
+      "disabledText": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base8}}",
+      "offForeground": "{{theme.colors.base3}}",
+      "offBackground": "{{theme.colors.base3}}",
       "onBackground": "{{theme.colors.yellow}}",
       "onForeground": "{{theme.colors.yellow}}"
     },
     "ToolBar": {
       "background": "{{theme.colors.base1}}",
-      "borderHandleColor": "{{theme.colors.base6}}",
-      "floatingForeground": "{{theme.colors.base6}}",
-      "foreground": "{{theme.colors.base8}}"
+      "borderHandleColor": "{{theme.colors.base8}}",
+      "floatingForeground": "{{theme.colors.base8}}",
+      "foreground": "{{theme.colors.base10}}"
     },
     "ToolTip": {
       "Actions": {
-        "background": "{{theme.colors.base2}}",
-        "infoForeground": "{{theme.colors.base6}}"
+        "background": "{{theme.colors.base3}}",
+        "infoForeground": "{{theme.colors.base8}}"
       },
-      "background": "{{theme.colors.base2}}",
-      "borderColor": "{{theme.colors.base4}}",
-      "foreground": "{{theme.colors.base8}}",
-      "infoForeground": "{{theme.colors.base6}}",
-      "shortcutForeground": "{{theme.colors.base6}}"
+      "background": "{{theme.colors.base3}}",
+      "borderColor": "{{theme.colors.base6}}",
+      "foreground": "{{theme.colors.base10}}",
+      "infoForeground": "{{theme.colors.base8}}",
+      "shortcutForeground": "{{theme.colors.base8}}"
     },
     "ToolWindow": {
       "Button": {
@@ -566,18 +901,18 @@
         "selectedBackground": "{{theme.colors.base8x0c}}"
       },
       "Header": {
-        "background": "{{theme.colors.base2}}",
+        "background": "{{theme.colors.base3}}",
         "borderColor": "{{theme.colors.base8x0c}}",
-        "inactiveBackground": "{{theme.colors.base2}}"
+        "inactiveBackground": "{{theme.colors.base3}}"
       },
       "HeaderCloseButton": {
-        "background": "{{theme.colors.base2}}"
+        "background": "{{theme.colors.base3}}"
       },
       "HeaderTab": {
         "hoverBackground": "{{theme.colors.base8x0c}}",
         "hoverInactiveBackground": "{{theme.colors.base8x0c}}",
         "inactiveUnderlineColor": "{{theme.colors.yellow}}",
-        "selectedInactiveBackground": "{{theme.colors.base2}}",
+        "selectedInactiveBackground": "{{theme.colors.base3}}",
         "underlineColor": "{{theme.colors.yellow}}",
         "underlinedTabBackground": "{{theme.colors.base8x0c}}",
         "underlinedTabInactiveBackground": "{{theme.colors.base8x0c}}"
@@ -585,22 +920,34 @@
     },
     "Tree": {
       "background": "{{theme.colors.base1}}",
-      "foreground": "{{theme.colors.base6}}",
-      "hash": "{{theme.colors.base2}}",
-      "modifiedItemForeground": "{{theme.colors.yellow}}",
+      "errorForeground": "{{theme.colors.errorRed}}",
+      "foreground": "{{theme.colors.base8}}",
+      "hash": "{{theme.colors.base6}}",
+      "hoverBackground": "{{theme.colors.base8x0c}}",
+      "hoverInactiveBackground": "{{theme.colors.base4}}",
+      "modifiedItemForeground": "{{theme.colors.blue}}",
       "rowHeight": 22,
-      "selectionBackground": "{{theme.colors.base2}}",
+      "selectionBackground": "{{theme.colors.base8x0c}}",
       "selectionForeground": "{{theme.colors.yellow}}",
-      "selectionInactiveBackground": "{{theme.colors.base2}}"
+      "selectionInactiveBackground": "{{theme.colors.base4}}",
+      "paintLines": true
     },
     "UiDesigner": {
       "Panel": {
-        "background": "{{theme.colors.base2}}"
+        "background": "{{theme.colors.base3}}"
       },
       "Preview": {
-        "background": "{{theme.colors.base2}}"
+        "background": "{{theme.colors.base3}}"
       }
     },
+    "UnattendedHostStatus": {
+      "dangerBackground": "",
+      "warningBackground": "",
+      "dangerForeground": "",
+      "normalBackground": "",
+      "normalForeground": "",
+      "warningForeground": ""
+    },
     "ValidationTooltip": {
       "errorBackground": "{{theme.colors.base8x0c}}",
       "errorBorderColor": "{{theme.colors.base8x0c}}",
@@ -610,75 +957,106 @@
     "VersionControl": {
       "FileHistory": {
         "Commit": {
-          "selectedBranchBackground": "{{theme.colors.base2}}"
+          "selectedBranchBackground": "{{theme.colors.base3}}"
         }
       },
       "GitLog": {
-        "localBranchIconColor": "{{theme.colors.yellow}}",
-        "otherIconColor": "{{theme.colors.base6}}",
-        "remoteBranchIconColor": "{{theme.colors.base8}}",
-        "tagIconColor": "{{theme.colors.base6}}"
+        "headIconColor": "{{theme.colors.red}}",
+        "localBranchIconColor": "{{theme.colors.blue}}",
+        "otherIconColor": "{{theme.colors.base8}}",
+        "remoteBranchIconColor": "{{theme.colors.green}}",
+        "tagIconColor": "{{theme.colors.base8}}"
       },
       "HgLog": {
-        "branchIconColor": "{{theme.colors.yellow}}",
+        "headIconColor": "",
         "bookmarkIconColor": "{{theme.colors.yellow}}",
-        "closedBranchIconColor": "{{theme.colors.base4}}",
-        "localTagIconColor": "{{theme.colors.base6}}",
-        "mqTagIconColor": "{{theme.colors.base6}}",
-        "tagIconColor": "{{theme.colors.base6}}",
-        "tipIconColor": "{{theme.colors.base6}}"
+        "branchIconColor": "{{theme.colors.yellow}}",
+        "closedBranchIconColor": "{{theme.colors.base6}}",
+        "localTagIconColor": "{{theme.colors.base8}}",
+        "mqTagIconColor": "{{theme.colors.base8}}",
+        "tagIconColor": "{{theme.colors.base8}}",
+        "tipIconColor": "{{theme.colors.base8}}"
       },
       "Log": {
         "Commit": {
-          "unmatchedForeground": "{{theme.colors.base6}}",
-          "currentBranchBackground": "{{theme.colors.base8x0c}}"
+          "currentBranchBackground": "{{theme.colors.base3}}",
+          "hoveredBackground": "{{theme.colors.base5}}",
+          "rowHeight": 20,
+          "selectionBackground": "{{theme.colors.base6}}",
+          "selectionForeground": "{{theme.colors.yellow}}",
+          "selectionInactiveBackground": "{{theme.colors.base1}}",
+          "selectionInactiveForeground": "{{theme.colors.yellow}}",
+          "unmatchedForeground": "{{theme.colors.base8}}"
         }
       },
+      "MarkerPopup": {
+        "borderColor": "{{theme.colors.base6}}",
+        "borderInsets": ""
+      },
       "RefLabel": {
-        "foreground": "{{theme.colors.yellow}}",
-        "backgroundBase": "{{theme.colors.base4}}"
+        "backgroundBase": "{{theme.colors.base6}}",
+        "backgroundBrightness": 0,
+        "foreground": "{{theme.colors.orange}}"
       }
     },
     "Viewport": {
       "background": "{{theme.colors.base1}}",
-      "foreground": "{{theme.colors.base8}}"
+      "foreground": "{{theme.colors.base10}}"
     },
     "WelcomeScreen": {
-      "background": "{{theme.colors.base2}}",
+      "background": "{{theme.colors.base3}}",
       "borderColor": "{{theme.colors.base8x0c}}",
       "captionBackground": "{{theme.colors.base1}}",
-      "captionForeground": "{{theme.colors.base8}}",
+      "captionForeground": "{{theme.colors.base10}}",
       "footerBackground": "{{theme.colors.base1}}",
-      "footerForeground": "{{theme.colors.base8}}",
-      "headerBackground": "{{theme.colors.base2}}",
-      "headerForeground": "{{theme.colors.base8}}",
+      "footerForeground": "{{theme.colors.base10}}",
+      "headerBackground": "{{theme.colors.base3}}",
+      "headerForeground": "{{theme.colors.base10}}",
       "Projects": {
         "background": "{{theme.colors.base1}}",
-        "selectionBackground": "{{theme.colors.base2}}",
-        "selectionInactiveBackground": "{{theme.colors.base2}}"
+        "selectionBackground": "{{theme.colors.base3}}",
+        "selectionInactiveBackground": "{{theme.colors.base3}}"
       },
       "separatorColor": "{{theme.colors.base8x0c}}"
     },
-    "window": "{{theme.colors.base2}}",
+    "window": "{{theme.colors.base3}}",
     "Window": {
       "border": "0,0,0,0,{{theme.colors.base8x0c}}"
     },
     "windowBorder": "{{theme.colors.base8x0c}}",
-    "windowText": "{{theme.colors.base6}}"
+    "windowText": "{{theme.colors.base8}}"
   },
   "icons": {
     "ColorPalette": {
-      "Checkbox.Background.Default.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Background.Disabled.Dark": "#{{theme.colors.base1}}",
-      "Checkbox.Background.Selected.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Border.Default.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Border.Disabled.Dark": "#{{theme.colors.base1}}",
-      "Checkbox.Border.Selected.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Focus.Thin.Default.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Focus.Thin.Selected.Dark": "#{{theme.colors.base1}}",
-      "Checkbox.Focus.Wide.Dark": "#{{theme.colors.base3}}",
-      "Checkbox.Foreground.Disabled.Dark": "#{{theme.colors.base6}}",
-      "Checkbox.Foreground.Selected.Dark": "#{{theme.colors.base8}}"
+      "Actions.Blue": "",
+      "Actions.Green": "",
+      "Actions.Grey": "",
+      "Actions.GreyInline": "",
+      "Actions.GreyInline.Dark": "",
+      "Actions.Red": "",
+      "Actions.Yellow": "",
+      "Checkbox.Background.Default.Dark": "{{theme.colors.base4}}",
+      "Checkbox.Background.Disabled.Dark": "{{theme.colors.base1}}",
+      "Checkbox.Background.Selected.Dark": "{{theme.colors.base4}}",
+      "Checkbox.Border.Default.Dark": "{{theme.colors.base7}}",
+      "Checkbox.Border.Disabled.Dark": "{{theme.colors.base4}}",
+      "Checkbox.Border.Selected.Dark": "{{theme.colors.base7}}",
+      "Checkbox.Focus.Thin.Default.Dark": "{{theme.colors.base4}}",
+      "Checkbox.Focus.Thin.Selected.Dark": "{{theme.colors.base1}}",
+      "Checkbox.Focus.Wide.Dark": "{{theme.colors.blue}}",
+      "Checkbox.Foreground.Disabled.Dark": "{{theme.colors.base8}}",
+      "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base10}}",
+      "Objects.BlackText": "{{theme.colors.base0}}",
+      "Objects.Blue": "{{theme.colors.blue}}",
+      "Objects.Green": "{{theme.colors.green}}",
+      "Objects.Grey": "{{theme.colors.base9}}",
+      "Objects.Pink": "",
+      "Objects.Purple": "{{theme.colors.purple}}",
+      "Objects.Red": "{{theme.colors.red}}",
+      "Objects.RedStatus": "{{theme.colors.errorRed}}",
+      "Objects.Yellow": "{{theme.colors.yellow}}",
+      "Objects.YellowDark": "{{theme.colors.darkYellow}}",
+      "Tree.iconColor": "{{theme.colors.base8}}"
     }
   }
 }