diff --git a/deploy.sh b/deploy.sh
index 1c2486d..da4627e 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,7 +17,7 @@ declare -A configs=(
     ["nvim/snippets"]="$HOME/.config/nvim/"
     ["tmux.conf"]="$HOME/.tmux.conf"
     ["wezterm.lua"]="$HOME/.config/wezterm/wezterm.lua"
-    # ["wezterm.local_linux.lua"]="$HOME/.config/wezterm/local.lua"
+    # ["wezterm.local_linux.lua"]="$HOME/.config/wezterm/local.lua" # TODO: switch contents to elsewhere, be aware of OS, or refactor elsewise
     ["npmrc"]="$HOME/.npmrc"
 )
 
diff --git a/npmrc b/npmrc
deleted file mode 100644
index 0353dfc..0000000
--- a/npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set the prefix to the user directory for "global" installs as non-root
-prefix=~/.local/
diff --git a/zsh/zshrc b/zsh/zshrc
index 6d23c3f..80067dc 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -22,21 +22,15 @@ fi
 export ZSH="$HOME/.oh-my-zsh"
 
 # Install the zsh-autosuggestions plugin if it doesn't exist
-# if [ ! -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions ]
-# then
-    # git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
-# fi
-
-# if [ ! -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting ]
-# then
-    # git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
-# fi
+if [ ! -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions ]
+then
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+fi
 
 plugins=(
     fzf
     virtualenvwrapper
-    # zsh-autosuggestions
-    # zsh-syntax-highlighting
+    zsh-autosuggestions
 )
 
 # Disable the startup update checks
@@ -69,10 +63,10 @@ zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
 zstyle ':completion:*:warnings' format '%BNo matches for: %d%b'
 
 # Autoload keychain for ssh-agent handling if it is installed
-if command -v keychain &> /dev/null
-then
-    eval $(keychain --eval --quiet --nogui --noask)
-fi
+# if command -v keychain &> /dev/null
+# then
+    # eval $(keychain --eval --quiet --nogui --noask)
+# fi
 
 # TODO: Replace above with GPG agent
 # GPG Agent handling of ssh key authorization and unlocks
@@ -80,7 +74,6 @@ fi
 # Inclusion of files to extend the configuration
 # From a theme to local specific changes, and grouping functions/aliases/exports
 include_files=(
-    # "$HOME/.config/zsh/fb_theme.zsh"
     "$HOME/.config/zsh/zsh_local.zsh"
     "$HOME/.config/zsh/zsh_aliases.zsh"
     "$HOME/.config/zsh/zsh_exports.zsh"
@@ -90,6 +83,7 @@ include_files=(
 for file in $include_files; do
     if [ ! -f $file ]
     then
+        # Create files even if they aren't overriden in the environment
         touch $file
     fi