diff --git a/chee-theme.el b/chee-theme.el
index cd9ab04..cf18f32 100644
--- a/chee-theme.el
+++ b/chee-theme.el
@@ -67,7 +67,7 @@
     ((t (:foreground ,subtle2))))
 
   `(font-lock-comment-face
-    ((t (:foreground ,subtle2 :family "sans-serif" :slant italic))))
+    ((t (:foreground ,subtle2 :slant italic))))
 
   `(font-lock-constant-face
     ((t (:foreground ,wishy))))
@@ -87,14 +87,6 @@
   `(font-lock-preprocessor-face
     ((t (:foreground ,sky))))
 
-  `(font-lock-regexp-grouping-backslash
-    ((t (:bold   t
-                 :weight bold))))
-
-  '(font-lock-regexp-grouping-construct
-    ((t (:bold   t
-                 :weight bold))))
-
   `(font-lock-string-face
     ((t (:foreground ,mint :background ,background))))
 
@@ -105,9 +97,7 @@
     ((t (:foreground ,variable))))
 
   `(font-lock-warning-face
-    ((t (:bold       t
-                     :foreground ,uhoh
-                     :weight     bold))))
+    ((t (:foreground ,uhoh))))
 
   `(fringe
     ((t (:background ,background))))
@@ -160,10 +150,8 @@
     ((t (:background ,hot))))
 
   '(trailing-whitespace
-    ((t (:bold       t
-                     :background "#571C0E"
-                     :foreground "#331C10"
-                     :weight     bold))))
+    ((t (            :background "#571C0E"
+                     :foreground "#331C10"))))
 
   ;;
   ;; ISearch
@@ -183,8 +171,7 @@
     ((t (:foreground "#729FCF"))))
 
   '(twittering-username-face
-    ((t (:foreground "#FC951E"
-                     :bold t))))
+    ((t (:foreground "#FC951E"))))
 
   ;;
   ;; Usual UI stuffs
@@ -193,15 +180,11 @@
     ((t (:background ,foreground :foreground "white"))))
 
   '(custom-group-tag-face
-    ((t (:bold       t
-                     :foreground "#67D9F0"
-                     :weight      bold
+    ((t (            :foreground "#67D9F0"
                      :height      1.2))))
 
   '(custom-variable-tag-face
-    ((t (:bold t
-               :foreground "#729FCF"
-               :weight bold))))
+    ((t (      :foreground "#729FCF" ))))
 
   '(custom-state-face
     ((t (:foreground "#A6E32Dr"))))
@@ -235,9 +218,8 @@
     ((t (:background "#555753"))))
 
   '(diff-file-header
-    ((t (:bold t
-               :background "#555753"
-               :weight bold))))
+    ((t (      :background "#555753"
+               ))))
 
   '(diff-context
     ((t (:foreground "#EEEEEE"))))
@@ -291,12 +273,12 @@
   '(flyspell-duplicate
     ((t (:background "#382323"
                      :underline  "#FC951E"
-                     :bold        t))))
+          ))))
 
   '(flyspell-incorrect
     ((t (:background "#382323"
                      :underline "#E52222"
-                     :bold t))))
+          ))))
 
   ;;
   ;; ERC
@@ -326,7 +308,7 @@
   '(rst-level-1-face
     ((t (:foreground "#729FCF"
                      :background nil
-                     :bold t))))
+          ))))
 
   '(rst-level-2-face
     ((t (:inherit 'rst-level-1-face))))
diff --git a/lychee-theme.el b/lychee-theme.el
index 24a10c8..c8e8c00 100644
--- a/lychee-theme.el
+++ b/lychee-theme.el
@@ -26,7 +26,7 @@
 
 (deftheme lychee "chee -- i love you and colours")
 (defvar lychee/colors
-  '(("background" . "#eef1f3")
+  '(("background" . "#f9fcff")
     ("foreground" . "#086F8A")
     ("hot"        . "#ee046f")
     ("subtle"     . "#bbccdd")
@@ -52,335 +52,317 @@
      ,@body))
 
 (lychee/with-colors
- (custom-theme-set-faces
-  'lychee
-  `(default
-     ((t (:foreground ,foreground :background ,background))))
+  (custom-theme-set-faces
+   'lychee
+   `(default
+      ((t (:foreground ,foreground
+           :background ,background))))
 
-  `(cursor
-    ((t (:foreground "white" :background ,hot))))
+   `(cursor
+     ((t (:foreground "white" :background ,hot))))
 
-  `(font-lock-builtin-face
-    ((t (:foreground ,hot))))
+   `(font-lock-builtin-face
+     ((t (:foreground ,hot))))
 
-  `(font-lock-comment-delimiter-face
-    ((t (:foreground ,subtle2))))
+   `(font-lock-comment-delimiter-face
+     ((t (:foreground ,subtle2))))
 
-  `(font-lock-comment-face
-    ((t (:foreground ,subtle2 :family "sans-serif" :slant italic))))
+   `(font-lock-comment-face
+     ((t (:foreground ,subtle2
+          :slant       italic))))
 
-  `(font-lock-constant-face
-    ((t (:foreground ,wishy))))
+   `(font-lock-constant-face
+     ((t (:foreground ,wishy))))
 
-  `(font-lock-doc-face
-    ((t (:foreground ,wishy :slant italic))))
+   `(font-lock-doc-face
+     ((t (:foreground ,wishy
+          :slant       italic))))
 
-  `(font-lock-function-name-face
-    ((t (:foreground ,function))))
+   `(font-lock-function-name-face
+     ((t (:foreground ,function))))
 
-  `(font-lock-keyword-face
-    ((t (:foreground ,myeyes))))
+   `(font-lock-keyword-face
+     ((t (:foreground ,myeyes))))
 
-  `(font-lock-negation-char-face
-    ((t (:foreground ,uhoh))))
+   `(font-lock-negation-char-face
+     ((t (:foreground ,uhoh))))
 
-  `(font-lock-preprocessor-face
-    ((t (:foreground ,sky))))
+   `(font-lock-preprocessor-face
+     ((t (:foreground ,sky))))
 
-  `(font-lock-regexp-grouping-backslash
-    ((t (:bold   t
-                 :weight bold))))
+   `(font-lock-string-face
+     ((t (:foreground ,mint
+          :background ,lymint))))
 
-  '(font-lock-regexp-grouping-construct
-    ((t (:bold   t
-                 :weight bold))))
+   `(font-lock-type-face
+     ((t (:foreground ,type))))
 
-  `(font-lock-string-face
-    ((t (:foreground ,mint :background ,lymint))))
+   `(font-lock-variable-name-face
+     ((t (:foreground ,variable))))
 
-  `(font-lock-type-face
-    ((t (:foreground ,type))))
+   `(font-lock-warning-face
+     ((t (:foreground ,uhoh))))
 
-  `(font-lock-variable-name-face
-    ((t (:foreground ,variable))))
+   `(fringe
+     ((t (:background ,background))))
 
-  `(font-lock-warning-face
-    ((t (:bold       t
-                     :foreground ,uhoh
-                     :weight     bold))))
+   '(header-line
+     ((t (:background "#303636"
+          :foreground "#eee"))))
 
-  `(fringe
-    ((t (:background ,background))))
+   `(mode-line
+     ((t (:inherit    'fringe
+          :foreground "#ccc"
+          :background ,subtle2
+          :box        ,subtle))))
 
-  '(header-line
-    ((t (:background "#303636"
-                     :foreground "#eee"))))
+   '(mode-line-inactive
+     ((t (:inherit    'mode-line
+          :box        nil))))
 
-  `(mode-line
-    ((t (:inherit    'fringe
-                     :foreground "#ccc"
-                     :background ,subtle2
-                     :box        ,subtle))))
+   '(mode-line-highlight
+     ((t (:box        "#abb4a1"
+          :background "#012"))))
 
-  '(mode-line-inactive
-    ((t (:inherit    'mode-line
-                     :box        nil))))
+   `(mode-line-buffer-id
+     ((t (:foreground ,hot))))
 
-  '(mode-line-highlight
-    ((t (:box        "#abb4a1"
-                     :background "#012"))))
+   `(show-paren-match
+     ((t (:background ,foreground
+          :foreground ,background))))
 
-  `(mode-line-buffer-id
-    ((t (:foreground ,hot))))
+   '(show-paren-mismatch
+     ((t (:background "#FA2573"))))
 
-  `(show-paren-match
-    ((t (:background ,foreground
-                     :foreground ,background))))
+   `(minibuffer-prompt
+     ((t (:foreground ,hot))))
 
-  '(show-paren-mismatch
-    ((t (:background "#FA2573"))))
+   `(highlight
+     ((t (:background ,subtle))))
 
-  `(minibuffer-prompt
-    ((t (:foreground ,hot))))
+   `(hl-line
+     ((t (:background ,subtle))))
 
-  `(highlight
-    ((t (:background ,subtle))))
+   `(linum
+     ((t (:inherit    (shadow default background)
+          :foreground ,subtle2
+          :slant      oblique
+          :height     0.94))))
 
-  `(hl-line
-    ((t (:background ,subtle))))
+   `(region
+     ((t (:background ,hot))))
 
-  `(linum
-    ((t (
-      :inherit    (shadow default background)
-      :foreground ,subtle2
-      :slant      oblique
-      :height     0.94))))
+   '(trailing-whitespace
+     ((t (:background "#571C0E"
+          :foreground "#331C10" ))))
 
-  `(region
-    ((t (:background ,hot))))
+   ;;
+   ;; ISearch
+   ;;
+   `(isearch
+     ((t (:background ,foreground
+          :box         "white"))))
 
-  '(trailing-whitespace
-    ((t (:bold       t
-                     :background "#571C0E"
-                     :foreground "#331C10"
-                     :weight     bold))))
+   `(isearch-fail
+     ((t (:background "#382323"
+          :foreground ,uhoh))))
 
-  ;;
-  ;; ISearch
-  ;;
-  `(isearch
-    ((t (:background ,foreground
-                     :box "white"))))
+   ;;
+   ;; Twittering mode
+   ;;
+   '(twittering-uri-face
+     ((t (:foreground "#729FCF"))))
 
-  `(isearch-fail
-    ((t (:background "#382323"
-                     :foreground ,uhoh))))
-
-  ;;
-  ;; Twittering mode
-  ;;
-  '(twittering-uri-face
-    ((t (:foreground "#729FCF"))))
-
-  '(twittering-username-face
-    ((t (:foreground "#FC951E"
-                     :bold t))))
-
-  ;;
-  ;; Usual UI stuffs
-  ;;
-  `(widget-field
-    ((t (:background ,foreground :foreground "white"))))
-
-  '(custom-group-tag-face
-    ((t (:bold       t
-                     :foreground "#67D9F0"
-                     :weight      bold
-                     :height      1.2))))
-
-  '(custom-variable-tag-face
-    ((t (:bold t
-               :foreground "#729FCF"
-               :weight bold))))
-
-  '(custom-state-face
-    ((t (:foreground "#A6E32D"))))
-
-  '(link
-    ((t (:foreground "#729FCF"
-                     :underline nil))))
-
-  ;;
-  ;; JS2 stuff
-  ;;
-  `(js2-function-param-face
-    ((t (:foreground ,variable))))
-
-  '(js3-function-param-face
-    ((t (:inherit 'js2-function-param-face))))
-
-  ;;
-  ;; Diff
-  ;;
-  '(diff-added
-    ((t (:foreground "#A6E32D"))))
-
-  '(diff-changed
-    ((t (:foreground "#67D9F0"))))
-
-  '(diff-removed
-    ((t (:foreground "#FA2573"))))
-
-  '(diff-header
-    ((t (:background "#555753"))))
-
-  '(diff-file-header
-    ((t (:bold t
-               :background "#555753"
-               :weight bold))))
-
-  '(diff-context
-    ((t (:foreground "#EEEEEE"))))
-
-
-  ;;
-  ;; Whitespace mode
-  ;;
-  `(whitespace-indentation
-    ((t (:background ,background
-                     :foreground "#82996A"))))
-
-  `(whitespace-line
-    ((t (:background ,background
-                     :foreground "#7A6D89"))))
-
-  `(whitespace-newline
-    ((t (:foreground ,background
-                     :weight normal))))
-
-  `(whitespace-space
-    ((t (:background ,background
-                     :foreground ,background))))
-
-  `(whitespace-tab
-    ((t (:background ,background
-                     :foreground ,background))))
-
-  '(whitespace-space-after-tab
-    ((t (:background "#303636"
-                     :foreground "#82996A"))))
-
-  '(whitespace-space-before-tab
-    ((t (:background "#382323"
-                     :foreground "#82996A"))))
-
-  '(whitespace-trailing
-    ((t (:inherit 'trailing-whitespace))))
-
-  '(whitespace-empty
-    ((t (:background "#382323"
-                     :foreground "#624935"))))
-
-  '(whitespace-hspace
-    ((t (:background "#382323"
-                     :foreground "#82996A"))))
-
-  ;;
-  ;; Flyspell stuff
-  ;;
-  '(flyspell-duplicate
-    ((t (:background "#382323"
-                     :underline  "#FC951E"
-                     :bold        t))))
-
-  '(flyspell-incorrect
-    ((t (:background "#382323"
-                     :underline "#E52222"
-                     :bold t))))
-
-  ;;
-  ;; ERC
-  ;;
-  '(erc-notice-face
-    ((t (:foreground "#75766A"))))
-
-  '(erc-current-nick-face
-    ((t (:foreground "#FA2573"))))
-
-  '(erc-input-face
-    ((t (:foreground "#ABB4A1"))))
-
-  '(erc-nick-default-face
-    ((t (:foreground "#729FCF"))))
-
-  '(erc-prompt-face
-    ((t (:foreground "#FC951E"
-                     :background nil))))
-
-  '(erc-timestamp-face
-    ((t (:foreground "#75766A"))))
-
-  ;;
-  ;; ReStructuredText
-  ;;
-  '(rst-level-1-face
-    ((t (:foreground "#729FCF"
-                     :background nil
-                     :bold t))))
-
-  '(rst-level-2-face
-    ((t (:inherit 'rst-level-1-face))))
-
-  '(rst-level-3-face
-    ((t (:inherit 'rst-level-2-face))))
-
-  '(rst-level-4-face
-    ((t (:inherit 'rst-level-3-face))))
-
-  '(rst-level-5-face
-    ((t (:inherit 'rst-level-4-face))))
-
-  '(rst-level-6-face
-    ((t (:inherit 'rst-level-5-face))))
-
-  ;;
-  ;; Outline
-  ;;
-  '(outline-1
-    ((t (:foreground "#437BA5"))))
-  '(outline-2
-    ((t (:foreground "#729bb6"))))
-  '(outline-3
-    ((t (:foreground "#a2bcc8"))))
-  '(outline-4
-    ((t (:foreground "#d1dcd9"))))
-  '(outline-5
-    ((t (:foreground "#437ba5"))))
-  '(outline-6
-    ((t (:foreground "#729bb6"))))
-  '(outline-7
-    ((t (:foreground "#a2bcc8"))))
-  '(outline-8
-    ((t (:foreground "#d1dcd9"))))
-
-  ;;
-  ;; ORG Mode
-  ;;
-  '(org-hide
-    ((t (:foreground "#303636"))))
-  '(org-special-keyword
-    ((t (:inherit 'font-lock-type-face))))
-
-  ;;
-  ;; Perspective mode
-  ;;
-  '(persp-selected-face
-    ((t (:foreground "#eeeeee"
-                     :background "#382323"
-                     :box        "#382323"))))
-  ;;
-  ;; Yasnippet
-  ;;
-  '(yas/field-highlight-face
-    ((t (:background "#586045"
-                     :box "#ACAE95"))))))
+   '(twittering-username-face
+     ((t (:foreground "#FC951E"))))
+
+   ;;
+   ;; Usual UI stuffs
+   ;;
+   `(widget-field
+     ((t (:background ,foreground
+          :foreground "white"))))
+
+   '(custom-group-tag-face
+     ((t (:foreground "#67D9F0"
+          :height      1.2))))
+
+   '(custom-variable-tag-face
+     ((t (:foreground "#729FCF"))))
+
+   '(custom-state-face
+     ((t (:foreground "#A6E32D"))))
+
+   '(link
+     ((t (:foreground "#729FCF"
+          :underline  nil))))
+
+   ;;
+   ;; JS2 stuff
+   ;;
+   `(js2-function-param-face
+     ((t (:foreground ,variable))))
+
+   '(js3-function-param-face
+     ((t (:inherit 'js2-function-param-face))))
+
+   ;;
+   ;; Diff
+   ;;
+   '(diff-added
+     ((t (:foreground "#A6E32D"))))
+
+   '(diff-changed
+     ((t (:foreground "#67D9F0"))))
+
+   '(diff-removed
+     ((t (:foreground "#FA2573"))))
+
+   '(diff-header
+     ((t (:background "#555753"))))
+
+   '(diff-file-header
+     ((t (:background "#555753" ))))
+
+   '(diff-context
+     ((t (:foreground "#EEEEEE"))))
+
+
+   ;;
+   ;; Whitespace mode
+   ;;
+   `(whitespace-indentation
+     ((t (:background ,background
+          :foreground "#82996A"))))
+
+   `(whitespace-line
+     ((t (:background ,background
+          :foreground "#7A6D89"))))
+
+   `(whitespace-newline
+     ((t (:foreground ,background
+          :weight      normal))))
+
+   `(whitespace-space
+     ((t (:background ,background
+          :foreground ,background))))
+
+   `(whitespace-tab
+     ((t (:background ,background
+          :foreground ,background))))
+
+   '(whitespace-space-after-tab
+     ((t (:background "#303636"
+          :foreground "#82996A"))))
+
+   '(whitespace-space-before-tab
+     ((t (:background "#382323"
+          :foreground "#82996A"))))
+
+   '(whitespace-trailing
+     ((t (:inherit 'trailing-whitespace))))
+
+   '(whitespace-empty
+     ((t (:background "#382323"
+          :foreground "#624935"))))
+
+   '(whitespace-hspace
+     ((t (:background "#382323"
+          :foreground "#82996A"))))
+
+   ;;
+   ;; Flyspell stuff
+   ;;
+   '(flyspell-duplicate
+     ((t (:background "#382323"
+          :underline  "#FC951E"))))
+
+   '(flyspell-incorrect
+     ((t (:background "#382323"
+          :underline "#E52222"))))
+
+   ;;
+   ;; ERC
+   ;;
+   '(erc-notice-face
+     ((t (:foreground "#75766A"))))
+
+   '(erc-current-nick-face
+     ((t (:foreground "#FA2573"))))
+
+   '(erc-input-face
+     ((t (:foreground "#ABB4A1"))))
+
+   '(erc-nick-default-face
+     ((t (:foreground "#729FCF"))))
+
+   '(erc-prompt-face
+     ((t (:foreground "#FC951E"
+          :background nil))))
+
+   '(erc-timestamp-face
+     ((t (:foreground "#75766A"))))
+
+   ;;
+   ;; ReStructuredText
+   ;;
+   '(rst-level-1-face
+     ((t (:foreground "#729FCF"
+          :background nil))))
+
+   '(rst-level-2-face
+     ((t (:inherit 'rst-level-1-face))))
+
+   '(rst-level-3-face
+     ((t (:inherit 'rst-level-2-face))))
+
+   '(rst-level-4-face
+     ((t (:inherit 'rst-level-3-face))))
+
+   '(rst-level-5-face
+     ((t (:inherit 'rst-level-4-face))))
+
+   '(rst-level-6-face
+     ((t (:inherit 'rst-level-5-face))))
+
+   ;;
+   ;; Outline
+   ;;
+   '(outline-1
+     ((t (:foreground "#437BA5"))))
+   '(outline-2
+     ((t (:foreground "#729bb6"))))
+   '(outline-3
+     ((t (:foreground "#a2bcc8"))))
+   '(outline-4
+     ((t (:foreground "#d1dcd9"))))
+   '(outline-5
+     ((t (:foreground "#437ba5"))))
+   '(outline-6
+     ((t (:foreground "#729bb6"))))
+   '(outline-7
+     ((t (:foreground "#a2bcc8"))))
+   '(outline-8
+     ((t (:foreground "#d1dcd9"))))
+
+   ;;
+   ;; ORG Mode
+   ;;
+   '(org-hide
+     ((t (:foreground "#303636"))))
+   '(org-special-keyword
+     ((t (:inherit 'font-lock-type-face))))
+
+   ;;
+   ;; Perspective mode
+   ;;
+   '(persp-selected-face
+     ((t (:foreground "#eeeeee"
+          :background "#382323"
+          :box        "#382323"))))
+   ;;
+   ;; Yasnippet
+   ;;
+   '(yas/field-highlight-face
+     ((t (:background "#586045"
+          :box "#ACAE95"))))))