diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 1c5b31f..8f8169a 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -64,9 +64,9 @@ hc keybind $Mod-k close
 hc keybind $Mod-Mod1-k remove
 
 # Always spawn an instance of Rxvt Unicode.
-hc keybind $Mod-Return spawn urxvt
+hc keybind $Mod-Return spawn kitty
 # Switch to a running instance of URxvt or Hyper, or start one.
-hc keybind $Mod-c spawn hlwm-run-or-raise '\(URxvt\|Hyper\)' urxvt
+hc keybind $Mod-c spawn hlwm-run-or-raise '\(URxvt\|Hyper\|kitty\)' kitty
 # Switch to a running instance of Conkeror, or start one.
 hc keybind $Mod-b spawn hlwm-run-or-raise '\(Conkeror\|Firefox\|Chromium\)' conkeror
 # Switch to a running instance of Emacs, or create an Emacs client
@@ -210,7 +210,7 @@ hc set update_dragged_clients 1
 hc unrule -F
 hc rule focus=on # normally focus new clients
 hc rule class=Emacs tag=dev index=0 switchtag=on hook=emacs
-hc rule class=URxvt tag=dev index=1 switchtag=on hook=urxvt
+hc rule class~'URxvt|kitty' tag=dev index=1 switchtag=on hook=urxvt
 hc rule class~'Conkeror|Firefox|Chromium' tag=web index=0 switchtag=on
 hc rule class=Pinentry pseudotile=on
 hc rule class=Alsaplayer pseudotile=on