diff --git a/color-theme-solarized.el b/color-theme-solarized.el
index f2bca29..cc5e4f5 100755
--- a/color-theme-solarized.el
+++ b/color-theme-solarized.el
@@ -152,9 +152,8 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
          (info-xref-visited ((t (:inherit info-xref :foreground ,magenta))))
          ;; org
          (org-hide ((t (:foreground ,base03))))
-         (org-todo ((t (:foreground ,red :bold t))))
+         (org-todo ((t (:foreground ,base03 :background ,red :bold t))))
          (org-done ((t (:foreground ,green :bold t))))
-         (org-todo ((t (:weight bold :foreground ,base03 :background ,red))))
          (org-todo-kwd-face ((t (:foreground ,red :background ,base03))))
          (org-done-kwd-face ((t (:foreground ,green :background ,base03))))
          (org-project-kwd-face ((t (:foreground ,violet :background ,base03))))
diff --git a/solarized-dark-theme.el b/solarized-dark-theme.el
index 74e2e4b..300776b 100644
--- a/solarized-dark-theme.el
+++ b/solarized-dark-theme.el
@@ -65,7 +65,7 @@
    `(trailing-whitespace ((t (:foreground ,red :inverse-video t))))
    `(vertical-border ((t (:foreground ,base0))))
    ;; compilation
-   `(compilation-info ((t (:forground ,green :bold t))))
+   `(compilation-info ((t (:foreground ,green :bold t))))
    `(compilation-warning ((t (:foreground ,orange :bold t))))
    ;; customize
    `(custom-button
@@ -104,8 +104,16 @@
    `(info-xref-visited ((t (:inherit info-xref :foreground ,magenta))))
    ;; org
    `(org-hide ((t (:foreground ,base03))))
-   `(org-todo ((t (:foreground ,red :bold t))))
+   `(org-todo ((t (:foreground ,base03 :background ,red :bold t))))
    `(org-done ((t (:foreground ,green :bold t))))
+   `(org-todo-kwd-face ((t (:foreground ,red :background ,base03))))
+   `(org-done-kwd-face ((t (:foreground ,green :background ,base03))))
+   `(org-project-kwd-face ((t (:foreground ,violet :background ,base03))))
+   `(org-waiting-kwd-face ((t (:foreground ,orange :background ,base03))))
+   `(org-someday-kwd-face ((t (:foreground ,blue :background ,base03))))
+   `(org-started-kwd-face ((t (:foreground ,yellow :background ,base03))))
+   `(org-cancelled-kwd-face ((t (:foreground ,green :background ,base03))))
+   `(org-delegated-kwd-face ((t (:foreground ,cyan :background ,base03))))
    ;; show-paren
    `(show-paren-match-face ((t (:background ,cyan :foreground ,base3))))
    `(show-paren-mismatch-face ((t (:background ,red :foreground ,base3))))
diff --git a/solarized-light-theme.el b/solarized-light-theme.el
index 30ab5ea..63a1a8f 100644
--- a/solarized-light-theme.el
+++ b/solarized-light-theme.el
@@ -65,7 +65,7 @@
    `(trailing-whitespace ((t (:foreground ,red :inverse-video t))))
    `(vertical-border ((t (:foreground ,base0))))
    ;; compilation
-   `(compilation-info ((t (:forground ,green :bold t))))
+   `(compilation-info ((t (:foreground ,green :bold t))))
    `(compilation-warning ((t (:foreground ,orange :bold t))))
    ;; customize
    `(custom-button
@@ -104,8 +104,16 @@
    `(info-xref-visited ((t (:inherit info-xref :foreground ,magenta))))
    ;; org
    `(org-hide ((t (:foreground ,base03))))
-   `(org-todo ((t (:foreground ,red :bold t))))
+   `(org-todo ((t (:foreground ,base03 :background ,red :bold t))))
    `(org-done ((t (:foreground ,green :bold t))))
+   `(org-todo-kwd-face ((t (:foreground ,red :background ,base03))))
+   `(org-done-kwd-face ((t (:foreground ,green :background ,base03))))
+   `(org-project-kwd-face ((t (:foreground ,violet :background ,base03))))
+   `(org-waiting-kwd-face ((t (:foreground ,orange :background ,base03))))
+   `(org-someday-kwd-face ((t (:foreground ,blue :background ,base03))))
+   `(org-started-kwd-face ((t (:foreground ,yellow :background ,base03))))
+   `(org-cancelled-kwd-face ((t (:foreground ,green :background ,base03))))
+   `(org-delegated-kwd-face ((t (:foreground ,cyan :background ,base03))))
    ;; show-paren
    `(show-paren-match-face ((t (:background ,cyan :foreground ,base3))))
    `(show-paren-mismatch-face ((t (:background ,red :foreground ,base3))))