diff --git a/alternative_user_files/userChrome_windows.css b/alternative_user_files/userChrome_windows.css
index acf5df7..500ef14 100644
--- a/alternative_user_files/userChrome_windows.css
+++ b/alternative_user_files/userChrome_windows.css
@@ -361,13 +361,18 @@ popup > menu > menupopup {
   background: var(--in-content-box-background)!important
 }
 #context-navigation menuitem:hover {
-  background: var(--in-content-category-header-background)!important
+  background: var(--in-content-primary-button-background-hover)!important
 }
 menuitem,
 menupopup menu {
   -moz-appearance: none!important;
   color: var(--in-content-selected-text)!important
 }
+menupopup menuseparator {
+  -moz-appearance: none!important;
+  padding: 1px!important;
+  margin: 5px 0!important
+}
 #context-navigation menuitem[disabled=true],
 menu[disabled=true],
 menuitem[disabled=true] {
@@ -385,7 +390,7 @@ menuitem:hover[disabled=true] {
 menuitem[_moz-menuactive=true],
 menupopup menu[_moz-menuactive=true] {
   color: var(--in-content-selected-text)!important;
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-primary-button-background-hover)!important
 }
 vbox#sidebar-box.chromeclass-extrachrome {
   border-color: var(--in-content-category-header-background)!important;
@@ -403,9 +408,8 @@ screen and (-moz-os-version:windows-win7),
 screen and (-moz-os-version:windows-win8),
 screen and (-moz-os-version:windows-win10) {
   menupopup menuseparator {
-    -moz-appearance: none!important;
-    background: rgba(0,0,0,0)!important;
-    border: 0!important
+    padding: 0!important;
+    border-color: var(--in-content-table-border-dark-color)!important
   }
   #context-navigation,
   #context-sep-navigation {
@@ -990,8 +994,6 @@ statuspanel .statuspanel-label {
   background-color: var(--in-content-border-focus)!important
 }
 menupopup menuseparator {
-  padding: 0!important;
-  margin: 2px 6px!important;
   -moz-appearance: none!important;
   background: rgba(0,0,0,0)!important;
   border: 0!important
diff --git a/alternative_user_files/userContent_no_addons.css b/alternative_user_files/userContent_no_addons.css
index c6abce5..824da96 100644
--- a/alternative_user_files/userContent_no_addons.css
+++ b/alternative_user_files/userContent_no_addons.css
@@ -209,18 +209,19 @@ url-prefix(https://discovery.addons.mozilla.org) {
   popup,
   popup > menu > menupopup {
     -moz-appearance: none!important;
-    background: var(--in-content-page-background)!important;
-    border: none!important
+    background: var(--in-content-box-background)!important;
+    border: none!important;
+    padding: 0!important
   }
   menuitem,
   menupopup menu {
     -moz-appearance: none!important;
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-selected-text)!important
   }
   menuitem:hover,
   menupopup menu:hover {
     color: var(--in-content-text-color)!important;
-    background-color: var(--theme-selection-background-hover)!important
+    background-color: var(--in-content-primary-button-background-hover)!important
   }
   menupopup menuseparator {
     padding: 0!important;
@@ -238,7 +239,8 @@ url-prefix(https://discovery.addons.mozilla.org) {
     menupopup > menu > menupopup,
     popup,
     popup > menu > menupopup {
-      border: 1px solid!important
+      border: 1px solid!important;
+      border-color: var(--in-content-box-background)!important
     }
   }
   .prefs-pane [type=checkbox]:checked + label::after,
diff --git a/css/userContent-files/about_pages.css b/css/userContent-files/about_pages.css
index 338c567..45a590a 100644
--- a/css/userContent-files/about_pages.css
+++ b/css/userContent-files/about_pages.css
@@ -9,18 +9,19 @@ url-prefix(https://discovery.addons.mozilla.org) {
   popup,
   popup > menu > menupopup {
     -moz-appearance: none!important;
-    background: var(--in-content-page-background)!important;
-    border: none!important
+    background: var(--in-content-box-background)!important;
+    border: none!important;
+    padding: 0!important
   }
   menuitem,
   menupopup menu {
     -moz-appearance: none!important;
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-selected-text)!important
   }
   menuitem:hover,
   menupopup menu:hover {
     color: var(--in-content-text-color)!important;
-    background-color: var(--theme-selection-background-hover)!important
+    background-color: var(--in-content-primary-button-background-hover)!important
   }
   menupopup menuseparator {
     padding: 0!important;
@@ -38,7 +39,8 @@ url-prefix(https://discovery.addons.mozilla.org) {
     menupopup > menu > menupopup,
     popup,
     popup > menu > menupopup {
-      border: 1px solid!important
+      border: 1px solid!important;
+      border-color: var(--in-content-box-background)!important
     }
   }
   .prefs-pane [type=checkbox]:checked + label::after,
diff --git a/userContent.css b/userContent.css
index d38c4a0..ce21a48 100644
--- a/userContent.css
+++ b/userContent.css
@@ -209,18 +209,19 @@ url-prefix(https://discovery.addons.mozilla.org) {
   popup,
   popup > menu > menupopup {
     -moz-appearance: none!important;
-    background: var(--in-content-page-background)!important;
-    border: none!important
+    background: var(--in-content-box-background)!important;
+    border: none!important;
+    padding: 0!important
   }
   menuitem,
   menupopup menu {
     -moz-appearance: none!important;
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-selected-text)!important
   }
   menuitem:hover,
   menupopup menu:hover {
     color: var(--in-content-text-color)!important;
-    background-color: var(--theme-selection-background-hover)!important
+    background-color: var(--in-content-primary-button-background-hover)!important
   }
   menupopup menuseparator {
     padding: 0!important;
@@ -238,7 +239,8 @@ url-prefix(https://discovery.addons.mozilla.org) {
     menupopup > menu > menupopup,
     popup,
     popup > menu > menupopup {
-      border: 1px solid!important
+      border: 1px solid!important;
+      border-color: var(--in-content-box-background)!important
     }
   }
   .prefs-pane [type=checkbox]:checked + label::after,