diff --git a/lib/Projects.hs b/lib/Projects.hs
index 83347d9..141dad2 100644
--- a/lib/Projects.hs
+++ b/lib/Projects.hs
@@ -6,7 +6,7 @@ import XMonad
 import XMonad.Actions.DynamicProjects
 import XMonad.Util.Run
 
-term = "kitty"
+term = "ghostty"
 
 spawnGuiTextEditor :: X ()
 spawnGuiTextEditor = safeSpawn "neovide" []
@@ -15,7 +15,7 @@ singleTermAppWithName :: String -> String -> Project
 singleTermAppWithName name app = Project
   { projectName = name
   , projectDirectory = "/tmp"
-  , projectStartHook = Just $ do safeSpawn term ["zsh","-c",app]
+  , projectStartHook = Just $ do safeSpawn term ["--command=\"zsh -c " <> app <>"\""]
   }
 
 singleAppWithName :: String -> String -> Project
diff --git a/lib/Scratchpad.hs b/lib/Scratchpad.hs
index 5f624ca..a58b558 100644
--- a/lib/Scratchpad.hs
+++ b/lib/Scratchpad.hs
@@ -16,7 +16,7 @@ modify conf = conf
   }
 
 pads =
-  [ NS "htop" "kitty --title htop tmux" (title =? "htop")
+  [ NS "htop" "ghostty --x11-instance-name=htop --command=tmux" (appName =? "htop")
       (customFloating $ W.RationalRect (1/3) (1/3) (1/3) (1/3))
   -- , NS "stardict" "stardict" (className =? "Stardict")
   --     (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3))
diff --git a/xmonad.hs b/xmonad.hs
index a748ef5..e6dbbd9 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -64,7 +64,7 @@ withConfig =
     $ desktopConfig     --   on a default desktop config
     { manageHook         = myManageHook
     , layoutHook         = desktopLayoutModifiers layouts
-    , terminal           = "kitty"
+    , terminal           = "ghostty"
     , normalBorderColor  = N.backgroundhl
     , focusedBorderColor = N.nord9
     , borderWidth        = 5