diff --git a/.config/hypr b/.config/hypr
index 8d228136..221369e3 160000
--- a/.config/hypr
+++ b/.config/hypr
@@ -1 +1 @@
-Subproject commit 8d22813645d4273fe78dd617a59d3e2a8def3b6d
+Subproject commit 221369e3987cc77d0247f4f9516228cf187a9421
diff --git a/.config/wlogout/layout b/.config/wlogout/layout
index acebe3ab..440783fc 100755
--- a/.config/wlogout/layout
+++ b/.config/wlogout/layout
@@ -6,7 +6,7 @@
 }
 {
     "label" : "logout",
-    "action" : "hyprctl dispatch exit",
+    "action" : "hyprctl dispatch 'hl.dsp.exit()'" ,
     "text" : "Logout",
     "keybind" : "e"
 }
diff --git a/laptop-files/.config/hypr/binds-local.conf b/laptop-files/.config/hypr/binds-local.conf
deleted file mode 100644
index fb23029a..00000000
--- a/laptop-files/.config/hypr/binds-local.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-
-bind = $mainMod, f, fullscreen # toggle the window between focus and fullscreen
-bind = $mainMod, e, exec, wlogout -b 5 # Wlogout menu
-
-# Application shortcuts
-bind = $mainMod, return, exec, $term # launch terminal emulator
-bind = $mainMod, i, exec, $editor # launch text editor
-bind = $mainMod, o, exec, $browser # launch web browser
-
-# Switch workspaces
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move focused window to a workspace
-bind = $mainMod+Shift, 1, movetoworkspacesilent, 1
-bind = $mainMod+Shift, 2, movetoworkspacesilent, 2
-bind = $mainMod+Shift, 3, movetoworkspacesilent, 3
-bind = $mainMod+Shift, 4, movetoworkspacesilent, 4
-bind = $mainMod+Shift, 5, movetoworkspacesilent, 5
-bind = $mainMod+Shift, 6, movetoworkspacesilent, 6
-bind = $mainMod+Shift, 7, movetoworkspacesilent, 7
-bind = $mainMod+Shift, 8, movetoworkspacesilent, 8
-bind = $mainMod+Shift, 9, movetoworkspacesilent, 9
-bind = $mainMod+Shift, 0, movetoworkspacesilent, 10
-
diff --git a/laptop-files/.config/hypr/local.conf b/laptop-files/.config/hypr/local.conf
deleted file mode 100644
index 67e4e6f3..00000000
--- a/laptop-files/.config/hypr/local.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Main modifier
-$mainMod = mod1
-$submod = super
-
-input {
-		kb_options = caps:swapescape # swap caps and escape
-}
-
-exec-once = wpaperd -d # Wallpaper
-exec-once = way-edges # Screen Edge Shell
-
-workspace = special:music, gapsout:5 330 300 330 # bigger music workspace
diff --git a/pc-files/.config/hypr/binds-local.conf b/pc-files/.config/hypr/binds-local.conf
deleted file mode 100644
index 2824ca9d..00000000
--- a/pc-files/.config/hypr/binds-local.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# Script Path
-$scrPath = ~/.config/scripts
-
-# Window/Session actions
-bind = $mainMod, b, fullscreen # toggle the window between focus and fullscreen
-bind = $mainMod, a, exec, wlogout -b 5 # Wlogout menu
-
-# Application shortcuts
-bind = $mainMod, s, exec, $file # launch web browser
-bind = $mainMod, return, exec, $term # launch terminal emulator
-bind = $mainMod, f, exec, $browser # launch web browser
-
-# Switch workspaces
-bind = $mainMod, q, workspace, 1
-bind = $mainMod, w, workspace, 2
-bind = $mainMod, e, workspace, 3
-bind = $mainMod, r, workspace, 4
-bind = $mainMod, t, workspace, 5
-bind = $mainMod, y, workspace, 6
-bind = $mainMod, u, workspace, 7
-bind = $mainMod, i, workspace, 8
-bind = $mainMod, o, workspace, 9
-bind = $mainMod, p, workspace, 10
-
-bind = $mainMod+SHIFT, q, movetoworkspacesilent, 1
-bind = $mainMod+SHIFT, w, movetoworkspacesilent, 2
-bind = $mainMod+SHIFT, e, movetoworkspacesilent, 3
-bind = $mainMod+SHIFT, r, movetoworkspacesilent, 4
-bind = $mainMod+SHIFT, t, movetoworkspacesilent, 5
-bind = $mainMod+SHIFT, y, movetoworkspacesilent, 6
-bind = $mainMod+SHIFT, u, movetoworkspacesilent, 7
-bind = $mainMod+SHIFT, i, movetoworkspacesilent, 8
-bind = $mainMod+SHIFT, o, movetoworkspacesilent, 9
-bind = $mainMod+SHIFT, p, movetoworkspacesilent, 10
diff --git a/pc-files/.config/hypr/local.conf b/pc-files/.config/hypr/local.conf
deleted file mode 100644
index 81947351..00000000
--- a/pc-files/.config/hypr/local.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Main modifier
-$mainMod = super # super / meta / windows key
-$submod = super
-
-#cool decorations
-exec-once = kitten panel --edge=background -o background_opacity=0 --output-name HDMI-A-1 sh -c "cmatrix -b -C magenta -a -u 10"
-exec-once = kitten panel --edge=background -o background_opacity=0 --output-name DP-2 sh -c "cava"
-# exec-once = kitten panel --edge=background -o background_opacity=0 --output-name DP-1 sh -c "fastfetch && tail -f /dev/null"
diff --git a/pc-files/.config/hypr/windows.conf b/pc-files/.config/hypr/windows.conf
deleted file mode 100644
index cd292414..00000000
--- a/pc-files/.config/hypr/windows.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-monitor = DP-1, 1920x1080@60, 0x0, 1
-monitor = DP-2, 1920x1080@60, 1920x0, 1
-monitor = HDMI-A-1, 1920x1080@60, -1920x0, 1
-
-workspace = 2, monitor:HDMI-A-1, default:true
-workspace = 3, monitor:DP-2, default:true
-workspace = 1, monitor:DP-1, default:true
-
-exec-once = wpaperd
-
-decoration {
-		blur {
-				vibrancy_darkness = 0.3
-        vibrancy = 1
-		}
-}