diff --git a/private_dot_config/gtk-4.0/settings.ini b/private_dot_config/gtk-4.0/settings.ini
index 72be76c..f5ccce9 100644
--- a/private_dot_config/gtk-4.0/settings.ini
+++ b/private_dot_config/gtk-4.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=adw-gtk3
+gtk-theme-name=adw-gtk3-dark
 gtk-icon-theme-name=Adwaita
 gtk-font-name=Adwaita Sans 11
 gtk-cursor-theme-name=Bibata-Modern-Ice
diff --git a/private_dot_config/helix/config.toml b/private_dot_config/helix/config.toml
index cdf780e..f0bffe9 100644
--- a/private_dot_config/helix/config.toml
+++ b/private_dot_config/helix/config.toml
@@ -4,6 +4,7 @@ theme = "default-jsw"
 line-number = "relative"
 default-yank-register = "+"
 bufferline = "multiple"
+end-of-line-diagnostics = "hint"
 
 [editor.cursor-shape]
 insert = "bar"
@@ -12,9 +13,16 @@ select = "underline"
 
 [editor.auto-save]
 focus-lost = true
-avter-delay.enable = true
+after-delay.enable = true
+
+[editor.soft-wrap]
+enable = true
+
+[editor.inline-diagnostics]
+cursor-line = "warning" # show warnings and errors on the cursorline inline
 
 [keys.normal]
 "C-/" = "toggle_comments"
 "x" = "extend_to_line_bounds"
 "X" = "extend_line_below"
+"C-." = "repeat_last_motion"
diff --git a/private_dot_config/hypr/land/binds.conf b/private_dot_config/hypr/land/binds.conf
index f876bb7..d068c52 100644
--- a/private_dot_config/hypr/land/binds.conf
+++ b/private_dot_config/hypr/land/binds.conf
@@ -7,6 +7,7 @@ bind = $mod, b, exec, $bluetooth
 bind = $mod SHIFT, p, exec, $display
 bind = $mod, d, exec, $menu
 bind = $mod, escape, exec, $lock
+bind = $mod, g, exec, $game
 
 bind = CTRL, Print, exec, $screenshot
 bind = $mod CTRL, p, exec, $screenshot 
diff --git a/private_dot_config/hypr/land/defaults.conf b/private_dot_config/hypr/land/defaults.conf
index 1efa63a..8430740 100644
--- a/private_dot_config/hypr/land/defaults.conf
+++ b/private_dot_config/hypr/land/defaults.conf
@@ -19,3 +19,4 @@ $rec = mkdir -p ~/Pictures/Screenshots && grim -t ppm -o "$(hyprctl activeworksp
 $np = ~/.config/hypr/scripts/np.sh
 # Other applications
 $browser = /usr/bin/firefox
+$game = ~/.local/bin/steam-gamescope
diff --git a/private_dot_config/hypr/land/empty_rules.conf b/private_dot_config/hypr/land/empty_rules.conf
new file mode 100644
index 0000000..e69de29
diff --git a/private_dot_config/hypr/land/input.conf b/private_dot_config/hypr/land/input.conf
index debff06..9df6486 100644
--- a/private_dot_config/hypr/land/input.conf
+++ b/private_dot_config/hypr/land/input.conf
@@ -16,3 +16,8 @@ input {
     }
 }
 gesture = 3, horizontal, workspace
+
+device {
+    name = dualsense-wireless-controller-touchpad
+    enabled = false
+}
diff --git a/private_dot_config/hypr/land/rules.conf b/private_dot_config/hypr/land/rules.conf
deleted file mode 100644
index 9cc043d..0000000
--- a/private_dot_config/hypr/land/rules.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-windowrule = suppressevent maximize, class:.*
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
diff --git a/private_dot_config/hypr/land/startup.conf b/private_dot_config/hypr/land/startup.conf
index c838296..68fcf9b 100644
--- a/private_dot_config/hypr/land/startup.conf
+++ b/private_dot_config/hypr/land/startup.conf
@@ -1,5 +1,8 @@
 exec-once = swaybg -i ~/Pictures/wallpaper.png
-exec-once = waybar
 exec-once = ~/.config/hypr/scripts/switch_powerprofiles.sh sync
 exec-once = /usr/bin/hyprlock -c ~/.config/hypr/lock/login.conf
+
+exec-once = waybar
 exec-once = mako
+exec-once = nm-applet
+exec-once = blueman-applet
diff --git a/private_dot_config/packages/aur.list b/private_dot_config/packages/aur.list
index 80adda9..1d9ec14 100644
--- a/private_dot_config/packages/aur.list
+++ b/private_dot_config/packages/aur.list
@@ -1,7 +1,4 @@
-emmet-language-server
 git-credential-oauth
-kanata-bin
-ookla-speedtest-bin
 protonup-qt-bin
 python-ble-serial
 yay-bin
diff --git a/private_dot_config/packages/normal.list b/private_dot_config/packages/normal.list
index 1a46657..e319a51 100644
--- a/private_dot_config/packages/normal.list
+++ b/private_dot_config/packages/normal.list
@@ -1,12 +1,12 @@
 7zip
 adw-gtk-theme
 aria2
-arp-scan
 atuin
 base
 bat
-bluetui
-bluez
+brightnessctl
+chaotic-keyring
+chaotic-mirrorlist
 chezmoi
 debugedit
 dua-cli
@@ -14,71 +14,82 @@ efibootmgr
 fakeroot
 firefox
 fish
-fprintd
 fwupd
 fwupd-efi
-git
+gamescope
+gnome-keyring
+gparted
 greetd
+gurk
+gvfs-mtp
 helix
 htop
-hyprland
-hyprlock
-hyprsunset
-imagemagick
 jq
 kitty
+libnotify
 libvdpau-va-gl
-linux-firmware
-linux-zen
 make
 mako
 man-db
 man-pages
 mpv
-networkmanager
-noto-fonts
-noto-fonts-emoji
-nwg-displays
-nwg-look
 openssh
-pipewire
+noto-fonts-emoji
 pkgconf
 polkit-gnome
 power-profiles-daemon
 pulsemixer
-rclone
-reflector
 ripgrep
 rofi
 rsync
-rtkit
-rust
-rust-analyzer
-satty
-steam
 sudo
 swaybg
-thunderbird
-tinymist
-tinyxxd
-tmux
-tor
-torbrowser-launcher
 ttf-jetbrains-mono-nerd
-typst
 udisks2
-vscode-html-languageserver
-vulkan-radeon
 waybar
-waypipe
 wev
 wf-recorder
 which
 wireplumber
 wl-clipboard
+wpa_supplicant
 xdg-desktop-portal-hyprland
 xdg-user-dirs
+xorg-xhost
+yay
 yazi
 zathura
 zathura-pdf-mupdf
 tesseract-data-nld
+
+blueman
+bluetui
+bluez
+bluez-utils
+
+hyprland
+hyprlock
+hyprsunset
+
+
+linux-cachyos-headers
+linux-firmware
+
+network-manager-applet
+networkmanager
+nm-connection-editor
+
+nwg-displays
+nwg-look
+
+libpulse
+pipewire
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
+rtkit
+gst-plugin-pipewire
+
+satty
+grim
+
diff --git a/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish b/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish
new file mode 100644
index 0000000..dfed4d6
--- /dev/null
+++ b/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish
@@ -0,0 +1,14 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# the 'fish_key_bindings' variable from its old default scope (universal)
+# to its new default scope (global).  We recommend you delete this file
+# and configure key bindings in ~/.config/fish/config.fish if needed.
+
+set --global fish_key_bindings fish_vi_key_bindings
+
+# Prior to version 4.3, fish shipped an event handler that runs
+# `set --universal fish_key_bindings fish_default_key_bindings`
+# whenever the fish_key_bindings variable is erased.
+# This means that as long as any fish < 4.3 is still running on this system,
+# we cannot complete the migration.
+# As a workaround, erase the universal variable at every shell startup.
+set --erase --universal fish_key_bindings
diff --git a/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish.bak b/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish.bak
new file mode 100644
index 0000000..dfed4d6
--- /dev/null
+++ b/private_dot_config/private_fish/conf.d/fish_frozen_key_bindings.fish.bak
@@ -0,0 +1,14 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# the 'fish_key_bindings' variable from its old default scope (universal)
+# to its new default scope (global).  We recommend you delete this file
+# and configure key bindings in ~/.config/fish/config.fish if needed.
+
+set --global fish_key_bindings fish_vi_key_bindings
+
+# Prior to version 4.3, fish shipped an event handler that runs
+# `set --universal fish_key_bindings fish_default_key_bindings`
+# whenever the fish_key_bindings variable is erased.
+# This means that as long as any fish < 4.3 is still running on this system,
+# we cannot complete the migration.
+# As a workaround, erase the universal variable at every shell startup.
+set --erase --universal fish_key_bindings
diff --git a/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish b/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish
new file mode 100644
index 0000000..5f1eaa4
--- /dev/null
+++ b/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish
@@ -0,0 +1,46 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 414559
+set --global fish_color_cancel -r
+set --global fish_color_command green
+set --global fish_color_comment 414559
+set --global fish_color_cwd green
+set --global fish_color_cwd_root red
+set --global fish_color_end brblack
+set --global fish_color_error red
+set --global fish_color_escape yellow
+set --global fish_color_history_current --bold
+set --global fish_color_host normal
+set --global fish_color_host_remote yellow
+set --global fish_color_match --background=brblue
+set --global fish_color_normal normal
+set --global fish_color_operator blue
+set --global fish_color_param 626880
+set --global fish_color_quote yellow
+set --global fish_color_redirection cyan
+set --global fish_color_search_match bryellow --background=414559
+set --global fish_color_selection white --bold --background=414559
+set --global fish_color_status red
+set --global fish_color_user brgreen
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_background
+set --global fish_pager_color_completion normal
+set --global fish_pager_color_description yellow --dim
+set --global fish_pager_color_prefix white --bold
+set --global fish_pager_color_progress brwhite --background=cyan
+set --global fish_pager_color_secondary_background
+set --global fish_pager_color_secondary_completion
+set --global fish_pager_color_secondary_description
+set --global fish_pager_color_secondary_prefix
+set --global fish_pager_color_selected_background -r
+set --global fish_pager_color_selected_completion
+set --global fish_pager_color_selected_description
+set --global fish_pager_color_selected_prefix
diff --git a/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish.bak b/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish.bak
new file mode 100644
index 0000000..5f1eaa4
--- /dev/null
+++ b/private_dot_config/private_fish/conf.d/fish_frozen_theme.fish.bak
@@ -0,0 +1,46 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 414559
+set --global fish_color_cancel -r
+set --global fish_color_command green
+set --global fish_color_comment 414559
+set --global fish_color_cwd green
+set --global fish_color_cwd_root red
+set --global fish_color_end brblack
+set --global fish_color_error red
+set --global fish_color_escape yellow
+set --global fish_color_history_current --bold
+set --global fish_color_host normal
+set --global fish_color_host_remote yellow
+set --global fish_color_match --background=brblue
+set --global fish_color_normal normal
+set --global fish_color_operator blue
+set --global fish_color_param 626880
+set --global fish_color_quote yellow
+set --global fish_color_redirection cyan
+set --global fish_color_search_match bryellow --background=414559
+set --global fish_color_selection white --bold --background=414559
+set --global fish_color_status red
+set --global fish_color_user brgreen
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_background
+set --global fish_pager_color_completion normal
+set --global fish_pager_color_description yellow --dim
+set --global fish_pager_color_prefix white --bold
+set --global fish_pager_color_progress brwhite --background=cyan
+set --global fish_pager_color_secondary_background
+set --global fish_pager_color_secondary_completion
+set --global fish_pager_color_secondary_description
+set --global fish_pager_color_secondary_prefix
+set --global fish_pager_color_selected_background -r
+set --global fish_pager_color_selected_completion
+set --global fish_pager_color_selected_description
+set --global fish_pager_color_selected_prefix
diff --git a/private_dot_config/private_fish/private_fish_variables b/private_dot_config/private_fish/private_fish_variables
index d82de1b..f5bfa73 100644
--- a/private_dot_config/private_fish/private_fish_variables
+++ b/private_dot_config/private_fish/private_fish_variables
@@ -1,6 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3800
+SETUVAR --export EDITOR:helix
+SETUVAR __fish_initialized:4300
 SETUVAR fish_color_autosuggestion:414559
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:green
@@ -12,7 +13,6 @@ SETUVAR fish_color_error:red
 SETUVAR fish_color_escape:yellow
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
 SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
 SETUVAR fish_color_normal:normal
 SETUVAR fish_color_operator:blue
@@ -24,18 +24,8 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3d4145
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_key_bindings:fish_vi_key_bindings
-SETUVAR fish_pager_color_background:\x1d
 SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:yellow\x1e\x2d\x2ddim
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_secondary_background:\x1d
-SETUVAR fish_pager_color_secondary_completion:\x1d
-SETUVAR fish_pager_color_secondary_description:\x1d
-SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_pager_color_selected_completion:\x1d
-SETUVAR fish_pager_color_selected_description:\x1d
-SETUVAR fish_pager_color_selected_prefix:\x1d
 SETUVAR fish_user_paths:/home/jsw/\x2elocal/bin
diff --git a/private_dot_config/waybar/config b/private_dot_config/waybar/config
index 8b80914..a1d0016 100644
--- a/private_dot_config/waybar/config
+++ b/private_dot_config/waybar/config
@@ -6,7 +6,7 @@
 
     "modules-left": ["hyprland/workspaces", "custom/platform-profile", "temperature"],
     "modules-center": ["clock"],
-    "modules-right": ["wireplumber", "battery", "idle_inhibitor", "network", "bluetooth", "tray"],
+    "modules-right": ["wireplumber", "battery", "idle_inhibitor", "tray"],
 
     "hyprland/workspaces": {
         "format": "<span size='larger'>{icon}</span>",
diff --git a/private_dot_local/bin/executable_steam-gamescope b/private_dot_local/bin/executable_steam-gamescope
new file mode 100644
index 0000000..1cd2a34
--- /dev/null
+++ b/private_dot_local/bin/executable_steam-gamescope
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+error() {
+  local err="Error! $@"
+  echo "$err"
+  notify-send "Steam-Gamescope" "$err"
+
+  exit 1
+}
+
+dependencies=(steam gamescope jq hyprctl notify-send)
+for dep in "${dependencies[@]}"; do
+  if command -v "$dep" >/dev/null 2>&1; then
+    continue
+  fi
+
+  error "Missing dependency '$dep'"
+done
+
+
+read -r name width height _ < <(
+    hyprctl -j monitors | jq -j '.[] | select(.focused) | .name, " ", .width, " ", .height, "\u0000"'
+)
+
+notify-send "Steam" "Launching on $name."
+gamescope -w "$width" -h "$height"  -ef --adaptive-sync -- steam -gamepadui -steamos3
+
+
+  
+  
diff --git a/private_dot_etc/greetd/config.toml b/private_dot_root/etc/greetd/config.toml
similarity index 73%
rename from private_dot_etc/greetd/config.toml
rename to private_dot_root/etc/greetd/config.toml
index 02a81ca..5f6dae5 100644
--- a/private_dot_etc/greetd/config.toml
+++ b/private_dot_root/etc/greetd/config.toml
@@ -2,7 +2,7 @@
 vt = 1
 
 [initial_session]
-command = "hyprland 2>&1 > /dev/null"
+command = "start-hyprland 2>&1 > /dev/null"
 user = "jsw"
 
 [default_session]
diff --git a/private_dot_root/usr/bin/executable_steamos-session-select b/private_dot_root/usr/bin/executable_steamos-session-select
new file mode 100644
index 0000000..6f05558
--- /dev/null
+++ b/private_dot_root/usr/bin/executable_steamos-session-select
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+steam -shutdown