themes tweaks

2 files changed, 17 insertions, 16 deletions

diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el
index 5aea738..afb9a71 100644
--- a/themes/jao-doomish-theme.el
+++ b/themes/jao-doomish-theme.el
@@ -64,12 +64,12 @@
           (vc-modified "#a6c1e0" "#dd8844" "brightred")
           (vertical-bar "#141519" "#0f0f0f" "brightblack")
           (violet "#b0a2e7" "#a9a1e1" "brightmagenta")
-          (warning "#cfcf9c" "#ECBE7B" "yellow")
+          (warning "#cfcf9c")
+          (warning2 "#ECBE7B")
           (yellow "#cfcf9c" "#ECBE7B" "yellow")
           (zenburn-green-2 "#5F7F5F")
           (zenburn-orange "#DFAF8F")
-          (zenburn-red-1 "#BC8383")
-          )
+          (zenburn-red-1 "#BC8383"))
   (:palette (fg unspecified "#c6c6c6")
             (bg unspecified "#282b33")
             (box "#2d2d2d" "grey25")
@@ -88,8 +88,8 @@
             (variable-name ((c nil)))
             (constant ((c 72)) ((c constants) nbf nit nul))
             (string ((c 36)) ((c strings))) ;; "wheat3" "slate gray" "medium aquamarine"
-            (error ((c 144)) ((c zenburn-orange)))
-            (warning ((c 95)) ((c "dark khaki")))
+            (error ((c 144)) ((c warning2)))
+            (warning ((c 95)) ((c warning)))
             (success ((c green)))
             (dimm ((c 59)) ((c "#6f6f6f")))
             (gnus-mail ((c nil)))
@@ -148,7 +148,7 @@
             (gnus-summary-selected (p warning) nul nbf)
             (header-line (p hilite))
             (magit-diff-context-highlight (p hilite) ex)
-            (mode-line  (c "grey60" modeline-bg)
+            (mode-line (c "grey60" modeline-bg)
                        :box (:line-width 2 :color "#22242b"))
             (mode-line-inactive (c "grey35" modeline-bg-inactive)
                                 :box (:line-width 2 :color "#24262d"))
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 91862e9..53b63b0 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -203,6 +203,7 @@
 (defun jao-themes--dfs (fs)
   (let ((dfs
          (append
+          `((aw-leading-char-face (~ error) :height 1.5))
           `((bbdb-company)
             (bbdb-field-name bf)
             (bbdb-field-value nil)
@@ -334,9 +335,9 @@
             (diff-indicator-changed (~ diff-changed))
             (diff-indicator-removed (~ diff-removed))
             (diff-nonexistent bf (p error))
-            (diff-refine-added (~ diff-changed) ul)
-            (diff-refine-change (~ diff-changed) ul)
-            (diff-refine-removed (~ diff-removed) ul)
+            (diff-refine-added (~ diff-added))
+            (diff-refine-change (~ diff-changed))
+            (diff-refine-removed (~ diff-removed))
             (diff-removed (p error) ex)
             (dired-directory (p f02))
             (dired-flagged bf)
@@ -602,14 +603,14 @@
             (isearch-fail (p error))
             (italic (p italic))
             (ivy-confirm (p f01))
-            (ivy-current-match (p error) ul)
+            (ivy-current-match (p hilite) ex)
             (ivy-highlight-face (p hilite))
             (ivy-match-required-face (p warning))
             (ivy-minibuffer-match-highlight (c nil nil) ul)
-            (ivy-minibuffer-match-face-1 (p f00))
-            (ivy-minibuffer-match-face-2 (p f00))
-            (ivy-minibuffer-match-face-3 (p f00))
-            (ivy-minibuffer-match-face-4 (p f00))
+            (ivy-minibuffer-match-face-1 (p error))
+            (ivy-minibuffer-match-face-2 (p error))
+            (ivy-minibuffer-match-face-3 (p error))
+            (ivy-minibuffer-match-face-4 (p error))
             (ivy-modified-buffer it)
             (ivy-subdir (p f12)))
           `((jabber-activity-face dbg dfg nbf)
@@ -699,8 +700,8 @@
             (mode-line-buffer-id nbf (c nil nil))
             (mode-line-emphasis (p warning))
             (mode-line-highlight (~ mode-line))
-            (modeline-mousable (~ mode-line-active))
-            (modeline-mousable-minor-mode (~ modeline-mousable))
+            ;; (modeline-mousable (~ mode-line-active))
+            ;; (modeline-mousable-minor-mode (~ modeline-mousable))
             (moinmoin-table-pi (p f02))
             (mouse dfg dbg ul)
             (mpdel-playlist-current-song-face (p hilite) ex)