diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config
index 02eef49..e57f350 100644
--- a/dotfiles/ssh/config
+++ b/dotfiles/ssh/config
@@ -1,13 +1,18 @@
 # Universal Settings
 Protocol 2
+CanonicalizeHostname        yes
+CanonicalizeMaxDots         0
+CanonicalizeFallbackLocal   yes
 
 Include ~/.ssh/config.d/*
 
+CanonicalDomains            systemoverlord.com
+
 # Defaults (May be Overridden)
 Host *.*
   CheckHostIP                 yes
 
-Host *
+Match canonical all
   CheckHostIP                 no
   ControlMaster               auto
   ControlPath                 ~/.ssh/master/%r@%h:%p
@@ -19,7 +24,3 @@ Host *
   UpdateHostKeys              yes
   User                        david
   VerifyHostKeyDNS            yes
-  CanonicalizeHostname        yes
-  CanonicalDomains            systemoverlord.com
-  CanonicalizeMaxDots         0
-  CanonicalizeFallbackLocal   yes
diff --git a/dotfiles/zpreztorc b/dotfiles/zpreztorc
index 5d928ad..a2bbd09 100644
--- a/dotfiles/zpreztorc
+++ b/dotfiles/zpreztorc
@@ -41,6 +41,7 @@ zstyle ':prezto:load' pmodule \
   'gpg' \
   'python' \
   'ruby' \
+  'syntax-highlighting' \
   'history-substring-search' \
   'jekyll' \
   'prompt' \
@@ -172,14 +173,14 @@ zstyle ':prezto:module:python:virtualenv' initialize 'yes'
 
 # Set syntax highlighters.
 # By default, only the main highlighter is enabled.
-# zstyle ':prezto:module:syntax-highlighting' highlighters \
-#   'main' \
-#   'brackets' \
-#   'pattern' \
-#   'line' \
-#   'cursor' \
-#   'root'
-#
+zstyle ':prezto:module:syntax-highlighting' highlighters \
+  'main' \
+  'brackets' \
+  'pattern' \
+  'line' \
+  'cursor' \
+  'root'
+
 # Set syntax highlighting styles.
 # zstyle ':prezto:module:syntax-highlighting' styles \
 #   'builtin' 'bg=blue' \
@@ -195,16 +196,16 @@ zstyle ':prezto:module:python:virtualenv' initialize 'yes'
 #
 
 # Auto set the tab and window titles.
-# zstyle ':prezto:module:terminal' auto-title 'yes'
+zstyle ':prezto:module:terminal' auto-title 'yes'
 
 # Set the window title format.
-# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
+zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
 
 # Set the tab title format.
-# zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
+zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
 
 # Set the terminal multiplexer title format.
-# zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
+zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
 
 #
 # Tmux