diff --git a/dotbot b/dotbot
index 847cb10..0b01d56 160000
--- a/dotbot
+++ b/dotbot
@@ -1 +1 @@
-Subproject commit 847cb101d486319da882f958b1cb58b515cc6db2
+Subproject commit 0b01d56d81c33f8b665487f5a64f2d69b2a645f0
diff --git a/lib/completions b/lib/completions
index 907cba3..10609c1 160000
--- a/lib/completions
+++ b/lib/completions
@@ -1 +1 @@
-Subproject commit 907cba3fd9ba16020f55b06b47a86209352652d4
+Subproject commit 10609c16ec87ec30e4908b80a8cba19b0987bc01
diff --git a/lib/fzf b/lib/fzf
index 337cdbb..6898849 160000
--- a/lib/fzf
+++ b/lib/fzf
@@ -1 +1 @@
-Subproject commit 337cdbb37c1efc49b09b4cacc6e9ee1369c7d76d
+Subproject commit 6898849e3e7908c8c5d7fff243ff3d8b630ebc75
diff --git a/lib/highlighting b/lib/highlighting
index 9523d6d..ad522a0 160000
--- a/lib/highlighting
+++ b/lib/highlighting
@@ -1 +1 @@
-Subproject commit 9523d6d49cb3d4db5bd84c3cec6168a2057fe3ab
+Subproject commit ad522a091429ba180c930f84b2a023b40de4dbcc
diff --git a/lib/nano/syntax b/lib/nano/syntax
index 59441c7..b394ee1 160000
--- a/lib/nano/syntax
+++ b/lib/nano/syntax
@@ -1 +1 @@
-Subproject commit 59441c7f5ac19b3696af02d859656c3dc898f7be
+Subproject commit b394ee16e160fe8fdb3a7711f167573e7841ce3a
diff --git a/lib/ohmyzsh b/lib/ohmyzsh
index b908fee..291e96d 160000
--- a/lib/ohmyzsh
+++ b/lib/ohmyzsh
@@ -1 +1 @@
-Subproject commit b908feebcfb0ca8a9a80360d177e716c24c317d6
+Subproject commit 291e96dcd034750fbe7473482508c08833b168e3
diff --git a/zsh/zshrc b/zsh/zshrc
index c3c64d3..e1004d9 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -6,6 +6,7 @@ export GOPATH=${HOME}/go
 export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.3.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/bin:${HOME}/dotfiles/lib/dasht/bin:${PATH}"
 export DASHT_DOCSETS_DIR=$HOME/.local/share/Zeal/Zeal/docsets
 export EDITOR='nano'
+export TERM=linux
 
 # Plugins
 plugins=(gem bundler git vagrant docker python ansible)
@@ -28,6 +29,10 @@ esac
 # OMZ
 source ${ZSH}/oh-my-zsh.sh
 
+# Fix MobaXterm Home/End key with ZSH
+bindkey '^[[H' beginning-of-line
+bindkey '^[[F' end-of-line
+
 # Syntax Highlighting
 source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
@@ -45,7 +50,3 @@ eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
 
 # Completions Path
 fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
-
-# Fix home/end key at work -- still needed?
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line