diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf
new file mode 100644
index 0000000..332e3a6
--- /dev/null
+++ b/.config/hypr/autostart.conf
@@ -0,0 +1,15 @@
+exec-once = dunst
+exec-once = ~/.bin/launch-waybar
+exec-once = waypaper --restore
+exec-once = wl-paste --watch cliphist store
+exec-once = dbus-update-activation-environment --all
+exec-once = gnome-keyring-daemon --start --components=pkcs11,secrets,ssh
+
+exec-once = [workspace 1 silent] godot
+exec-once = [workspace 2 silent] $editor
+exec-once = [workspace 3 silent] $browser
+exec-once = [workspace 4 silent] $terminal
+exec-once = [workspace 5 silent] $terminal
+exec-once = [workspace 6 silent] $terminal
+exec-once = [workspace 7 silent] $files
+exec-once = [workspace 9 silent] $email
diff --git a/.config/hypr/environment.conf b/.config/hypr/environment.conf
new file mode 100644
index 0000000..c157b71
--- /dev/null
+++ b/.config/hypr/environment.conf
@@ -0,0 +1,13 @@
+# Some default env vars.
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt6ct
+
+# SSH
+env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/gcr/ssh
+
+# Nvidia
+env = LIBVA_DRIVER_NAME,nvidia
+env = XDG_SESSION_TYPE,wayland
+env = GBM_BACKEND,nvidia-drm
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+env = WLR_NO_HARDWARE_CURSORS,1
diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf
new file mode 100644
index 0000000..b3f4c83
--- /dev/null
+++ b/.config/hypr/general.conf
@@ -0,0 +1,72 @@
+general {
+	gaps_in = 5
+	gaps_out = 20
+	border_size = 2
+	col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+	col.inactive_border = rgba(595959aa)
+
+	layout = dwindle
+
+	allow_tearing = false
+}
+
+input {
+	kb_layout = us
+	kb_variant =
+	kb_model =
+	kb_options =
+	kb_rules =
+
+	follow_mouse = 1
+
+	touchpad {
+		natural_scroll = no
+	}
+
+	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+decoration {
+	rounding = 10
+
+	blur {
+		enabled = true
+		size = 3
+		passes = 1
+	}
+
+	drop_shadow = yes
+	shadow_range = 4
+	shadow_render_power = 3
+	col.shadow = rgba(1a1a1aee)
+}
+
+animations {
+	enabled = yes
+
+	bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+	animation = windows, 1, 7, myBezier
+	animation = windowsOut, 1, 7, default, popin 80%
+	animation = border, 1, 10, default
+	animation = borderangle, 1, 8, default
+	animation = fade, 1, 7, default
+	animation = workspaces, 1, 1, default
+}
+
+dwindle {
+	pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+	preserve_split = yes # you probably want this
+}
+
+master {
+	new_is_master = true
+}
+
+gestures {
+	workspace_swipe = off
+}
+
+misc {
+	force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
+}
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index a0ab3d8..4e5d03b 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,208 +1,7 @@
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,highrr,auto,auto
-
-# Some default env vars.
-env = XCURSOR_SIZE,24
-env = QT_QPA_PLATFORMTHEME,qt6ct
-
-# SSH
-env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/gcr/ssh
-
-# Nvidia
-env = LIBVA_DRIVER_NAME,nvidia
-env = XDG_SESSION_TYPE,wayland
-env = GBM_BACKEND,nvidia-drm
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = WLR_NO_HARDWARE_CURSORS,1
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
-# Execute your favorite apps at launch
-exec-once=swaync
-exec-once=waybar
-exec-once=waypaper --restore
-exec-once = wl-paste --watch cliphist store
-exec-once = dbus-update-activation-environment --all
-exec-once = gnome-keyring-daemon --start --components=pkcs11,secrets,ssh
-
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
-
-# Set programs that you use
-$terminal = alacritty
-$browser = firefox
-$fileManager = nautilus
-$menu = fuzzel
-$email = geary
-
-# Autostart
-exec-once=[workspace 1 silent] godot
-exec-once=[workspace 2 silent] code
-exec-once=[workspace 3 silent] $browser
-exec-once=[workspace 4 silent] $terminal
-exec-once=[workspace 5 silent] $terminal
-exec-once=[workspace 6 silent] $terminal
-exec-once=[workspace 7 silent] $fileManager
-exec-once=[workspace 9 silent] $email
-
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-input {
-	kb_layout = us
-	kb_variant =
-	kb_model =
-	kb_options =
-	kb_rules =
-
-	follow_mouse = 1
-
-	touchpad {
-		natural_scroll = no
-	}
-
-	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-}
-
-general {
-	# See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-	gaps_in = 5
-	gaps_out = 20
-	border_size = 2
-	col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-	col.inactive_border = rgba(595959aa)
-
-	layout = dwindle
-
-	# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-	allow_tearing = false
-}
-
-decoration {
-	# See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-	rounding = 10
-
-	blur {
-		enabled = true
-		size = 3
-		passes = 1
-	}
-
-	drop_shadow = yes
-	shadow_range = 4
-	shadow_render_power = 3
-	col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-	enabled = yes
-
-	# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-	bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-	animation = windows, 1, 7, myBezier
-	animation = windowsOut, 1, 7, default, popin 80%
-	animation = border, 1, 10, default
-	animation = borderangle, 1, 8, default
-	animation = fade, 1, 7, default
-	animation = workspaces, 1, 1, default
-}
-
-dwindle {
-	# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-	pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-	preserve_split = yes # you probably want this
-}
-
-master {
-	# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-	new_is_master = true
-}
-
-gestures {
-	# See https://wiki.hyprland.org/Configuring/Variables/ for more
-	workspace_swipe = off
-}
-
-misc {
-	# See https://wiki.hyprland.org/Configuring/Variables/ for more
-	force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
-}
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# windowrulev2 = nomaximizerequest, class:.* # You'll probably like this.
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = SUPER
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, T, exec, $terminal
-bind = $mainMod, B, exec, $browser
-bind = $mainMod, C, killactive,
-bind = $mainMod, F, fullscreen,
-bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, R, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Switch workspaces with numpad
-bind = , KP_Home, workspace, 1
-bind = , KP_Up, workspace, 2
-bind = , KP_Prior, workspace, 3
-bind = , KP_Left, workspace, 4
-bind = , KP_Begin, workspace, 5
-bind = , KP_Right, workspace, 6
-bind = , KP_End, workspace, 7
-bind = , KP_Down, workspace, 8
-bind = , KP_Next, workspace, 9
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Media keys
-# l -> do stuff even when locked
-# e -> repeats when key is held
-bindle =, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+
-bindle =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-
-#bindle =, XF86MonBrightnessUp, exec, bri --up
-#bindle =, XF86MonBrightnessDown, exec, bri --down
-#bindle =, XF86Search, exec, launchpad
-# bindl =, XF86AudioMute, exec, amixer set Master toggle
-bindl =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindl =, XF86AudioPlay, exec, playerctl play-pause # the stupid key is called play , but it toggles
-bindl =, XF86AudioNext, exec, playerctl next
-bindl =, XF86AudioPrev, exec, playerctl previous
+source = monitor.conf
+source = environment.conf
+source = programs.conf
+source = autostart.conf
+source = general.conf
+source = rules.conf
+source = keys.conf
diff --git a/.config/hypr/keys.conf b/.config/hypr/keys.conf
new file mode 100644
index 0000000..ee6c449
--- /dev/null
+++ b/.config/hypr/keys.conf
@@ -0,0 +1,69 @@
+$leader = SUPER
+$movews = CTRL ALT
+
+# Apps
+bind = $leader, T, exec, $terminal
+bind = $leader, B, exec, $browser
+bind = $leader, E, exec, $files
+bind = $leader, R, exec, $menu
+
+# Screenshot
+bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy
+
+# Window management
+bind = $leader, C, killactive,
+bind = $leader, F, fullscreen,
+bind = $leader, V, togglefloating,
+bind = $leader, P, pseudo, # dwindle
+bind = $leader, J, togglesplit, # dwindle
+bind = $leader, M, exit,
+
+# Move focus with leader + arrow keys
+bind = $leader, left, movefocus, l
+bind = $leader, right, movefocus, r
+bind = $leader, up, movefocus, u
+bind = $leader, down, movefocus, d
+
+# Switch workspaces with numpad
+bind =, KP_Home, workspace, 1
+bind =, KP_Up, workspace, 2
+bind =, KP_Prior, workspace, 3
+bind =, KP_Left, workspace, 4
+bind =, KP_Begin, workspace, 5
+bind =, KP_Right, workspace, 6
+bind =, KP_End, workspace, 7
+bind =, KP_Down, workspace, 8
+bind =, KP_Next, workspace, 9
+
+# Move active window to an adjacent workspace
+bind = $movews, right, movetoworkspace, +1
+bind = $movews, left, movetoworkspace, -1
+
+# Move active window to a specific workspace
+bind = $movews, 1, movetoworkspace, 1
+bind = $movews, 2, movetoworkspace, 2
+bind = $movews, 3, movetoworkspace, 3
+bind = $movews, 4, movetoworkspace, 4
+bind = $movews, 5, movetoworkspace, 5
+bind = $movews, 6, movetoworkspace, 6
+bind = $movews, 7, movetoworkspace, 7
+bind = $movews, 8, movetoworkspace, 8
+bind = $movews, 9, movetoworkspace, 9
+
+# Example special workspace (scratchpad)
+bind = $leader, S, togglespecialworkspace, magic
+bind = $leader SHIFT, S, movetoworkspace, special:magic
+
+# Move/resize windows with leader + LMB/RMB and dragging
+bindm = $leader, mouse:272, movewindow
+bindm = $leader, mouse:273, resizewindow
+
+# Volume control
+bindle =, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+
+bindle =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-
+bindl =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+
+# Media keys
+bindl =, XF86AudioPlay, exec, playerctl play-pause
+bindl =, XF86AudioNext, exec, playerctl next
+bindl =, XF86AudioPrev, exec, playerctl previous
diff --git a/.config/hypr/monitor.conf b/.config/hypr/monitor.conf
new file mode 100644
index 0000000..8c156da
--- /dev/null
+++ b/.config/hypr/monitor.conf
@@ -0,0 +1 @@
+monitor=,highrr,auto,auto
diff --git a/.config/hypr/programs.conf b/.config/hypr/programs.conf
new file mode 100644
index 0000000..65e9c8c
--- /dev/null
+++ b/.config/hypr/programs.conf
@@ -0,0 +1,6 @@
+$terminal = alacritty
+$browser = firefox
+$files = nautilus
+$menu = fuzzel
+$editor = code
+$email = geary
diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf
new file mode 100644
index 0000000..af370c0
--- /dev/null
+++ b/.config/hypr/rules.conf
@@ -0,0 +1 @@
+windowrulev2 = suppressevent maximize, class:.*
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 1f37ea7..e84e5bf 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -3,18 +3,18 @@
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
-  "mini.completion": { "branch": "main", "commit": "72fc63b350f600d1dc8ba7d2c523e16d3c4110af" },
-  "multiple-cursors.nvim": { "branch": "main", "commit": "23f012050e46aee9fd0ef0bcb373a19588bb1b80" },
-  "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
+  "mini.completion": { "branch": "main", "commit": "0cf6c4e257b5e8189ac6b3ffa2064a319c4eb8a8" },
+  "multiple-cursors.nvim": { "branch": "main", "commit": "9cd1b9204a3862332eaa96d08ef125de5b44bef8" },
+  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
   "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
-  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
-  "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
-  "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
-  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
+  "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
+  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
+  "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" },
+  "nvim-treesitter": { "branch": "master", "commit": "62b0bb4f24ad09f535efe44cc9d088f90dcd2498" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
   "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" },
-  "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }
+  "telescope.nvim": { "branch": "master", "commit": "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d" }
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua
index d66ab72..eb1c1ed 100644
--- a/.config/nvim/lua/config/settings.lua
+++ b/.config/nvim/lua/config/settings.lua
@@ -43,7 +43,7 @@ opt.wrap = false
 -- UI
 opt.fillchars = { eob = " ", vert = " " }
 opt.laststatus = 0
-opt.number = false
+opt.number = true
 opt.relativenumber = false
 opt.signcolumn = "yes"
 opt.statusline = "%{repeat('─',winwidth('.'))}"
diff --git a/.config/vscode/settings.json b/.config/vscode/settings.json
index 5c98820..c7f2c79 100644
--- a/.config/vscode/settings.json
+++ b/.config/vscode/settings.json
@@ -27,8 +27,8 @@
 	"gitProjectManager.storeRepositoriesBetweenSessions": false,
 	"go.gopath": "~/.go",
 	"go.toolsManagement.autoUpdate": true,
-	"godot_tools.gdscript_lsp_server_port": 6005,
-	"godot_tools.editor_path": "/usr/bin/godot",
+	"godotTools.editorPath.godot4": "/usr/bin/godot",
+	"godotTools.lsp.serverPort": 6005,
 	"security.workspace.trust.enabled": false,
 	"svelte.enable-ts-plugin": true,
 	"telemetry.telemetryLevel": "off",
diff --git a/.config/waybar/config b/.config/waybar/config
index 1c57c1e..b476733 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,8 +1,8 @@
 {
 	"layer": "top",
 	"modules-left": ["custom/launcher","hyprland/workspaces"],
-	"modules-center": ["clock","cpu","memory","network","disk"],
-	"modules-right": ["mpris","wireplumber"],
+	"modules-center": [],
+	"modules-right": ["mpris","wireplumber","cpu","memory","network","disk","clock"],
 	"clock": {
 		"interval": 60,
 		"format": "{:%a %H:%M}",
@@ -58,15 +58,7 @@
 		"format": "{icon}",
 		"on-click": "activate",
 		"persistent-workspaces": {
-			"1": [],
-			"2": [],
-			"3": [],
-			"4": [],
-			"5": [],
-			"6": [],
-			"7": [],
-			"8": [],
-			"9": [],
+			"*": 9
 		},
 		"format-icons": {
 			"urgent": "",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 4ecd377..949aa18 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -92,53 +92,3 @@ window#waybar.hidden {
 	color: #89DCEB;
 	background: transparent;
 }
-
-#custom-power {
-	font-size: 20px;
-	margin-top: 6px;
-	margin-left: 8px;
-	margin-right: 8px;
-	padding-left: 10px;
-	padding-right: 5px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #F28FAD;
-}
-
-#custom-wallpaper {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #C9CBFF;
-}
-
-#custom-updates {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #E8A2AF;
-}
-
-#custom-media {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #F2CDCD;
-}