diff --git a/.config/nvim/pack/plugins/opt/onedark b/.config/nvim/pack/plugins/opt/onedark
index 1230aaf..8e4b79b 160000
--- a/.config/nvim/pack/plugins/opt/onedark
+++ b/.config/nvim/pack/plugins/opt/onedark
@@ -1 +1 @@
-Subproject commit 1230aaf2a427b2c5b73aba6e4a9a5881d3e69429
+Subproject commit 8e4b79b0e6495ddf29552178eceba1e147e6cecf
diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope
index 2d0d057..e9be6bb 160000
--- a/.config/nvim/pack/plugins/opt/telescope
+++ b/.config/nvim/pack/plugins/opt/telescope
@@ -1 +1 @@
-Subproject commit 2d0d057791854decb2c9b6a0b52d43f3900dff40
+Subproject commit e9be6bb7a78cd44b9183ede4627d2bfea4f301f0
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index 99d3e79..f224fef 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit 99d3e799b46f5c2a1fc0d7a42d7ab452de48c067
+Subproject commit f224fef9d28e1fd30ccd9a9c374ced2546dde6ea
diff --git a/.config/zsh/input.zsh b/.config/zsh/input.zsh
index 8ef9f16..d3762e4 100644
--- a/.config/zsh/input.zsh
+++ b/.config/zsh/input.zsh
@@ -1,91 +1,41 @@
-function zle-line-init() {
-    echoti smkx
-}
-function zle-line-finish() {
-    echoti rmkx
-}
-zle -N zle-line-init
-zle -N zle-line-finish
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+    function zle-line-init()   { echoti smkx }; zle -N zle-line-init
+    function zle-line-finish() { echoti rmkx }; zle -N zle-line-finish
+fi
 
-# Use emacs key bindings
-bindkey -e
+# PageUp/PageDown
+(( ${+terminfo[kpp]} )) && bindkey -- "${terminfo[kpp]}" up-line-or-history
+(( ${+terminfo[knp]} )) && bindkey -- "${terminfo[knp]}" down-line-or-history
 
-# [PageUp] - Up a line of history
-bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
-bindkey -M viins "${terminfo[kpp]}" up-line-or-history
-bindkey -M vicmd "${terminfo[kpp]}" up-line-or-history
-# [PageDown] - Down a line of history
-bindkey -M emacs "${terminfo[knp]}" down-line-or-history
-bindkey -M viins "${terminfo[knp]}" down-line-or-history
-bindkey -M vicmd "${terminfo[knp]}" down-line-or-history
+# Up/Down
+if (( ${+terminfo[kcuu1]} )) && (( ${+terminfo[kcud1]} )); then
+    autoload -Uz up-line-or-beginning-search;   zle -N up-line-or-beginning-search
+    autoload -Uz down-line-or-beginning-search; zle -N down-line-or-beginning-search
+    bindkey -- "${terminfo[kcuu1]}" up-line-or-beginning-search
+    bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
+fi
 
-# Start typing + [Up-Arrow] - fuzzy find history forward
-autoload -Uz up-line-or-beginning-search
-zle -N up-line-or-beginning-search
-bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
-bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
-bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
-# Start typing + [Down-Arrow] - fuzzy find history backward
-autoload -Uz down-line-or-beginning-search
-zle -N down-line-or-beginning-search
-bindkey -M emacs "${terminfo[kcud1]}" down-line-or-beginning-search
-bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
-bindkey -M vicmd "${terminfo[kcud1]}" down-line-or-beginning-search
+# Home/End
+(( ${+terminfo[khome]} )) && bindkey -- "${terminfo[khome]}" beginning-of-line
+(( ${+terminfo[kend]} ))  && bindkey -- "${terminfo[kend]}"  end-of-line
 
-# [Home] - Go to beginning of line
-bindkey -M emacs "${terminfo[khome]}" beginning-of-line
-bindkey -M viins "${terminfo[khome]}" beginning-of-line
-bindkey -M vicmd "${terminfo[khome]}" beginning-of-line
-# [End] - Go to end of line
-bindkey -M emacs "${terminfo[kend]}"  end-of-line
-bindkey -M viins "${terminfo[kend]}"  end-of-line
-bindkey -M vicmd "${terminfo[kend]}"  end-of-line
+# Shift-Tab
+(( ${+terminfo[kcbt]} )) && bindkey -- "${terminfo[kcbt]}" reverse-menu-complete
 
-# [Shift-Tab] - move through the completion menu backwards
-bindkey -M emacs "${terminfo[kcbt]}" reverse-menu-complete
-bindkey -M viins "${terminfo[kcbt]}" reverse-menu-complete
-bindkey -M vicmd "${terminfo[kcbt]}" reverse-menu-complete
+# Delete
+(( ${+terminfo[kdch1]} )) && bindkey -- "${terminfo[kdch1]}" delete-char
 
-# [Backspace] - delete backward
-bindkey -M emacs '^?' backward-delete-char
-bindkey -M viins '^?' backward-delete-char
-bindkey -M vicmd '^?' backward-delete-char
-# [Delete] - delete forward
-bindkey -M emacs "${terminfo[kdch1]}" delete-char
-bindkey -M viins "${terminfo[kdch1]}" delete-char
-bindkey -M vicmd "${terminfo[kdch1]}" delete-char
+# Ctrl-Delete
+bindkey -- '^[[3;5~' kill-word
 
-# [Ctrl-Delete] - delete whole forward-word
-bindkey -M emacs '^[[3;5~' kill-word
-bindkey -M viins '^[[3;5~' kill-word
-bindkey -M vicmd '^[[3;5~' kill-word
+# Ctrl-RightArrow/LeftArrow
+bindkey -- '^[[1;5C' forward-word
+bindkey -- '^[[1;5D' backward-word
 
-# [Ctrl-RightArrow] - move forward one word
-bindkey -M emacs '^[[1;5C' forward-word
-bindkey -M viins '^[[1;5C' forward-word
-bindkey -M vicmd '^[[1;5C' forward-word
-# [Ctrl-LeftArrow] - move backward one word
-bindkey -M emacs '^[[1;5D' backward-word
-bindkey -M viins '^[[1;5D' backward-word
-bindkey -M vicmd '^[[1;5D' backward-word
+# Space - don't do history expansion
+bindkey ' ' magic-space
 
-bindkey ' ' magic-space # [Space] - don't do history expansion
-
-# file rename magick
-bindkey "^[m" copy-prev-shell-word
-
-bindkey -v
-
-# allow vv to edit the command line (standard behaviour)
+# VV in vi mode to edit cmd
 autoload -Uz edit-command-line
 zle -N edit-command-line
 bindkey -M vicmd 'vv' edit-command-line
-
-# allow ctrl-p, ctrl-n for navigate history (standard behaviour)
-bindkey '^P' up-history
-bindkey '^N' down-history
-
-# allow ctrl-h, ctrl-w, ctrl-? for char and word deletion (standard behaviour)
-bindkey '^?' backward-delete-char
-bindkey '^h' backward-delete-char
-bindkey '^w' backward-kill-word