diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock
index 20c0065..079a307 100644
--- a/dot_config/flake/flake.lock
+++ b/dot_config/flake/flake.lock
@@ -172,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758119172,
-        "narHash": "sha256-LnVuGLf0PJHqqIHroxEzwXS57mjAdHSrXi0iODKbbiU=",
+        "lastModified": 1758207369,
+        "narHash": "sha256-BG7GlXo5moXtrFSCqnkIb1Q00szOZXTj5Dx7NmWgves=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9f408dc51c8e8216a94379e6356bdadbe8b4fef9",
+        "rev": "b5698ed57db7ee7da5e93df2e6bbada91c88f3ce",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1758139056,
-        "narHash": "sha256-qS4VkDso0nc+UpGR+pWLMBrC14Dvbk1Q4ZC74Qx6r7M=",
+        "lastModified": 1758186479,
+        "narHash": "sha256-UdC6KXSnt1QfEigiP6TtS3R9TIqPEFJegPoTcjhC4SY=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "2a84fdae04beddac03cbcaea8cfc05386dfb3bdc",
+        "rev": "b399b939d7b980b52cbd739a7d44f07017c8572e",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1758135863,
-        "narHash": "sha256-r6u4eGvMECO7p1YRIcVFhhR/REwolaaVeafAhUIuLc0=",
+        "lastModified": 1758183971,
+        "narHash": "sha256-rZpQqXa9LIwWulScUEHMqtcJqlidx5OfEfEr/iVC+AM=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "4808ba2b2055a09008be17d3e9eeae2d592b7b18",
+        "rev": "d9648e6bde1d2fc4a568dec93ba65c11073192a3",
         "type": "github"
       },
       "original": {
@@ -326,11 +326,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1758035966,
+        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1758035966,
+        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
         "type": "github"
       },
       "original": {
@@ -411,11 +411,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1758138010,
-        "narHash": "sha256-jZqB8XwznSnA7OshUR72OuYAmG0RLhPFQ8kjUzZpy8U=",
+        "lastModified": 1758225108,
+        "narHash": "sha256-154sY+s9oG8GPkBaPP1cVK6E7+d0ctgGelfWweJgO+E=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "85d7dc2506bfdc68d6fec8ce2ae6394ea79eabc7",
+        "rev": "0d3cc917fa9632917be3aee1d4a142c54bb6e5df",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758006913,
-        "narHash": "sha256-lU00BAdiKAhm96M6o0AzBdZY6+bBSfB2a0zm4xJYl/U=",
+        "lastModified": 1758088549,
+        "narHash": "sha256-+MwZeOWtfONHS27q+sepWEJ1ZxkvPKLCoWZ4WxnH7i8=",
         "owner": "outfoxxed",
         "repo": "quickshell",
-        "rev": "49646e4407fce5925920b178872ddd9f8e495218",
+        "rev": "59f5744f307606435c52e7356ec67e3a483ddff0",
         "type": "github"
       },
       "original": {
diff --git a/dot_config/flake/home/ghostty.nix b/dot_config/flake/home/ghostty.nix
deleted file mode 100644
index 9c9bb85..0000000
--- a/dot_config/flake/home/ghostty.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{pkgs, ...}: let
-  catppuccin = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "ghostty";
-    rev = "61bed99612125e9873cadfd0857137cdd2568a21";
-    hash = "sha256-GM/wKBUdgly7lKs8IiGKB7cBaUuE+GSubLgOMZNmsZ4=";
-  };
-in {
-  programs.ghostty = {
-    enable = true;
-
-    package =
-      if pkgs.stdenv.isDarwin
-      then pkgs.unstable.ghostty-bin
-      else pkgs.unstable.ghostty;
-
-    settings = {
-      theme = "dark:rose-pine,light:rose-pine-dawn";
-      macos-option-as-alt = "left";
-
-      keybind = [
-        "alt+left=unbind"
-        "alt+right=unbind"
-        "global:f12=toggle_quick_terminal"
-      ];
-    };
-  };
-
-  xdg.configFile."ghostty/themes/catppuccin-latte.conf".source = "${catppuccin}/themes/catppuccin-latte.conf";
-  xdg.configFile."ghostty/themes/catppuccin-macchiato.conf".source = "${catppuccin}/themes/catppuccin-macchiato.conf";
-}
diff --git a/dot_config/flake/home/gui.nix b/dot_config/flake/home/gui.nix
index 875e52c..49c4f81 100644
--- a/dot_config/flake/home/gui.nix
+++ b/dot_config/flake/home/gui.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   imports = [
-    ./ghostty.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix
index 0d65a10..8a05b90 100644
--- a/dot_config/flake/machines/wash/configuration.nix
+++ b/dot_config/flake/machines/wash/configuration.nix
@@ -117,8 +117,6 @@
     lm_sensors
     nautilus
 
-    ghostty
-
     unstable.android-studio
     jetbrains.rust-rover
     # jetbrains.rider
diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix
index 0766d49..00c1726 100644
--- a/dot_config/flake/machines/wash/home.nix
+++ b/dot_config/flake/machines/wash/home.nix
@@ -1,16 +1,11 @@
-{pkgs, ...}: let
-  ff_gnome_theme = pkgs.fetchFromGitHub {
-    owner = "rafaelmardojai";
-    repo = "firefox-gnome-theme";
-    rev = "b655eaf16d4cbec9c3472f62eee285d4b419a808";
-    hash = "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=";
-  };
-in {
+{pkgs, ...}: {
   imports = [
     ../../home/common.nix
 
     ../../home/darkman.nix
 
+    ../../modules/home/ghostty.nix
+
     ../../home/home-backup.nix
     ../../home/gui.nix
 
@@ -29,21 +24,9 @@ in {
     ];
 
     stateVersion = "23.11";
-
-    file.".mozilla/firefox/default/chrome/firefox-gnome-theme" = {
-      source = ff_gnome_theme;
-      recursive = true;
-    };
   };
 
   programs.firefox = {
     enable = true;
-    profiles.default = {
-      name = "default";
-      userChrome = ''
-        @import "firefox-gnome-theme/userChrome.css";
-        @import "firefox-gnome-theme/theme/colors/dark.css";
-      '';
-    };
   };
 }
diff --git a/dot_config/flake/modules/home/ghostty.nix b/dot_config/flake/modules/home/ghostty.nix
new file mode 100644
index 0000000..f428444
--- /dev/null
+++ b/dot_config/flake/modules/home/ghostty.nix
@@ -0,0 +1,29 @@
+{pkgs, ...}: {
+  programs.ghostty = {
+    enable = true;
+
+    package =
+      if pkgs.stdenv.isDarwin
+      then pkgs.unstable.ghostty-bin
+      else pkgs.unstable.ghostty;
+
+    settings = {
+      auto-update = false;
+
+      theme = "light:Rose Pine Dawn,dark:Rose Pine";
+      macos-option-as-alt = "left";
+
+      quick-terminal-size = "50%";
+
+      shell-integration-features = ["ssh-terminfo"];
+
+      right-click-action = "copy-or-paste";
+
+      keybind = [
+        "alt+left=unbind"
+        "alt+right=unbind"
+        "global:f12=toggle_quick_terminal"
+      ];
+    };
+  };
+}