diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index 3feecc1..08002f4 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -1,4 +1,6 @@
-[general]
+# Alacritty Configuration
+# Migrated from Ghostty configuration
+
 # Import rose-pine theme
 import = ["~/.config/alacritty/themes/rose-pine.toml"]
 
diff --git a/alacritty/.config/alacritty/themes/noctalia.toml b/alacritty/.config/alacritty/themes/noctalia.toml
index 08d37f9..f5c090b 100644
--- a/alacritty/.config/alacritty/themes/noctalia.toml
+++ b/alacritty/.config/alacritty/themes/noctalia.toml
@@ -1,33 +1,35 @@
-# Colors (Eldritch)
-
-[colors.bright]
-black = '#7081d0'
-blue = '#a48cf2'
-cyan = '#66e4fd'
-green = '#69F8B3'
-magenta = '#FD92CE'
-red = '#f16c75'
-white = '#ffffff'
-yellow = '#f1fc79'
-
-[colors.cursor]
-cursor = '#37f499'
-text = '#f8f8f2'
-
-[colors.normal]
-black = '#21222c'
-blue = '#9071f4'
-cyan = '#04d1f9'
-green = '#37f499'
-magenta = '#f265b5'
-red = '#f9515d'
-white = '#ebfafa'
-yellow = '#e9f941'
+# Noctalia Theme
+# Migrated from Ghostty noctalia theme
 
 [colors.primary]
 background = '#212337'
 foreground = '#ebfafa'
 
 [colors.selection]
-background = '#bf4f8e'
 text = '#ebfafa'
+background = '#bf4f8e'
+
+[colors.cursor]
+text = '#212337'
+cursor = '#37f499'
+
+[colors.normal]
+black   = '#21222c'
+red     = '#f9515d'
+green   = '#37f499'
+yellow  = '#e9f941'
+blue    = '#9071f4'
+magenta = '#f265b5'
+cyan    = '#04d1f9'
+white   = '#ebfafa'
+
+[colors.bright]
+black   = '#7081d0'
+red     = '#f16c75'
+green   = '#69F8B3'
+yellow  = '#f1fc79'
+blue    = '#a48cf2'
+magenta = '#FD92CE'
+cyan    = '#66e4fd'
+white   = '#ffffff'
+
diff --git a/alacritty/.config/alacritty/themes/rose-pine.toml b/alacritty/.config/alacritty/themes/rose-pine.toml
deleted file mode 100644
index efe81a9..0000000
--- a/alacritty/.config/alacritty/themes/rose-pine.toml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Colors section of "Alacritty - TOML configuration file format"
-# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd#colors
-
-[colors.primary]
-foreground = "#e0def4"
-background = "#191724"
-dim_foreground = "#908caa"
-bright_foreground = "#e0def4"
-
-[colors.cursor]
-text = "#e0def4"
-cursor = "#524f67"
-
-[colors.vi_mode_cursor]
-text = "#e0def4"
-cursor = "#524f67"
-
-[colors.search.matches]
-foreground = "#908caa"
-background = "#26233a"
-
-[colors.search.focused_match]
-foreground = "#191724"
-background = "#ebbcba"
-
-[colors.hints.start]
-foreground = "#908caa"
-background = "#1f1d2e"
-
-[colors.hints.end]
-foreground = "#6e6a86"
-background = "#1f1d2e"
-
-[colors.line_indicator]
-foreground = "None"
-background = "None"
-
-[colors.footer_bar]
-foreground = "#e0def4"
-background = "#1f1d2e"
-
-[colors.selection]
-text = "#e0def4"
-background = "#403d52"
-
-[colors.normal]
-black = "#26233a"
-red = "#eb6f92"
-green = "#31748f"
-yellow = "#f6c177"
-blue = "#9ccfd8"
-magenta = "#c4a7e7"
-cyan = "#ebbcba"
-white = "#e0def4"
-
-[colors.bright]
-black = "#6e6a86"
-red = "#eb6f92"
-green = "#31748f"
-yellow = "#f6c177"
-blue = "#9ccfd8"
-magenta = "#c4a7e7"
-cyan = "#ebbcba"
-white = "#e0def4"
-
-[colors.dim]
-black = "#6e6a86"
-red = "#eb6f92"
-green = "#31748f"
-yellow = "#f6c177"
-blue = "#9ccfd8"
-magenta = "#c4a7e7"
-cyan = "#ebbcba"
-white = "#e0def4"
diff --git a/niri/.config/niri/config.d/binds.kdl b/niri/.config/niri/config.d/binds.kdl
index 0df60a5..7d96aa9 100644
--- a/niri/.config/niri/config.d/binds.kdl
+++ b/niri/.config/niri/config.d/binds.kdl
@@ -15,9 +15,9 @@ binds {
 
     XF86AudioMicMute     allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; }
 
-    // Mod+O repeat=false { toggle-overview; }
-    Mod+Escape repeat=false { toggle-overview; }
+    Mod+O repeat=false { toggle-overview; }
 
+    Mod+Q repeat=false { close-window; }
     Mod+MouseMiddle { close-window; }
 
     Mod+Left  { focus-column-left; }
@@ -141,6 +141,6 @@ binds {
 
     Mod+P { spawn-sh "rm -f /tmp/screenshot.png && niri msg action screenshot --show-pointer=false && for i in $(seq 1 100); do [ -f /tmp/screenshot.png ] && break; sleep 0.05; done && [ -f /tmp/screenshot.png ] && swappy -f /tmp/screenshot.png"; }
 
-    // Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
 }
 
diff --git a/niri/.config/niri/config.d/input.kdl b/niri/.config/niri/config.d/input.kdl
index 95248b7..eb63eba 100644
--- a/niri/.config/niri/config.d/input.kdl
+++ b/niri/.config/niri/config.d/input.kdl
@@ -25,10 +25,3 @@ input {
     focus-follows-mouse max-scroll-amount="0%"
 }
 
-
-gestures {
-    hot-corners {
-        off
-    }
-}
-
diff --git a/niri/.config/niri/config.d/layout.kdl b/niri/.config/niri/config.d/layout.kdl
index 77d8029..bcdda75 100644
--- a/niri/.config/niri/config.d/layout.kdl
+++ b/niri/.config/niri/config.d/layout.kdl
@@ -36,6 +36,5 @@ layout {
 }
 
 animations {
-    off
 }
 
diff --git a/niri/.config/niri/config.d/settings.kdl b/niri/.config/niri/config.d/settings.kdl
index f15b5b8..a96f278 100644
--- a/niri/.config/niri/config.d/settings.kdl
+++ b/niri/.config/niri/config.d/settings.kdl
@@ -1,11 +1,7 @@
+hotkey-overlay {
+}
+
 prefer-no-csd
 
 screenshot-path "/tmp/screenshot.png"
 
-recent-windows {
-    off
-}
-
-hotkey-overlay {
-    skip-at-startup
-}
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index 276896e..7858bd1 100644
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -26,3 +26,7 @@ include "noctalia/window-rules.kdl"
 include "noctalia/binds.kdl"
 include "noctalia/startup.kdl"
 
+debug {
+    honor-xdg-activation-with-invalid-serial
+    wait-for-frame-completion-before-queueing
+}
diff --git a/niri/.config/niri/noctalia/config.kdl b/niri/.config/niri/noctalia/config.kdl
index 58fa4f0..e4fe2e3 100644
--- a/niri/.config/niri/noctalia/config.kdl
+++ b/niri/.config/niri/noctalia/config.kdl
@@ -1,8 +1,6 @@
 // Noctalia-specific debug settings
 debug {
     honor-xdg-activation-with-invalid-serial
-    wait-for-frame-completion-before-queueing
-    // force-pipewire-invalid-modifier
 }
 
 // Noctalia-specific environment variables
diff --git a/noctalia/.config/noctalia/colors.json b/noctalia/.config/noctalia/colors.json
index 82c00f6..88b2e16 100644
--- a/noctalia/.config/noctalia/colors.json
+++ b/noctalia/.config/noctalia/colors.json
@@ -1,18 +1,18 @@
 {
-    "mError": "#eb6f92",
-    "mHover": "#524f67",
-    "mOnError": "#191724",
-    "mOnHover": "#e0def4",
-    "mOnPrimary": "#191724",
-    "mOnSecondary": "#191724",
-    "mOnSurface": "#e0def4",
-    "mOnSurfaceVariant": "#908caa",
-    "mOnTertiary": "#e0def4",
-    "mOutline": "#403d52",
-    "mPrimary": "#ebbcba",
-    "mSecondary": "#9ccfd8",
-    "mShadow": "#191724",
-    "mSurface": "#191724",
-    "mSurfaceVariant": "#26233a",
-    "mTertiary": "#31748f"
+    "mError": "#f16c75",
+    "mHover": "#a48cf2",
+    "mOnError": "#171928",
+    "mOnHover": "#171928",
+    "mOnPrimary": "#171928",
+    "mOnSecondary": "#171928",
+    "mOnSurface": "#ebfafa",
+    "mOnSurfaceVariant": "#abb4da",
+    "mOnTertiary": "#171928",
+    "mOutline": "#3b4261",
+    "mPrimary": "#37f499",
+    "mSecondary": "#04d1f9",
+    "mShadow": "#414868",
+    "mSurface": "#212337",
+    "mSurfaceVariant": "#292e42",
+    "mTertiary": "#a48cf2"
 }
diff --git a/noctalia/.config/noctalia/settings.json b/noctalia/.config/noctalia/settings.json
index 005d14c..a9e59e9 100644
--- a/noctalia/.config/noctalia/settings.json
+++ b/noctalia/.config/noctalia/settings.json
@@ -265,13 +265,13 @@
         "weatherShowEffects": true
     },
     "network": {
-        "wifiEnabled": false
+        "wifiEnabled": true
     },
     "nightLight": {
         "autoSchedule": true,
         "dayTemp": "6500",
         "enabled": true,
-        "forced": false,
+        "forced": true,
         "manualSunrise": "06:30",
         "manualSunset": "18:30",
         "nightTemp": "4000"
diff --git a/zsh/.config/zsh/functions/git.zsh b/zsh/.config/zsh/functions/git.zsh
index 6b210b7..b862b4e 100644
--- a/zsh/.config/zsh/functions/git.zsh
+++ b/zsh/.config/zsh/functions/git.zsh
@@ -6,7 +6,7 @@ function dc() {
     compdef _dc_completion dc 2>/dev/null
     _dc_completion_setup=1
   fi
-
+  
   if [[ "$1" == "-h" || "$1" == "--help" ]]; then
     echo "Usage: dc [commit_message]"
     echo "Quickly commit all changes and push to remote"
@@ -111,7 +111,7 @@ function zrepo() {
     compdef _zrepo_completion zrepo 2>/dev/null
     _zrepo_completion_setup=1
   fi
-
+  
   if [[ "$1" == "-h" || "$1" == "--help" ]]; then
     echo "Usage: zrepo <repo-name>"
     echo "Create a new bare git repository on remote server"
@@ -126,8 +126,8 @@ function zrepo() {
   fi
 
   local REPO="$1"
-  local SERVER="git@doom"
-  local PATH_ON_SERVER="~/$REPO.git"
+  local SERVER="git@zvps"
+  local PATH_ON_SERVER="/var/git/$REPO.git"
 
   echo "Creating repository '$REPO' on $SERVER..."