diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json
index 43e7411..4cadc43 100644
--- a/src/themes/theme-template-color-theme.json
+++ b/src/themes/theme-template-color-theme.json
@@ -665,7 +665,7 @@
   "colors": {
     "focusBorder": "{{variant.scheme.focusBorder}}00",
     "editorCursor.foreground": "{{variant.scheme.caret}}",
-    "scrollbar.shadow": "{{variant.scheme.shadow}}",
+    "scrollbar.shadow": "{{variant.scheme.background}}",
     "editor.background": "{{variant.scheme.background}}",
     "editor.foreground": "{{variant.scheme.foreground}}",
     "editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}",
diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json
index a7c04fb..6793c9d 100644
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@@ -3,7 +3,8 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#212121"
+        "background": "#212121",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -664,7 +665,7 @@
   "colors": {
     "focusBorder": "#FFFFFF00",
     "editorCursor.foreground": "#FFCC00",
-    "scrollbar.shadow": "#00000030",
+    "scrollbar.shadow": "#212121",
     "editor.background": "#212121",
     "editor.foreground": "#EEFFFF",
     "editorLineNumber.foreground": "#424242",
diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json
index 0960ff9..f6e0db9 100644
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@@ -3,7 +3,8 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#263238"
+        "background": "#263238",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -664,7 +665,7 @@
   "colors": {
     "focusBorder": "#FFFFFF00",
     "editorCursor.foreground": "#FFCC00",
-    "scrollbar.shadow": "#00000030",
+    "scrollbar.shadow": "#263238",
     "editor.background": "#263238",
     "editor.foreground": "#EEFFFF",
     "editorLineNumber.foreground": "#37474F",
diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json
index 012362a..6ce7868 100644
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@@ -3,7 +3,8 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#FAFAFA"
+        "background": "#FAFAFA",
+        "foreground": "#FFFFFF"
       }
     },
     {
@@ -664,7 +665,7 @@
   "colors": {
     "focusBorder": "#FFFFFF00",
     "editorCursor.foreground": "#272727",
-    "scrollbar.shadow": "#00000030",
+    "scrollbar.shadow": "#FAFAFA",
     "editor.background": "#FAFAFA",
     "editor.foreground": "#90A4AE",
     "editorLineNumber.foreground": "#CFD8DC",
diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json
index 0eb8594..3883f9b 100644
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@@ -3,7 +3,8 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#292D3E"
+        "background": "#292D3E",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -664,7 +665,7 @@
   "colors": {
     "focusBorder": "#FFFFFF00",
     "editorCursor.foreground": "#FFCC00",
-    "scrollbar.shadow": "#00000030",
+    "scrollbar.shadow": "#292D3E",
     "editor.background": "#292D3E",
     "editor.foreground": "#A6ACCD",
     "editorLineNumber.foreground": "#3A3F58",