diff --git a/src/themes/default-theme.json b/src/themes/default-theme.json
index 3920d78c..b23b8120 100644
--- a/src/themes/default-theme.json
+++ b/src/themes/default-theme.json
@@ -51,6 +51,10 @@
                         "color": "Silver",
                         "background-color": "Teal"
                     },
+                    "scrollbar": {
+                        "color": "Black",
+                        "background-color": "Silver"
+                    },
                     "focused": {
                         "color": "Black",
                         "background-color": "Silver"
diff --git a/src/themes/eldar.json b/src/themes/eldar.json
index 5bce9447..f063b0dc 100644
--- a/src/themes/eldar.json
+++ b/src/themes/eldar.json
@@ -60,6 +60,10 @@
                         "color": "$black",
                         "background-color": "Grey37"
                     },
+                    "scrollbar": {
+                        "color": "$black",
+                        "background-color": "$white"
+                    },
                     "h1": {
                         "underline": true
                     },
diff --git a/src/themes/night-owl.json b/src/themes/night-owl.json
index 7e775e3b..d3d3a9bc 100644
--- a/src/themes/night-owl.json
+++ b/src/themes/night-owl.json
@@ -68,6 +68,10 @@
                         "color": "$base00",
                         "background-color": "$base3"
                     },
+                    "scrollbar": {
+                        "color": "$black",
+                        "background-color": "$white"
+                    },
                     "h1": {
                         "underline": true
                     },
diff --git a/src/themes/solarized-dark.json b/src/themes/solarized-dark.json
index 3451cdaf..3ff21a97 100644
--- a/src/themes/solarized-dark.json
+++ b/src/themes/solarized-dark.json
@@ -4,23 +4,23 @@
         "theme-defs": {
             "solarized-dark": {
                 "vars": {
-                    "base03":    "#002b36",
-                    "base02":    "#073642",
-                    "base01":    "#586e75",
-                    "base00":    "#657b83",
-                    "base0":     "#839496",
-                    "base1":     "#93a1a1",
-                    "base2":     "#eee8d5",
-                    "base3":     "#fdf6e3",
-                    "black":     "#002b36",
-                    "yellow":    "#b58900",
-                    "orange":    "#cb4b16",
-                    "red":       "#dc322f",
-                    "magenta":   "#d33682",
-                    "violet":    "#6c71c4",
-                    "blue":      "#268bd2",
-                    "cyan":      "#2aa198",
-                    "green":     "#859900",
+                    "base03": "#002b36",
+                    "base02": "#073642",
+                    "base01": "#586e75",
+                    "base00": "#657b83",
+                    "base0": "#839496",
+                    "base1": "#93a1a1",
+                    "base2": "#eee8d5",
+                    "base3": "#fdf6e3",
+                    "black": "#002b36",
+                    "yellow": "#b58900",
+                    "orange": "#cb4b16",
+                    "red": "#dc322f",
+                    "magenta": "#d33682",
+                    "violet": "#6c71c4",
+                    "blue": "#268bd2",
+                    "cyan": "#2aa198",
+                    "green": "#859900",
                     "semantic_highlight_color": "semantic()"
                 },
                 "styles": {
@@ -69,6 +69,10 @@
                         "color": "$base00",
                         "background-color": "$base3"
                     },
+                    "scrollbar": {
+                        "color": "$base03",
+                        "background-color": "$base0"
+                    },
                     "focused": {
                         "color": "$base03",
                         "background-color": "$base01"
diff --git a/src/themes/solarized-light.json b/src/themes/solarized-light.json
index cc3fc8cc..08737a60 100644
--- a/src/themes/solarized-light.json
+++ b/src/themes/solarized-light.json
@@ -4,23 +4,23 @@
         "theme-defs": {
             "solarized-light": {
                 "vars": {
-                    "base03":    "#002b36",
-                    "base02":    "#073642",
-                    "base01":    "#586e75",
-                    "base00":    "#657b83",
-                    "base0":     "#839496",
-                    "base1":     "#93a1a1",
-                    "base2":     "#eee8d5",
-                    "base3":     "#fdf6e3",
-                    "black":     "#002b36",
-                    "yellow":    "#b58900",
-                    "orange":    "#cb4b16",
-                    "red":       "#dc322f",
-                    "magenta":   "#d33682",
-                    "violet":    "#6c71c4",
-                    "blue":      "#268bd2",
-                    "cyan":      "#2aa198",
-                    "green":     "#859900",
+                    "base03": "#002b36",
+                    "base02": "#073642",
+                    "base01": "#586e75",
+                    "base00": "#657b83",
+                    "base0": "#839496",
+                    "base1": "#93a1a1",
+                    "base2": "#eee8d5",
+                    "base3": "#fdf6e3",
+                    "black": "#002b36",
+                    "yellow": "#b58900",
+                    "orange": "#cb4b16",
+                    "red": "#dc322f",
+                    "magenta": "#d33682",
+                    "violet": "#6c71c4",
+                    "blue": "#268bd2",
+                    "cyan": "#2aa198",
+                    "green": "#859900",
                     "semantic_highlight_color": "semantic()"
                 },
                 "styles": {
@@ -69,6 +69,10 @@
                         "color": "$base00",
                         "background-color": "$base3"
                     },
+                    "scrollbar": {
+                        "color": "$base3",
+                        "background-color": "$base00"
+                    },
                     "focused": {
                         "color": "$base03",
                         "background-color": "$base01"