diff --git a/lisp/my-base16-dark-theme.el b/lisp/my-base16-dark-theme.el
index a18a154..2500162 100644
--- a/lisp/my-base16-dark-theme.el
+++ b/lisp/my-base16-dark-theme.el
@@ -18,7 +18,19 @@
   my-base16-dark-core-palette
   '((custom-theme-set-faces
      theme-name
+
+     `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold))))
+     `(font-lock-doc-face ((,class (:foreground ,green :slant normal))))
+     `(font-lock-string-face ((,class (:foreground ,green))))
+
      `(italic ((,class (:slant italic))))
+     `(line-number ((,class (:foreground ,base01 :weight light))))
+     `(button ((,class (:foreground ,yellow :underline t))))
+
+     `(mode-line ((,class (:foreground ,base0 :background ,base02))))
+     `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))
+     `(display-time-date-and-time ((,class (:foreground ,base1 :bold t))))
+
      `(org-level-1 ((,class (:foreground ,orange :height 1.0 :weight normal))))
      `(org-level-2 ((,class (:foreground ,blue :height 1.0 :weight normal))))
      `(org-level-3 ((,class (:foreground ,green :height 1.0 :weight normal))))
@@ -35,11 +47,15 @@
      `(org-priority ((,class (:foreground ,green :weight bold))))
      `(org-checkbox ((,class (:foreground ,base0 :weight bold))))
      `(org-dispatcher-highlight ((,class (:foreground "#c1a059" :background "#253224" :weight bold))))
-     `(denote-journal-calendar ((,class (:foreground ,cyan :slant italic))))
+
      `(calendar-month-header ((,class (:foreground ,base0 :weight bold))))
      `(holiday ((,class (:underline (:style line :color ,yellow)))))
      `(cal-china-x-important-holiday-face ((,class (:underline (:style line :color ,red)))))
      `(cal-china-x-general-holiday-face ((,class (:underline (:style line :color ,yellow)))))
+
+     `(denote-journal-calendar ((,class (:foreground ,cyan :slant italic))))
+     `(denote-faces-keywords ((,class (:foreground ,cyan))))
+
      `(markdown-header-face-1 ((,class (:foreground ,orange :height 1.0 :weight normal))))
      `(markdown-header-face-2 ((,class (:foreground ,blue :height 1.0 :weight normal))))
      `(markdown-header-face-3 ((,class (:foreground ,green :height 1.0 :weight normal))))
@@ -48,49 +64,52 @@
      `(markdown-header-face-6 ((,class (:foreground ,green :height 1.0 :weight normal))))
      `(markdown-code-face ((,class (:foreground ,base0))))
      `(markdown-table-face ((,class (:foreground ,green))))
-     `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold))))
-     `(font-lock-doc-face ((,class (:foreground ,green :slant normal))))
-     `(font-lock-string-face ((,class (:foreground ,green))))
-     `(line-number ((,class (:foreground ,base01 :weight light))))
-     `(button ((,class (:foreground ,yellow :underline t))))
+
      `(dashboard-footer-face ((,class (:foreground ,blue))))
      `(dashboard-text-banner ((,class (:foreground ,green))))
      `(dashboard-heading ((,class (:foreground ,green :weight bold))))
-     `(dirvish-file-time ((,class (:foreground ,base01))))
-     `(dirvish-free-space ((,class (:foreground ,green))))
+
      `(dired-broken-symlink ((,class (:inherit dired-symlink :foreground ,orange))))
      `(dired-header ((,class (:foreground ,green))))
+     `(dirvish-file-time ((,class (:foreground ,base01))))
+     `(dirvish-free-space ((,class (:foreground ,green))))
      `(dired-async-mode-message ((,class (:foreground ,red))))
      `(dired-async-message ((,class (:foreground ,yellow))))
+
+     `(diff-hunk-header ((,class (:foreground "#c1a059" :background "#253224"))))
+
      `(consult-file ((,class (:foreground ,green))))
      `(consult-notes-name ((,class (:foreground ,base01))))
      `(consult-notes-time ((,class (:foreground ,base01))))
      `(consult-notes-size ((,class (:foreground ,base01))))
-     `(denote-faces-keywords ((,class (:foreground ,cyan))))
-     `(mode-line ((,class (:foreground ,base0 :background ,base02))))
-     `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))
-     `(display-time-date-and-time ((,class (:foreground ,base1 :bold t))))
-     `(jinx-misspelled ((,class (:underline (:style line :color ,yellow)))))
-     `(geiser-font-lock-repl-output ((,class (:foreground ,green))))
-     `(geiser-font-lock-doc-link ((,class (:foreground ,blue :underline t))))
-     `(geiser-font-lock-error-link ((,class (:foreground ,orange :underline t))))
+
      `(vertico-current ((,class (:background ,base02 :extend t :underline nil))))
-     `(vundo-saved ((,class (:foreground ,green))))
-     `(vundo-last-saved ((,class (:foreground ,green :weight bold))))
-     `(vundo-highlight ((,class (:foreground ,cyan :weight bold))))
-     `(vundo-node ((,class (:foreground ,base01))))
-     `(vundo-stem ((,class (:foreground ,base01))))
+
      `(transient-key-stay ((,class (:foreground ,cyan :inherit transient-key))))
      `(transient-key-return ((,class (:foreground ,violet :inherit transient-key))))
      `(transient-key-exit ((,class (:foreground ,blue :inherit transient-key))))
      `(transient-key-stack ((,class (:foreground ,magenta :inherit transient-key))))
      `(transient-key-recurse ((,class (:foreground ,blue :inherit transient-key))))
      `(transient-key-noop ((,class (:foreground ,base01 :inherit transient-key))))
+
+     `(geiser-font-lock-repl-output ((,class (:foreground ,green))))
+     `(geiser-font-lock-doc-link ((,class (:foreground ,blue :underline t))))
+     `(geiser-font-lock-error-link ((,class (:foreground ,orange :underline t))))
+
+     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face))))
+
+     `(vundo-saved ((,class (:foreground ,green))))
+     `(vundo-last-saved ((,class (:foreground ,green :weight bold))))
+     `(vundo-highlight ((,class (:foreground ,cyan :weight bold))))
+     `(vundo-node ((,class (:foreground ,base01))))
+     `(vundo-stem ((,class (:foreground ,base01))))
+
+     `(jinx-misspelled ((,class (:underline (:style line :color ,yellow)))))
+
      `(keycast-key ((,class (:foreground ,green :weight bold))))
+
      `(emms-playlist-track-face ((,class (:foreground ,cyan))))
-     `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold))))
-     `(diff-hunk-header ((,class (:foreground "#c1a059" :background "#253224"))))
-     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face)))))))
+     `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold)))))))
 
 (provide-theme 'my-base16-dark)
 
diff --git a/lisp/my-base16-light-theme.el b/lisp/my-base16-light-theme.el
index aefc302..26fef1a 100644
--- a/lisp/my-base16-light-theme.el
+++ b/lisp/my-base16-light-theme.el
@@ -18,7 +18,19 @@
   my-base16-light-core-palette
   '((custom-theme-set-faces
      theme-name
+
+     `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold))))
+     `(font-lock-doc-face ((,class (:foreground ,green :slant normal))))
+     `(font-lock-string-face ((,class (:foreground ,green))))
+
      `(italic ((,class (:slant italic))))
+     `(line-number ((,class (:foreground ,base01 :weight light))))
+     `(button ((,class (:foreground ,yellow :underline t))))
+
+     `(mode-line ((,class (:foreground ,base0 :background ,base02))))
+     `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))
+     `(display-time-date-and-time ((,class (:foreground ,base1 :bold t))))
+
      `(org-level-1 ((,class (:foreground ,orange :height 1.0 :weight normal))))
      `(org-level-2 ((,class (:foreground ,blue :height 1.0 :weight normal))))
      `(org-level-3 ((,class (:foreground ,green :height 1.0 :weight normal))))
@@ -35,11 +47,15 @@
      `(org-priority ((,class (:foreground ,green :weight bold))))
      `(org-checkbox ((,class (:foreground ,base0 :weight bold))))
      `(org-dispatcher-highlight ((,class (:foreground "#6b561e" :background "#f0e6b8" :weight bold))))
-     `(denote-journal-calendar ((,class (:foreground ,cyan :slant italic))))
+
      `(calendar-month-header ((,class (:foreground ,base0 :weight bold))))
      `(holiday ((,class (:underline (:style line :color ,yellow)))))
      `(cal-china-x-important-holiday-face ((,class (:underline (:style line :color ,red)))))
      `(cal-china-x-general-holiday-face ((,class (:underline (:style line :color ,yellow)))))
+
+     `(denote-journal-calendar ((,class (:foreground ,cyan :slant italic))))
+     `(denote-faces-keywords ((,class (:foreground ,cyan))))
+
      `(markdown-header-face-1 ((,class (:foreground ,orange :height 1.0 :weight normal))))
      `(markdown-header-face-2 ((,class (:foreground ,blue :height 1.0 :weight normal))))
      `(markdown-header-face-3 ((,class (:foreground ,green :height 1.0 :weight normal))))
@@ -48,49 +64,52 @@
      `(markdown-header-face-6 ((,class (:foreground ,green :height 1.0 :weight normal))))
      `(markdown-code-face ((,class (:foreground ,base0))))
      `(markdown-table-face ((,class (:foreground ,green))))
-     `(font-lock-keyword-face ((,class (:foreground ,cyan :weight bold))))
-     `(font-lock-doc-face ((,class (:foreground ,green :slant normal))))
-     `(font-lock-string-face ((,class (:foreground ,green))))
-     `(line-number ((,class (:foreground ,base01 :weight light))))
-     `(button ((,class (:foreground ,yellow :underline t))))
+
      `(dashboard-footer-face ((,class (:foreground ,blue))))
      `(dashboard-text-banner ((,class (:foreground ,green))))
      `(dashboard-heading ((,class (:foreground ,green :weight bold))))
-     `(dirvish-file-time ((,class (:foreground ,base01))))
-     `(dirvish-free-space ((,class (:foreground ,green))))
+
      `(dired-broken-symlink ((,class (:inherit dired-symlink :foreground ,orange))))
      `(dired-header ((,class (:foreground ,green))))
+     `(dirvish-file-time ((,class (:foreground ,base01))))
+     `(dirvish-free-space ((,class (:foreground ,green))))
      `(dired-async-mode-message ((,class (:foreground ,red))))
      `(dired-async-message ((,class (:foreground ,yellow))))
+
+     `(diff-hunk-header ((,class (:foreground "#6b561e" :background "#f0e6b8"))))
+
      `(consult-file ((,class (:foreground ,green))))
      `(consult-notes-name ((,class (:foreground ,base01))))
      `(consult-notes-time ((,class (:foreground ,base01))))
      `(consult-notes-size ((,class (:foreground ,base01))))
-     `(denote-faces-keywords ((,class (:foreground ,cyan))))
-     `(mode-line ((,class (:foreground ,base0 :background ,base02))))
-     `(mode-line-inactive ((,class (:foreground ,base01 :background ,base03))))
-     `(display-time-date-and-time ((,class (:foreground ,base1 :bold t))))
-     `(jinx-misspelled ((,class (:underline (:style line :color ,yellow)))))
-     `(geiser-font-lock-repl-output ((,class (:foreground ,green))))
-     `(geiser-font-lock-doc-link ((,class (:foreground ,blue :underline t))))
-     `(geiser-font-lock-error-link ((,class (:foreground ,orange :underline t))))
+
      `(vertico-current ((,class (:background ,base02 :extend t :underline nil))))
-     `(vundo-saved ((,class (:foreground ,green))))
-     `(vundo-last-saved ((,class (:foreground ,green :weight bold))))
-     `(vundo-highlight ((,class (:foreground ,cyan :weight bold))))
-     `(vundo-node ((,class (:foreground ,base01))))
-     `(vundo-stem ((,class (:foreground ,base01))))
+
      `(transient-key-stay ((,class (:foreground ,cyan :inherit transient-key))))
      `(transient-key-return ((,class (:foreground ,violet :inherit transient-key))))
      `(transient-key-exit ((,class (:foreground ,blue :inherit transient-key))))
      `(transient-key-stack ((,class (:foreground ,magenta :inherit transient-key))))
      `(transient-key-recurse ((,class (:foreground ,blue :inherit transient-key))))
      `(transient-key-noop ((,class (:foreground ,base01 :inherit transient-key))))
+
+     `(geiser-font-lock-repl-output ((,class (:foreground ,green))))
+     `(geiser-font-lock-doc-link ((,class (:foreground ,blue :underline t))))
+     `(geiser-font-lock-error-link ((,class (:foreground ,orange :underline t))))
+
+     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face))))
+
+     `(vundo-saved ((,class (:foreground ,green))))
+     `(vundo-last-saved ((,class (:foreground ,green :weight bold))))
+     `(vundo-highlight ((,class (:foreground ,cyan :weight bold))))
+     `(vundo-node ((,class (:foreground ,base01))))
+     `(vundo-stem ((,class (:foreground ,base01))))
+
+     `(jinx-misspelled ((,class (:underline (:style line :color ,yellow)))))
+
      `(keycast-key ((,class (:foreground ,green :weight bold))))
+
      `(emms-playlist-track-face ((,class (:foreground ,cyan))))
-     `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold))))
-     `(diff-hunk-header ((,class (:foreground "#6b561e" :background "#f0e6b8"))))
-     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face)))))))
+     `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold)))))))
 
 (provide-theme 'my-base16-light)