diff --git a/.config/emacs/init.org b/.config/emacs/init.org
index 38cb603..8775de3 100644
--- a/.config/emacs/init.org
+++ b/.config/emacs/init.org
@@ -199,27 +199,31 @@ Use Dashboard.el. First load `all-the-icons` for nicer rendering
 
 #+begin_src emacs-lisp
 (straight-use-package 'doom-themes)
-(setq custom-safe-themes t)
+;; (setq custom-safe-themes t)
 
+;; (setq debug-on-message "stop")
 ;; General Faces
 (custom-set-faces
  '(dashboard-items-face ((t (:inherit widget-button :weight normal)))))
 
 ;; Theme Specific
-(with-eval-after-load 'doom-themes
-  (load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-palenight-theme.el")
-  (load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-flatwhite-theme.el")
+;; (with-eval-after-load 'doom-themes
+;; (load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-flatwhite-theme.el")
+(load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-palenight-theme.el")
 
-  (custom-theme-set-faces
-   'doom-palenight
-   '(highlight ((t (:background "#3C435E" :foreground "#ffffff"))))
-   '(markdown-code-face ((t (:extend t :background "#232635")))))
+(custom-theme-set-faces
+ 'doom-palenight
+ `(highlight ((t (:background ,(doom-color 'base3) :foreground ,(doom-color 'fg)))))
+ `(markdown-code-face ((t (:extend t :background ,(doom-color 'base2))))))
 
-  (custom-theme-set-faces
-   'doom-flatwhite
-   '(hl-line ((t (:extend t :background "#e4ddd2"))))
-   '(org-block ((t (:extend t :background "#f1ece4"))))
-   '(org-block-begin-line ((t (:extend t :background "#3C435E"))))))
+(load-theme 'doom-palenight t)
+
+;; (custom-theme-set-faces
+;;  'doom-flatwhite
+;;  '(hl-line ((t (:extend t :background "#e4ddd2"))))
+;;  '(org-block ((t (:extend t :background "#f1ece4"))))
+;;  '(org-block-begin-line ((t (:extend t :background "#3C435E")))))
+;; )
 #+end_src
 
 We want to add whatever custom theme we selected to the custom variables since emacs will just
@@ -233,10 +237,10 @@ our case is worse since we have a literate file. Send all custom variables to ~c
 
 Save the last used theme when exiting emacs and then reload it.
 
-#+begin_src emacs-lisp
-(defun joe/save-current-theme ()
-  (customize-save-variable 'custom-enabled-themes custom-enabled-themes))
-(add-hook 'kill-emacs-hook #'joe/save-current-theme)
+#+begin_src emacs-lisp tangle: no
+;; (defun joe/save-current-theme ()
+;;   (customize-save-variable 'custom-enabled-themes custom-enabled-themes))
+;; (add-hook 'kill-emacs-hook #'joe/save-current-theme)
 #+end_src
 *** Other
 
@@ -285,8 +289,8 @@ Setup other stuff
 (straight-use-package 'doom-modeline)
 (doom-modeline-mode)
 (doom-modeline-def-modeline 'main
-  '(modals bar window-number matches buffer-info remote-host buffer-position word-count selection-info)
-  '(parrot objed-state misc-info battery grip irc mu4e gnus github debug repl lsp bar input-method indent-info buffer-encoding bar major-mode process bar workspace-name))
+  '(workspace-name bar modals bar window-number matches buffer-info remote-host buffer-position word-count selection-info)
+  '(parrot objed-state misc-info battery grip irc mu4e gnus github debug repl lsp bar input-method indent-info buffer-encoding bar major-mode process))
 
 ;; Set default mode-line
 (add-hook 'doom-modeline-mode-hook
@@ -306,16 +310,12 @@ Setup other stuff
 #+begin_src emacs-lisp
 (set-face-attribute 'default nil :family "Fira Code Nerd Font Mono" :height 120)
 ;; (set-face-attribute 'variable-pitch nil :family "Source Code Pro" :height 120)
-
 (setq-default c-basic-offset 4) ;; This is annoying
 (setq-default indent-tabs-mode nil)
 (setq-default tab-width 4)
 (setq-default line-spacing 5)
 (setq indent-line-function #'indent-relative)
 
-(set-default 'truncate-lines t)
-(set-default 'truncate-partial-width-windows nil)
-
 ;; (add-hook 'before-save-hook 'whitespace-cleanup)
 #+end_src
 ** Text Editor
@@ -392,7 +392,6 @@ Emacs is an great operating system, if only it had a good text editor...
 (add-hook 'emacs-startup-hook
           (lambda ()
             (evil-define-key 'normal 'global 
-              (kbd "<leader>w")  'save-buffer
               (kbd "<leader>q")  'kill-buffer-and-window
               (kbd "<leader>k")  'kill-this-buffer
               (kbd "<leader>h")  'help-command
@@ -533,6 +532,9 @@ The theme of `C-x 4` bindings is that they operate on other windows, so this fun
 (defun joe/window-split-vertical   () (interactive) (set 'joe/popper-side-toggle 'right) (rotate:main-horizontal))
 (defun joe/window-split-horizontal () (interactive) (set 'joe/popper-side-toggle 'below) (rotate:main-vertical))
 
+(evil-global-set-key 'normal (kbd "<leader>w") 'evil-window-map)
+(evil-global-set-key 'normal (kbd "C-w") 'save-buffer)
+
 (define-key ctl-x-4-map (kbd "|") #'joe/window-split-vertical)
 (define-key ctl-x-4-map (kbd "-") #'joe/window-split-horizontal)
 (define-key ctl-x-4-map (kbd "t") #'rotate-window)
@@ -853,6 +855,8 @@ targets."
 (global-set-key (kbd "C-x d") #'dirvish-dwim)
 (global-set-key (kbd "C-x C-d") #'joe/dirvish-find-directory)
 
+(add-hook 'dired-mode-hook (lambda () (setq truncate-lines t)))
+
 #+end_src
 ** Org Mode
 
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index c9a4452..66f04a9 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -39,6 +39,7 @@ packer.startup(function(use)
     use {
         'marko-cerovac/material.nvim',
         config = function()
+            -- vim.g.material_style = 'lighter'
             vim.g.material_style = 'palenight'
             vim.cmd [[colorscheme material]]
         end