diff --git a/src/themes/settings/specific/darker.json b/src/themes/settings/specific/darker.json
index c44ce98..d01f505 100644
--- a/src/themes/settings/specific/darker.json
+++ b/src/themes/settings/specific/darker.json
@@ -8,11 +8,9 @@
     "findHighlight": "#F8E71C",
     "foreground": "#eeffffff",
     "guides": "#42424270",
-    "activeGuide": "#FFFFFF50",
-    "stackGuides": "#42424280",
-    "gutter": "#424242",
+    "lineNumbers": "#424242",
     "invisibles": "#65737e",
-    "highlight": "#00000050",
+    "lineHighlight": "#00000050",
     "selection": "#61616150",
     "shadow": "#00000010",
     "keywords": "#cfd8dc",
diff --git a/src/themes/settings/specific/default.json b/src/themes/settings/specific/default.json
index 9ff0e7a..a82c352 100644
--- a/src/themes/settings/specific/default.json
+++ b/src/themes/settings/specific/default.json
@@ -8,11 +8,9 @@
     "findHighlight": "#F8E71C",
     "foreground": "#eeffff",
     "guides": "#37474F80",
-    "activeGuide": "#80CBC470",
-    "stackGuides": "#37474Fff",
-    "gutter": "#37474F",
+    "lineNumbers": "#37474F",
     "invisibles": "#65737e",
-    "highlight": "#00000050",
+    "lineHighlight": "#00000050",
     "selection": "#80CBC420",
     "shadow": "#00000010",
     "keywords": "#cfd8dc",
diff --git a/src/themes/settings/specific/lighter.json b/src/themes/settings/specific/lighter.json
index a9b34b7..8ce5709 100644
--- a/src/themes/settings/specific/lighter.json
+++ b/src/themes/settings/specific/lighter.json
@@ -8,11 +8,9 @@
     "findHighlight": "#F8E71C",
     "foreground": "#80CBC4",
     "guides": "#B0BEC570",
-    "activeGuide": "#00000070",
-    "stackGuides": "#B0BEC580",
-    "gutter": "#CFD8DC",
+    "lineNumbers": "#CFD8DC",
     "invisibles": "#E7EAEC",
-    "highlight": "#90A4AE20",
+    "lineHighlight": "#90A4AE20",
     "selection": "#80CBC440",
     "shadow": "#90A4AE50",
     "keywords": "#AAB3B5",
diff --git a/src/themes/settings/specific/palenight.json b/src/themes/settings/specific/palenight.json
index 4178771..2522701 100644
--- a/src/themes/settings/specific/palenight.json
+++ b/src/themes/settings/specific/palenight.json
@@ -8,11 +8,9 @@
     "findHighlight": "#F8E71C",
     "foreground": "#959DCB",
     "guides": "#4E557980",
-    "activeGuide": "#828ED5",
-    "stackGuides": "#4E5579",
-    "gutter": "#3A3F58",
+    "lineNumbers": "#3A3F58",
     "invisibles": "#4E5579",
-    "highlight": "#00000030",
+    "lineHighlight": "#00000030",
     "selection": "#717CB440",
     "shadow": "#00000010",
     "keywords": "#cfd8dc",
diff --git a/src/themes/theme-template.yml b/src/themes/theme-template.yml
index 5fb82ad..d6dcf17 100644
--- a/src/themes/theme-template.yml
+++ b/src/themes/theme-template.yml
@@ -414,3 +414,10 @@ colors:
   sideBarBackground: '{{variant.scheme.background}}'
   tabsContainerBackground: '{{variant.scheme.background}}'
   inactiveTabBackground: '{{variant.scheme.background}}'
+  editorLineNumbers: '{{variant.scheme.lineNumbers}}'
+  editorLineHighlight: '{{variant.scheme.lineHighlight}}'
+  editorSelection: '{{variant.scheme.selection}}'
+  editorIndentGuides: '{{variant.scheme.guides}}'
+  inputBoxBackground: '{{variant.scheme.background}}'
+  dropdownBackground: '{{variant.scheme.background}}'
+  editorFindWidgetBackground: '{{variant.scheme.background}}'
diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json
index 11ac89f..1938f38 100644
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@@ -670,6 +670,13 @@
     "titleBarInactiveBackground": "#212121",
     "sideBarBackground": "#212121",
     "tabsContainerBackground": "#212121",
-    "inactiveTabBackground": "#212121"
+    "inactiveTabBackground": "#212121",
+    "editorLineNumbers": "#424242",
+    "editorLineHighlight": "#00000050",
+    "editorSelection": "#61616150",
+    "editorIndentGuides": "#42424270",
+    "inputBoxBackground": "#212121",
+    "dropdownBackground": "#212121",
+    "editorFindWidgetBackground": "#212121"
   }
 }
\ No newline at end of file
diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json
index bbce642..41ba411 100644
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@@ -670,6 +670,13 @@
     "titleBarInactiveBackground": "#263238",
     "sideBarBackground": "#263238",
     "tabsContainerBackground": "#263238",
-    "inactiveTabBackground": "#263238"
+    "inactiveTabBackground": "#263238",
+    "editorLineNumbers": "#37474F",
+    "editorLineHighlight": "#00000050",
+    "editorSelection": "#80CBC420",
+    "editorIndentGuides": "#37474F80",
+    "inputBoxBackground": "#263238",
+    "dropdownBackground": "#263238",
+    "editorFindWidgetBackground": "#263238"
   }
 }
\ No newline at end of file
diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json
index fdde7b7..9931795 100644
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@@ -670,6 +670,13 @@
     "titleBarInactiveBackground": "#FAFAFA",
     "sideBarBackground": "#FAFAFA",
     "tabsContainerBackground": "#FAFAFA",
-    "inactiveTabBackground": "#FAFAFA"
+    "inactiveTabBackground": "#FAFAFA",
+    "editorLineNumbers": "#CFD8DC",
+    "editorLineHighlight": "#90A4AE20",
+    "editorSelection": "#80CBC440",
+    "editorIndentGuides": "#B0BEC570",
+    "inputBoxBackground": "#FAFAFA",
+    "dropdownBackground": "#FAFAFA",
+    "editorFindWidgetBackground": "#FAFAFA"
   }
 }
\ No newline at end of file
diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json
index 187373c..9ec74ce 100644
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@@ -670,6 +670,13 @@
     "titleBarInactiveBackground": "#292D3E",
     "sideBarBackground": "#292D3E",
     "tabsContainerBackground": "#292D3E",
-    "inactiveTabBackground": "#292D3E"
+    "inactiveTabBackground": "#292D3E",
+    "editorLineNumbers": "#3A3F58",
+    "editorLineHighlight": "#00000030",
+    "editorSelection": "#717CB440",
+    "editorIndentGuides": "#4E557980",
+    "inputBoxBackground": "#292D3E",
+    "dropdownBackground": "#292D3E",
+    "editorFindWidgetBackground": "#292D3E"
   }
 }
\ No newline at end of file