diff --git a/hosts/asus-gl553vd/users/xmonad-projects.secret.nix b/hosts/asus-gl553vd/users/xmonad-projects.secret.nix
index bae15ea..d8b86e6 100644
Binary files a/hosts/asus-gl553vd/users/xmonad-projects.secret.nix and b/hosts/asus-gl553vd/users/xmonad-projects.secret.nix differ
diff --git a/hosts/home/users/xmonad-projects.secret.nix b/hosts/home/users/xmonad-projects.secret.nix
index 15856e7..743292d 100644
Binary files a/hosts/home/users/xmonad-projects.secret.nix and b/hosts/home/users/xmonad-projects.secret.nix differ
diff --git a/modules/home-manager/configs/window-manager/hyprland/default.nix b/modules/home-manager/configs/window-manager/hyprland/default.nix
index 9e88bdd..45b0f72 100644
--- a/modules/home-manager/configs/window-manager/hyprland/default.nix
+++ b/modules/home-manager/configs/window-manager/hyprland/default.nix
@@ -108,7 +108,7 @@ in
           force_zero_scaling = true;
         };
 
-        "$terminal" = "wezterm start";
+        "$terminal" = "ghostty";
         "$browser" = "librewolf";
         "$menu" = "dmenu-wl_run";
 
diff --git a/modules/home-manager/configs/window-manager/xmonad/default.nix b/modules/home-manager/configs/window-manager/xmonad/default.nix
index 71cb596..6ebd777 100644
--- a/modules/home-manager/configs/window-manager/xmonad/default.nix
+++ b/modules/home-manager/configs/window-manager/xmonad/default.nix
@@ -69,7 +69,7 @@ in
     programs.rofi.pass = {
       enable = true;
       extraConfig = ''
-        EDITOR='wezterm start -- nvim'
+        EDITOR='ghostty -e nvim'
 
         URL_field='url'
         USERNAME_field='login'
diff --git a/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs b/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs
index 33e9553..1ccaffc 100644
--- a/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs
+++ b/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs
@@ -52,7 +52,7 @@ import XMonad.Util.Run
 -- The preferred terminal program, which is used in a binding below and by
 -- certain contrib modules.
 --
-myTerminal = "wezterm start"
+myTerminal = "ghostty"
 
 -- Whether focus follows the mouse pointer.
 myFocusFollowsMouse = False
@@ -240,9 +240,10 @@ myManageHook = manageApps
 
     isGameMachine = machine =? "games"
 
+    isGhostty = className =? "com.mitchellh.ghostty"
     isWezterm = className =? "org.wezfurlong.wezterm"
     isAlacritty = className =? "Alacritty"
-    isTerminal = anyOf [isWezterm, isAlacritty]
+    isTerminal = anyOf [isWezterm, isAlacritty, isGhostty]
 
     tileBelow = insertPosition Below Newer
     manageApps =
@@ -374,7 +375,7 @@ myKeys conf =
         ("<XF86KbdBrightnessUp>", spawn (kdbBrightness "up")),
         ("<XF86KbdBrightnessDown>", spawn (kdbBrightness "down"))
       ]
-      where kdbBrightness cmd = myTerminal ++ " -- @kdbBrightnessScriptPath@ " ++ cmd
+      where kdbBrightness cmd = myTerminal ++ " -e @kdbBrightnessScriptPath@ " ++ cmd
 
 ------------------------------------------------------------------------
 -- Mouse bindings: default actions bound to mouse events
@@ -402,9 +403,9 @@ myProjects =
     terminal' wd' cmd' =
       myTerminal ++ workdir ++ command
       where
-        workdir = " --cwd " ++ wd'
+        workdir = " --working-directory=" ++ wd'
         command = case cmd' of
-          Just c -> " -- " ++ c
+          Just c -> " -e " ++ c
           _ -> ""
 
 myPromptConfig :: XPConfig
diff --git a/modules/home-manager/programs/terminals/ghostty.nix b/modules/home-manager/programs/terminals/ghostty.nix
index df7aa14..3d959a2 100644
--- a/modules/home-manager/programs/terminals/ghostty.nix
+++ b/modules/home-manager/programs/terminals/ghostty.nix
@@ -21,10 +21,12 @@ in
       package = cfg.package;
       settings = {
         theme = "nixos-theme";
+        font-family = "monospace";
         font-size = cfg.fontSize;
         window-decoration = false;
         cursor-style-blink = false;
         shell-integration-features = "no-cursor";
+        gtk-single-instance = false; # It required to provide working-directory
       };
       enableZshIntegration = config.programs.zsh.enable;
       themes = {