diff --git a/modules/programs/browser/firefox.nix b/modules/programs/browser/firefox.nix
index 01722c9..4db465a 100644
--- a/modules/programs/browser/firefox.nix
+++ b/modules/programs/browser/firefox.nix
@@ -80,6 +80,12 @@
   };
   config = lib.mkIf (config.mods.browser.firefox.enable || config.mods.homePackages.browser == "firefox") (
     lib.optionalAttrs (options ? programs.firefox.profiles) {
+      stylix.targets.firefox.profileNames =
+        map (
+          {name, ...}:
+            name
+        )
+        config.mods.browser.firefox.profiles;
       programs.firefox = {
         enable = true;
         policies = config.mods.browser.firefox.configuration;
diff --git a/modules/programs/gpu.nix b/modules/programs/gpu.nix
index 56083db..339b694 100644
--- a/modules/programs/gpu.nix
+++ b/modules/programs/gpu.nix
@@ -87,7 +87,7 @@
           (lib.mkIf config.mods.gpu.vapi.enable pkgs.libvdpau-va-gl)
           (lib.mkIf config.mods.gpu.vapi.enable pkgs.libva)
           (lib.mkIf config.mods.gpu.vapi.enable pkgs.vaapiVdpau)
-          (lib.mkIf (config.mods.gpu.intelgpu.enable || config.mods.gpu.amdgpu.enable) pkgs.mesa.drivers)
+          (lib.mkIf (config.mods.gpu.intelgpu.enable || config.mods.gpu.amdgpu.enable) pkgs.mesa)
         ];
         rocmPackages = [
           pkgs.rocmPackages.clr.icd
diff --git a/modules/programs/hyprland/anyrun.nix b/modules/programs/hyprland/anyrun.nix
index 5b17669..6a3a24e 100644
--- a/modules/programs/hyprland/anyrun.nix
+++ b/modules/programs/hyprland/anyrun.nix
@@ -10,8 +10,8 @@
     hyprland = {
       anyrun = {
         enable = lib.mkOption {
-          default = true;
-          example = false;
+          default = false;
+          example = true;
           type = lib.types.bool;
           description = "Enables anyrun";
         };
diff --git a/modules/programs/hyprland/hyprland.nix b/modules/programs/hyprland/hyprland.nix
index a517f98..ff13a4c 100644
--- a/modules/programs/hyprland/hyprland.nix
+++ b/modules/programs/hyprland/hyprland.nix
@@ -124,8 +124,8 @@ in {
         settings =
           if config.mods.hyprland.useDefaultConfig
           then
-            (
-              lib.recursiveUpdate
+            lib.mkMerge
+            [
               {
                 "$mod" = "SUPER";
 
@@ -148,12 +148,13 @@ in {
                   "$mod SUPER,T,exec,kitty -1"
                   "$mod SUPER,E,exec,nautilus -w"
                   "$mod SUPER,N,exec,neovide"
-                  "$mod SUPER,M,exec,oxidash"
-                  "$mod SUPER,R,exec,anyrun"
-                  "$mod SUPER,G,exec,oxicalc"
-                  "$mod SUPER,D,exec,oxishut"
-                  "$mod SUPER,A,exec,oxipaste-iced"
-                  "$mod SUPERSHIFT,P,exec,hyprdock --gui"
+                  (lib.mkIf (config.mods.hyprland.anyrun.enable) "$mod SUPER,R,exec,anyrun")
+                  (lib.mkIf (config.mods.oxi.oxirun.enable) "$mod SUPER,R,exec,oxirun")
+                  (lib.mkIf (config.mods.oxi.oxidash.enable) "$mod SUPER,M,exec,oxidash")
+                  (lib.mkIf (config.mods.oxi.oxicalc.enable) "$mod SUPER,G,exec,oxicalc")
+                  (lib.mkIf (config.mods.oxi.oxishut.enable) "$mod SUPER,D,exec,oxishut")
+                  (lib.mkIf (config.mods.oxi.oxipaste.enable) "$mod SUPER,A,exec,oxipaste-iced")
+                  (lib.mkIf (config.mods.oxi.hyprdock.enable) "$mod SUPERSHIFT,P,exec,hyprdock --gui")
                   "$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl suspend"
                   "$mod SUPERSHIFT,K,exec, playerctl -a pause & hyprlock & systemctl hibernate"
 
@@ -375,18 +376,20 @@ in {
                   ++ config.mods.hyprland.extraAutostart;
 
                 plugin =
-                  lib.recursiveUpdate
-                  {
-                    hyprspace = lib.mkIf config.mods.hyprland.hyprspaceEnable {
-                      bind = [
-                        "SUPER, W, overview:toggle, toggle"
-                      ];
-                    };
-                  }
-                  config.mods.hyprland.pluginConfig;
+                  lib.mkMerge
+                  [
+                    {
+                      hyprspace = lib.mkIf config.mods.hyprland.hyprspaceEnable {
+                        bind = [
+                          "SUPER, W, overview:toggle, toggle"
+                        ];
+                      };
+                    }
+                    config.mods.hyprland.pluginConfig
+                  ];
               }
               config.mods.hyprland.customConfig
-            )
+            ]
           else lib.mkForce config.mods.hyprland.customConfig;
         plugins =
           [