diff --git a/yoshi-theme.el b/yoshi-theme.el
index ead85b9..135a6e4 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -60,26 +60,26 @@
       (yoshi-4 "#848484")
       (yoshi-5 "#a2a2a2")
       (yoshi-6 "#bfbfbf")
-      (bgred       "#3f1a1a") (fgred       "#a85454")
-      (bgorange    "#3f321f") (fgorange    "#a87e54")
-      (bgyellow    "#343922") (fgyellow    "#a8a854")
-      (bggreen     "#263f1f") (fggreen     "#54a854")
-      (bgturquoise "#1f3f2c") (fgturquoise "#54a87e")
-      (bgcyan      "#1f3f3f") (fgcyan      "#54a8a8")
-      (bgblue      "#1f2c3f") (fgblue      "#547ea8")
-      (bgpurple    "#2f2a3f") (fgpurple    "#7d71a8")
-      (bgmagenta   "#381f3f") (fgmagenta   "#a845a8")
-      (bgpink      "#3f1f32") (fgpink      "#a8547e"))
+      (bgred       "#47ad1eb81eb8") (fgred       "#ca3c828e828e") (brred       "#f01f71267126")
+      (bgorange    "#47ad374b1eb8") (fgorange    "#ca3cad90828e") (brorange    "#f01fbd557126")
+      (bgyellow    "#3f7c47ad1eb8") (fgyellow    "#bbe6ca3c828e") (bryellow    "#d6baf01f7126")
+      (bggreen     "#26e947ad1eb8") (fggreen     "#90e4ca3c828e") (brgreen     "#8a8bf01f7126")
+      (bgturquoise "#1eb847ad2f1a") (fgturquoise "#828eca3c9f3a") (brturquoise "#7126f01fa3f0")
+      (bgcyan      "#1eb847ad47ad") (fgcyan      "#828eca3cca3c") (brcyan      "#7126f01ff01f")
+      (bgblue      "#1eb82f1a47ad") (fgblue      "#828e9f3aca3c") (brblue      "#7126a3f0f01f")
+      (bgpurple    "#26e91eb847ad") (fgpurple    "#90e4828eca3c") (brpurple    "#8a8b7126f01f")
+      (bgmagenta   "#3f7c1eb847ad") (fgmagenta   "#bbe6828eca3c") (brmagenta   "#d6ba7126f01f")
+      (bgpink      "#47ad1eb8374b") (fgpink      "#ca3c828ead90") (brpink      "#f01f7126bd55"))
   (custom-theme-set-faces
    'yoshi
 
    ;; General
    `(cursor ((t (:background ,yoshi-4))))
    `(default ((t (:background ,yoshi-0 :foreground ,yoshi-6))))
-   `(error ((t (:foreground ,fgred :weight bold))))
+   `(error ((t (:foreground ,brred :weight bold))))
    `(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-comment-face ((t (:foreground ,brpink))))
    `(font-lock-constant-face ((t (:foreground ,fgred))))
    `(font-lock-doc-face ((t (:foreground ,fggreen :inherit unspecified))))
    `(font-lock-function-name-face ((t (:foreground ,fgblue))))
@@ -95,14 +95,14 @@
    `(header-line ((t (:inherit mode-line))))
    `(highlight ((t (:background ,bgcyan))))
    `(italic ((t (:slant italic))))
-   `(link ((t (:foreground ,fgorange :underline t))))
+   `(link ((t (:foreground ,brorange :underline t))))
    `(link-visited ((t (:foreground ,fgmagenta :underline t))))
    `(minibuffer-prompt ((t (:foreground ,fgblue))))
    `(mode-line ((t (:background ,yoshi-2 :foreground ,yoshi-6 :box (:color ,yoshi-2 :line-width 5 :style nil)))))
-   `(mode-line-buffer-id ((t (:background ,fgred :foreground ,yoshi-6 :box (:color ,fgred :line-width 5 :style nil)))))
+   `(mode-line-buffer-id ((t (:background ,brred :foreground ,yoshi-1 :box (:color ,brred :line-width 5 :style nil)))))
    `(mode-line-highlight ((t (:background ,yoshi-3 :foreground ,yoshi-6 :box (:color ,yoshi-3 :line-width 5 :style nil)))))
    `(mode-line-inactive ((t (:background ,yoshi-1 :foreground ,yoshi-5 :box (:color ,yoshi-1 :line-width 5 :style nil)))))
-   `(region ((t (:background ,bgblue))))
+   `(region ((t (:background ,brblue :foreground ,yoshi-1))))
    `(shadow ((t (:foreground ,yoshi-4))))
    `(success ((t (:foreground ,fggreen :weight bold))))
    `(trailing-whitespace ((t (:background ,fgred))))
@@ -122,7 +122,7 @@
    `(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-scrollbar-br ((t (:background ,yoshi-2))))
    `(company-tooltip ((t (:foreground ,yoshi-6 :background ,yoshi-1))))
    `(company-tooltip-annotation ((t (:foreground ,fgblue))))
    `(company-tooltip-common ((t (:foreground ,fgcyan))))