diff --git a/hypr/env.conf b/hypr/env.conf
index 92d1544..7a71222 100644
--- a/hypr/env.conf
+++ b/hypr/env.conf
@@ -1,3 +1,9 @@
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
 # Cursor size
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 7607254..6faea9d 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -6,16 +6,6 @@
 # Refer to the wiki for more information.
 # https://wiki.hyprland.org/Configuring/
 
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-
-################
-### MONITORS ###
-################
-
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor= ,preferred,auto,auto
-monitor = HDMI-A-1, 3440x1440@59.97, 0x0, 1
 
 #################
 ### AUTOSTART ###
@@ -26,12 +16,7 @@ monitor = HDMI-A-1, 3440x1440@59.97, 0x0, 1
 
 exec-once = waybar & swaync & elephant & hyprpaper
 
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hyprland.org/Configuring/Environment-variables/
-
+source = ~/.config/hypr/windows.conf
 source = ~/.config/hypr/env.conf
 
 ###################
@@ -198,28 +183,6 @@ device {
     sensitivity = -0.5
 }
 
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-windowrulev2 = float,class:^(float)$
-#windowrule = float,title:InstallWebApp
-windowrulev2 = size 800 600,class:^(float)$,title:^(Install Web App)$
-windowrulev2 = center,class:^(float)$,title:^(Install Web App)$
-
-# Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
-
-# Just a dash of opacity by default.
-windowrule = opacity 0.97 0.92, class:.*
-
-# Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
-
-workspace = special:hidden, invisible
-
+source = ~/.config/hypr/windows.conf
 # Include the keybinds file.
 source = ~/.config/hypr/keybinds.conf
diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf
index 7ad3dfd..8a7e69f 100644
--- a/hypr/keybinds.conf
+++ b/hypr/keybinds.conf
@@ -13,7 +13,7 @@ $mainMod = SUPER # Sets "Command/Windows" key as main modifier
 #
 # Set programs that you use
 $terminal = ghostty
-$browser = zen-browser #chromium
+$browser = zen-browser
 $fileManager = $terminal -e yazi
 $fileBrowser = nautilus
 $menu = walker
@@ -35,7 +35,7 @@ $youtube = $pwa "https://youtube.com"
 # Apps
 bind = $mainMod, Space, exec, $menu # launcher (set above)
 bind = $mainMod, Return, exec, $terminal
-bind = $mainMod, A, exec, $launch ChatGPT
+bind = $mainMod, A, exec, $pwa "https://chatgpt.com"
 bind = $mainMod, B, exec, $browser
 bind = $mainMod SHIFT, B, exec, $browser --private-window
 bind = $mainMod, C, exec, $config
@@ -45,7 +45,7 @@ bind = $mainMod, E, exec, $email
 bind = $mainMod, F, exec, $fileManager
 bind = $mainMod, K, exec, $launch Komodo
 bind = $mainMod SHIFT, F, exec, $fileBrowser
-bind = $mainMod SHIFT, G, exec, $gitea
+bind = $mainMod, G, exec, $gitea
 bind = $mainMod, N, exec, $neovim 
 bind = $mainMod, P, exec, $protonPass
 bind = $mainMod, Y, exec, $youtube
diff --git a/hypr/monitors.conf b/hypr/monitors.conf
index e69de29..8ad2d11 100644
--- a/hypr/monitors.conf
+++ b/hypr/monitors.conf
@@ -0,0 +1,9 @@
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor= ,preferred,auto,auto
+monitor = HDMI-A-1, 3440x1440@59.97, 0x0, 1
+
+
diff --git a/hypr/windows.conf b/hypr/windows.conf
new file mode 100644
index 0000000..dfd9b25
--- /dev/null
+++ b/hypr/windows.conf
@@ -0,0 +1,25 @@
+##############################
+### WINDOWS AND WORKSPACES ###
+##############################
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
+
+windowrule = float,class:^(float)$
+#windowrule = float,title:InstallWebApp
+windowrule = size 800 600,class:^(float)$,title:^(Install Web App)$
+windowrule = center,class:^(float)$,title:^(Install Web App)$
+
+# Ignore maximize requests from apps. You'll probably like this.
+windowrule = suppressevent maximize, class:.*
+
+# Just a dash of opacity by default.
+windowrule = opacity 0.97 0.92, class:.*
+
+# Fix some dragging issues with XWayland
+windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+#windowrule = float, class:.*pass.proton.me.*
+
+workspace = special:hidden, invisible
+
diff --git a/zsh/config/.zshenv b/zsh/config/.zshenv
index c1786f5..4e3a285 100755
--- a/zsh/config/.zshenv
+++ b/zsh/config/.zshenv
@@ -92,7 +92,7 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export TMUX_SESSIONATOR_PATH="$HOME:$SCRIPTS:$LOCAL_REPOS:$REPOS:$ANSIBLE_LOCAL:$GHREPOS:$HVACIOTREPOS"
 
 # Password-store
-#export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/gopass/stores/root"
 export PASSWORD_STORE_GENERATED_LENGTH=40
 export PASSWORD_STORE_ENABLE_EXTENSIONS=true