diff --git a/petrol-theme.el b/petrol-theme.el
index b533194..f116517 100644
--- a/petrol-theme.el
+++ b/petrol-theme.el
@@ -83,14 +83,14 @@
    `(vertical-border ((,class (:foreground ,petrol-blue))))
    `(highlight ((,class (:background "#fffbc4"))))
    `(region ((,class (:background "#3389ab" :foreground "#f2f2f2"))))
-   `(secondary-selection ((,class (:weight bold :background "#fffbc4"))))
+   `(secondary-selection ((,class (:background "#fffbc4"))))
    `(isearch ((,class (:foreground "#f2f2f2" :background "#008abd"))))
-   `(isearch-fail ((,class (:weight bold :foreground "#f2f2f2" :background "#d0372d"))))
+   `(isearch-fail ((,class (:foreground "#f2f2f2" :background "#d0372d"))))
    `(query-replace ((,class (:inherit isearch))))
    `(lazy-highlight ((,class (:foreground "#454545" :background "#fffbc4")))) ; Isearch others (see `match').
    `(hl-line ((,class (:background "#ededed"))))
    `(shadow ((,class ((:foreground "#cccccc")))))
-   `(match ((,class (:weight bold :background "#fffbc4"))))
+   `(match ((,class (:background "#fffbc4"))))
    `(show-paren-match ((,class (:background "#cccccc" :foreground ,petrol-blue))))
    `(show-paren-mismatch ((,class (:background "#cccccc" :foreground "#d0372d"))))
    `(trailing-whitespace ((,class (:foreground "#cccccc" :background "#fffbc4"))))
@@ -124,14 +124,14 @@
    `(font-lock-constant-face ((,class (:foreground "#008080"))))
    `(font-lock-doc-face ((,class (:weight normal :foreground "#678f03"))))
    `(font-lock-function-name-face ((,class (:foreground "#454545"))))
-   `(font-lock-keyword-face ((,class (:weight bold :foreground "#00638a"))))
+   `(font-lock-keyword-face ((,class (:foreground "#00638a"))))
    `(font-lock-preprocessor-face ((,class (:foreground ,petrol-purple))))
-   `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil))))
-   `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil))))
+   `(font-lock-regexp-grouping-backslash ((,class (:inherit nil))))
+   `(font-lock-regexp-grouping-construct ((,class (:inherit nil))))
    `(font-lock-string-face ((,class (:foreground "#678f03"))))
-   `(font-lock-type-face ((,class (:weight bold :foreground "#008abd"))))
+   `(font-lock-type-face ((,class (:foreground "#008abd"))))
    `(font-lock-variable-name-face ((,class (:weight normal :foreground "#454545"))))
-   `(font-lock-warning-face ((,class (:weight bold :foreground "#cc6d00"))))
+   `(font-lock-warning-face ((,class (:foreground "#cc6d00"))))
 
 
    `(mode-line ((,class (:background ,petrol-blue
@@ -153,14 +153,14 @@
    `(header-line-highlight ((,class (:background "#fffbc4" :foreground "#454545"))))
 
 
-   `(error ((,class (:weight bold :foreground "#d0372d"))))
-   `(warning ((,class (:weight bold :foreground "#cc6d00"))))
-   `(success ((,class (:weight bold :foreground "#2e994c"))))
+   `(error ((,class (:foreground "#d0372d"))))
+   `(warning ((,class (:foreground "#cc6d00"))))
+   `(success ((,class (:foreground "#2e994c"))))
 
 
-   `(minibuffer-prompt ((,class (:weight bold :foreground ,petrol-blue))))
-   `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground ,petrol-blue))))
-   `(escape-glyph ((,class (:weight bold :foreground "#b48cff"))))
+   `(minibuffer-prompt ((,class (:foreground ,petrol-blue))))
+   `(minibuffer-noticeable-prompt ((,class (:foreground ,petrol-blue))))
+   `(escape-glyph ((,class (:foreground "#b48cff"))))
 
 
    `(whitespace-hspace ((,class (:foreground "#cccccc"))))
@@ -177,8 +177,8 @@
    `(link-visited ((,class ,petrol-link-visited)))
 
 
-   `(dired-header ((,class (:weight bold :foreground ,petrol-blue :background "#f2f2f2"))))
-   `(dired-directory ((,class (:weight bold :foreground ,petrol-blue :background "#f2f2f2"))))
+   `(dired-header ((,class (:foreground ,petrol-blue :background "#f2f2f2"))))
+   `(dired-directory ((,class (:foreground ,petrol-blue :background "#f2f2f2"))))
    `(dired-ignored ((,class (:strike-through t :foreground "#d0372d"))))
    `(dired-mark ((,class (:foreground "#d0372d" :background "#f2f2f2"))))
    `(dired-marked ((,class (:foreground "#d0372d" :background "#ffdddd"))))
@@ -193,7 +193,7 @@
    `(diff-refine-changed ((,class (:background "#fce8c9"))))
    `(diff-header ((,class (:foreground "#8c8c8c" :background "#f2f2f2"))))
    `(diff-file-header ((,class (:foreground ,petrol-blue :background "#f2f2f2"))))
-   `(diff-hunk-header ((,class (:weight bold :foreground "#6f42c1" :background "#f2f2f2"))))
+   `(diff-hunk-header ((,class (:foreground "#6f42c1" :background "#f2f2f2"))))
    `(diff-index ((,class (:foreground "#8c8c8c" :background "#f2f2f2"))))
    `(diff-indicator-added ((,class (:foreground "#22863a" :background "#ddffdd"))))
    `(diff-indicator-removed ((,class (:foreground "#d0372d" :background "#ffdddd"))))
@@ -223,13 +223,13 @@
    `(company-scrollbar-fg ((,class (:background "#8c8c8c"))))
 
 
-   `(eldoc-highlight-function-argument ((,class (:foreground "#008abd" :weight bold))))
+   `(eldoc-highlight-function-argument ((,class (:foreground "#008abd"))))
 
 
    `(haskell-pragma-face ((,class (:foreground ,petrol-purple))))
    `(haskell-keyword-face ((,class (:foreground ,petrol-blue))))
    `(haskell-operator-face ((,class (:foreground "#d70087"))))
-   `(haskell-type-face ((,class (:weight bold :foreground "#008abd"))))
+   `(haskell-type-face ((,class (:foreground "#008abd"))))
 
 
    `(which-func ((,class (:foreground ,petrol-purple))))
@@ -261,13 +261,13 @@
    `(compilation-mode-line-exit ((,class (:foreground "#b4efb4"))))
    `(compilation-mode-line-run ((,class (:foreground "#b48cff"))))
 
-   `(eglot-mode-line ((,class (:foreground "#f2f2f2" :weight bold))))
+   `(eglot-mode-line ((,class (:foreground "#f2f2f2"))))
 
-   `(xref-file-header ((,class (:weight bold :foreground ,petrol-blue :background "#f2f2f2"))))
+   `(xref-file-header ((,class (:foreground ,petrol-blue :background "#f2f2f2"))))
 
-   `(flycheck-info ((,class (:underline (:color "#2e994c" :style wave) :weight bold))))
-   `(flycheck-warning ((,class (:underline (:color "#cc6d00" :style wave) :weight bold))))
-   `(flycheck-error ((,class (:underline (:color "#d0372d" :style wave) :weight bold))))
+   `(flycheck-info ((,class (:underline (:color "#2e994c" :style wave)))))
+   `(flycheck-warning ((,class (:underline (:color "#cc6d00" :style wave)))))
+   `(flycheck-error ((,class (:underline (:color "#d0372d" :style wave)))))
    `(flycheck-fringe-info ((,class (:foreground "#2e994c"))))
    `(flycheck-fringe-warning ((,class (:foreground "#cc6d00"))))
    `(flycheck-fringe-error ((,class (:foreground "#d0372d"))))
@@ -293,15 +293,15 @@
    `(helm-buffer-saved-out ((,class (:foreground "#d0372d"))))
    `(helm-buffer-size ((,class (:foreground "#cc6d00"))))
    `(helm-candidate-number ((,class (:foreground "#f2f2f2" :background "#cc6d00"))))
-   `(helm-ff-directory ((,class (:foreground ,petrol-blue :weight bold))))
+   `(helm-ff-directory ((,class (:foreground ,petrol-blue))))
    `(helm-ff-executable ((,class (:foreground "#2e994c"))))
    `(helm-ff-file ((,class (:foreground "#454545"))))
    `(helm-ff-invalid-symlink ((,class (:foreground ,petrol-purple :background "#ffdddd"))))
    `(helm-ff-symlink ((,class (:foreground ,petrol-purple))))
 
 
-   `(which-key-key-face ((,class (:foreground ,petrol-purple :weight bold))))
-   `(which-key-special-key-face ((,class (:foreground "#d70087"  :weight bold :height 1.1))))
+   `(which-key-key-face ((,class (:foreground ,petrol-purple))))
+   `(which-key-special-key-face ((,class (:foreground "#d70087" :height 1.1))))
    `(which-key-command-description-face ((,class (:foreground "#454545" ))))
    `(which-key-group-description-face ((,class (:foreground ,petrol-blue))))
    `(which-key-separator-face ((,class (:foreground "#919aa1"))))
@@ -321,24 +321,24 @@
    `(rainbow-delimiters-depth-12-face ((,class (:foreground "#2e994c"))))
 
 
-   `(outline-1 ((,class (:height 1.3 :weight bold :foreground "#008abd"))))
-   `(outline-2 ((,class (:height 1.2 :weight bold :foreground ,petrol-purple))))
-   `(outline-3 ((,class (:height 1.1 :weight bold :foreground "#cc6d00"))))
-   `(outline-4 ((,class (:height 1.0 :weight bold :foreground "#2e994c"))))
-   `(outline-5 ((,class (:height 1.0 :weight bold :foreground "#00638a"))))
-   `(outline-6 ((,class (:height 1.0 :weight bold :foreground "#D0372D"))))
-   `(outline-7 ((,class (:height 1.0 :weight bold :foreground "#008080"))))
-   `(outline-8 ((,class (:height 1.0 :weight bold :foreground "#6c7378"))))
+   `(outline-1 ((,class (:height 1.3 :foreground "#008abd"))))
+   `(outline-2 ((,class (:height 1.2 :foreground ,petrol-purple))))
+   `(outline-3 ((,class (:height 1.1 :foreground "#cc6d00"))))
+   `(outline-4 ((,class (:height 1.0 :foreground "#2e994c"))))
+   `(outline-5 ((,class (:height 1.0 :foreground "#00638a"))))
+   `(outline-6 ((,class (:height 1.0 :foreground "#D0372D"))))
+   `(outline-7 ((,class (:height 1.0 :foreground "#008080"))))
+   `(outline-8 ((,class (:height 1.0 :foreground "#6c7378"))))
 
 
-   `(org-level-1 ((,class (:height 1.3 :weight bold :foreground "#008abd"))))
-   `(org-level-2 ((,class (:height 1.2 :weight bold :foreground ,petrol-purple))))
-   `(org-level-3 ((,class (:height 1.1 :weight bold :foreground "#cc6d00"))))
-   `(org-level-4 ((,class (:height 1.0 :weight bold :foreground "#2e994c"))))
-   `(org-level-5 ((,class (:height 1.0 :weight bold :foreground "#00638a"))))
-   `(org-level-6 ((,class (:height 1.0 :weight bold :foreground "#D0372D"))))
-   `(org-level-7 ((,class (:height 1.0 :weight bold :foreground "#008080"))))
-   `(org-level-8 ((,class (:height 1.0 :weight bold :foreground "#6c7378"))))
+   `(org-level-1 ((,class (:height 1.3 :foreground "#008abd"))))
+   `(org-level-2 ((,class (:height 1.2 :foreground ,petrol-purple))))
+   `(org-level-3 ((,class (:height 1.1 :foreground "#cc6d00"))))
+   `(org-level-4 ((,class (:height 1.0 :foreground "#2e994c"))))
+   `(org-level-5 ((,class (:height 1.0 :foreground "#00638a"))))
+   `(org-level-6 ((,class (:height 1.0 :foreground "#D0372D"))))
+   `(org-level-7 ((,class (:height 1.0 :foreground "#008080"))))
+   `(org-level-8 ((,class (:height 1.0 :foreground "#6c7378"))))
 
    `(org-link ((,class ,petrol-link)))
    
@@ -392,12 +392,12 @@
    `(magit-header-line ((,class (:foreground "#f2f2f2"))))
    `(magit-hash ((,class (:foreground "#008080"))))
    `(magit-blame-hash ((,class (:foreground "#008080"))))
-   `(magit-blame-name ((,class (:foreground "#008abd" :weight bold))))
+   `(magit-blame-name ((,class (:foreground "#008abd"))))
    `(magit-blame-date ((,class (:foreground "#cc6d00"))))
    `(magit-blame-summary ((,class (:foreground "#678f03" :slant italic))))
    `(magit-blame-heading ((,class (:background "#e6e6e6"))))
    `(magit-log-graph ((,class (:foreground ,petrol-purple))))
-   `(magit-log-author ((,class (:foreground "#008abd" :weight bold))))
+   `(magit-log-author ((,class (:foreground "#008abd"))))
    `(magit-log-date ((,class (:foreground "#cc6d00"))))