diff --git a/options/custom/programs/firefox/.common.nix b/options/custom/programs/firefox/.common.nix
index 5152773..2fee019 100644
--- a/options/custom/programs/firefox/.common.nix
+++ b/options/custom/programs/firefox/.common.nix
@@ -51,10 +51,11 @@ with lib; {
 
     # TODO: Consider other themes
     # https://github.com/soulhotel/FF-ULTIMA
-
+    #!! @import must be above other rules
     # https://github.com/rafaelmardojai/firefox-gnome-theme/blob/master/theme/colors/dark.css
-    userChrome = builtins.readFile ./userChrome.css;
-    userContent = builtins.readFile ./userContent.css;
+    userChrome = mkAfter ''@import "${./customChrome.css}";'';
+    userContent = mkAfter ''@import "${./customContent.css}";'';
+
     containersForce = true;
 
     containers = {
diff --git a/options/custom/programs/firefox/customChrome.css b/options/custom/programs/firefox/customChrome.css
new file mode 100644
index 0000000..542be97
--- /dev/null
+++ b/options/custom/programs/firefox/customChrome.css
@@ -0,0 +1,21 @@
+/***
+https://github.com/rafaelmardojai/firefox-gnome-theme
+***/
+
+:root {
+  --gnome-accent: #d33682;
+  --gnome-tabbar-tab-hover-background: color-mix(in srgb, #073642, #586e75 10%);
+  --gnome-tabbar-tab-active-background: color-mix(in srgb, #073642, #586e75 20%);
+  --gnome-tabbar-tab-active-background-contrast: color-mix(in srgb, #073642, #586e75 20%);
+  --gnome-tabbar-tab-active-hover-background: color-mix(in srgb, #073642, #586e75 30%);
+}
+
+/* Center bookmarks */
+#PlacesToolbarItems {
+  justify-content: center;
+}
+
+/* Disable bookmark folder icons */
+.bookmark-item[container] > .toolbarbutton-icon {
+  display: none;
+}
diff --git a/options/custom/programs/firefox/userContent.css b/options/custom/programs/firefox/customContent.css
similarity index 100%
rename from options/custom/programs/firefox/userContent.css
rename to options/custom/programs/firefox/customContent.css
diff --git a/options/custom/programs/firefox/userChrome.css b/options/custom/programs/firefox/userChrome.css
deleted file mode 100644
index 5cf491b..0000000
--- a/options/custom/programs/firefox/userChrome.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/***
-https://github.com/rafaelmardojai/firefox-gnome-theme
-***/
-
-:root {
-  --gnome-accent: #d33682;
-  --gnome-window-background: #002b36;
-  --gnome-window-color: #93a1a1;
-  --gnome-view-background: #073642;
-  --gnome-sidebar-background: #002b36;
-  --gnome-secondary-sidebar-background: #002b36;
-  --gnome-menu-background: #073642;
-  --gnome-headerbar-background: #002b36;
-  --gnome-toolbar-icon-fill: #93a1a1;
-  --gnome-tabbar-tab-hover-background: #073642;
-  --gnome-tabbar-tab-active-background: #073642;
-  --gnome-tabbar-tab-active-hover-background: #073642;
-}
-
-:root:-moz-window-inactive {
-  --gnome-inactive-entry-color: #586e75;
-  --gnome-tabbar-tab-hover-background: #073642;
-  --gnome-tabbar-tab-active-background: #073642;
-}
-
-/* Center bookmarks */
-#PlacesToolbarItems {
-  justify-content: center;
-}
-
-/* Disable bookmark folder icons */
-.bookmark-item[container] > .toolbarbutton-icon {
-  display: none;
-}