diff --git a/debian/changelog b/debian/changelog
index afd60bb..cbd36c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-monokai-emacs (3.5.3-4) UNRELEASED; urgency=medium
+monokai-emacs (3.5.3+git20220117.1.4a09c59-1) UNRELEASED; urgency=medium
 
+  [ Nicholas D Steeves ]
   * Drop emacs25 from Enhances (package does not exist in bullseye).
 
- -- Nicholas D Steeves <sten@debian.org>  Wed, 28 Jul 2021 19:40:45 -0400
+  [ Debian Janitor ]
+  * New upstream snapshot.
+
+ -- Nicholas D Steeves <sten@debian.org>  Tue, 10 May 2022 18:57:46 -0000
 
 monokai-emacs (3.5.3-3) unstable; urgency=medium
 
diff --git a/debian/patches/0001-fix-documentation.diff b/debian/patches/0001-fix-documentation.diff
index 1053e9c..182fe83 100644
--- a/debian/patches/0001-fix-documentation.diff
+++ b/debian/patches/0001-fix-documentation.diff
@@ -5,8 +5,10 @@ This patch removes badges icons and screenshots from README file.
 These icons are intended rather for developers and are loaded from
 several external web sites.
 
---- a/README.md
-+++ b/README.md
+Index: monokai-emacs/README.md
+===================================================================
+--- monokai-emacs.orig/README.md
++++ monokai-emacs/README.md
 @@ -1,6 +1,3 @@
 -[![MELPA](http://melpa.org/packages/monokai-theme-badge.svg)](http://melpa.org/#/monokai-theme)
 -[![MELPA Stable](http://stable.melpa.org/packages/monokai-theme-badge.svg)](http://stable.melpa.org/#/monokai-theme)
diff --git a/monokai-theme.el b/monokai-theme.el
index 3337ad2..f0bef3a 100644
--- a/monokai-theme.el
+++ b/monokai-theme.el
@@ -193,6 +193,14 @@ Also affects 'linum-mode' background."
        ;; Definitions for guis that support 256 colors
        (monokai-class '((class color) (min-colors 257)))
 
+       ;; Functionality specific colors
+       (monokai-diff-blue-base      "#232438")
+       (monokai-diff-blue-emphasis  "#1F204E")
+       (monokai-diff-green-base     "#233E1E")
+       (monokai-diff-green-emphasis "#1F541A")
+       (monokai-diff-red-base       "#3D241E")
+       (monokai-diff-red-emphasis   "#53201A")
+
        ;; Darker and lighter accented colors
        (monokai-yellow-d       "#BEB244")
        (monokai-yellow-l       "#FFF7A8")
@@ -217,10 +225,12 @@ Also affects 'linum-mode' background."
        (monokai-foreground-lc  "#171A0B")
        ;; High contrast colors
        (monokai-yellow-hc      "#FFFACE")
+       (monokai-yellow-hc-alt  "#E7DB74")
        (monokai-yellow-lc      "#9A8F21")
        (monokai-orange-hc      "#FFBE74")
        (monokai-orange-lc      "#A75B00")
        (monokai-red-hc         "#FEB0CC")
+       (monokai-red-hc-alt     "#F83535")
        (monokai-red-lc         "#F20055")
        (monokai-magenta-hc     "#FEC6F9")
        (monokai-magenta-lc     "#F309DF")
@@ -231,6 +241,7 @@ Also affects 'linum-mode' background."
        (monokai-cyan-hc        "#D3FBF6")
        (monokai-cyan-lc        "#4BBEAE")
        (monokai-green-hc       "#CCF47C")
+       (monokai-green-hc-alt   "#A6E22C")
        (monokai-green-lc       "#679A01")
 
        ;; Distinct fringe
@@ -240,6 +251,15 @@ Also affects 'linum-mode' background."
 
        ;; Definitions for terminals that do not support 256 colors
        (monokai-256-class '((class color) (min-colors 89)))
+
+       ;; Functionality specific colors
+       (monokai-256-diff-blue-base      "#00005f")
+       (monokai-256-diff-blue-emphasis  "#000087")
+       (monokai-256-diff-green-base     "#005800")
+       (monokai-256-diff-green-emphasis "#008700")
+       (monokai-256-diff-red-base       "#5f0000")
+       (monokai-256-diff-red-emphasis   "#870000")
+
        ;; Primary colors
        (monokai-256-yellow         "#CDC673")
        (monokai-256-orange         "#FF8C00")
@@ -861,7 +881,7 @@ Also affects 'linum-mode' background."
        (:inherit (font-latex-doctex-documentation-face
                   font-lock-builtin-face
                   font-lock-preprocessor-face)))
-      (,monokai-class
+      (,monokai-256-class
        (:inherit (font-latex-doctex-documentation-face
                   font-lock-builtin-face
                   font-lock-preprocessor-face)))))
@@ -1621,45 +1641,53 @@ Also affects 'linum-mode' background."
 
    ;; diff-hl
    `(diff-hl-change
-     ((,monokai-class (:background ,monokai-blue-lc
-                                   :foreground ,monokai-blue-hc))
-      (,monokai-256-class (:background ,monokai-256-blue-lc
-                                        :foreground ,monokai-256-blue-hc))))
+     ((,monokai-class (:background ,monokai-yellow-hc-alt
+                                   :foreground ,monokai-yellow-hc-alt))
+      (,monokai-256-class (:background ,monokai-256-yellow-hc
+                                        :foreground ,monokai-256-yellow-hc))))
 
    `(diff-hl-delete
-     ((,monokai-class (:background ,monokai-red-lc
-                                   :foreground ,monokai-red-hc))
-      (,monokai-256-class (:background ,monokai-256-red-lc
+     ((,monokai-class (:background ,monokai-red-hc-alt
+                                   :foreground ,monokai-red-hc-alt))
+      (,monokai-256-class (:background ,monokai-256-red-hc
                                         :foreground ,monokai-256-red-hc))))
 
    `(diff-hl-insert
-     ((,monokai-class (:background ,monokai-green-lc
-                                   :foreground ,monokai-green-hc))
-      (,monokai-256-class (:background ,monokai-256-green-lc
+     ((,monokai-class (:background ,monokai-green-hc-alt
+                                   :foreground ,monokai-green-hc-alt))
+      (,monokai-256-class (:background ,monokai-256-green-hc
                                         :foreground ,monokai-256-green-hc))))
 
    `(diff-hl-unknown
-     ((,monokai-class (:background ,monokai-violet-lc
+     ((,monokai-class (:background ,monokai-violet-hc
                                    :foreground ,monokai-violet-hc))
-      (,monokai-256-class (:background ,monokai-256-violet-lc
+      (,monokai-256-class (:background ,monokai-256-violet-hc
                                         :foreground ,monokai-256-violet-hc))))
 
    ;; ediff
    `(ediff-fine-diff-A
-     ((,monokai-class (:background ,monokai-orange-lc))
-      (,monokai-256-class (:background ,monokai-256-orange-lc))))
+     ((,monokai-class (:background ,monokai-diff-red-emphasis))
+      (,monokai-256-class (:background ,monokai-256-diff-red-emphasis))))
 
    `(ediff-fine-diff-B
-     ((,monokai-class (:background ,monokai-green-lc))
-      (,monokai-256-class (:background ,monokai-256-green-lc))))
+     ((,monokai-class (:background ,monokai-diff-green-emphasis))
+      (,monokai-256-class (:background ,monokai-256-diff-green-emphasis))))
 
    `(ediff-fine-diff-C
-     ((,monokai-class (:background ,monokai-yellow-lc))
-      (,monokai-256-class (:background ,monokai-256-yellow-lc))))
+     ((,monokai-class (:background ,monokai-diff-blue-emphasis))
+      (,monokai-256-class (:background ,monokai-256-diff-blue-emphasis))))
+
+   `(ediff-current-diff-A
+     ((,monokai-class (:background ,monokai-diff-red-base))
+      (,monokai-256-class (:background ,monokai-256-diff-red-base))))
+
+   `(ediff-current-diff-B
+     ((,monokai-class (:background ,monokai-diff-green-base))
+      (,monokai-256-class (:background ,monokai-256-diff-green-base))))
 
    `(ediff-current-diff-C
-     ((,monokai-class (:background ,monokai-blue-lc))
-      (,monokai-256-class (:background ,monokai-256-blue-lc))))
+     ((,monokai-class (:background ,monokai-diff-blue-base))
+      (,monokai-256-class (:background ,monokai-256-diff-blue-base))))
 
    `(ediff-even-diff-A
      ((,monokai-class (:background ,monokai-comments
@@ -2717,8 +2745,8 @@ Also affects 'linum-mode' background."
       (,monokai-256-class (:foreground ,monokai-256-orange))))
 
    `(helm-grep-match
-     ((,monokai-class (:inherit helm-match)))
-     ((,monokai-256-class (:inherit helm-match))))
+     ((,monokai-class (:inherit helm-match))
+      (,monokai-256-class (:inherit helm-match))))
 
    `(helm-grep-running
      ((,monokai-class (:foreground ,monokai-red))
@@ -2898,6 +2926,8 @@ Also affects 'linum-mode' background."
 
    `(hi-red-b
      ((,monokai-class (:foreground ,monokai-red
+                                   :weight bold))
+      (,monokai-256-class (:foreground ,monokai-256-red
                                    :weight bold))))
 
    `(hi-black-hb
@@ -3275,6 +3305,15 @@ Also affects 'linum-mode' background."
                                         :background ,monokai-256-highlight-line
                                         :underline nil))))
 
+   ;; lsp-mode
+   `(lsp-ui-doc-header
+     ((,monokai-class (:inherit org-document-title))
+      (,monokai-256-class (:inherit org-document-title))))
+
+   `(lsp-ui-doc-background
+     ((,monokai-class (:background ,monokai-highlight-line))
+      (,monokai-256-class (:background ,monokai-highlight-line))))
+
    ;; lusty-explorer
    `(lusty-directory-face
      ((,monokai-class (:inherit dimonokai-red-directory))
@@ -3295,117 +3334,265 @@ Also affects 'linum-mode' background."
                                         :weight bold))))
 
    ;; magit
-   ;;
-   ;; TODO: Add supports for all magit faces
-   ;; https://github.com/magit/magit/search?utf8=%E2%9C%93&q=face
-   ;;
+   `(magit-bisect-good
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
+
+   `(magit-bisect-skip
+     ((,monokai-class (:foreground ,monokai-orange))
+      (,monokai-256-class (:foreground ,monokai-256-orange))))
+
+   `(magit-bisect-bad
+     ((,monokai-class (:foreground ,monokai-red))
+      (,monokai-256-class (:foreground ,monokai-256-red))))
+
+   `(magit-blame-highlight
+     ((,monokai-class (:foreground ,monokai-foreground
+                                   :background ,monokai-highlight-alt))
+      (,monokai-256-class (:foreground ,monokai-256-foreground
+                                       :background ,monokai-256-highlight-alt))))
+
+   `(magit-diff-file-heading-selection
+     ((,monokai-class (:inherit magit-diff-file-heading-highlight
+                                :foreground ,monokai-orange-d))
+      (,monokai-256-class (:inherit magit-diff-file-heading-highlight
+                                   :foreground ,monokai-256-orange-d))))
+
+   `(magit-diff-hunk-heading
+     ((,monokai-class (:foreground ,monokai-gray-d
+                                   :background ,monokai-gray-l))
+      (,monokai-256-class (:foreground ,monokai-256-gray-d
+                                       :background ,monokai-256-gray-l))))
+
+   `(magit-diff-hunk-heading-highlight
+     ((,monokai-class (:foreground ,monokai-background
+                                   :background ,monokai-foreground))
+      (,monokai-256-class (:foreground ,monokai-256-background
+                                       :background ,monokai-256-foreground))))
+
+   `(magit-diff-hunk-heading-selection
+     ((,monokai-class (:inherit magit-diff-hunk-heading-highlight
+                                :foreground ,monokai-orange))
+      (,monokai-256-class (:inherit magit-diff-hunk-heading-highlight
+                                    :foreground ,monokai-256-orange))))
+
+   `(magit-diff-lines-heading
+     ((,monokai-class (:inherit magit-diff-hunk-heading-highlight
+                                :foreground ,monokai-background
+                                :background ,monokai-orange-l))
+      (,monokai-256-class (:inherit magit-diff-hunk-heading-highlight
+                                    :foreground ,monokai-256-background
+                                    :background ,monokai-256-orange-l))))
+
    `(magit-diff-added
      ((,monokai-class (:foreground ,monokai-green
                                    :background ,monokai-background))
       (,monokai-256-class (:foreground ,monokai-256-green
                                         :background ,monokai-256-background))))
 
-   `(magit-diff-added-highlight
-     ((,monokai-class (:foreground ,monokai-green
-                                   :background ,monokai-highlight-line))
-      (,monokai-256-class (:foreground ,monokai-256-green
-                                        :background ,monokai-256-highlight-line))))
-
    `(magit-diff-removed
      ((,monokai-class (:foreground ,monokai-red
                                    :background ,monokai-background))
       (,monokai-256-class (:foreground ,monokai-256-red
-                                        :background ,monokai-256-background))))
+                                       :background ,monokai-256-background))))
+
+   `(magit-diff-base
+     ((,monokai-class (:foreground ,monokai-yellow
+                                   :background ,monokai-background))
+      (,monokai-256-class (:foreground ,monokai-256-yellow
+                                       :background ,monokai-256-background))))
+
+   `(magit-diff-context
+     ((,monokai-class (:foreground ,monokai-gray-l))
+      (,monokai-256-class (:foreground ,monokai-256-gray-l))))
+
+   `(magit-diff-added-highlight
+     ((,monokai-class (:foreground ,monokai-green
+                                   :background ,monokai-highlight-alt))
+      (,monokai-256-class (:foreground ,monokai-256-green
+                                        :background ,monokai-256-highlight-alt))))
 
    `(magit-diff-removed-highlight
      ((,monokai-class (:foreground ,monokai-red
-                                   :background ,monokai-highlight-line))
+                                   :background ,monokai-highlight-alt))
       (,monokai-256-class (:foreground ,monokai-256-red
-                                        :background ,monokai-256-highlight-line))))
+                                        :background ,monokai-256-highlight-alt))))
 
-   `(magit-section-title
+   `(magit-diff-base-highlight
      ((,monokai-class (:foreground ,monokai-yellow
-                                   :weight bold))
+                                   :background ,monokai-highlight-alt))
       (,monokai-256-class (:foreground ,monokai-256-yellow
-                                        :weight bold))))
+                                       :background ,monokai-256-highlight-alt))))
 
-   `(magit-branch
-     ((,monokai-class (:foreground ,monokai-orange
-                                   :weight bold))
-      (,monokai-256-class (:foreground ,monokai-256-orange
-                                        :weight bold))))
+   `(magit-diff-context-highlight
+     ((,monokai-class (:foreground ,monokai-foreground
+                                   :background ,monokai-highlight-alt))
+      (,monokai-256-class (:foreground ,monokai-256-foreground
+                                       :background ,monokai-256-highlight-alt))))
 
-   `(magit-item-highlight
-     ((,monokai-class (:background ,monokai-highlight-line
-                                   :weight unspecified))
-      (,monokai-256-class (:background ,monokai-256-highlight-line
-                                        :weight unspecified))))
+   `(magit-diffstat-added
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
+
+   `(magit-diffstat-removed
+     ((,monokai-class (:foreground ,monokai-red))
+      (,monokai-256-class (:foreground ,monokai-256-red))))
+
+   `(magit-log-graph
+     ((,monokai-class (:foreground ,monokai-comments))
+      (,monokai-256-class (:foreground ,monokai-256-comments))))
 
    `(magit-log-author
+     ((,monokai-class (:foreground ,monokai-red-d
+                                   :slant normal
+                                   :weight normal))
+      (,monokai-256-class (:foreground ,monokai-256-red-d
+                                       :slant normal
+                                       :weight normal))))
+
+   `(magit-log-date
+     ((,monokai-class (:foreground ,monokai-gray
+                                   :slant normal
+                                   :weight normal))
+      (,monokai-256-class (:foreground ,monokai-256-gray
+                                       :slant normal
+                                       :weight normal))))
+
+   `(magit-process-ok
+     ((,monokai-class (:inherit magit-section-heading
+                                :foreground ,monokai-green))
+      (,monokai-256-class (:inherit magit-section-heading
+                                    :foreground ,monokai-256-green))))
+
+   `(magit-process-ng
+     ((,monokai-class (:inherit magit-section-heading
+                                :foreground ,monokai-red))
+      (,monokai-256-class (:inherit magit-section-heading
+                                    :foreground ,monokai-256-red))))
+
+   `(magit-reflog-commit
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
+
+   `(magit-reflog-amend
+     ((,monokai-class (:foreground ,monokai-magenta))
+      (,monokai-256-class (:foreground ,monokai-256-magenta))))
+
+   `(magit-reflog-merge
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
+
+   `(magit-reflog-checkout
+     ((,monokai-class (:foreground ,monokai-blue))
+      (,monokai-256-class (:foreground ,monokai-256-blue))))
+
+   `(magit-reflog-reset
+     ((,monokai-class (:foreground ,monokai-red))
+      (,monokai-256-class (:foreground ,monokai-256-red))))
+
+   `(magit-reflog-rebase
+     ((,monokai-class (:foreground ,monokai-violet))
+      (,monokai-256-class (:foreground ,monokai-256-violet))))
+
+   `(magit-reflog-cherry-pick
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
+
+   `(magit-reflog-remote
      ((,monokai-class (:foreground ,monokai-cyan))
       (,monokai-256-class (:foreground ,monokai-256-cyan))))
 
-   `(magit-log-graph
+   `(magit-reflog-other
+     ((,monokai-class (:foreground ,monokai-cyan))
+      (,monokai-256-class (:foreground ,monokai-256-cyan))))
+
+   `(magit-section-highlight
+     ((,monokai-class (:background ,monokai-highlight-line))
+      (,monokai-256-class (:background ,monokai-256-highlight-line))))
+
+   `(magit-section-heading
+     ((,monokai-class (:foreground ,monokai-yellow
+                                   :weight bold))
+      (,monokai-256-class (:foreground ,monokai-256-yellow
+                                       :weight bold))))
+
+   `(magit-section-heading-selection
+     ((,monokai-class (:foreground ,monokai-orange))
+      (,monokai-256-class (:foreground ,monokai-256-orange))))
+
+   `(magit-sequence-stop
+     ((,monokai-class (:foreground ,monokai-cyan))
+      (,monokai-256-class (:foreground ,monokai-256-cyan))))
+
+   `(magit-sequence-part
+     ((,monokai-class (:foreground ,monokai-orange))
+      (,monokai-256-class (:foreground ,monokai-256-orange))))
+
+   `(magit-sequence-head
+     ((,monokai-class (:foreground ,monokai-blue))
+      (,monokai-256-class (:foreground ,monokai-256-blue))))
+
+   `(magit-sequence-drop
+     ((,monokai-class (:foreground ,monokai-red))
+      (,monokai-256-class (:foreground ,monokai-256-red))))
+
+   `(magit-dimmed
      ((,monokai-class (:foreground ,monokai-comments))
       (,monokai-256-class (:foreground ,monokai-256-comments))))
 
-   `(magit-log-head-label-bisect-bad
-     ((,monokai-class (:background ,monokai-red-hc
-                                   :foreground ,monokai-red-lc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-red-hc
-                                        :foreground ,monokai-256-red-lc
-                                        :box 1))))
+   `(magit-hash
+     ((,monokai-class (:foreground ,monokai-comments))
+      (,monokai-256-class (:foreground ,monokai-256-comments))))
 
-   `(magit-log-head-label-bisect-good
-     ((,monokai-class (:background ,monokai-green-hc
-                                   :foreground ,monokai-green-lc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-green-hc
-                                        :foreground ,monokai-256-green-lc
-                                        :box 1))))
+   `(magit-tag
+     ((,monokai-class (:foreground ,monokai-orange))
+      (,monokai-256-class (:foreground ,monokai-256-orange))))
 
-   `(magit-log-head-label-default
-     ((,monokai-class (:background ,monokai-highlight-line
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-highlight-line
-                                        :box 1))))
+   `(magit-branch-remote
+     ((,monokai-class (:foreground ,monokai-green))
+      (,monokai-256-class (:foreground ,monokai-256-green))))
 
-   `(magit-log-head-label-local
-     ((,monokai-class (:background ,monokai-blue-lc
-                                   :foreground ,monokai-blue-hc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-blue-lc
-                                        :foreground ,monokai-256-blue-hc
-                                        :box 1))))
+   `(magit-branch-local
+     ((,monokai-class (:foreground ,monokai-blue))
+      (,monokai-256-class (:foreground ,monokai-256-blue))))
 
-   `(magit-log-head-label-patches
-     ((,monokai-class (:background ,monokai-red-lc
-                                   :foreground ,monokai-red-hc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-red-lc
-                                        :foreground ,monokai-256-red-hc
-                                        :box 1))))
+   `(magit-refname
+     ((,monokai-class (:foreground ,monokai-comments))
+      (,monokai-256-class (:foreground ,monokai-256-comments))))
 
-   `(magit-log-head-label-remote
-     ((,monokai-class (:background ,monokai-green-lc
-                                   :foreground ,monokai-green-hc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-green-lc
-                                        :foreground ,monokai-256-green-hc
-                                        :box 1))))
+   `(magit-signature-good
+     ((,monokai-class (:foreground ,monokai-green-d))
+      (,monokai-256-class (:foreground ,monokai-256-green-d))))
 
-   `(magit-log-head-label-tags
-     ((,monokai-class (:background ,monokai-yellow-lc
-                                   :foreground ,monokai-yellow-hc
-                                   :box 1))
-      (,monokai-256-class (:background ,monokai-256-yellow-lc
-                                        :foreground ,monokai-256-yellow-hc
-                                        :box 1))))
+   `(magit-signature-bad
+     ((,monokai-class (:foreground ,monokai-red-d
+                                   :weight bold))
+      (,monokai-256-class (:foreground ,monokai-256-red-d
+                                       :weight bold))))
 
-   `(magit-log-sha1
-     ((,monokai-class (:foreground ,monokai-yellow))
-      (,monokai-256-class (:foreground ,monokai-256-yellow))))
+   `(magit-signature-untrusted
+     ((,monokai-class (:foreground ,monokai-cyan))
+      (,monokai-256-class (:foreground ,monokai-256-cyan))))
+
+   `(magit-signature-expired
+     ((,monokai-class (:foreground ,monokai-orange))
+      (,monokai-256-class (:foreground ,monokai-256-orange))))
+
+   `(magit-signature-revoked
+     ((,monokai-class (:foreground ,monokai-magenta))
+      (,monokai-256-class (:foreground ,monokai-256-magenta))))
+
+   `(magit-signature-error
+     ((,monokai-class (:foreground ,monokai-red-l))
+      (,monokai-256-class (:foreground ,monokai-256-red-l))))
+
+   `(magit-cherry-unmatched
+     ((,monokai-class (:foreground ,monokai-cyan))
+      (,monokai-256-class (:foreground ,monokai-256-cyan))))
+
+   `(magit-cherry-equivalent
+     ((,monokai-class (:foreground ,monokai-magenta))
+      (,monokai-256-class (:foreground ,monokai-256-magenta))))
 
    ;; man
    `(Man-overstrike
@@ -4377,8 +4564,8 @@ Also affects 'linum-mode' background."
 
    `(org-todo
      ((,monokai-class (:foreground ,monokai-red
-                                   :weight bold)))
-     ((,monokai-256-class (:foreground ,monokai-256-red
+                                   :weight bold))
+      (,monokai-256-class (:foreground ,monokai-256-red
                                         :weight bold))))
 
    `(org-upcoming-deadline
@@ -4672,29 +4859,29 @@ Also affects 'linum-mode' background."
       (,monokai-256-class (:foreground ,monokai-256-orange-d))))
 
    `(realgud-bp-enabled-face
-     ((,monokai-class (:inherit error)))
-     ((,monokai-256-class (:inherit error))))
+     ((,monokai-class (:inherit error))
+      (,monokai-256-class (:inherit error))))
 
    `(realgud-bp-disabled-face
-     ((,monokai-class (:inherit secondary-selection)))
-     ((,monokai-256-class (:inherit secondary-selection))))
+     ((,monokai-class (:inherit secondary-selection))
+      (,monokai-256-class (:inherit secondary-selection))))
 
    `(realgud-bp-line-enabled-face
-     ((,monokai-class (:foreground ,monokai-red-d)))
-     ((,monokai-256-class (:foreground ,monokai-256-red-d))))
+     ((,monokai-class (:foreground ,monokai-red-d))
+      (,monokai-256-class (:foreground ,monokai-256-red-d))))
 
    `(realgud-bp-line-disabled-face
-     ((,monokai-class (:inherit secondary-selection)))
-     ((,monokai-256-class (:inherit secondary-selection))))
+     ((,monokai-class (:inherit secondary-selection))
+      (,monokai-256-class (:inherit secondary-selection))))
 
    `(realgud-line-number
-     ((,monokai-class (:inerhit monokai-line-number)))
-     ((,monokai-256-class (:inerhit monokai-line-number))))
+     ((,monokai-class (:inerhit monokai-line-number))
+      (,monokai-256-class (:inerhit monokai-line-number))))
 
    `(realgud-backtrace-number
      ((,monokai-class (:foreground ,monokai-yellow-d
-                                   :weight bold)))
-     ((,monokai-256-class (:foreground ,monokai-256-yellow
+                                   :weight bold))
+      (,monokai-256-class (:foreground ,monokai-256-yellow
                                        :weight bold))))
 
    ;; rhtm-mode
@@ -4933,6 +5120,28 @@ Also affects 'linum-mode' background."
      ((,monokai-class (:foreground ,monokai-red))
       (,monokai-256-class (:foreground ,monokai-256-red))))
 
+   ;; smerge
+   `(smerge-base
+      ((,monokai-class (:background ,monokai-diff-blue-base))
+        (,monokai-256-class (:background ,monokai-256-diff-blue-base))))
+   `(smerge-upper
+      ((,monokai-class (:background ,monokai-diff-red-base))
+        (,monokai-256-class (:background ,monokai-256-diff-red-base))))
+   `(smerge-lower
+      ((,monokai-class (:background ,monokai-diff-green-base))
+        (,monokai-256-class (:background ,monokai-256-diff-green-base))))
+   ;; WARNING: defining this face will overwrite the next two when displaying a
+   ;; smerge diff in a file.
+   ;; `(smerge-refined-changed
+   ;;    ((,monokai-class (:background ,monokai-diff-blue-emphasis))
+   ;;      (,monokai-256-class (:background ,monokai-256-diff-blue-emphasis))))
+   `(smerge-refined-added
+      ((,monokai-class (:background ,monokai-diff-green-emphasis))
+        (,monokai-256-class (:background ,monokai-256-diff-green-emphasis))))
+   `(smerge-refined-removed
+      ((,monokai-class (:background ,monokai-diff-red-emphasis))
+        (,monokai-256-class (:background ,monokai-256-diff-red-emphasis))))
+
    ;; speedbar
    `(speedbar-button-face
      ((,monokai-class (:inherit ,monokai-pitch
@@ -5546,6 +5755,10 @@ Also affects 'linum-mode' background."
      ((,monokai-class (:foreground ,monokai-green))
       (,monokai-256-class (:foreground ,monokai-256-green))))
 
+   `(web-mode-html-tag-bracket-face
+     ((,monokai-class (:foreground ,monokai-gray))
+      (,monokai-256-class (:foreground ,monokai-256-gray))))
+
    `(web-mode-keyword-face
      ((,monokai-class (:foreground ,monokai-red))
       (,monokai-256-class (:foreground ,monokai-256-red))))
@@ -5940,6 +6153,14 @@ Also affects 'linum-mode' background."
                                    :weight bold))
       (,monokai-256-class (:foreground ,monokai-256-red
                                         :weight bold))))
+
+   ;; window-divider-mode
+   `(window-divider
+     ((,monokai-class (:foreground ,monokai-highlight))
+      (,monokai-256-class (:foreground ,monokai-highlight))))
+   `(window-divider-first-pixel ((t (:inherit window-divider))))
+   `(window-divider-last-pixel ((t (:inherit window-divider))))
+
    ;; window-number-mode
    `(window-number-face
      ((,monokai-class (:foreground ,monokai-green))