diff --git a/jslib b/jslib
index e0d5a4d8b7..c512b9b3ce 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e0d5a4d8b706f3b44a07d2d77e1bf127a117179d
+Subproject commit c512b9b3ce9d1cbc432e2a42232526cbb8ca25f8
diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss
index 10a3997f27..df51fcaabb 100644
--- a/src/popup/scss/base.scss
+++ b/src/popup/scss/base.scss
@@ -110,12 +110,17 @@ content::-webkit-scrollbar-track {
 }
 
 content::-webkit-scrollbar-thumb {
-    background-color: rgba(100,100,100,.2);
     border-radius: 10px;
     margin-right: 1px;
 
+    @include themify($themes) {
+        background-color: themed('scrollbarColor');
+    }
+
     &:hover {
-        background-color: rgba(100,100,100,.4);
+        @include themify($themes) {
+            background-color: themed('scrollbarHoverColor');
+        }
     }
 }
 
diff --git a/src/popup/scss/variables.scss b/src/popup/scss/variables.scss
index a145e336d1..ebba7ae323 100644
--- a/src/popup/scss/variables.scss
+++ b/src/popup/scss/variables.scss
@@ -42,6 +42,13 @@ $themes: (
         borderColorDark: $border-color-dark,
         backgroundColor: $background-color,
         backgroundColorAlt: #ffffff,
+        scrollbarColor: rgba(100,100,100,.2),
+        scrollbarHoverColor: rgba(100,100,100,.4),
+        boxBackgroundColor: $box-background-color,
+        boxBackgroundHoverColor: $box-background-hover-color,
+        boxBorderColor: $box-border-color,
+        tabBackgroundColor: #ffffff,
+        tabBackgroundHoverColor: $list-item-hover,
         headerColor: #ffffff,
         headerBackgroundColor: $brand-primary,
         headerBackgroundHoverColor: rgba(255, 255, 255, 0.1),
@@ -51,11 +58,6 @@ $themes: (
         headerInputColor: #ffffff,
         headerInputPlaceholderColor: lighten($brand-primary, 35%),
         listItemBackgroundHoverColor: $list-item-hover,
-        boxBackgroundColor: $box-background-color,
-        boxBackgroundHoverColor: $box-background-hover-color,
-        boxBorderColor: $box-border-color,
-        tabBackgroundColor: #ffffff,
-        tabBackgroundHoverColor: $list-item-hover,
         disabledIconColor: $list-icon-color,
         headingColor: $gray-light,
         labelColor: $gray-light,
@@ -84,6 +86,8 @@ $themes: (
         borderColorDark: #111111,
         backgroundColor: #222222,
         backgroundColorAlt: #3d3d3d,
+        scrollbarColor: #4d4d4d,
+        scrollbarHoverColor: #5f5f5f,
         boxBackgroundColor: #363636,
         boxBackgroundHoverColor: #3f3f3f,
         boxBorderColor: #2f2f2f,