diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix
index 9d5e3bb0..2afb1d11 100644
--- a/home-manager/common/software/gui/firefox.nix
+++ b/home-manager/common/software/gui/firefox.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, theme, ... }: {
+
+  imports = [ ./themes/${theme}/firefox-theme.nix ];
   programs.firefox = {
     enable = true;
 
@@ -16,8 +18,6 @@
         link-cleaner
         adnauseam
         censor-tracker
-        # Theming
-        gruvbox-dark-theme
       ];
 
       search.default = "DuckDuckGo";
diff --git a/home-manager/common/software/gui/themes/default/firefox-theme.nix b/home-manager/common/software/gui/themes/default/firefox-theme.nix
new file mode 100644
index 00000000..544b7b4d
--- /dev/null
+++ b/home-manager/common/software/gui/themes/default/firefox-theme.nix
@@ -0,0 +1,3 @@
+{
+    
+}
\ No newline at end of file
diff --git a/home-manager/common/software/gui/themes/default/kitty-theme.nix b/home-manager/common/software/gui/themes/default/kitty-theme.nix
new file mode 100644
index 00000000..544b7b4d
--- /dev/null
+++ b/home-manager/common/software/gui/themes/default/kitty-theme.nix
@@ -0,0 +1,3 @@
+{
+    
+}
\ No newline at end of file
diff --git a/home-manager/common/software/gui/themes/gruvbox/firefox-theme.nix b/home-manager/common/software/gui/themes/gruvbox/firefox-theme.nix
new file mode 100644
index 00000000..e318021b
--- /dev/null
+++ b/home-manager/common/software/gui/themes/gruvbox/firefox-theme.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, theme, ... }: {
+  programs.firefox = {
+      # https://nur.nix-community.org/repos/rycee/
+      extensions =  with pkgs.nur.repos.rycee.firefox-addons; [
+        # Theming
+        gruvbox-dark-theme
+      ];
+  };
+}
\ No newline at end of file