diff --git a/yoshi-theme.el b/yoshi-theme.el
index fd57b80..6026fa5 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -34,21 +34,13 @@
 (let ((bgdefault   "#111111") (fgdefault   "#bfbfbf")
       (bgbright    "#3d3d3d") (fgbright    "#ededed")
       (bgdim       "#222222") (fgdim       "#969696")
-                              (fgdim-1     "#656565")
-                              (fgdim-2     "#323232")
       (bgred       "#3f1a1a") (fgred       "#a85454")
       (bgorange    "#3f321f") (fgorange    "#a88654")
-                              (fgorange-1  "#d78f24")
       (bgyellow    "#343922") (fgyellow    "#8d995c")
       (bggreen     "#263f1f") (fggreen     "#65a854")
-                              (fggreen-1   "#82ba74")
-                              (fggreen-2   "#a1cb97")
-                              (fggreen-3   "#c0dcb9")
-                              (fggreen-4   "#deeddb")
       (bgturquoise "#1f3f2c") (fgturquoise "#54a875")
       (bgcyan      "#1f3f3f") (fgcyan      "#54a8a8")
       (bgblue      "#1f2c3f") (fgblue      "#5476a8")
-      (bgblue-1    "#2a3b54")
       (bgpurple    "#2f2a3f") (fgpurple    "#7d71a8")
       (bgmagenta   "#381f3f") (fgmagenta   "#9754a8")
       (bgpink      "#3f1f32") (fgpink      "#a85487"))
@@ -148,7 +140,7 @@
    `(gnus-header-name ((t (:foreground ,fgblue :weight bold))))
    `(gnus-header-newsgroups ((t (:foreground ,fgbright :weight bold))))
    `(gnus-header-subject ((t (:foreground ,fgyellow))))
-   `(gnus-signature ((t (:foreground ,fgdim-1 :slant italic))))
+   `(gnus-signature ((t (:foreground ,fgdim :slant italic))))
    `(gnus-splash ((t (:foreground ,fgdefault))))
    `(gnus-summary-cancelled ((t (:foreground ,fgyellow :background ,bgbright))))
    `(gnus-summary-high-ancient ((t (:inherit gnus-summary-normal-ancient :weight bold))))
@@ -212,36 +204,36 @@
    `(message-header-other ((t (:inherit gnus-header-content))))
    `(message-header-subject ((t (:inherit gnus-header-subject))))
    `(message-header-to ((t (:foreground ,fgdim :weight bold))))
-   `(message-header-xheader ((t (:foreground ,fgdim-1))))
+   `(message-header-xheader ((t (:foreground ,fgdim :slant italic))))
    `(message-mml ((t (:foreground ,fggreen))))
    `(message-separator ((t (:foreground ,fgblue))))
    `(minibuffer-prompt ((t (:foreground ,fgblue))))
-   `(mode-line ((t (:background ,bgblue-1 :foreground ,fgbright :box (:color ,bgblue-1 :line-width 2 :style nil)))))
-   `(mode-line-buffer-id ((t (:foreground ,fgorange-1 :weight bold))))
+   `(mode-line ((t (:background ,bgblue :foreground ,fgbright :box (:color ,bgblue :line-width 2 :style nil)))))
+   `(mode-line-buffer-id ((t (:foreground ,fggreen :weight bold))))
    `(mode-line-inactive ((t (:weight normal :background ,bgbright :foreground ,fgdefault :box (:color ,bgbright :line-width 2 :style nil) :inherit unspecified))))
    `(org-agenda-calendar-sexp ((t (:foreground ,fgyellow))))
    `(org-agenda-current-time ((t (:foreground ,fgorange :weight bold))))
    `(org-agenda-date ((t (:foreground ,bgcyan))))
    `(org-agenda-date-today ((t (:foreground ,fgcyan :slant italic))))
    `(org-agenda-date-weekend ((t (:foreground ,fgcyan))))
-   `(org-agenda-done ((t (:foreground ,fgdim-1))))
+   `(org-agenda-done ((t (:foreground ,fgorange))))
    `(org-agenda-structure ((t (:foreground ,fgblue))))
    `(org-block-background ((t (:background ,bgdim))))
-   `(org-block-begin-line ((t (:foreground ,fgdefault :background ,fgdim-2 :slant unspecified :underline ,fgdim-1))))
-   `(org-block-end-line ((t (:foreground ,fgdefault :background ,fgdim-2 :slant unspecified :overline ,fgdim-1))))
+   `(org-block-begin-line ((t (:foreground ,fgdefault :slant unspecified :underline ,fgdim))))
+   `(org-block-end-line ((t (:foreground ,fgdefault :slant unspecified :overline ,fgdim))))
    `(org-checkbox-statistics-done ((t (:foreground ,bgcyan))))
    `(org-checkbox-statistics-todo ((t (:foreground ,fgcyan))))
    `(org-date ((t (:foreground ,fgpink :underline unspecified))))
    `(org-document-title ((t (:foreground ,fgorange :height 1.5))))
-   `(org-headline-done ((t (:foreground ,fgdim-1))))
-   `(org-level-1 ((t (:foreground ,fggreen :weight bold))))
-   `(org-level-2 ((t (:foreground ,fggreen-1 :weight bold))))
-   `(org-level-3 ((t (:foreground ,fggreen-2 :weight bold))))
-   `(org-level-4 ((t (:foreground ,fggreen-3 :weight bold))))
-   `(org-level-5 ((t (:foreground ,fggreen-4 :weight bold))))
-   `(org-level-6 ((t (:foreground ,fggreen-3 :weight bold))))
-   `(org-level-7 ((t (:foreground ,fggreen-2 :weight bold))))
-   `(org-level-8 ((t (:foreground ,fggreen-1 :weight bold))))
+   `(org-headline-done ((t (:foreground ,fgdim))))
+   `(org-level-1 ((t (:foreground ,fggreen))))
+   `(org-level-2 ((t (:foreground ,fgcyan))))
+   `(org-level-3 ((t (:foreground ,fgred))))
+   `(org-level-4 ((t (:foreground ,fgblue))))
+   `(org-level-5 ((t (:foreground ,fgyellow))))
+   `(org-level-6 ((t (:foreground ,fgpurple))))
+   `(org-level-7 ((t (:foreground ,fgturquoise))))
+   `(org-level-8 ((t (:foreground ,fgorange))))
    `(org-scheduled ((t (:foreground ,fgdim))))
    `(org-scheduled-previously ((t (:weight bold))))
    `(org-scheduled-today ((t (:foreground ,fgdefault))))
@@ -312,7 +304,7 @@
    `(whitespace-space ((t (:background unspecified :foreground ,fgpink))))
    `(whitespace-space-after-tab ((t (:background ,bgorange :foreground unspecified))))
    `(whitespace-space-before-tab ((t (:background ,bgorange :foreground unspecified))))
-   `(whitespace-tab ((t (:background unspecified :foreground ,fgdim-1 :underline ,fgdim-2))))
+   `(whitespace-tab ((t (:background unspecified :underline ,bgbright))))
    `(whitespace-trailing ((t (:background ,bgorange :foreground unspecified))))
    `(widget-button ((t (:inherit button))))
    `(widget-button-pressed ((t (:inherit widget-button :weight bold))))