   (magit-cherry-equivalent                   (:foreground darktooth-neutral_orange))
   (magit-cherry-unmatched                    (:foreground darktooth-neutral_purple))
   (magit-diff-context                        (:foreground darktooth-dark3 :background nil))
-  (magit-diff-context-highlight              (:foreground darktooth-dark4 :background darktooth-dark0_soft))
+  (magit-diff-context-highlight              (:foreground darktooth-dark4 :background darktooth-dark0_soft :extend t))
   (magit-diff-added                          (:foreground darktooth-bright_green :background darktooth-mid_green))
-  (magit-diff-added-highlight                (:foreground darktooth-bright_green :background darktooth-mid_green))
+  (magit-diff-added-highlight                (:foreground darktooth-bright_green :background darktooth-mid_green :extend t))
   (magit-diff-removed                        (:foreground darktooth-bright_red :background darktooth-mid_red))
-  (magit-diff-removed-highlight              (:foreground darktooth-bright_red :background darktooth-mid_red))
+  (magit-diff-removed-highlight              (:foreground darktooth-bright_red :background darktooth-mid_red :extend t))
   (magit-diff-add                            (:foreground darktooth-bright_green))
   (magit-diff-del                            (:foreground darktooth-bright_red))
   (magit-diff-file-header                    (:foreground darktooth-bright_blue))
   (magit-diff-hunk-header                    (:foreground darktooth-neutral_aqua))
+  (magit-diff-hunk-heading                   (:foreground "grey70" :background "grey25" :extend t))
+  (magit-diff-hunk-heading-highlight         (:foreground "grey70" :background "grey35" :extend t))
   (magit-diff-merge-current                  (:background darktooth-dark_yellow))
   (magit-diff-merge-diff3-separator          (:foreground darktooth-neutral_orange :weight 'bold))
   (magit-diff-merge-proposed                 (:background darktooth-dark_green))

  ;; TODO: set up inheritance when native line numbers reach release
  (line-number                               (:foreground darktooth-dark2))
  (line-number-current-line                  (:foreground darktooth-light4 :background darktooth-dark1))
  (hl-line                                   (:background darktooth-dark1))
  (region                                    (:background darktooth-mid_blue :distant-foreground darktooth-light0))
  (secondary-selection                       (:background darktooth-dark_blue))
  (cua-rectangle                             (:background darktooth-mid_blue))
  (header-line                               (:foreground darktooth-turquoise4 :background darktooth-dark0 :bold nil))

  (org-mode-line-clock-overrun               (:foreground darktooth-black :background darktooth-bright_red))
  (org-ellipsis                              (:inherit 'font-lock-comment-face :slant 'normal :underline nil))
  (org-footnote                              (:foreground darktooth-faded_aqua :underline t))
  (org-block                                 (:foreground darktooth-light2 :background darktooth-dark0_soft :extend t))
  (org-code                                  (:foreground darktooth-light2 :background darktooth-dark0_soft))
  (org-verbatim                              (:foreground darktooth-light2 :background darktooth-dark0_soft))
  (org-agenda-current-time                   (:foreground darktooth-bright_green))
