diff --git a/.gitmodules b/.gitmodules
index 406da39..fd852fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,12 +4,9 @@
 [submodule "files/.config/zsh/custom/plugins/zsh-syntax-highlighting"]
 	path = files/.config/zsh/custom/plugins/zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "files/.config/zsh/custom/plugins/zsh-autosuggestions"]
-	path = files/.config/zsh/custom/plugins/zsh-autosuggestions
-	url = https://github.com/zsh-users/zsh-autosuggestions.git
 [submodule "files/.vim/bundle/repos/github.com/Shougo/dein.vim"]
 	path = files/.vim/bundle/repos/github.com/Shougo/dein.vim
 	url = https://github.com/Shougo/dein.vim.git
-[submodule "files/.config/zsh/custom/plugins/history-search-multi-word"]
-	path = files/.config/zsh/custom/plugins/history-search-multi-word
-	url = https://github.com/zdharma/history-search-multi-word.git
+[submodule "files/.config/zsh/custom/plugins/fast-syntax-highlighting"]
+	path = files/.config/zsh/custom/plugins/fast-syntax-highlighting
+	url = https://github.com/zdharma/fast-syntax-highlighting.git
diff --git a/files/.config/zsh/custom/100-alias.zsh b/files/.config/zsh/custom/100-alias.zsh
index 4d04961..2e5cdb0 100644
--- a/files/.config/zsh/custom/100-alias.zsh
+++ b/files/.config/zsh/custom/100-alias.zsh
@@ -8,10 +8,13 @@ alias http-server="python -m http.server"
 alias rename="perl-rename"
 alias userctl="systemctl --user"
 
-# powershell seems to have trouble with xterm-256colors
+# powershell seems to have trouble with xterm-256color
 alias pwsh="TERM=xterm pwsh"
 alias powershell="TERM=xterm pwsh"
 
+# remote often does not have the correct terminfo for termite
+alias ssh="TERM=xterm-256color ssh"
+
 # network stuff must always be run with sudo anyway
 alias wifi-menu="sudo wifi-menu -o"
 alias netctl="sudo netctl"
diff --git a/files/.config/zsh/custom/300-syntax-highlighting.zsh b/files/.config/zsh/custom/300-syntax-highlighting.zsh
deleted file mode 100644
index c664a68..0000000
--- a/files/.config/zsh/custom/300-syntax-highlighting.zsh
+++ /dev/null
@@ -1,26 +0,0 @@
-ZSH_HIGHLIGHT_STYLES[default]="none"
-ZSH_HIGHLIGHT_STYLES[unknown-token]="fg=red,bold"
-ZSH_HIGHLIGHT_STYLES[reserved-word]="fg=yellow"
-ZSH_HIGHLIGHT_STYLES[alias]="fg=white,bold"
-ZSH_HIGHLIGHT_STYLES[builtin]="fg=magenta,bold"
-ZSH_HIGHLIGHT_STYLES[function]="fg=white,bold"
-ZSH_HIGHLIGHT_STYLES[command]="fg=white,bold"
-ZSH_HIGHLIGHT_STYLES[precommand]="fg=yellow,bold"
-ZSH_HIGHLIGHT_STYLES[commandseparator]="none"
-ZSH_HIGHLIGHT_STYLES[hashed-command]="none"
-ZSH_HIGHLIGHT_STYLES[path]="none"
-ZSH_HIGHLIGHT_STYLES[globbing]="none"
-ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=blue"
-ZSH_HIGHLIGHT_STYLES[single-hyphen-option]="fg=cyan"
-ZSH_HIGHLIGHT_STYLES[double-hyphen-option]="fg=cyan,bold"
-ZSH_HIGHLIGHT_STYLES[single-quoted-argument]="fg=green"
-ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]="fg=red,bold"
-ZSH_HIGHLIGHT_STYLES[double-quoted-argument]="fg=green"
-ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]="fg=red,bold"
-ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]="fg=yellow"
-ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]="fg=yellow"
-#ZSH_HIGHLIGHT_STYLES[assign]="none"
-
-HSMW_HIGHLIGHT_STYLES=("${(@kvf)ZSH_HIGHLIGHT_STYLES}")
-FAST_HIGHLIGHT_STYLES=("${(@kvf)ZSH_HIGHLIGHT_STYLES}")
-
diff --git a/files/.config/zsh/custom/301-autosuggestion.zsh b/files/.config/zsh/custom/301-autosuggestion.zsh
deleted file mode 100644
index 9215888..0000000
--- a/files/.config/zsh/custom/301-autosuggestion.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=0"
-ZSH_AUTOSUGGEST_STRATEGY="match_prev_cmd"
-#ZSH_AUTOSUGGEST_USE_ASYNC=1
-ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-
-bindkey '^ ' autosuggest-accept
-
diff --git a/files/.config/zsh/custom/plugins/fast-syntax-highlighting b/files/.config/zsh/custom/plugins/fast-syntax-highlighting
new file mode 160000
index 0000000..2a0a685
--- /dev/null
+++ b/files/.config/zsh/custom/plugins/fast-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 2a0a685922fb60a227732b432ffc17777eaafa3b
diff --git a/files/.config/zsh/custom/plugins/history-search-multi-word b/files/.config/zsh/custom/plugins/history-search-multi-word
deleted file mode 160000
index 2a59378..0000000
--- a/files/.config/zsh/custom/plugins/history-search-multi-word
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2a593787b2645c941c6aabfabca7dfd00721d56b
diff --git a/files/.config/zsh/custom/plugins/zsh-autosuggestions b/files/.config/zsh/custom/plugins/zsh-autosuggestions
deleted file mode 160000
index c7d4a85..0000000
--- a/files/.config/zsh/custom/plugins/zsh-autosuggestions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c7d4a85031c101ef9bce0018096622087894dd09
diff --git a/files/.config/zsh/custom/plugins/zsh-syntax-highlighting b/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
index e4fffa4..47c2b7e 160000
--- a/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
+++ b/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit e4fffa4de566c9552f9284fd75e689edb3a1083d
+Subproject commit 47c2b7e1851375c3a9d3c1faec5851fc8409da08
diff --git a/files/.config/zsh/oh-my-zsh b/files/.config/zsh/oh-my-zsh
index 0cec462..5460333 160000
--- a/files/.config/zsh/oh-my-zsh
+++ b/files/.config/zsh/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 0cec4626219bfd5a163986ebe3745fc31b593446
+Subproject commit 54603333634d057c5d2e1b2eb826eec5ce8fd706
diff --git a/files/.local/bin/apod b/files/.local/bin/apod
index 8fb137b..38da388 100755
--- a/files/.local/bin/apod
+++ b/files/.local/bin/apod
@@ -1,9 +1,9 @@
 #!/bin/bash -e
 
 api_response="$(curl -sS https://api.nasa.gov/planetary/apod?api_key=DEMO_KEY)"
-filename="$HOME/Pictures/apod/$(echo $api_response | jq --join-output '.date+" "+.title').jpg"
+filename="$HOME/Pictures/apod/$(echo -n $api_response | jq --join-output '.date+" "+.title').jpg"
 wallpaper_filename="$HOME/Pictures/wallpaper"
-url="$(echo $api_response | jq --raw-output '.hdurl')"
+url="$(echo -n $api_response | jq --raw-output '.hdurl')"
 screen_size="$(xrandr --screen 0 | grep '^Screen' | grep -Eo 'current [0-9]+ x [0-9]+' | sed -E 's/current ([0-9]+) x ([0-9]+)/\1x\2/g')"
 
 mkdir -p "$(dirname $filename)"
diff --git a/files/.profile b/files/.profile
index eedc72c..5d77c74 100644
--- a/files/.profile
+++ b/files/.profile
@@ -7,6 +7,7 @@ export BROWSER=firefox
 export VISUAL=nvim
 export EDITOR=nvim
 export PAGER=less
+export DIFFPROG=meld
 
 # motd
 export MOTD_SERVICES="$MOTD_SERVICES docker.socket"
diff --git a/files/.vim/bundle/repos/github.com/Shougo/dein.vim b/files/.vim/bundle/repos/github.com/Shougo/dein.vim
index ec5a35c..8eae025 160000
--- a/files/.vim/bundle/repos/github.com/Shougo/dein.vim
+++ b/files/.vim/bundle/repos/github.com/Shougo/dein.vim
@@ -1 +1 @@
-Subproject commit ec5a35ce0b4dc954d278a1bb29d96ef118e96a29
+Subproject commit 8eae0257d1e05a6fc11dc6742585bf198c52ccc2
diff --git a/files/.zshrc b/files/.zshrc
index fb9a8b9..bf9a7f2 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -35,7 +35,7 @@ DISABLE_AUTO_UPDATE="true"
 # DISABLE_AUTO_TITLE="true"
 
 # Uncomment the following line to enable command auto-correction.
-ENABLE_CORRECTION="true"
+# ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"
@@ -57,7 +57,7 @@ ZSH_CUSTOM="$HOME/.config/zsh/custom/"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git archlinux tmux thefuck zsh-autosuggestions history-search-multi-word zsh-syntax-highlighting)
+plugins=(git archlinux tmux thefuck fzf fast-syntax-highlighting)
 
 source $ZSH/oh-my-zsh.sh