diff --git a/Cask b/Cask
index 5c8f5cf34..bb8a97474 100644
--- a/Cask
+++ b/Cask
@@ -170,9 +170,6 @@
 (depends-on "php-refactor-mode")
 (depends-on "php-boris")
 (depends-on "php-extras")
-;; (depends-on "hack-mode"
-;;   :git "https://github.com/facebook/hhvm"
-;;   :files ("hphp/hack/editor-plugins/emacs/*.el"))
 
 ;; Python -- modules/module-python.el
 (depends-on "anaconda-mode")
diff --git a/bootstrap.el b/bootstrap.el
index 89f3278e8..12a30aef5 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -44,11 +44,12 @@
 
 (defun narf (packages)
   "Bootstrap NARF emacs and initialize PACKAGES"
-  ;; stop package.el from being annoying. NARF relies entirely on Cask.
+  ;; stop package.el from being annoying. I rely solely on Cask.
   (setq-default
    package--init-file-ensured t
    package-enable-at-startup nil
-   gc-cons-threshold 4388608)
+   gc-cons-threshold 4388608
+   gc-cons-percentage 0.2)
 
   ;; prematurely optimize for faster startup
   (let ((gc-cons-threshold  169715200)
@@ -82,9 +83,6 @@
 
     ;; Load 'em up!
     (load-theme narf-current-theme t)
-    (mapc 'require packages)
-
-    (defun display-startup-echo-area-message ()
-      (message ":: Loaded in %s" (emacs-init-time)))))
+    (mapc 'require packages)))
 
 ;;; bootstrap.el ends here
diff --git a/core/core-editor.el b/core/core-editor.el
index bfd486189..9460ec645 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -26,8 +26,9 @@
 
  shift-select-mode t
  tabify-regexp "^\t* [ \t]+"
- whitespace-style '(face tabs tab-mark trailing newline newline-mark indentation lines-tail)
  whitespace-line-column fill-column
+ whitespace-style '(face tabs tab-mark newline newline-mark
+                    trailing indentation lines-tail)
  whitespace-display-mappings
  '((tab-mark   ?\t   [?> ?\t])
    (newline-mark 10 [36 10])))
@@ -66,7 +67,7 @@ enable multiple minor modes for the same regexp.")
             (funcall (cdar alist) 1))
         (setq alist (cdr alist))))))
 
-(add-hook! find-file 'narf|enable-minor-mode-maybe)
+(add-hook 'find-file-hook 'narf|enable-minor-mode-maybe)
 
 
 ;;
diff --git a/core/core-eval.el b/core/core-eval.el
index bde870dd3..c9a521c8c 100644
--- a/core/core-eval.el
+++ b/core/core-eval.el
@@ -8,9 +8,10 @@
              quickrun-compile-only
              quickrun-replace-region
              helm-quickrun)
+  :init
+  (add-hook 'quickrun/mode-hook 'linum-mode)
   :config
   (setq quickrun-focus-p nil)
-  (add-hook! quickrun/mode '(linum-mode))
   (add-to-list 'quickrun-file-alist '("\\.gvy$" . "groovy")))
 
 (use-package repl-toggle
diff --git a/core/core-project.el b/core/core-project.el
index 4f9fab306..d86859c59 100644
--- a/core/core-project.el
+++ b/core/core-project.el
@@ -56,6 +56,10 @@
         ido-save-directory-list-file (concat narf-temp-dir "/ido.last"))
   :config
   (add-hook! ido-setup
+    (add-to-list 'ido-ignore-files "\\`.DS_Store$")
+    (add-to-list 'ido-ignore-files "Icon\\?$")
+    (advice-add 'ido-sort-mtime :override 'narf*ido-sort-mtime)
+
     (require 'ido-vertical-mode)
     (ido-vertical-mode 1)
     (require 'flx-ido)
@@ -68,10 +72,6 @@
           "C-w" 'ido-delete-backward-word-updir
           "C-u" 'ido-up-directory))
 
-  (add-to-list 'ido-ignore-files "\\`.DS_Store$")
-  (add-to-list 'ido-ignore-files "Icon\\?$")
-
-  (advice-add 'ido-sort-mtime :override 'narf*ido-sort-mtime)
   (add-hook! (ido-make-file-list ido-make-dir-list) 'narf*ido-sort-mtime)
   (add-hook! ido-setup 'narf|ido-setup-home-keybind))
 
diff --git a/core/core-vcs.el b/core/core-vcs.el
index 4c38128ce..83aa081b1 100644
--- a/core/core-vcs.el
+++ b/core/core-vcs.el
@@ -2,7 +2,7 @@
 
 (use-package gitconfig-mode
   :mode ("/\\.?git/?config$" "/\\.gitmodules$")
-  :init (add-hook! gitconfig-mode 'flyspell-mode))
+  :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
 (use-package gitignore-mode
   :mode ("/\\.gitignore$"
@@ -34,7 +34,7 @@
     nil nil 'center)
 
   (advice-add 'evil-force-normal-state :after 'git-gutter)
-  (add-hook! focus-in 'git-gutter:update-all-windows))
+  (add-hook 'focus-in-hook 'git-gutter:update-all-windows))
 
 (after! vc-annotate
   (evil-set-initial-state 'vc-annotate-mode 'normal)
diff --git a/core/core.el b/core/core.el
index 9fb910e28..338dfc74a 100644
--- a/core/core.el
+++ b/core/core.el
@@ -149,15 +149,19 @@
 
 
 ;;
-;; We put this on `after-init-hook' Allow errors to stop this from happening
+;; We add this to `after-init-hook' to allow errors to stop this advice
 (add-hook! after-init
   (defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)
     "Prevent annoying \"Active processes exist\" query when you quit Emacs."
     (cl-flet ((process-list ())) ad-do-it)))
 
-(require 'server)
-(unless (server-running-p)
-  (server-start))
+(when (display-graphic-p)
+  (require 'server)
+  (unless (server-running-p)
+    (server-start)))
+
+(defun display-startup-echo-area-message ()
+  (message ":: Loaded in %s" (emacs-init-time)))
 
 (provide 'core)
 ;;; core.el ends here
diff --git a/modules/module-org.el b/modules/module-org.el
index 78d0af54a..5a4a51c99 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -108,7 +108,7 @@
    org-highlight-latex-and-related '(latex)
    org-latex-create-formula-image-program 'dvipng
    org-latex-image-default-width nil
-   org-latex-preview-ltxpng-directory (concat narf-temp-dir "ltxpng/")
+   org-latex-preview-ltxpng-directory (concat narf-temp-dir "/ltxpng/")
    org-latex-remove-logfiles nil
    org-startup-with-latex-preview nil
    ;; org-latex-packages-alist
diff --git a/modules/module-web.el b/modules/module-web.el
index f5ecc0b67..689f524a4 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -50,7 +50,11 @@
         :i [backtab] 'narf/dumb-dedent))
 
 (use-package web-mode
-  :mode ("\\.\\(p\\)?htm\\(l\\)?$" "\\.tpl\\(\\.php\\)?$" "\\.erb$" "wp-content/themes/.+/.+\\.php$")
+  :mode ("\\.\\(p\\)?htm\\(l\\)?$"
+         "\\.tpl\\(\\.php\\)?$"
+         "\\.erb$"
+         "wp-content/themes/.+/.+\\.php$"
+         "\\.blade\\.php$")
   :init
   ;; smartparens handles this
   (setq web-mode-enable-auto-pairing nil