diff --git a/yoshi-theme.el b/yoshi-theme.el
index 19d842e..1acf41a 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -29,22 +29,23 @@
 (deftheme yoshi
   "Created 2012-09-24")
 
-(let ((lblack     "#eeeeec") (dblack     "#111113")
-      (lwhite     "#a5a5a4") (dwhite     "#222224")
-      (lred       "#bf7d7d") (dred       "#734a4a")
-      (lorange    "#bfa47d") (dorange    "#73634a")
-      (lyellow    "#b2bf7d") (dyellow    "#6b734a")
-      (lgreen     "#8abf6d") (dgreen     "#52734a")
-      (lturquoise "#7dbf97") (dturquoise "#4a735b")
-      (lcyan      "#7dbfbf") (dcyan      "#4a7373")
-      (lblue      "#6d97bf") (dblue      "#4a5b73")
-      (lpurple    "#8a7dbf") (dpurple    "#524a73")
-      (lmagenta   "#b27dbf") (dmagenta   "#6b4a73")
-      (lpink      "#bf6da4") (dpink      "#734a63"))
+(let ((lblack     "#ededed") (dblack     "#111111")
+      (lwhite     "#bfbfbf") (dwhite     "#404040")
+      (lred       "#bf7d7d") (dred       "#402929")
+      (lorange    "#bfa47d") (dorange    "#403729")
+      (lyellow    "#b2bf7d") (dyellow    "#3b4029")
+      (lgreen     "#8abf6d") (dgreen     "#2d4029")
+      (lturquoise "#7dbf97") (dturquoise "#294032")
+      (lcyan      "#7dbfbf") (dcyan      "#294040")
+      (lblue      "#6d97bf") (dblue      "#293240")
+      (lpurple    "#8a7dbf") (dpurple    "#2d2940")
+      (lmagenta   "#b27dbf") (dmagenta   "#3b2940")
+      (lpink      "#bf6da4") (dpink      "#402937"))
   (custom-theme-set-faces
    'yoshi
 
-   `(default ((t (:background ,dblack :foreground ,lblack))))
+   `(cursor ((t (:background ,lwhite))))
+   `(default ((t (:background ,dblack :foreground ,lwhite))))
    `(diff-added ((t (:background ,dgreen :inherit unspecified))))
    `(diff-changed ((t (:background ,dyellow))))
    `(diff-file-header ((t (:foreground ,lblue :background unspecified :weight bold))))
@@ -70,8 +71,8 @@
    `(flyspell-duplicate ((t (:inherit unspecified :underline (:color ,lorange :style wave)))))
    `(flyspell-incorrect ((t (:inherit unspecified :underline (:color ,lred :style wave)))))
    `(font-lock-builtin-face ((t (:foreground ,lcyan))))
-   `(font-lock-comment-delimiter-face ((t (:foreground ,lwhite :weight bold :inherit unspecified))))
-   `(font-lock-comment-face ((t (:foreground ,lwhite :slant italic))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,dwhite :weight bold :inherit unspecified))))
+   `(font-lock-comment-face ((t (:foreground ,dwhite :slant italic))))
    `(font-lock-constant-face ((t (:foreground ,lred))))
    `(font-lock-doc-face ((t (:foreground ,lgreen :inherit unspecified))))
    `(font-lock-function-name-face ((t (:foreground ,lpurple))))
@@ -83,10 +84,11 @@
    `(font-lock-type-face ((t (:foreground ,lorange))))
    `(font-lock-variable-name-face ((t (:foreground ,lblue))))
    `(font-lock-warning-face ((t (:underline (:color ,lorange) :inherit unspecified))))
-   `(gnus-button ((t (:foreground ,lorange :box (:line-width 2 :color ,lwhite :style released-button)))))
+   `(fringe ((t (:background unspecified :inherit default))))
+   `(gnus-button ((t (:foreground ,lwhite :background ,dblue :box (:line-width 2 :color ,dblue :style released-button)))))
    `(gnus-cite-1 ((t (:foreground ,lred))))
    `(gnus-cite-10 ((t (:foreground ,lpink))))
-   `(gnus-cite-11 ((t (:foreground ,lwhite))))
+   `(gnus-cite-11 ((t (:foreground ,lblack))))
    `(gnus-cite-2 ((t (:foreground ,lorange))))
    `(gnus-cite-3 ((t (:foreground ,lyellow))))
    `(gnus-cite-4 ((t (:foreground ,lgreen))))
@@ -121,9 +123,9 @@
    `(gnus-header-content ((t (:foreground ,lblack :slant italic))))
    `(gnus-header-name ((t (:foreground ,lpurple))))
    `(gnus-header-subject ((t (:foreground ,lred))))
-   `(gnus-signature ((t (:foreground ,lwhite :slant normal))))
-   `(gnus-splash ((t (:foreground ,lblack))))
-   `(gnus-summary-cancelled ((t (:foreground ,lwhite :background unspecified :strike-through "#eeeeec"))))
+   `(gnus-signature ((t (:foreground ,lblack :slant normal))))
+   `(gnus-splash ((t (:foreground ,lwhite))))
+   `(gnus-summary-cancelled ((t (:foreground ,lblack :background unspecified :strike-through ,lblack))))
    `(gnus-summary-high-ancient ((t (:foreground ,lyellow :weight bold))))
    `(gnus-summary-high-read ((t (:foreground ,lwhite :weight bold))))
    `(gnus-summary-high-ticked ((t (:foreground ,lblue :weight bold))))
@@ -150,10 +152,10 @@
    `(jabber-chat-prompt-foreign ((t (:foreground ,lred :slant italic))))
    `(jabber-chat-prompt-local ((t (:foreground ,lblue :slant italic))))
    `(jabber-chat-prompt-system ((t (:foreground ,lgreen :slant italic))))
-   `(jabber-rare-time-face ((t (:foreground ,lblack :underline t))))
+   `(jabber-rare-time-face ((t (:foreground ,lwhite :underline t))))
    `(jabber-roster-user-away ((t (:foreground ,lgreen :slant italic))))
    `(jabber-roster-user-error ((t (:foreground ,lred :slant italic))))
-   `(jabber-roster-user-offline ((t (:foreground ,lwhite :slant italic))))
+   `(jabber-roster-user-offline ((t (:foreground ,lblack :slant italic))))
    `(jabber-roster-user-online ((t (:foreground ,lblue))))
    `(link ((t (:foreground ,lorange :underline t))))
    `(link-visited ((t (:foreground ,lmagenta :underline t))))
@@ -167,9 +169,9 @@
    `(markdown-header-face-5 ((t (:inherit org-level-5))))
    `(markdown-header-face-6 ((t (:inherit org-level-6))))
    `(minibuffer-prompt ((t (:foreground ,lblue))))
-   `(mode-line ((t (:background ,dwhite :foreground ,lblack :box (:color ,dwhite :line-width 1 :style nil)))))
+   `(mode-line ((t (:background ,dwhite :foreground ,lwhite :box (:color ,dwhite :line-width 1 :style nil)))))
    `(mode-line-buffer-id ((t (:foreground ,lpurple :weight bold))))
-   `(mode-line-inactive ((t (:weight normal :background ,dblack :foreground ,lwhite :box (:color ,dwhite :line-width 1 :style nil) :inherit unspecified))))
+   `(mode-line-inactive ((t (:weight normal :background ,dblack :foreground ,dwhite :box (:color ,dwhite :line-width 1 :style nil) :inherit unspecified))))
    `(org-agenda-calendar-sexp ((t (:foreground ,lyellow))))
    `(org-agenda-current-time ((t (:foreground ,lorange :weight bold))))
    `(org-agenda-date ((t (:foreground ,dcyan))))
@@ -179,7 +181,7 @@
    `(org-checkbox-statistics-done ((t (:foreground ,dcyan))))
    `(org-checkbox-statistics-todo ((t (:foreground ,lcyan))))
    `(org-document-title ((t (:foreground ,lorange :height 1.5))))
-   `(org-headline-done ((t (:foreground ,lwhite :strike-through t))))
+   `(org-headline-done ((t (:foreground ,lblack :strike-through t))))
    `(org-level-1 ((t (:foreground ,lred))))
    `(org-level-2 ((t (:foreground ,lorange))))
    `(org-level-3 ((t (:foreground ,lyellow))))
@@ -200,7 +202,7 @@
    `(outline-6 ((t (:inherit org-level-6))))
    `(outline-7 ((t (:inherit org-level-7))))
    `(outline-8 ((t (:inherit org-level-8))))
-   `(pp^L-highlight ((t (:box unspecified :foreground ,lwhite))))
+   `(pp^L-highlight ((t (:box unspecified :foreground ,lblack))))
    `(rainbow-delimiters-depth-1-face ((t (:foreground ,lred))))
    `(rainbow-delimiters-depth-10-face ((t (:foreground ,lpink))))
    `(rainbow-delimiters-depth-2-face ((t (:foreground ,lorange))))
@@ -220,20 +222,20 @@
    `(rst-level-5 ((t (:background unspecified))))
    `(rst-level-6 ((t (:background unspecified))))
    `(sh-heredoc ((t (:foreground ,lorange))))
-   `(shadow ((t (:foreground ,lwhite))))
+   `(shadow ((t (:foreground ,lblack))))
    `(show-paren-match ((t (:background ,dwhite :weight bold))))
    `(show-paren-mismatch ((t (:background unspecified :foreground ,lred))))
-   `(slime-repl-input-face ((t (:foreground ,lwhite))))
-   `(slime-repl-inputed-output-face ((t (:foreground ,lwhite))))
-   `(slime-repl-output-face ((t (:foreground ,lblack))))
+   `(slime-repl-input-face ((t (:foreground ,lblack))))
+   `(slime-repl-inputed-output-face ((t (:foreground ,lblack))))
+   `(slime-repl-output-face ((t (:foreground ,lwhite))))
    `(slime-repl-prompt-face ((t (:foreground ,lblue))))
-   `(term-color-black ((t (:background ,dblack :foreground ,lwhite))))
+   `(term-color-black ((t (:background ,dblack :foreground ,lblack))))
    `(term-color-blue ((t (:background ,dblue :foreground ,lblue))))
    `(term-color-cyan ((t (:background ,dcyan :foreground ,lcyan))))
    `(term-color-green ((t (:background ,dgreen :foreground ,lgreen))))
    `(term-color-magenta ((t (:background ,dmagenta :foreground ,lmagenta))))
    `(term-color-red ((t (:background ,dred :foreground ,lred))))
-   `(term-color-white ((t (:background ,dwhite :foreground ,lblack))))
+   `(term-color-white ((t (:background ,dwhite :foreground ,lwhite))))
    `(term-color-yellow ((t (:background ,dyellow :foreground ,lyellow))))
    `(texinfo-heading ((t (:foreground ,lpink :inherit unspecified :height 1.3))))
    `(which-func ((t (:foreground ,lblue))))