diff --git a/modules/home/dank-material-shell.nix b/modules/home/dank-material-shell.nix
index a226c86..069ae56 100644
--- a/modules/home/dank-material-shell.nix
+++ b/modules/home/dank-material-shell.nix
@@ -21,9 +21,5 @@ in {
       "DankMaterialShell/settings.json".source =
         json.generate "settings.json" cfg.settings;
     };
-
-    programs.niri.settings.switch-events = {
-      lid-close.action.spawn = ["dms" "ipc" "lock" "lock"];
-    };
   };
 }
diff --git a/modules/home/users/msyds/dank-material-shell.nix b/modules/home/users/msyds/dank-material-shell.nix
index 5ecb7d6..2a504fc 100644
--- a/modules/home/users/msyds/dank-material-shell.nix
+++ b/modules/home/users/msyds/dank-material-shell.nix
@@ -1,6 +1,11 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, host, ... }:
 
-let cfg = config.sydnix.users.msyds.dank-material-shell;
+let
+  cfg = config.sydnix.users.msyds.dank-material-shell;
+  on = hosts:
+    if builtins.isString hosts
+    then hosts == host
+    else builtins.elem host hosts;
 in {
   options.sydnix.users.msyds.dank-material-shell = {
     enable = lib.mkEnableOption "Dank Material Shell";
@@ -167,7 +172,7 @@ in {
           showControlCenterButton = true;
           showCapsLockIndicator = true;
           controlCenterShowNetworkIcon = true;
-          controlCenterShowBluetoothIcon = true;
+          controlCenterShowBluetoothIcon = on ["fruitbook"];
           controlCenterShowAudioIcon = true;
           controlCenterShowVpnIcon = true;
           controlCenterShowBrightnessIcon = false;
@@ -286,9 +291,9 @@ in {
           batterySuspendTimeout = 0;
           batterySuspendBehavior = 0;
           batteryProfileName = "";
-          lockBeforeSuspend = false;
+          lockBeforeSuspend = true;
           loginctlLockIntegration = true;
-          fadeToLockEnabled = false;
+          fadeToLockEnabled = true;
           fadeToLockGracePeriod = 5;
           launchPrefix = "";
           brightnessDevicePins = {};