diff --git a/yoshi-theme.el b/yoshi-theme.el
index efa5eaf..54ed943 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -36,9 +36,9 @@
       (yoshi-1 "#2c3434")
       (yoshi-2 "#475454")
       (yoshi-3 "#627373")
-      (fgdefault   "#bfbfbf")
-      (fgbright    "#ededed")
-      (fgdim       "#969696")
+      (yoshi-4 "#848484")
+      (yoshi-5 "#a2a2a2")
+      (yoshi-6 "#bfbfbf")
       (bgred       "#3f1a1a") (fgred       "#a85454")
       (bgorange    "#3f321f") (fgorange    "#a88654")
       (bgyellow    "#343922") (fgyellow    "#8d995c")
@@ -53,11 +53,11 @@
    'yoshi
 
    ;;; General
-   `(default ((t (:background ,yoshi-0 :foreground ,fgdefault))))
-   `(cursor ((t (:background ,fgdim))))
+   `(default ((t (:background ,yoshi-0 :foreground ,yoshi-6))))
+   `(cursor ((t (:background ,yoshi-4))))
    `(error ((t (:foreground ,fgred :weight bold))))
    `(font-lock-builtin-face ((t (:foreground ,fgcyan))))
-   `(font-lock-comment-delimiter-face ((t (:foreground ,fgdim :inherit unspecified))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,yoshi-4 :inherit unspecified))))
    `(font-lock-comment-face ((t (:foreground ,fgpink))))
    `(font-lock-constant-face ((t (:foreground ,fgred))))
    `(font-lock-doc-face ((t (:foreground ,fggreen :inherit unspecified))))
@@ -71,33 +71,33 @@
    `(font-lock-variable-name-face ((t (:foreground ,fgyellow))))
    `(font-lock-warning-face ((t (:foreground ,fgorange :inherit unspecified :weight bold))))
    `(fringe ((t (:background unspecified :inherit default))))
-   `(header-line ((t (:background ,bgblue :foreground ,fgbright :box (:color ,bgblue :line-width 5 :style nil)))))
+   `(header-line ((t (:background ,bgblue :foreground ,yoshi-5 :box (:color ,bgblue :line-width 5 :style nil)))))
    `(highlight ((t (:background ,bgcyan))))
    `(italic ((t (:slant italic))))
    `(link ((t (:foreground ,fgorange :underline t))))
    `(link-visited ((t (:foreground ,fgmagenta :underline t))))
    `(minibuffer-prompt ((t (:foreground ,fgblue))))
-   `(mode-line ((t (:background ,bgblue :foreground ,fgbright :box (:color ,bgblue :line-width 5 :style nil)))))
+   `(mode-line ((t (:background ,bgblue :foreground ,yoshi-5 :box (:color ,bgblue :line-width 5 :style nil)))))
    `(mode-line-buffer-id ((t (:foreground ,fggreen :weight bold))))
-   `(mode-line-inactive ((t (:weight normal :background ,yoshi-1 :foreground ,fgdefault :box (:color ,yoshi-1 :line-width 5 :style nil) :inherit unspecified))))
+   `(mode-line-inactive ((t (:weight normal :background ,yoshi-1 :foreground ,yoshi-6 :box (:color ,yoshi-1 :line-width 5 :style nil) :inherit unspecified))))
    `(region ((t (:background ,bgblue))))
-   `(shadow ((t (:foreground ,fgdim))))
+   `(shadow ((t (:foreground ,yoshi-4))))
    `(success ((t (:foreground ,fggreen :weight bold))))
    `(trailing-whitespace ((t (:background ,fgred))))
    `(warning ((t (:foreground ,fgorange :weight unspecified))))
 
    ;;; Circe
    `(circe-highlight-nick-face ((t (:foreground ,fgred :weight bold))))
-   `(circe-server-face ((t (:foreground ,fgdim))))
+   `(circe-server-face ((t (:foreground ,yoshi-4))))
    `(lui-button-face ((t (:foreground unspecified :underline unspecified :inherit button))))
    `(lui-time-stamp-face ((t (:foreground ,fggreen :weight unspecified))))
 
    ;;; Company
-   `(company-preview ((t (:background unspecified :foreground ,fgdim))))
+   `(company-preview ((t (:background unspecified :foreground ,yoshi-4))))
    `(company-preview-common ((t (:foreground ,bgcyan :inherit unspecified :weight bold))))
    `(company-scrollbar-bg ((t (:background ,yoshi-1))))
    `(company-scrollbar-fg ((t (:background ,yoshi-2))))
-   `(company-tooltip ((t (:foreground ,fgdefault :background ,yoshi-1))))
+   `(company-tooltip ((t (:foreground ,yoshi-6 :background ,yoshi-1))))
    `(company-tooltip-annotation ((t (:foreground ,fgblue))))
    `(company-tooltip-common ((t (:foreground ,fgcyan))))
    `(company-tooltip-search ((t (:background ,bgyellow :inherit unspecified))))
@@ -115,7 +115,7 @@
    ;;; Diff
    `(diff-added ((t (:background ,bggreen :inherit unspecified))))
    `(diff-changed ((t (:background ,bgorange))))
-   `(diff-file-header ((t (:foreground ,fgbright :background unspecified :weight bold))))
+   `(diff-file-header ((t (:foreground ,yoshi-5 :background unspecified :weight bold))))
    `(diff-function ((t (:inherit unspecified :foreground ,fgorange))))
    `(diff-header ((t (:background ,yoshi-1))))
    `(diff-hl-change ((t (:foreground ,bgyellow :background unspecified :inherit diff-changed))))
@@ -154,8 +154,8 @@
    `(erc-input-face ((t (:inherit shadow))))
    `(erc-my-nick-face ((t (:inherit erc-current-nick-face))))
    `(erc-notice-face ((t (:foreground ,fgblue :weight normal))))
-   `(erc-prompt-face ((t (:foreground ,fgbright :weight bold))))
-   `(erc-timestamp-face ((t (:foreground ,fgdim :weight normal))))
+   `(erc-prompt-face ((t (:foreground ,yoshi-5 :weight bold))))
+   `(erc-timestamp-face ((t (:foreground ,yoshi-4 :weight normal))))
 
    ;;; ERT
    `(ert-test-result-expected ((t (:background unspecified :foreground ,fggreen))))
@@ -166,7 +166,7 @@
    `(eshell-fringe-status-success ((t (:foreground ,fggreen))))
    `(eshell-ls-archive ((t (:foreground ,fgpink :weight unspecified))))
    `(eshell-ls-backup ((t (:foreground ,fgorange))))
-   `(eshell-ls-clutter ((t (:foreground ,fgdim :weight unspecified))))
+   `(eshell-ls-clutter ((t (:foreground ,yoshi-4 :weight unspecified))))
    `(eshell-ls-directory ((t (:foreground ,fgblue :weight unspecified))))
    `(eshell-ls-executable ((t (:foreground ,fggreen :weight unspecified))))
    `(eshell-ls-missing ((t (:foreground ,fgred :weight bold))))
@@ -175,7 +175,7 @@
    `(eshell-ls-special ((t (:foreground ,fgturquoise))))
    `(eshell-ls-symlink ((t (:foreground ,fgcyan :weight unspecified))))
    `(eshell-ls-unreadable ((t (:foreground ,fgred))))
-   `(eshell-prompt ((t (:foreground ,fgbright :weight unspecified))))
+   `(eshell-prompt ((t (:foreground ,yoshi-5 :weight unspecified))))
 
    `(fill-column-indicator ((t (:foreground ,yoshi-3 :inherit unspecified))))
 
@@ -205,7 +205,7 @@
    `(gnus-button ((t (:weight bold))))
    `(gnus-cite-1 ((t (:foreground ,fgred))))
    `(gnus-cite-10 ((t (:foreground ,fgpink))))
-   `(gnus-cite-11 ((t (:foreground ,fgbright))))
+   `(gnus-cite-11 ((t (:foreground ,yoshi-5))))
    `(gnus-cite-2 ((t (:foreground ,fgorange))))
    `(gnus-cite-3 ((t (:foreground ,fgyellow))))
    `(gnus-cite-4 ((t (:foreground ,fggreen))))
@@ -218,14 +218,14 @@
    `(gnus-group-mail-3-empty ((t (:foreground ,fgcyan))))
    `(gnus-group-news-3 ((t (:foreground ,fgred :weight bold))))
    `(gnus-group-news-3-empty ((t (:foreground ,fgred))))
-   `(gnus-header-content ((t (:foreground ,fgdim :slant italic))))
+   `(gnus-header-content ((t (:foreground ,yoshi-4 :slant italic))))
    `(gnus-header-from ((t (:weight bold))))
    `(gnus-header-name ((t (:foreground ,fgblue :weight bold))))
-   `(gnus-header-newsgroups ((t (:foreground ,fgbright :weight bold))))
+   `(gnus-header-newsgroups ((t (:foreground ,yoshi-5 :weight bold))))
    `(gnus-header-subject ((t (:foreground ,fgyellow))))
-   `(gnus-signature ((t (:foreground ,fgdim :slant italic))))
-   `(gnus-splash ((t (:foreground ,fgdefault))))
-   `(gnus-summary-cancelled ((t (:foreground ,fgdim :background unspecified :strike-through t))))
+   `(gnus-signature ((t (:foreground ,yoshi-4 :slant italic))))
+   `(gnus-splash ((t (:foreground ,yoshi-6))))
+   `(gnus-summary-cancelled ((t (:foreground ,yoshi-4 :background unspecified :strike-through t))))
    `(gnus-summary-high-ancient ((t (:inherit gnus-summary-normal-ancient :weight bold))))
    `(gnus-summary-high-read ((t (:inherit gnus-summary-normal-read :weight bold))))
    `(gnus-summary-high-ticked ((t (:inherit gnus-summary-normal-ticked :weight bold))))
@@ -235,9 +235,9 @@
    `(gnus-summary-low-ticked ((t (:inherit gnus-summary-normal-ticked :slant italic))))
    `(gnus-summary-low-unread ((t (:inherit gnus-summary-normal-unread :slant italic))))
    `(gnus-summary-normal-ancient ((t (:foreground ,fgcyan))))
-   `(gnus-summary-normal-read ((t (:foreground ,fgdim))))
+   `(gnus-summary-normal-read ((t (:foreground ,yoshi-4))))
    `(gnus-summary-normal-ticked ((t (:foreground ,fgturquoise))))
-   `(gnus-summary-normal-unread ((t (:foreground ,fgdefault))))
+   `(gnus-summary-normal-unread ((t (:foreground ,yoshi-6))))
    `(gnus-summary-selected ((t (:background ,bgblue :weight bold))))
 
    ;;; Helm
@@ -253,7 +253,7 @@
    `(helm-ff-file ((t (:inherit default))))
    `(helm-ff-invalid-symlink ((t (:foreground ,fgred :background unspecified))))
    `(helm-ff-symlink ((t (:foreground ,fgcyan))))
-   `(helm-match ((t (:foreground ,fgbright :weight bold))))
+   `(helm-match ((t (:foreground ,yoshi-5 :weight bold))))
    `(helm-selection ((t (:distant-foreground unspecified :background ,bgblue))))
    `(helm-source-header ((t (:font-family unspecified :height 1.1 :weight bold :foreground ,fgturquoise :background unspecified))))
 
@@ -295,12 +295,12 @@
    `(isearch-fail ((t (:background ,bgred))))
 
    ;;; Ivy
-   `(ivy-current-match ((t (:background ,bgblue :foreground ,fgdefault))))
+   `(ivy-current-match ((t (:background ,bgblue :foreground ,yoshi-6))))
    `(ivy-minibuffer-match-face-1 ((t (:background unspecified :underline t))))
    `(ivy-minibuffer-match-face-2 ((t (:background unspecified :weight bold))))
    `(ivy-minibuffer-match-face-3 ((t (:background unspecified :weight bold))))
    `(ivy-minibuffer-match-face-4 ((t (:background unspecified :weight bold))))
-   `(ivy-posframe ((t (:background ,yoshi-1 :foreground ,fgdefault :inherit unspecified))))
+   `(ivy-posframe ((t (:background ,yoshi-1 :foreground ,yoshi-6 :inherit unspecified))))
    `(ivy-posframe-border ((t (:background ,yoshi-1 :inherit unspecified))))
 
    ;;; Jabber
@@ -310,12 +310,12 @@
    `(jabber-chat-prompt-foreign ((t (:foreground ,fgred :slant italic))))
    `(jabber-chat-prompt-local ((t (:foreground ,fgblue :slant italic))))
    `(jabber-chat-prompt-system ((t (:foreground ,fggreen :slant italic))))
-   `(jabber-rare-time-face ((t (:foreground ,fgdefault :underline t))))
+   `(jabber-rare-time-face ((t (:foreground ,yoshi-6 :underline t))))
    `(jabber-roster-user-away ((t (:foreground ,fggreen :slant italic))))
    `(jabber-roster-user-chatty ((t (:foreground ,fgpink))))
    `(jabber-roster-user-dnd ((t (:foreground ,fgred :weight unspecified :slant unspecified))))
    `(jabber-roster-user-error ((t (:foreground ,fgred :slant unspecified :weight bold))))
-   `(jabber-roster-user-offline ((t (:foreground ,fgdim :slant italic))))
+   `(jabber-roster-user-offline ((t (:foreground ,yoshi-4 :slant italic))))
    `(jabber-roster-user-online ((t (:foreground ,fgblue))))
    `(jabber-roster-user-xa ((t (:foreground ,fgmagenta))))
 
@@ -330,17 +330,17 @@
    ;;; Magit
    `(magit-bisect-bad ((t (:foreground ,fgred))))
    `(magit-bisect-good ((t (:foreground ,fggreen))))
-   `(magit-bisect-skip ((t (:foreground ,fgdim))))
+   `(magit-bisect-skip ((t (:foreground ,yoshi-4))))
    `(magit-blame-date ((t (:foreground ,fgpink :inherit magit-blame-heading))))
    `(magit-blame-hash ((t (:foreground ,fgmagenta :inherit magit-blame-heading))))
    `(magit-blame-header ((t (:foreground ,fggreen :background ,yoshi-1 :weight bold :inherit unspecified))))
-   `(magit-blame-heading ((t (:foreground ,fgdefault :background ,yoshi-2))))
+   `(magit-blame-heading ((t (:foreground ,yoshi-6 :background ,yoshi-2))))
    `(magit-blame-name ((t (:foreground ,fgturquoise :inherit magit-blame-heading))))
    `(magit-blame-summary ((t (:foreground ,fggreen :inherit magit-blame-heading))))
    `(magit-branch ((t (:foreground ,fgpink :weight bold :inherit unspecified))))
-   `(magit-branch-current ((t (:foreground ,fgdefault :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil) :inherit unspecified))))
-   `(magit-branch-local ((t (:foreground ,fgdefault :background ,bgmagenta :box (:color ,bgmagenta :line-width 2 :style nil)))))
-   `(magit-branch-remote ((t (:foreground ,fgdefault :background ,bggreen :box (:color ,bggreen :line-width 2 :style nil)))))
+   `(magit-branch-current ((t (:foreground ,yoshi-6 :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil) :inherit unspecified))))
+   `(magit-branch-local ((t (:foreground ,yoshi-6 :background ,bgmagenta :box (:color ,bgmagenta :line-width 2 :style nil)))))
+   `(magit-branch-remote ((t (:foreground ,yoshi-6 :background ,bggreen :box (:color ,bggreen :line-width 2 :style nil)))))
    `(magit-diff-added ((t (:foreground unspecified :background unspecified :inherit diff-added))))
    `(magit-diff-added-highlight ((t (:foreground unspecified :background unspecified :inherit magit-diff-added))))
    `(magit-diff-context ((t (:foreground unspecified :inherit shadow))))
@@ -349,12 +349,12 @@
    `(magit-diff-removed ((t (:foreground unspecified :background unspecified :inherit diff-removed))))
    `(magit-diff-removed-highlight ((t (:foreground unspecified :background unspecified :inherit magit-diff-removed))))
    `(magit-item-highlight ((t (:slant italic  :inherit unspecified))))
-   `(magit-log-head-label-default ((t (:foreground ,fgdefault :background ,bgcyan :box (:color ,bgcyan :line-width 2 :style nil)))))
-   `(magit-log-head-label-head ((t (:foreground ,fgdefault :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil)))))
-   `(magit-log-head-label-local ((t (:foreground ,fgdefault :background ,bgmagenta :box (:color ,bgmagenta :line-width 2 :style nil)))))
-   `(magit-log-head-label-remote ((t (:foreground ,fgdefault :background ,bggreen :box (:color ,bggreen :line-width 2 :style nil)))))
-   `(magit-log-head-label-tags ((t (:foreground ,fgdefault :background ,bgorange :box (:color ,bgorange :line-width 2 :style nil)))))
-   `(magit-log-sha1 ((t (:foreground ,fgdefault :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil)))))
+   `(magit-log-head-label-default ((t (:foreground ,yoshi-6 :background ,bgcyan :box (:color ,bgcyan :line-width 2 :style nil)))))
+   `(magit-log-head-label-head ((t (:foreground ,yoshi-6 :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil)))))
+   `(magit-log-head-label-local ((t (:foreground ,yoshi-6 :background ,bgmagenta :box (:color ,bgmagenta :line-width 2 :style nil)))))
+   `(magit-log-head-label-remote ((t (:foreground ,yoshi-6 :background ,bggreen :box (:color ,bggreen :line-width 2 :style nil)))))
+   `(magit-log-head-label-tags ((t (:foreground ,yoshi-6 :background ,bgorange :box (:color ,bgorange :line-width 2 :style nil)))))
+   `(magit-log-sha1 ((t (:foreground ,yoshi-6 :background ,bgblue :box (:color ,bgblue :line-width 2 :style nil)))))
    `(magit-process-ng ((t (:foreground ,fgred :inherit unspecified))))
    `(magit-process-ok ((t (:foreground ,fggreen :inherit unspecified))))
    `(magit-section-heading ((t (:foreground ,fgturquoise :weight unspecified :height 1.3))))
@@ -373,13 +373,13 @@
    `(markdown-header-face-6 ((t (:foreground ,fgpurple :inherit unspecified))))
 
    ;;; Message mode
-   `(message-header-cc ((t (:foreground ,fgdim))))
+   `(message-header-cc ((t (:foreground ,yoshi-4))))
    `(message-header-name ((t (:inherit gnus-header-name))))
-   `(message-header-newsgroups ((t (:foreground ,fgdim :weight bold))))
+   `(message-header-newsgroups ((t (:foreground ,yoshi-4 :weight bold))))
    `(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 :slant italic))))
+   `(message-header-to ((t (:foreground ,yoshi-4 :weight bold))))
+   `(message-header-xheader ((t (:foreground ,yoshi-4 :slant italic))))
    `(message-mml ((t (:foreground ,fggreen))))
    `(message-separator ((t (:foreground ,fgblue))))
 
@@ -391,15 +391,15 @@
    `(org-agenda-date-weekend ((t (:foreground ,fgcyan))))
    `(org-agenda-done ((t (:foreground ,fgorange))))
    `(org-agenda-structure ((t (:foreground ,fgblue))))
-   `(org-block ((t (:foreground ,fgdefault :background ,yoshi-1 :inherit unspecified))))
+   `(org-block ((t (:foreground ,yoshi-6 :background ,yoshi-1 :inherit unspecified))))
    `(org-block-background ((t (:background ,yoshi-1))))
-   `(org-block-begin-line ((t (:foreground ,fgdim :slant unspecified :background ,yoshi-2 :height 0.71))))
-   `(org-block-end-line ((t (:foreground ,fgdim :slant unspecified :background ,yoshi-1 :height 0.71))))
+   `(org-block-begin-line ((t (:foreground ,yoshi-4 :slant unspecified :background ,yoshi-2 :height 0.71))))
+   `(org-block-end-line ((t (:foreground ,yoshi-4 :slant unspecified :background ,yoshi-1 :height 0.71))))
    `(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))))
+   `(org-headline-done ((t (:foreground ,yoshi-4))))
    `(org-level-1 ((t (:foreground ,fggreen :underline t :height 1.2))))
    `(org-level-2 ((t (:foreground ,fgcyan :weight bold :height 1.1))))
    `(org-level-3 ((t (:foreground ,fgred :slant italic))))
@@ -408,9 +408,9 @@
    `(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 ((t (:foreground ,yoshi-4))))
    `(org-scheduled-previously ((t (:weight bold))))
-   `(org-scheduled-today ((t (:foreground ,fgdefault))))
+   `(org-scheduled-today ((t (:foreground ,yoshi-6))))
    `(org-time-grid ((t (:foreground ,fgorange))))
 
    ;;; Outline
@@ -426,11 +426,11 @@
    ;;; Package
    `(package-status-avail-obso ((t (:foreground ,bggreen))))
    `(package-status-available ((t (:foreground ,fggreen))))
-   `(package-status-dependency ((t (:foreground ,fgdim))))
-   `(package-status-installed ((t (:foreground ,fgdefault))))
+   `(package-status-dependency ((t (:foreground ,yoshi-4))))
+   `(package-status-installed ((t (:foreground ,yoshi-6))))
 
    ;;; Pretty-print ^L highlight
-   `(pp^L-highlight ((t (:box unspecified :foreground ,fgbright))))
+   `(pp^L-highlight ((t (:box unspecified :foreground ,yoshi-5))))
 
    ;;; Rainbow delimiters
    `(rainbow-delimiters-depth-1-face ((t (:foreground ,fgred))))
@@ -445,7 +445,7 @@
    `(rainbow-delimiters-unmatched-face ((t (:background ,bgred :foreground unspecified))))
 
    ;;; Rebase mode
-   `(rebase-mode-description-face ((t (:foreground ,fgbright))))
+   `(rebase-mode-description-face ((t (:foreground ,yoshi-5))))
 
    ;;; reStructuredText
    `(rst-level-1 ((t (:background unspecified))))
@@ -465,9 +465,9 @@
    `(show-paren-mismatch ((t (:background unspecified :foreground ,fgred))))
 
    ;;; Slime
-   `(slime-repl-input-face ((t (:foreground ,fgbright))))
-   `(slime-repl-inputed-output-face ((t (:foreground ,fgbright))))
-   `(slime-repl-output-face ((t (:foreground ,fgdefault))))
+   `(slime-repl-input-face ((t (:foreground ,yoshi-5))))
+   `(slime-repl-inputed-output-face ((t (:foreground ,yoshi-5))))
+   `(slime-repl-output-face ((t (:foreground ,yoshi-6))))
    `(slime-repl-prompt-face ((t (:foreground ,fgblue))))
 
    ;;; Smerge
@@ -480,13 +480,13 @@
    `(smerge-refined-removed ((t (:inherit diff-refine-removed))))
 
    ;;; Term
-   `(term-color-black ((t (:background ,yoshi-0 :foreground ,fgbright))))
+   `(term-color-black ((t (:background ,yoshi-0 :foreground ,yoshi-5))))
    `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue))))
    `(term-color-cyan ((t (:background ,bgcyan :foreground ,fgcyan))))
    `(term-color-green ((t (:background ,bggreen :foreground ,fggreen))))
    `(term-color-magenta ((t (:background ,bgmagenta :foreground ,fgmagenta))))
    `(term-color-red ((t (:background ,bgred :foreground ,fgred))))
-   `(term-color-white ((t (:background ,yoshi-2 :foreground ,fgdefault))))
+   `(term-color-white ((t (:background ,yoshi-2 :foreground ,yoshi-6))))
    `(term-color-yellow ((t (:background ,bgyellow :foreground ,fgyellow))))
 
    ;;; Texinfo
@@ -496,8 +496,8 @@
    `(which-func ((t (:foreground ,fgblue))))
 
    ;;; Whitespace mode
-   `(whitespace-empty ((t (:background ,bgcyan :foreground ,fgdefault))))
-   `(whitespace-hspace ((t (:background ,yoshi-2 :foreground ,fgbright))))
+   `(whitespace-empty ((t (:background ,bgcyan :foreground ,yoshi-6))))
+   `(whitespace-hspace ((t (:background ,yoshi-2 :foreground ,yoshi-5))))
    `(whitespace-indentation ((t (:background ,bgyellow :foreground unspecified))))
    `(whitespace-line ((t (:background ,bgred :foreground unspecified))))
    `(whitespace-newline ((t (:foreground ,fgpink))))
@@ -533,7 +533,7 @@
   (custom-theme-set-variables
    'yoshi
    `(ansi-color-names-vector [,yoshi-1 ,fgred ,fggreen ,fgyellow
-                                       ,fgblue ,fgmagenta ,fgcyan ,fgdim])
+                                       ,fgblue ,fgmagenta ,fgcyan ,yoshi-4])
    `(fci-rule-color ,bgred)
    '(org-fontify-whole-block-delimiter-line t)
    '(org-fontify-whole-heading-line t)