diff --git a/yoshi-theme.el b/yoshi-theme.el
index 201fda6..c64b791 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -39,12 +39,12 @@
       (yoshi-4 "#848484")
       (yoshi-5 "#a2a2a2")
       (yoshi-6 "#bfbfbf")
-      (yoshi-7 "#54a8a8")
       (bgred       "#3f1a1a") (fgred       "#a85454")
       (bgorange    "#3f321f") (fgorange    "#a88654")
       (bgyellow    "#343922") (fgyellow    "#8d995c")
       (bggreen     "#263f1f") (fggreen     "#65a854")
       (bgturquoise "#1f3f2c") (fgturquoise "#54a875")
+      (bgcyan      "#1f3f3f") (fgcyan      "#54a8a8")
       (bgblue      "#1f2c3f") (fgblue      "#5476a8")
       (bgpurple    "#2f2a3f") (fgpurple    "#7d71a8")
       (bgmagenta   "#381f3f") (fgmagenta   "#9754a8")
@@ -56,7 +56,7 @@
    `(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 ,yoshi-7))))
+   `(font-lock-builtin-face ((t (:foreground ,fgcyan))))
    `(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))))
@@ -72,7 +72,7 @@
    `(font-lock-warning-face ((t (:foreground ,fgorange :inherit unspecified :weight bold))))
    `(fringe ((t (:background unspecified :inherit default))))
    `(header-line ((t (:background ,bgblue :foreground ,yoshi-5 :box (:color ,bgblue :line-width 5 :style nil)))))
-   `(highlight ((t (:background ,yoshi-2))))
+   `(highlight ((t (:background ,bgcyan))))
    `(italic ((t (:slant italic))))
    `(link ((t (:foreground ,fgorange :underline t))))
    `(link-visited ((t (:foreground ,fgmagenta :underline t))))
@@ -94,12 +94,12 @@
 
    ;;; Company
    `(company-preview ((t (:background unspecified :foreground ,yoshi-4))))
-   `(company-preview-common ((t (:foreground ,(color-darken-name yoshi-7 30) :inherit unspecified :weight bold))))
+   `(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 ,yoshi-6 :background ,yoshi-1))))
    `(company-tooltip-annotation ((t (:foreground ,fgblue))))
-   `(company-tooltip-common ((t (:foreground ,yoshi-7))))
+   `(company-tooltip-common ((t (:foreground ,fgcyan))))
    `(company-tooltip-search ((t (:background ,bgyellow :inherit unspecified))))
    `(company-tooltip-search-selection ((t (:background ,bgyellow :inherit unspecified))))
    `(company-tooltip-selection ((t (:background ,bgblue))))
@@ -173,7 +173,7 @@
    `(eshell-ls-product ((t (:foreground ,fgpurple))))
    `(eshell-ls-readonly ((t (:foreground ,fgmagenta))))
    `(eshell-ls-special ((t (:foreground ,fgturquoise))))
-   `(eshell-ls-symlink ((t (:foreground ,yoshi-7 :weight unspecified))))
+   `(eshell-ls-symlink ((t (:foreground ,fgcyan :weight unspecified))))
    `(eshell-ls-unreadable ((t (:foreground ,fgred))))
    `(eshell-prompt ((t (:foreground ,yoshi-5 :weight unspecified))))
 
@@ -210,12 +210,12 @@
    `(gnus-cite-3 ((t (:foreground ,fgyellow))))
    `(gnus-cite-4 ((t (:foreground ,fggreen))))
    `(gnus-cite-5 ((t (:foreground ,fgturquoise))))
-   `(gnus-cite-6 ((t (:foreground ,yoshi-7))))
+   `(gnus-cite-6 ((t (:foreground ,fgcyan))))
    `(gnus-cite-7 ((t (:foreground ,fgblue))))
    `(gnus-cite-8 ((t (:foreground ,fgpurple))))
    `(gnus-cite-9 ((t (:foreground ,fgmagenta))))
-   `(gnus-group-mail-3 ((t (:foreground ,yoshi-7 :weight bold))))
-   `(gnus-group-mail-3-empty ((t (:foreground ,yoshi-7))))
+   `(gnus-group-mail-3 ((t (:foreground ,fgcyan :weight bold))))
+   `(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 ,yoshi-4 :slant italic))))
@@ -234,7 +234,7 @@
    `(gnus-summary-low-read ((t (:inherit gnus-summary-normal-read :slant italic))))
    `(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 ,yoshi-7))))
+   `(gnus-summary-normal-ancient ((t (:foreground ,fgcyan))))
    `(gnus-summary-normal-read ((t (:foreground ,yoshi-4))))
    `(gnus-summary-normal-ticked ((t (:foreground ,fgturquoise))))
    `(gnus-summary-normal-unread ((t (:foreground ,yoshi-6))))
@@ -244,7 +244,7 @@
    `(helm-M-x-key ((t (:underline unspecified :foreground ,fgpink :weight bold))))
    `(helm-buffer-directory ((t (:background unspecified :foreground ,fgblue))))
    `(helm-buffer-file ((t (:inherit default))))
-   `(helm-buffer-not-saved ((t (:foreground ,yoshi-7))))
+   `(helm-buffer-not-saved ((t (:foreground ,fgcyan))))
    `(helm-buffer-process ((t (:foreground ,fggreen))))
    `(helm-buffer-size ((t (:foreground ,fgorange))))
    `(helm-ff-directory ((t (:foreground ,fgblue :background unspecified))))
@@ -252,7 +252,7 @@
    `(helm-ff-executable ((t (:foreground ,fggreen))))
    `(helm-ff-file ((t (:inherit default))))
    `(helm-ff-invalid-symlink ((t (:foreground ,fgred :background unspecified))))
-   `(helm-ff-symlink ((t (:foreground ,yoshi-7))))
+   `(helm-ff-symlink ((t (:foreground ,fgcyan))))
    `(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))))
@@ -261,7 +261,7 @@
    `(highlight-80+ ((t (:underline (:color ,fgred :style wave) :background unspecified))))
 
    ;;; Highlight numbers
-   `(highlight-numbers-number ((t (:foreground ,yoshi-7 :inherit unspecified))))
+   `(highlight-numbers-number ((t (:foreground ,fgcyan :inherit unspecified))))
 
    ;;; Highlight indent
    `(hl-indent-block-face-1 ((t (:background ,bgred))))
@@ -280,7 +280,7 @@
    `(hydra-face-blue ((t (:foreground ,fgblue :weight bold))))
    `(hydra-face-pink ((t (:foreground ,fgpink :weight bold))))
    `(hydra-face-red ((t (:foreground ,fgred :weight bold))))
-   `(hydra-face-teal ((t (:foreground ,yoshi-7 :weight bold))))
+   `(hydra-face-teal ((t (:foreground ,fgcyan :weight bold))))
 
    ;;; Identica
    `(identica-stripe-face ((t (:background ,yoshi-2))))
@@ -349,7 +349,7 @@
    `(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 ,yoshi-6 :background ,yoshi-7 :box (:color ,yoshi-7 :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)))))
@@ -366,7 +366,7 @@
 
    ;;; Markdown
    `(markdown-header-face-1 ((t (:foreground ,fggreen :inherit unspecified))))
-   `(markdown-header-face-2 ((t (:foreground ,yoshi-7 :inherit unspecified))))
+   `(markdown-header-face-2 ((t (:foreground ,fgcyan :inherit unspecified))))
    `(markdown-header-face-3 ((t (:foreground ,fgred :inherit unspecified))))
    `(markdown-header-face-4 ((t (:foreground ,fgblue :inherit unspecified))))
    `(markdown-header-face-5 ((t (:foreground ,fgyellow :inherit unspecified))))
@@ -386,22 +386,22 @@
    ;;; Org
    `(org-agenda-calendar-sexp ((t (:foreground ,fgyellow))))
    `(org-agenda-current-time ((t (:foreground ,fgorange :weight bold))))
-   `(org-agenda-date ((t (:foreground ,yoshi-7))))
-   `(org-agenda-date-today ((t (:foreground ,yoshi-7 :slant italic))))
-   `(org-agenda-date-weekend ((t (:foreground ,yoshi-7))))
+   `(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 ,fgorange))))
    `(org-agenda-structure ((t (:foreground ,fgblue))))
    `(org-block ((t (:foreground ,yoshi-6 :background ,yoshi-1 :inherit unspecified))))
    `(org-block-background ((t (:background ,yoshi-1))))
    `(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 ,yoshi-7))))
-   `(org-checkbox-statistics-todo ((t (:foreground ,yoshi-7))))
+   `(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 ,yoshi-4))))
    `(org-level-1 ((t (:foreground ,fggreen :underline t :height 1.2))))
-   `(org-level-2 ((t (:foreground ,yoshi-7 :weight bold :height 1.1))))
+   `(org-level-2 ((t (:foreground ,fgcyan :weight bold :height 1.1))))
    `(org-level-3 ((t (:foreground ,fgred :slant italic))))
    `(org-level-4 ((t (:foreground ,fgblue))))
    `(org-level-5 ((t (:foreground ,fgyellow))))
@@ -438,7 +438,7 @@
    `(rainbow-delimiters-depth-3-face ((t (:foreground ,fgyellow))))
    `(rainbow-delimiters-depth-4-face ((t (:foreground ,fggreen))))
    `(rainbow-delimiters-depth-4-face ((t (:foreground ,fgturquoise))))
-   `(rainbow-delimiters-depth-6-face ((t (:foreground ,yoshi-7))))
+   `(rainbow-delimiters-depth-6-face ((t (:foreground ,fgcyan))))
    `(rainbow-delimiters-depth-7-face ((t (:foreground ,fgblue))))
    `(rainbow-delimiters-depth-8-face ((t (:foreground ,fgpurple))))
    `(rainbow-delimiters-depth-9-face ((t (:foreground ,fgmagenta))))
@@ -482,7 +482,7 @@
    ;;; Term
    `(term-color-black ((t (:background ,yoshi-0 :foreground ,yoshi-5))))
    `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue))))
-   `(term-color-cyan ((t (:background ,(color-darken-name yoshi-7 30) :foreground ,yoshi-7))))
+   `(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))))
@@ -496,7 +496,7 @@
    `(which-func ((t (:foreground ,fgblue))))
 
    ;;; Whitespace mode
-   `(whitespace-empty ((t (:background ,(color-darken-name yoshi-7 30) :foreground ,yoshi-6))))
+   `(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))))
@@ -517,7 +517,7 @@
    `(rpm-spec-tag-face ((t (:foreground ,fgblue))))
    `(rpm-spec-obsolete-tag-face ((t (:background ,bgred))))
    `(rpm-spec-macro-face ((t (:foreground ,fgyellow))))
-   `(rpm-spec-var-face ((t (:foreground ,yoshi-7))))
+   `(rpm-spec-var-face ((t (:foreground ,fgcyan))))
    `(rpm-spec-doc-face ((t (:foreground ,fgmagenta))))
    `(rpm-spec-dir-face ((t (:foreground ,fgturquoise))))
    `(rpm-spec-package-face ((t (:foreground ,fgred))))
@@ -533,7 +533,7 @@
   (custom-theme-set-variables
    'yoshi
    `(ansi-color-names-vector [,yoshi-1 ,fgred ,fggreen ,fgyellow
-                                       ,fgblue ,fgmagenta ,yoshi-7 ,yoshi-4])
+                                       ,fgblue ,fgmagenta ,fgcyan ,yoshi-4])
    `(fci-rule-color ,bgred)
    '(org-fontify-whole-block-delimiter-line t)
    '(org-fontify-whole-heading-line t)