diff --git a/modules/firefox/testbeds/firefox-color.nix b/modules/firefox/testbeds/firefox-color.nix
new file mode 100644
index 00000000..4d44ecfe
--- /dev/null
+++ b/modules/firefox/testbeds/firefox-color.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+{
+  imports = [ ./firefox.nix ];
+
+  home-manager.sharedModules = lib.singleton {
+    stylix.targets.firefox.colorTheme.enable = true;
+    programs.firefox.profiles.stylix.extensions.force = true;
+  };
+}
diff --git a/modules/firefox/testbeds/firefox-gnome-theme.nix b/modules/firefox/testbeds/firefox-gnome-theme.nix
index 8acfa81e..b8a884f3 100644
--- a/modules/firefox/testbeds/firefox-gnome-theme.nix
+++ b/modules/firefox/testbeds/firefox-gnome-theme.nix
@@ -1,24 +1,8 @@
-{ lib, pkgs, ... }:
-let
-  package = pkgs.firefox;
-  profileName = "stylix";
-in
+{ lib, ... }:
 {
-  stylix.testbed.ui.application = {
-    name = "firefox";
-    inherit package;
-  };
+  imports = [ ./firefox.nix ];
 
   home-manager.sharedModules = lib.singleton {
-    programs.firefox = {
-      enable = true;
-      inherit package;
-      profiles.${profileName}.isDefault = true;
-    };
-
-    stylix.targets.firefox = {
-      profileNames = [ profileName ];
-      firefoxGnomeTheme.enable = true;
-    };
+    stylix.targets.firefox.firefoxGnomeTheme.enable = true;
   };
 }