diff --git a/.config/polybar/config b/.config/polybar/config
index a37afe2..b2ac78f 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -151,11 +151,12 @@ type = internal/network
 interface = wlan0
 interval = 3
 
+; TODO: use $TERMINAL
 format-connected = <label-connected>
-label-connected = %{A1:st -t polybar-wlan -e nmtui connect &:} %essid:0:20:...%:%signal%% %{A}
+label-connected = %{A1:kitty --single-instance -T polybar-wlan -e nmtui connect &:} %essid:0:20:...%:%signal%% %{A}
 
 format-disconnected = <label-disconnected>
-label-disconnected = %{A1:st -t polybar-wlan -e nmtui connect &:} %ifname% disconnected %{A}
+label-disconnected = %{A1:kitty --single-instance -T polybar-wlan -e nmtui connect &:} %ifname% disconnected %{A}
 
 ;#################################################
 
diff --git a/.config/polybar/scripts/calendar.sh b/.config/polybar/scripts/calendar.sh
index fa5384c..1168e12 100755
--- a/.config/polybar/scripts/calendar.sh
+++ b/.config/polybar/scripts/calendar.sh
@@ -31,7 +31,8 @@ elif [[ $1 = "-t" ]]; then
 	# Kill and exit if already running to achieve a toggle.
 	! pkill -f "$TITLE" || exit 0
 
-	exec st -A 0.45 -t "$TITLE" "$0"
+	# TODO: Use $TERMINAL
+	exec kitty --single-instance -T "$TITLE" "$0"
 else
 	# Backend
 
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index db0b098..d24432f 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -87,8 +87,8 @@ if (( $+commands[ssh-agent] )) && [[ ! $SSH_AGENT_PID ]]; then
 fi
 
 # Terminal
-if (( $+commands[st] )); then
-	export TERMINAL=st
+if (( $+commands[kitty] )); then
+	export TERMINAL=kitty
 fi
 
 # Editor