   (set! :popup " output\\*$" '((size . 15)))
 
   ;; TeX Font Styling
-  (def-package! tex-style
-    :defer t)
+  ;; (def-package! tex-style :defer t)
 
   ;; TeX Folding
-  (def-package! tex-fold
-    :defer t
-    :init
-    (add-hook! 'TeX-mode-hook 'TeX-fold-mode))
+  (add-hook 'TeX-mode-hook 'TeX-fold-mode)
 
   (def-package! latex
     :defer t
     :init
-    (setq
-     ;; Add the toc entry to the sectioning hooks.
-     LaTeX-section-hook
-       '(LaTeX-section-heading
-         LaTeX-section-title
-         LaTeX-section-toc
-         LaTeX-section-section
-         LaTeX-section-label)
-     LaTeX-fill-break-at-separators nil
-     ;; Item indentation.
-     LaTeX-item-indent 0)
+    (setq LaTeX-section-hook ; Add the toc entry to the sectioning hooks.
+          '(LaTeX-section-heading
+            LaTeX-section-title
+            LaTeX-section-toc
+            LaTeX-section-section
+            LaTeX-section-label)
+          LaTeX-fill-break-at-separators nil
+          LaTeX-item-indent 0) ; item indentation.
     :config
     (map! :map LaTeX-mode-map "C-j" nil)
     ;; Do not prompt for Master files, this allows auto-insert to add templates
     ;; to .tex files
-    (add-hook! '(LaTeX-mode TeX-mode) '(lambda () (remove-hook 'find-file-hooks (car find-file-hooks) 'local)))
+    (add-hook! '(LaTeX-mode TeX-mode)
+      (remove-hook 'find-file-hook (car find-file-hook) 'local))
     ;; Adding useful things for latex
-    (add-hook! LaTeX-mode (LaTeX-math-mode) (TeX-source-correlate-mode)(TeX-global-PDF-mode t)
-                          (TeX-PDF-mode t) (visual-line-mode +1))
+    (add-hook! LaTeX-mode
+      (LaTeX-math-mode)
+      (TeX-source-correlate-mode)
+      (TeX-global-PDF-mode t)
+      (TeX-PDF-mode t)
+      (visual-line-mode +1))
     (when (featurep! :feature spellcheck)
-      (add-hook! LaTeX-mode (flyspell-mode t)))
+      (add-hook 'LaTeX-mode-hook #'flyspell-mode))
     ;; Default language setting.
     (setq ispell-dictionary "english")
     ;; Use chktex to search for errors in a latex file.

(def-package! adaptive-wrap
  :commands (adaptive-wrap-prefix-mode)
  :init
  (add-hook! LaTeX-mode 'adaptive-wrap-prefix-mode)
  (setq-default adaptive-wrap-extra-indent 0))

        reftex-toc-split-windows-fraction 0.3)
  (unless (string-empty-p +latex-bibtex-file)
    (setq reftex-default-bibliography (list (expand-file-name +latex-bibtex-file))))
  ;; Get ReTeX working with biblatex
  ;; http://tex.stackexchange.com/questions/31966/setting-up-reftex-with-biblatex-citation-commands/31992#31992
  (setq reftex-cite-format
        '((?t . "\\textcite[]{%l}")
          (?a . "\\autocite[]{%l}")
