diff --git a/config.el b/config.el
index fb56069..cea6676 100644
--- a/config.el
+++ b/config.el
@@ -1,19 +1,20 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
 
-;; Place your private configuration here! Remember, you do not need to run 'doom
-;; sync' after modifying this file!
-
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file temp+bindingslates and snippets. It is optional.
 (setq user-full-name "Matt Nish-Lapidus"
       user-mail-address "matt@emenel.ca")
 
-;; See 'C-h v doom-font' for documentation and more examples of what they
-;; accept. For example:
-(setq doom-font (font-spec :family "IBM Plex Mono" :size 18))
-(setq fancy-splash-image (concat doom-user-dir "splash.png"))
 (setq doom-theme 'doom-one)
 
+;; (setq doom-font (font-spec :family "Liga SFMono Nerd Font" :size 15)
+;;       doom-big-font (font-spec :family "Liga SFMono Nerd Font" :size 20)
+;;       doom-variable-pitch-font (font-spec :family "IBM Plex Sans" :size 16)
+;;       doom-symbol-font (font-spec :family "Liga SFMono Nerd Font")
+;;       doom-serif-font (font-spec :family "IBM Plex Sans" :size 16 :weight 'medium))
+
+(setq doom-font (font-spec :family "IBM Plex Mono" :size 18))
+
+(setq fancy-splash-image (concat doom-user-dir "splash.png"))
+
 (setq +doom-dashboard-pwd-policy nil)
 
 ;; Must be used *after* the theme is loaded
@@ -25,28 +26,26 @@
  '(line-number ((t (:foreground "#424242"))))
  '(mu4e-highlight-face ((t (:inherit nil :background "gray26" :foreground "gray85")))))
 
-;; This determines the style of line numbers in effect. If set to `nil', line
-;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type 'relative)
 (setq scroll-preserve-screen-position t)
 (setq global-hl-line-modes nil)
 
 (if (daemonp)
-    (add-hook 'after-make-frame-functions
+    (add-hook! after-make-frame-functions
               (lambda (frame)
                 (with-selected-frame frame
                   (scroll-bar-mode -1))))
   (scroll-bar-mode -1))
 
+;; encodings
 (setq locale-coding-system 'utf-8)
 (set-terminal-coding-system 'utf-8)
 (set-keyboard-coding-system 'utf-8)
 (prefer-coding-system 'utf-8)
 
+;; org dir == obsidian vault
 (setq org-directory "~/Documents/Obsidian/Primary")
 
-(use-package! kbd-mode :defer t)
-
 (use-package! direnv
   :config
   (direnv-mode))
@@ -169,6 +168,8 @@
 (after! vertico
   (vertico-mouse-mode))
 
+;; modes
+(use-package! kbd-mode :defer t)
 
 (after! lsp-mode
   (setq lsp-signature-render-documentation nil)
@@ -250,8 +251,7 @@
 (after! gcode-mode
   (add-hook! 'gcode-mode-hook 'eldoc-mode))
 
-(use-package!
-    tramp
+(use-package! tramp
   :defer t
   :config
   ;; To “turn off” the backup feature for remote files and stop TRAMP from saving to the backup directory.
@@ -320,16 +320,16 @@
                         (end (region-end)))
               (font-lock-flush beg end))))
 
-(defun +workspaces-associate-frame-fn (frame &optional _new-frame-p)
-  "Create a blank, new perspective and associate it with FRAME."
-  (when persp-mode
-    (with-selected-frame frame
-      (if (not (cdr-safe (persp-frame-list-without-daemon)))
-          (+workspace-switch +workspaces-main t)
-        (+workspace-switch (format "#%s" (+workspace--generate-id)) t))
-      (unless (doom-real-buffer-p (current-buffer))
-        (switch-to-buffer (doom-fallback-buffer)))
-      (set-frame-parameter frame 'workspace (+workspace-current-name))
-      ;; ensure every buffer has a buffer-predicate
-      (persp-set-frame-buffer-predicate frame))
-    (run-at-time 0.1 nil #'+workspace/display)))
+;; (defun +workspaces-associate-frame-fn (frame &optional _new-frame-p)
+;;   "Create a blank, new perspective and associate it with FRAME."
+;;   (when persp-mode
+;;     (with-selected-frame frame
+;;       (if (not (cdr-safe (persp-frame-list-without-daemon)))
+;;           (+workspace-switch +workspaces-main t)
+;;         (+workspace-switch (format "#%s" (+workspace--generate-id)) t))
+;;       (unless (doom-real-buffer-p (current-buffer))
+;;         (switch-to-buffer (doom-fallback-buffer)))
+;;       (set-frame-parameter frame 'workspace (+workspace-current-name))
+;;       ;; ensure every buffer has a buffer-predicate
+;;       (persp-set-frame-buffer-predicate frame))
+;;     (run-at-time 0.1 nil #'+workspace/display)))
diff --git a/meow.el b/meow.el
index 8017264..143caba 100644
--- a/meow.el
+++ b/meow.el
@@ -120,6 +120,9 @@
   :config
   (meow-setup)
   (pushnew! meow-mode-state-list '(mu4e-main-mode . motion))
+  (pushnew! meow-mode-state-list '(mu4e-view-mode . motion))
+  (pushnew! meow-mode-state-list '(mu4e-compose-mode . normal))
+  (pushnew! meow-mode-state-list '(mu4e-headers-mode . motion))
   (pushnew! meow-mode-state-list '(sly-db-mode . motion))
   (pushnew! meow-mode-state-list '(sly-inspector-mode . motion))
   (pushnew! meow-mode-state-list '(vterm-mode . insert))
diff --git a/mu4e-config.el b/mu4e-config.el
index 10e3a49..0dadb2c 100644
--- a/mu4e-config.el
+++ b/mu4e-config.el
@@ -53,7 +53,6 @@
   (print args)
   (kill-this-buffer))
 ;;TODO close view window and open compose window in place
-;;
 
 
 (defun mu4e-view-save-all-attachments (&optional arg)
@@ -93,17 +92,18 @@
 
 
 (use-package! consult-mu
-  :defer-incrementally mu4e
+  :after mu4e
   :custom
   (consult-mu-maxnum 200)
+
   ;;show preview when pressing any keys
   (consult-mu-preview-key 'any)
   (consult-mu-mark-previewed-as-read nil)
-  ;;mark email as read when selected.
-  ;; (consult-mu-mark-viewed-as-read t)
+  (consult-mu-mark-viewed-as-read t)
   (consult-mu-use-wide-reply t)
 
   (consult-mu-headers-template (lambda () (concat "%f" (number-to-string (floor (* (frame-width) 0.15))) "%s" (number-to-string (floor (* (frame-width) 0.5))) "%d13" "%g" "%x")))
+
   (consult-mu-action #'consult-mu--view-action)
 
   :config
@@ -131,11 +131,6 @@
   :defer-incrementally t
   :config
 
-  ;; Run mu4e in the background to sync mail periodically
-  ;; (mu4e t)
-
-
-
   (setq mm-discouraged-alternatives '("text/html" "text/richtext"))
 
   (setq
@@ -161,13 +156,6 @@
 
   (set-popup-rule! "*mu4e overview*" :side 'left :size '0.25)
 
-  ;; Use gnus article view
-  ;; (setq mu4e-view-use-gnus t)
-
-  ;; (gnus-icalendar-setup)
-  ;; Optional
-  ;; (setq mu4e-icalendar-trash-after-reply t)
-
   (setq
    sendmail-program "/etc/profiles/per-user/emenel/bin/msmtp"
    send-mail-function 'smtpmail-send-it
@@ -177,7 +165,6 @@
 
   (add-hook! 'mu4e-compose-mode-hook
     (ws-butler-mode -1)
-    ;; (use-hard-newlines -1)
     (visual-line-mode)
     (message-goto-body)
     (message-insert-signature-at-point)
diff --git a/packages.el b/packages.el
index 2dce231..fe4a17c 100644
--- a/packages.el
+++ b/packages.el
@@ -37,25 +37,22 @@
            :files (:defaults "*.el")))
 
 (package! meow-vterm
-  :recipe (:type git
-           :host github
-           :repo "accelbread/meow-vterm"))
+  :recipe (:type git :host github :repo "accelbread/meow-vterm"))
 
 (package! meow-tree-sitter
   :recipe (:type git :host github :repo "skissue/meow-tree-sitter"))
 
 (package! kbd-mode
-  :recipe (:type git
-           :host github
-           :repo "kmonad/kbd-mode"))
+  :recipe (:type git :host github :repo "kmonad/kbd-mode"))
+
+(package! mu4e-query
+  :recipe (:host github :type git :repo "mickeynp/mu4e-query"))
 
 (package! consult-mu
   :recipe (:host github :type git :repo "armindarvish/consult-mu" :files (:defaults "extras/*.el")))
 
 (package! mu4e-overview
-  :recipe (:type git
-           :host github
-           :repo "mkcms/mu4e-overview"))
+  :recipe (:type git :host github :repo "mkcms/mu4e-overview"))
 
 (package! just-mode)
 (package! justl)
@@ -99,8 +96,6 @@
            :repo "moderninterpreters/markup"
            :files ("*.el")))
 
-(package! bookmark-in-project)
-
 (package! eglot-booster
   :recipe (:type git
            :host github