diff --git a/hypr/hyprbinds.conf b/hypr/hyprbinds.conf
index 4634635..11eeaee 100644
--- a/hypr/hyprbinds.conf
+++ b/hypr/hyprbinds.conf
@@ -8,7 +8,7 @@ bind = SUPER_L, B, togglesplit
 # Screen locking
 bindl = SUPER, ESCAPE, exec, ~/.config/scripts/lock.sh
 bind = , XF86Go, exec, ~/.config/scripts/idle-toggle.sh
-bindl= ,switch:on:Lid Switch, exec, pgrep hyprlock || hyprlock & systemctl suspend
+bindl= ,switch:on:Lid Switch, exec, (pgrep hyprlock || hyprlock) & sleep 1; systemctl suspend
 
 $select = winsel
 
@@ -38,7 +38,6 @@ bind = SUPER, 6, workspace, 6
 bind = SUPER, 7, workspace, 7
 bind = SUPER, 8, workspace, 8
 bind = SUPER, 9, workspace, 9
-bind = SUPER, 0, exec, hyprctl activewindow | workspace0
 bind = SUPER, apostrophe, hyprexpo:expo, toggle 
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
@@ -71,13 +70,13 @@ bind = SUPER ALT, S, resizeactive, 50 0
 
 # Open favourites
 bind = SUPER, G, exec, zen-browser
-bind = SUPER, C, exec, spotify-launcher
+bind = SUPER, C, exec, steam
 bind = SUPER, R, exec, keepassxc
 bind = SUPER, L, exec, kitty
 
 # Adjust brightness
-bindle = , XF86MonBrightnessUp, exec, brillo -A 8% -q -u 500000
-bindle = , XF86MonBrightnessDown, exec, brillo -U 8% -q -u 500000
+bindle = , XF86MonBrightnessUp, exec, brillo -A 5% -q -u 300000
+bindle = , XF86MonBrightnessDown, exec, brillo -U 5% -q -u 300000
 bindle = SHIFT, XF86MonBrightnessDown, exec, brillo -S 0% -q -u 1000000
 bind = , Cancel, exec, ~/.config/scripts/sunset-toggle.sh
 
@@ -94,25 +93,5 @@ bind = SUPER SHIFT,	COMMA, exec, pgrep slurp || hyprshot -o ~/Pictures/Screensho
 bind = SUPER,			SEMICOLON,		exec, ~/.config/scripts/zoom.sh
 bind = SHIFT,			XF86Display,	exec, ~/.config/scripts/vnc-toggle.sh
 bind = ,		    	XF86Display,	exec, killall gjs && ags run
+bind = ALT,             XF86Display,    exec, sleep 0.5 && hyprctl dispatch dpms off
 
-# MCSR
-# Thin macro
-bind = ,                KP_DOWN,        fullscreenstate, 0 2 set
-bind = ,                KP_DOWN,        setfloating
-bind = ,                KP_DOWN,        resizeactive, exact 400 1400
-bind = ,                KP_DOWN,        centerwindow
-# Wide macro
-bind = ,                KP_NEXT,        fullscreenstate, 0 2 set
-bind = ,                KP_NEXT,        setfloating
-bind = ,                KP_NEXT,        resizeactive, exact 2560 400
-bind = ,                KP_NEXT,        centerwindow
-# Tall macro
-bind = ,                KP_END,         fullscreenstate, 0 2 set
-bind = ,                KP_END,         setfloating
-bind = ,                KP_END,         resizeactive, exact 1950 16384
-bind = ,                KP_END,         movewindowpixel, exact 600 -7500, activewindow
-
-bind = ,                KP_UP,          exec, boateye.sh
-windowrule = float,         title:boateye.png
-windowrule = size 500 500,  title:boateye.png
-windowrule = move 50 800,   title:boateye.png
diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index fa7f0ec..23eec2c 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -1,4 +1,9 @@
 listener {
 	timeout = 100
-	on-timeout = ~/.config/scripts/idle.sh
+	on-timeout = hyprctl dispatch dpms off
+}
+
+listener {
+	timeout = 105
+	on-timeout = pgrep -x hyprlock || hyprlock & sleep 0.5; systemctl suspend
 }
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index d8177ca..c38e295 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -11,19 +11,19 @@ exec-once 	= hypridle
 exec-once	= nextcloud
 exec-once 	= /lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once 	= keyd-application-mapper -d
-exec-once 	= ags run
+exec-once 	= ags run --gtk 3
 exec-once 	= hyprpm reload
-exec-once	= tradjust
 exec-once	= swww-daemon
+exec-once   = kanshi
 
 # Theming with envvars for some reason
 env  = XCURSOR_SIZE,		    22
 env  = XCURSOR_THEME,		    GoogleDot-Black
-envd = GTK_THEME,               catppuccin-mocha-sapphire-standard+default
+envd = GTK_THEME,               Graphite-purple-Dark
 env  = GTK_ICON_THEME,          BeautyLine
 env  = HYPRCURSOR_SIZE,		    22
 env  = HYPRCURSOR_THEME,	    GoogleDot-hypr
-env  = QT_QPA_PLATFORMTHEME,    qt6ct
+env  = QT_QPA_PLATFORMTHEME,    gtk3
 env  = QT_QPA_PLATFORM,         wayland;xcb
 
 env = FREETYPE_PROPERTIES,cff:no-stem-darkening=0 autofitter:no-stem-darkening=0
@@ -101,14 +101,12 @@ dwindle {
 plugin {
     hyprexpo {
         columns 			= 3
-        gap_size 			= 5
+        gap_size 			= 6
         bg_col				= rgb(111111)
         workspace_method 	= first 1 # [center/first] [workspace] e.g. first 1 or center m+1
 
-        enable_gesture 		= true # laptop touchpad
-        gesture_fingers 	= 3  # 3 or 4
-        gesture_distance 	= 300 # how far is the "max"
-        gesture_positive 	= true # positive = swipe down. Negative = swipe up.
+        enable_gesture      = false
+        skip_empty          = false
     }
 	#dynamic-cursors {
 	#	enabled = true
@@ -142,7 +140,8 @@ windowrule = size 95% 90%,      class:(mpv|loupe)
 windowrule = center 1,          floating:1
 
 # Misc layer rules
-layerrule = animation slide,	.*bar.*
+layerrule = animation slide,	bar
+layerrule = animation popin,    swww-daemon
 layerrule = blur, 				logout_dialog
 layerrule = animation fade, 	logout_dialog
 layerrule = animation fade, 	selection
@@ -168,6 +167,7 @@ misc {
     disable_splash_rendering            = false
 	new_window_takes_over_fullscreen 	= 2
 	key_press_enables_dpms				= true
+	mouse_move_enables_dpms				= true
 	focus_on_activate					= true
     session_lock_xray                   = true
 	animate_manual_resizes				= true
@@ -181,7 +181,3 @@ cursor {
 xwayland {
     force_zero_scaling = true
 }
-
-debug {
-    full_cm_proto   = true
-}
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index 1dcc715..98dc419 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -2,7 +2,7 @@ source = ~/.config/hypr/hyprcolors.conf
 
 general {
 	hide_cursor 				= true
-	immediate_render			= true
+	immediate_render			= false
 }
 
 auth {
@@ -24,10 +24,10 @@ animations {
 
 background {
 	monitor 					=
-	path 						= screenshot
+	path 						= ~/Pictures/Wallpapers/endcity.png
 	color						= rgba(181825aa)
-	blur_strength 				= 10
-	blur_passes 				= 3
+	blur_strength 				= 2
+	blur_passes 				= 2
 	brightness 					= 0.8
 	contrast 					= 0.8
 }                       		
diff --git a/hypr/monitors.conf b/hypr/monitors.conf
index af7b82f..8c9d0da 100644
--- a/hypr/monitors.conf
+++ b/hypr/monitors.conf
@@ -1,3 +1,4 @@
-# Generated by nwg-displays on 2025-10-10 at 11:48:17. Do not edit manually.
+# Generated by nwg-displays on 2025-10-30 at 14:31:04. Do not edit manually.
 
-monitor=DP-1,2560x1440@143.97,0x0,1.0
+monitor=eDP-1,1920x1200@60.0,0x1080,1.0
+monitor=HDMI-A-1,preferred,0x0,1.0
diff --git a/kitty/colors.conf b/kitty/colors.conf
index c5805a0..c23b8e7 100644
--- a/kitty/colors.conf
+++ b/kitty/colors.conf
@@ -1,6 +1,6 @@
 foreground         #ECE5F0
 background         #262229
-background_opacity 
+background_opacity 0
 cursor             #A795C1
 
 active_tab_foreground     #262229
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 60d34e0..51af290 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -2,8 +2,8 @@ include colors.conf
 
 background_opacity				0
 
-font_family						ComicShannsMono Nerd Font
-font_size						14
+font_family						0xProto Nerd Font
+font_size						12
 
 cursor							#cdf
 cursor_trail 					1
diff --git a/nvim/init.lua b/nvim/init.lua
index 71c522d..24cdd5f 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -13,7 +13,7 @@ vim.lsp.enable({
     "ts_ls",
     "css_ls",
     "tinymist",
-    "dartls"
+    "bashls"
 })
 
 
@@ -71,6 +71,7 @@ vim.cmd([[
 	set tabstop=4
 	set shiftwidth=4
 	set cmdheight=0
+    set scrolloff=12
 
 	let g:vsnip_snippet_dir = '~/.config/nvim/vsnip'
 	colorscheme catppuccin