diff --git a/tools/emacs.d/lisp/init-appearance.el b/tools/emacs.d/lisp/init-appearance.el
index 7ed5355..b6d8455 100644
--- a/tools/emacs.d/lisp/init-appearance.el
+++ b/tools/emacs.d/lisp/init-appearance.el
@@ -19,28 +19,30 @@
 (use-package catppuccin-theme
   :config
   (setq catppuccin-flavor 'mocha) ; This looks like shit in terminal mode
-  ;; (load-theme 'catppuccin t)
+  (load-theme 'catppuccin t)
   )
 
-(use-package doom-themes
-  :ensure t
-  :config
-  ;; Global settings (defaults)
-  (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
-        doom-themes-enable-italic t) ; if nil, italics is universally disabled
-  (load-theme 'doom-nord-aurora t)
+;; (use-package doom-themes
+;;   :ensure t
+;;   :config
+;;   ;; Global settings (defaults)
+;;   :custom
+;;   (doom-themes-enable-bold t)    ; if nil, bold is universally disabled
+;;   (doom-themes-enable-italic t) ; if nil, italics is universally disabled
+;;   (doom-themes-treemacs-theme "doom-nord-aurora") ; use "doom-colors" for less minimal icon theme
+;;   :config
+;; ;;  (load-theme 'doom-nord-aurora t)
 
-  ;; Enable flashing mode-line on errors
-  (doom-themes-visual-bell-config)
+;;   ;; Enable flashing mode-line on errors
+;; ;;  (doom-themes-visual-bell-config)
 
-  ;; Enable custom neotree theme (nerd-icons must be installed!)
-  ;; (doom-themes-neotree-config)
+;;   ;; Enable custom neotree theme (nerd-icons must be installed!)
+;;   ;; (doom-themes-neotree-config)
 
-  ;; or for treemacs users
-  (setq doom-themes-treemacs-theme "doom-nord-aurora") ; use "doom-colors" for less minimal icon theme
-  (doom-themes-treemacs-config)
-  ;; Corrects (and improves) org-mode's native fontification.
-  (doom-themes-org-config))
+;;   ;; or for treemacs users
+;;   (doom-themes-treemacs-config)
+;;   ;; Corrects (and improves) org-mode's native fontification.
+;;   (doom-themes-org-config))
 
 
 ;; Better mode line, see (L11) for Icon install
diff --git a/tools/emacs.d/lisp/init-evil.el b/tools/emacs.d/lisp/init-evil.el
index 470917a..e1ab18d 100644
--- a/tools/emacs.d/lisp/init-evil.el
+++ b/tools/emacs.d/lisp/init-evil.el
@@ -1,13 +1,14 @@
 ;;; init-evil.el
 
 ;; Evil - Extensible VI Layer
-(defvar evil-colemak-state-map (make-sparse-keymap))
+;; (defvar evil-colemak-state-map (make-sparse-keymap))
 
 (use-package evil
   :ensure t
   :config
   (evil-mode 1)
   ; Colemak Vim Arrow
+  ; Motion - Emacs built-in read-only mode
   (evil-define-key '(normal visual operator motion) 'global
     ;; To see the keybindings, use <C-h> k then type the key
     "n" 'evil-next-line
@@ -21,15 +22,20 @@
     "J" 'evil-forward-WORD-end
     "N" '(lambda () (interactive) (evil-next-line 5))       ; 5n
     "E" '(lambda () (interactive) (evil-previous-line 5))   ; 5e
-    "H" 'switch-to-prev-buffer
-    "I" 'switch-to-next-buffer
     (kbd "C-w n") 'evil-window-down
     (kbd "C-w e") 'evil-window-up
-    (kbd "C-w i") 'evil-window-right
-    )
+    (kbd "C-w i") 'evil-window-right)
   (evil-define-key '(normal visual) 'global
                    "l" 'evil-insert
-                   "L" 'evil-insert-0-line))
+                   "L" 'evil-insert-0-line)
+  (evil-define-key '(normal motion) 'global
+    "H" #'tab-line-switch-to-prev-tab
+    "I" #'tab-line-switch-to-next-tab)
+  (evil-define-key '(visual operator) 'global
+    "H" #'evil-beginning-of-visual-line
+    "I" #'evil-end-of-visual-line)
+  (evil-ex-define-cmd "bn" #'tab-line-switch-to-next-tab)
+  (evil-ex-define-cmd "bp" #'tab-line-switch-to-prev-tab))
 
 ;; Text Objects Keymap - Use `l` for inner (swap i and l)
 ;; https://github.com/emacs-evil/evil/blob/master/evil-maps.el#L398-L421
@@ -44,8 +50,8 @@
   (global-evil-leader-mode)
   (evil-leader/set-leader "<SPC>")
   (evil-leader/set-key
-    "ft" 'treemacs
-    "fc" '(dired user-emacs-directory)
+    "ft" #'treemacs
+    "fc" #'(counsel-find-file user-emacs-directory)
     "b" 'buffer-menu
    ))
 
diff --git a/tools/emacs.d/lisp/init-org.el b/tools/emacs.d/lisp/init-org.el
index 198ed94..2259899 100644
--- a/tools/emacs.d/lisp/init-org.el
+++ b/tools/emacs.d/lisp/init-org.el
@@ -249,6 +249,5 @@
                         (org-get-heading t t t t)
                         effort))))))
 
-(setq diary-file "~/.local/js0ny/diary")
 
 (provide 'init-org)
diff --git a/tools/emacs.d/lisp/init-package.el b/tools/emacs.d/lisp/init-package.el
index 88f305c..9befe21 100644
--- a/tools/emacs.d/lisp/init-package.el
+++ b/tools/emacs.d/lisp/init-package.el
@@ -1,6 +1,6 @@
 ;;; init-package.el --- Package management setup using straight.el -*- lexical-binding: t -*-
 
-(setq straight-base-dir (expand-file-name "straight" user-emacs-data))
+(setq straight-base-dir user-emacs-data)
 
 ;; Bootstrap straight.el
 (defvar bootstrap-version)