diff --git a/git/git/config b/git/git/config
index 54211ac..59eb36e 100644
--- a/git/git/config
+++ b/git/git/config
@@ -3,7 +3,7 @@
 	ignorecasse = false
 
 [init]
-  defaultBranch = main
+	defaultBranch = main
 
 [user]
 	name = Michael Housh
@@ -32,7 +32,7 @@
   followTags = true
 
 [fetch]
-  prune = true
+	prune = true
   #pruneTags = true
   #all = true
 
diff --git a/gopass/config b/gopass/config
index 609f0d5..304d1f0 100644
--- a/gopass/config
+++ b/gopass/config
@@ -1,7 +1,7 @@
 [mounts]
-	path = /Users/michael/.local/share/password-store
+	path = /home/michael/.local/share/gopass/passwordstore
 [recipients]
-	hash = b73e3c328517ad0b8a03ab1ba113e117595d40ae355f1e42984a8f8144bafc4a
+	hash = 6a408ace969698b274c7c7580f7b0187e8aab4018ae06c5de895d69ae99b8b44
 [mounts "servers"]
 [recipients "homelab"]
 	hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index e1b8d4a..eb4b3e4 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -24,7 +24,7 @@ monitor= ,preferred,auto,auto
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-exec-once = waybar & swaync & elephant
+exec-once = swaync & elephant
 
 #############################
 ### ENVIRONMENT VARIABLES ###
@@ -205,6 +205,11 @@ device {
 
 # Example windowrule
 # windowrule = float,class:^(kitty)$,title:^(kitty)$
+#
+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:.*
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index 94b887e..fae0fbb 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -34,13 +34,13 @@ animations {
 }
 
 background {
-    monitor =
-    path = screenshot
+    monitor = eDP-1
+    path = /usr/share/hypr/lockdead2.png
     blur_passes = 3
 }
 
 input-field {
-    monitor =
+    monitor = eDP-1
     size = 20%, 5%
     outline_thickness = 3
     inner_color = rgba(0, 0, 0, 0.0) # no fill
diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf
index 7be0ba3..096761e 100644
--- a/hypr/keybinds.conf
+++ b/hypr/keybinds.conf
@@ -13,21 +13,22 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 #
 # Set programs that you use
 $terminal = ghostty
-$browser = chromium
+$browser = zen-browser #chromium
 $fileManager = $terminal -e yazi
-$fileBrowser = dolphin
+$fileBrowser = nautilus
 $menu = walker
 $pwa = chromium --profile-directory=Default
 
+$btop = $terminal -e btop
 $chatgpt = $pwa --app-id=cadlkienfkclaiaibeoongdcgmdikeeg
 $config = $terminal -e ~/.local/share/scripts/tmux-sessionator ~/.config
 $email = $pwa --app-id=jnpecgipniidlgicjocehkhajgdnjekh # proton mail
+$excalidraw = $pwa --app-id=fehpfgkaiahomgjlkjleaolhifmngapb
 $gitea = $pwa --app-id=jenmjaeafdjpclbgpkemokbhfeplfdbg
 $neovim = $terminal -e nvim
 $protonPass = $pwa --app-id=hkhckfoofhljcngmlnlojcbplgkcpcab
 $youtube = $pwa --app-id=agimnkijcaahngcdmfeangaknmldooml
 
-
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 
 # Apps
@@ -35,17 +36,20 @@ bind = $mainMod, Space, exec, $menu # launcher (set above)
 bind = $mainMod, Return, exec, $terminal
 bind = $mainMod, A, exec, $chatgpt
 bind = $mainMod, B, exec, $browser
+bind = $mainMod Shift, B, exec, $btop
 bind = $mainMod, C, exec, $config
+bind = $mainMod, D, exec, $excalidraw
 bind = $mainMod, E, exec, $email
 bind = $mainMod, F, exec, $fileManager
-bind = $mainMod SHIFT, F, exec, $fileBrowser
-bind = $mainMod SHIFT, G, exec, $gitea
+bind = $mainMod Shift, F, exec, $fileBrowser
+bind = $mainMod Shift, G, exec, $gitea
 bind = $mainMod, N, exec, $neovim 
 bind = $mainMod, P, exec, $protonPass
 bind = $mainMod, Y, exec, $youtube
 
 bind = $mainMod, W, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod Shift, M, exit,
+bind = $mainMod, M, exec, ~/.local/bin/toggle-waybar
 bind = $mainMod, V, togglefloating,
 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, J, togglesplit, # dwindle
diff --git a/hypr/monitors.conf b/hypr/monitors.conf
new file mode 100644
index 0000000..e69de29
diff --git a/hypr/workspaces.conf b/hypr/workspaces.conf
new file mode 100644
index 0000000..e69de29
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 651e575..d7adb14 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,11 +1,89 @@
+# vim:ft=kitty
 # _  _ _ ___ ___ _   _  ____ ____ _  _ ____
 # |_/  |  |   |   \_/   |    |  | |\ | |___
 # | \_ |  |   |    |   .|___ |__| | \| |
 #
 
+## name:     Catppuccin Kitty Mocha
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+# The basic colors
+foreground              #cdd6f4
+background              #1e1e2e
+selection_foreground    #1e1e2e
+selection_background    #f5e0dc
+
+# Cursor colors
+cursor                  #f5e0dc
+cursor_text_color       #1e1e2e
+
+# URL underline color when hovering with mouse
+url_color               #f5e0dc
+
+# Kitty window border colors
+active_border_color     #b4befe
+inactive_border_color   #6c7086
+bell_border_color       #f9e2af
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111b
+active_tab_background   #cba6f7
+inactive_tab_foreground #cdd6f4
+inactive_tab_background #181825
+tab_bar_background      #11111b
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1e1e2e
+mark1_background #b4befe
+mark2_foreground #1e1e2e
+mark2_background #cba6f7
+mark3_foreground #1e1e2e
+mark3_background #74c7ec
+
+# The 16 terminal colors
+
+# black
+color0 #45475a
+color8 #585b70
+
+# red
+color1 #f38ba8
+color9 #f38ba8
+
+# green
+color2  #a6e3a1
+color10 #a6e3a1
+
+# yellow
+color3  #f9e2af
+color11 #f9e2af
+
+# blue
+color4  #89b4fa
+color12 #89b4fa
+
+# magenta
+color5  #f5c2e7
+color13 #f5c2e7
+
+# cyan
+color6  #94e2d5
+color14 #94e2d5
+
+# white
+color7  #bac2de
+color15 #a6adc8
+
 font_family Droid Sans Mono for Powerline Regular
 
-font_size 16.0
+font_size 13.0
 symbol_map U+E0A0-U+E0A3,U+E0C0-U+E0C7 1
 narrow_symbols U+E0A0-U+E0A3,U+E0C0-U+E0C7 1
 
@@ -15,3 +93,4 @@ background_opacity 0.9
 
 #hide_window_decorations titlebar-only
 hide_window_decorations no
+confirm_os_window_close 0
diff --git a/zsh/config/.zshenv b/zsh/config/.zshenv
index 2ca1341..f686905 100755
--- a/zsh/config/.zshenv
+++ b/zsh/config/.zshenv
@@ -91,7 +91,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/password-store"
 export PASSWORD_STORE_GENERATED_LENGTH=40
 export PASSWORD_STORE_ENABLE_EXTENSIONS=true