diff --git a/CHANGELOG.org b/CHANGELOG.org
index ff7caea..0d0bf8f 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -48,6 +48,12 @@ This project adheres to [[http://semver.org][Semantic Versioning]].
    Make the foreground and background color on the =diff-hl-change=,
    =diff-hl-add= and =diff-hl-remove= the same.
 
+** CHANGED the top 3 Org heading faces
+
+   Make the =org-level-1=, =org-level-2= and =org-level-3= stand out
+   more by giving them and underline, bold weight and italic slant
+   respectively.
+
 ** REMOVED the 10th rainbow delimiters depth face
 
 * [[https://github.com/ryuslash/yoshi-theme/compare/v6.0.0...v6.1.0][6.1.0]] -- 2015-11-20
diff --git a/yoshi-theme.el b/yoshi-theme.el
index 6a836e8..0c296f5 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -356,9 +356,9 @@
    `(org-date ((t (:foreground ,fgpink :underline unspecified))))
    `(org-document-title ((t (:foreground ,fgorange :height 1.5))))
    `(org-headline-done ((t (:foreground ,fgdim))))
-   `(org-level-1 ((t (:foreground ,fggreen))))
-   `(org-level-2 ((t (:foreground ,fgcyan))))
-   `(org-level-3 ((t (:foreground ,fgred))))
+   `(org-level-1 ((t (:foreground ,fggreen :underline t))))
+   `(org-level-2 ((t (:foreground ,fgcyan :weight bold))))
+   `(org-level-3 ((t (:foreground ,fgred :slant italic))))
    `(org-level-4 ((t (:foreground ,fgblue))))
    `(org-level-5 ((t (:foreground ,fgyellow))))
    `(org-level-6 ((t (:foreground ,fgpurple))))
@@ -488,9 +488,10 @@
 
   (custom-theme-set-variables
    'yoshi
-   `(fci-rule-color ,bgred)
    `(ansi-color-names-vector [,bgdim ,fgred ,fggreen ,fgyellow
                               ,fgblue ,fgmagenta ,fgcyan ,fgdim])
+   `(fci-rule-color ,bgred)
+   '(org-fontify-whole-heading-line t)
    '(window-divider-mode t)
    '(window-divider-default-right-width 1)))