diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index ecae469b..4e514709 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -73,7 +73,6 @@ self: {pkgs, ...}: {
     };
 
     defaultApps.enable = true;
-    services.gammastep.enable = true;
     theme.enable = true;
   };
 }
diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix
index ab8bd6ea..c400532b 100644
--- a/hosts/fallarbor/home.nix
+++ b/hosts/fallarbor/home.nix
@@ -2,13 +2,20 @@
   home-manager = {
     sharedModules = [
       {
-        services.easyeffects = {
-          enable = true;
-          preset = "fw13-easy-effects";
-        };
-
         wayland.windowManager.sway.config.output = {"BOE 0x095F Unknown".scale = "1.5";};
-        ar.home.desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];
+
+        ar.home = {
+          desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];
+
+          services = {
+            easyeffects = {
+              enable = true;
+              preset = "fw13-easy-effects";
+            };
+
+            gammastep.enable = true;
+          };
+        };
       }
     ];
 
diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix
index dad678f1..836b38cf 100644
--- a/hosts/lavaridge/home.nix
+++ b/hosts/lavaridge/home.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  self,
-  ...
-}: {
+{self, ...}: {
   home-manager = {
     sharedModules = [
       {
@@ -21,8 +17,6 @@
               enable = true;
               preset = "fw13-easy-effects";
             };
-
-            gammastep.enable = lib.mkForce false;
           };
         };
       }
diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix
index 55b9a6da..6f44a188 100644
--- a/hosts/petalburg/home.nix
+++ b/hosts/petalburg/home.nix
@@ -42,13 +42,17 @@
           };
         };
 
-        ar.home.desktop.hyprland = {
-          laptopMonitors = ["desc:Samsung Display Corp. 0x4152,preferred,auto,2,transform,0"];
+        ar.home = {
+          desktop.hyprland = {
+            laptopMonitors = ["desc:Samsung Display Corp. 0x4152,preferred,auto,2,transform,0"];
 
-          tabletMode = {
-            enable = true;
-            switches = ["Lenovo Yoga Tablet Mode Control switch"];
+            tabletMode = {
+              enable = true;
+              switches = ["Lenovo Yoga Tablet Mode Control switch"];
+            };
           };
+
+          services.gammastep.enable = true;
         };
       }
     ];
diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix
index 0471ae2a..bc98112d 100644
--- a/hosts/rustboro/home.nix
+++ b/hosts/rustboro/home.nix
@@ -7,9 +7,13 @@
         ar.home = {
           desktop.hyprland.laptopMonitors = ["desc:LG Display 0x0569,preferred,auto,1.25"];
 
-          services.easyeffects = {
-            enable = true;
-            preset = "LoudnessEqualizer";
+          services = {
+            easyeffects = {
+              enable = true;
+              preset = "LoudnessEqualizer";
+            };
+
+            gammastep.enable = true;
           };
         };
       }