diff --git a/modules/Commands.qml b/modules/Commands.qml
index 6d2f02a..cdf3aee 100644
--- a/modules/Commands.qml
+++ b/modules/Commands.qml
@@ -54,10 +54,13 @@ Scope {
         if (index > uiState.workspaces.count) return;
         let id;
         if (index === uiState.workspaces.count) {
+            if (uiState.workspaces.get(index - 1).workspace === Hypr.focusedWorkspace
+                && Hypr.focusedWorkspace.toplevels.values.length === 0) return;
             id = root.nextWorkspace();
         } else {
             id = uiState.workspaces.get(index).workspace.id;
         }
+        if (id === Hypr.focusedWorkspace.id) return;
         Hypr.dispatch(`workspace ${id}`);
     }
 
@@ -76,10 +79,13 @@ Scope {
         if (index > uiState.workspaces.count) return;
         let id;
         if (index === uiState.workspaces.count) {
+            if (uiState.workspaces.get(index - 1).workspace === Hypr.focusedWorkspace
+                && Hypr.focusedWorkspace.toplevels.values.length === 0) return;
             id = nextWorkspace();
         } else {
             id = uiState.workspaces.get(index).workspace.id;
         }
+        if (id === Hypr.focusedWorkspace.id) return;
         Hypr.dispatch(`hy3:movetoworkspace ${id}`);
     }
 
@@ -109,7 +115,7 @@ Scope {
         description: "Toggle launcher"
         onPressed: {
             const uiState = States.getForActive();
-            uiState.laucher = !uiState.launcher;
+            uiState.launcher = !uiState.launcher;
         }
     }
 
diff --git a/services/Audio.qml b/services/Audio.qml
index 2c38010..75fd528 100644
--- a/services/Audio.qml
+++ b/services/Audio.qml
@@ -2,6 +2,7 @@ pragma Singleton
 
 import qs.config
 import qs.custom
+import QtQuick
 import Quickshell
 import Quickshell.Services.Pipewire
 
@@ -37,15 +38,49 @@ Singleton {
     }
 
     CustomShortcut {
+        id: volumeUp
         name: "volumeUp"
         description: "Increase volume"
-        onPressed: root.increaseVolume()
+        onPressed: {
+            root.increaseVolume();
+            volumeUpTimer.interval = 800;
+            volumeUpTimer.running = true;
+        }
+        onReleased: {
+            volumeUpTimer.running = false;
+        }
+    }
+    Timer {
+        id: volumeUpTimer
+        interval: 800
+        repeat: true
+        onTriggered: {
+            interval = 200;
+            root.increaseVolume();
+        }
     }
 
     CustomShortcut {
+        id: volumeDown
         name: "volumeDown"
         description: "Decrease volume"
-        onPressed: root.decreaseVolume()
+        onPressed: {
+            root.decreaseVolume();
+            volumeDownTimer.interval = 800;
+            volumeDownTimer.running = true;
+        }
+        onReleased: {
+            volumeDownTimer.running = false;
+        }
+    }
+    Timer {
+        id: volumeDownTimer
+        interval: 800
+        repeat: true
+        onTriggered: {
+            interval = 200;
+            root.decreaseVolume();
+        }
     }
 
     CustomShortcut {
diff --git a/services/Brightness.qml b/services/Brightness.qml
index b369d2f..34403d0 100644
--- a/services/Brightness.qml
+++ b/services/Brightness.qml
@@ -1,6 +1,7 @@
 pragma Singleton
 pragma ComponentBehavior: Bound
 
+import qs.config
 import qs.custom
 import Quickshell
 import Quickshell.Io
@@ -67,15 +68,50 @@ Singleton {
     }
 
     CustomShortcut {
+        id: brightnessUp
         name: "brightnessUp"
         description: "Increase brightness"
-        onPressed: root.increaseBrightness()
+        onPressed: {
+            console.log("a")
+            root.increaseBrightness();
+            brightnessUpTimer.interval = 800;
+            brightnessUpTimer.running = true;
+        }
+        onReleased: {
+            brightnessUpTimer.running = false;
+        }
+    }
+    Timer {
+        id: brightnessUpTimer
+        interval: 800
+        repeat: true
+        onTriggered: {
+            interval = 200;
+            root.increaseBrightness();
+        }
     }
 
     CustomShortcut {
+        id: brightnessDown
         name: "brightnessDown"
         description: "Decrease brightness"
-        onPressed: root.decreaseBrightness()
+        onPressed: {
+            root.decreaseBrightness();
+            brightnessDownTimer.interval = 800;
+            brightnessDownTimer.running = true;
+        }
+        onReleased: {
+            brightnessDownTimer.running = false;
+        }
+    }
+    Timer {
+        id: brightnessDownTimer
+        interval: 800
+        repeat: true
+        onTriggered: {
+            interval = 200;
+            root.decreaseBrightness();
+        }
     }
 
     component Monitor: QtObject {
diff --git a/services/Notifs.qml b/services/Notifs.qml
index 52a20ca..decc95e 100644
--- a/services/Notifs.qml
+++ b/services/Notifs.qml
@@ -54,16 +54,7 @@ Singleton {
         description: "Dismiss all notifications"
         onPressed: {
             for (const notif of root.list)
-                notif.popup = null;
-        }
-    }
-
-    IpcHandler {
-        target: "notifs"
-
-        function clear(): void {
-            for (const notif of root.list)
-                notif.popup = null;
+                notif.notification.dismiss();
         }
     }
 
diff --git a/services/SystemUsage.qml b/services/SystemUsage.qml
index bd02da3..18e5333 100644
--- a/services/SystemUsage.qml
+++ b/services/SystemUsage.qml
@@ -10,7 +10,7 @@ Singleton {
 
     property real cpuPerc
     property real cpuTemp
-    readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
+    readonly property string gpuType: Config.services.gpuType?.toUpperCase() || autoGpuType
     property string autoGpuType: "NONE"
     property real gpuPerc
     property real gpuTemp