diff --git a/README.md b/README.md
index a6bca26..83ce55f 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ Enjoy!
     * [`waybar`](https://github.com/Alexays/Waybar) - Easily customizable statusbar for wayland
     * [`bemenu`](https://github.com/Cloudef/bemenu) - Extended dmenu replacement for wayland, X11 and ncurses
     * [`fontconfig`] - System-wide font replacements and styling settings
-* [`kitty`](https://sw.kovidgoyal.net/kitty/) - Terminal emulator (GPU accelerated and configurable)
-* [`tmux`](https://github.com/tmux/tmux/) - terminal multiplexer
+* [`wezterm`](https://wezfurlong.org/wezterm/) - Terminal emulator (fast, understandable and lua configurable)
+* [`tmux`](https://github.com/tmux/tmux/) - terminal multiplexer (slowly migrating away in favor of wezterm)
 * [`nvim`](https://neovim.io/) - Neovim configuration
 * [`vifm`](https://github.com/vifm/vifm) - vim-like file-manager
 * [`qutebrowser`](https://github.com/qutebrowser/qutebrowser) - vim-key enabled web browser
diff --git a/sh/.config/sh/env b/sh/.config/sh/env
index db99a4e..fceba1b 100644
--- a/sh/.config/sh/env
+++ b/sh/.config/sh/env
@@ -22,7 +22,7 @@ export BIBFILE="${BIBFILE:-$LIBRARYROOT/academia/academia.bib}"
 # these are my personal 'important' application settings
 export EDITOR="nvim"
 export BROWSER="qutebrowser"
-export TERMINAL="kitty"
+export TERMINAL="wezterm"
 export PAGER="less"
 
 export FILEREADER="zathura"
@@ -42,5 +42,5 @@ export SHELL=${SHELL:-/bin/bash}
 export TERM=xterm-256color
 
 if exist fzf; then
-	export FZF_DEFAULT_OPTS="--bind 'tab:toggle+down,shift-tab:toggle+up,ctrl-g:top,ctrl-t:toggle-preview,ctrl-d:preview-half-page-down,ctrl-u:preview-half-page-up' --color=light -1 -m --delimiter :"
+    export FZF_DEFAULT_OPTS="--bind 'tab:toggle+down,shift-tab:toggle+up,ctrl-g:top,ctrl-t:toggle-preview,ctrl-d:preview-half-page-down,ctrl-u:preview-half-page-up' --color=light -1 -m --delimiter :"
 fi
diff --git a/wayland/.config/waybar/config b/wayland/.config/waybar/config
index 4bd87ed..6ead0b9 100644
--- a/wayland/.config/waybar/config
+++ b/wayland/.config/waybar/config
@@ -12,7 +12,7 @@
         "return-type": "json",
         "exec": "~/.config/waybar/modules/archupdates 5 json",
         "interval": 3600,
-        "on-click": "kitty --class float topgrade"
+        "on-click": "$TERMINAL start --class float topgrade"
     },
     "backlight": {
         "device": "intel_backlight",
@@ -45,8 +45,8 @@
             "warning": 50,
             "critical": 80
         },
-        "on-click": "kitty --class float top",
-        "on-click-right": "kitty --class float glances"
+        "on-click": "$TERMINAL start --class float top",
+        "on-click-right": "$TERMINAL start --class float glances"
     },
     "custom/events": {
         "format": "{}",
@@ -115,7 +115,7 @@
         "tooltip-format-ethernet": "{ifname} ",
         "tooltip-format-disconnected": "Disconnected",
         "max-length": 50,
-        "on-click": "kitty --class float nmtui",
+        "on-click": "$TERMINAL start --class float nmtui",
         // "on-click-right": "sudo rfkill toggle wlan"
     },
     "pulseaudio": {
@@ -132,7 +132,7 @@
             "default": ["", ""]
         },
         "scroll-step": 1,
-        "on-click": "kitty --class float pulsemixer",
+        "on-click": "$TERMINAL start --class float pulsemixer",
         "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%",
         "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%"
     },
@@ -146,7 +146,7 @@
         "critical-threshold": 80,
         // "format-critical": "{temperatureC}° ",
         "format": "{temperatureC}° ",
-        "on-click": "kitty --class float watch sensors"
+        "on-click": "$TERMINAL start --class float watch sensors"
     },
     "tray": {
         "icon-size": 21,
@@ -176,6 +176,6 @@
         "exec": "wc -l ~/.local/share/vidl/vidl_queue | cut -d' ' -f1",
         "exec-if": "[ -f ~/.local/share/vidl/vidl_queue ]",
         "interval": 5,
-        "on-click": "kitty --class float nvim ~/.local/share/vidl/vidl_queue"
+        "on-click": "$TERMINAL start --class float nvim ~/.local/share/vidl/vidl_queue"
     },
 }