@@ -228,6 +228,7 @@ (setq completion-styles '(basic initials partial-completion substring)
       completion-ignore-case t)
 
 (req-package smart-tab
+  :commands (global-smart-tab-mode)
   :init (global-smart-tab-mode)
   :config (progn
             (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function)))
@@ -429,7 +430,6 @@ (kill-this-buffer))))
 
 (req-package ws-butler
   :if window-system
-  :diminish highlight-changes-mode
   :config (ws-butler-global-mode 1))
 (if (daemonp)
     (add-hook #'before-make-frame-hook (lambda () (ws-butler-global-mode 1))))
@@ -880,10 +880,11 @@
 (req-package go-mode
   :mode (("\\.go\\'" . go-mode)))
 
-(req-package oracle
-  :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH"))
-  :init (progn
-          (add-hook 'go-mode-hook #'go-oracle-mode)))
+(when (file-exists-p "src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
+  (req-package oracle
+    :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH"))
+    :init (progn
+            (add-hook 'go-mode-hook #'go-oracle-mode))))
 
 (req-package company-go
   :require go-mode
@@ -1032,11 +1033,11 @@ (setq eshell-directory-name "~/.emacs.d/eshell")
             (add-hook 'eshell-load-hook (lambda ()
                                           (bind-key "C-c C-l" #'helm-eshell-history eshell-mode-map)))
             (req-package em-smart
-              :init (progn
-                      (setq eshell-where-to-jump 'begin
-                            eshell-review-quick-commands nil
-                            eshell-smart-space-goes-to-end t)
-                      (eshell-smart-initialize)))))
+              :config (progn
+                        (setq eshell-where-to-jump 'begin
+                              eshell-review-quick-commands nil
+                              eshell-smart-space-goes-to-end t)
+                        (eshell-smart-initialize)))))
 
 (autoload #'eshell/cd "em-dirs")
 (defun eshell-goto-current-dir (&optional arg)

@@ -177,10 +177,6 @@
 ############
 # Keybinds #
 ############
-#KiTTY
-bindkey "OD"    backward-word
-bindkey "OC"    forward-word
-
 #General
 bindkey "[1~"   beginning-of-line
 bindkey "[4~"   end-of-line
@@ -376,7 +372,6 @@ echo "per-directory-history is missing"
 fi
 
 _FASD_DATA="$HOME/.cache/zsh/fasd-data"
-autoload -U fasd
 if [[ -e ~/.config/zsh/fasd.zsh ]]
 then
 	source ~/.config/zsh/fasd.zsh