color themes tweaks

2 files changed, 20 insertions, 9 deletions

diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el
index 69e0a00..7435890 100644
--- a/themes/jao-mono-dark-theme.el
+++ b/themes/jao-mono-dark-theme.el
@@ -1,9 +1,10 @@
 (jao-define-custom-theme jao-mono-dark
   (:palette (fg unspecified "grey80")
-            (bg unspecified "#3f3f3f")
+            ; (bg unspecified "#3f3f3f")
+            (bg unspecified "#2f2f2f")
             (box "color-237" "grey25")
             (button ((c 240) nul) ((c "lightskyblue1" "#4f4f4f")))
-            (hilite ((c nil "#666666")))
+            (hilite ((c nil "#555555")))
             (strike-through ((c 237)) (st))
             (italic ((c 137) it) (it (c "lightyellow3")))
             (link ((c 108) nul) ((c "#F0DFAF") nit nul))
@@ -18,11 +19,11 @@
             (type ((c 72) nbf) ((c "honeydew3")))
             (variable-name ((c nil)))
             (constant ((c 72)) ((c "darkseagreen2")))
-            (string ((c 36)) ((c "lemonchiffon3")))
+            (string ((c 36)) ((c "lightcyan3"))) ;; lemonchiffon3
             (warning ((c 144)) ((c "#F0DFAF")))
             (error ((c 95)) ((c "goldenrod3")))
             ;; (dimm ((c 240)))
-            (dimm ((c 59)) ((c "#7f7f7f")))
+            (dimm ((c 59)) ((c "#6f6f6f")))
             (gnus-mail ((c "gray70" nil)))
             (gnus-news ((c "gray70" nil)))
             (outline ((c 247)))
@@ -54,15 +55,15 @@
           (widget-field (c 143 236)))
   (:x-faces (diff-hl-change (c "#3f3f3f" "darkseagreen4"))
             (diff-hl-delete (c "#3f3f3f" "goldenrod4"))
-            (diff-hl-insert (c "#3f3f3f" "aquamarine4"))
-            (font-lock-doc-face (p visited-link))
+            (diff-hl-insert (c "#3f3f3f" "cadetblue4"))
+            (font-lock-doc-face (c "lightcyan3") it)
             (fringe (p dimm))
             (gnus-button (c "lightyellow3") nul)
             (gnus-summary-cancelled  (c "dark slate gray" nil) st)
             (gnus-summary-selected (p warning) nul nbf)
             (header-line (p hilite))
-            (mode-line (c "grey75" "grey21"))
-            (mode-line-inactive (c "grey60" "grey31"))
+            (mode-line (c "grey60" "#1f1f1f"))
+            (mode-line-inactive (c "grey50" "#3f3f3f"))
             (org-hide (c 0 nil))
             (rcirc-other-nick (c 5))
             (spaceline-modified (c "black" "lemonchiffon3") niv)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index a814354..8c1d518 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -205,6 +205,7 @@
           `((calendar-holiday-marker (p f00))
             (circe-highlight-nick-face (p warning))
             (circe-originator-face (p f00))
+            (circe-my-message-face (~ font-lock-string-face))
             (circe-server-face (p dimm))
             (clojure-test-failure-face (p warning) ul)
             (clojure-test-error-face (p error) ul)
@@ -244,7 +245,12 @@
             (cider-test-success-face (p f01))
             (comint-highlight-input (p f01) nbf)
             (comint-highlight-prompt (p f00))
+            (company-echo-common (p warning))
+            (company-scrollbar-bg (p warning))
+            (company-scrollbar-fg (p warning))
             (company-tooltip (~ highlight))
+            (company-tooltip-annotation (~ company-tooltip) it)
+            (company-tooltip-annotation-selection (~ company-tooltip) it ul)
             (company-tooltip-selection (~ company-tooltip) ul)
             (company-tooltip-common (~ company-tooltip) bf)
             (company-tooltip-common-selection
@@ -610,6 +616,8 @@
             (jde-java-font-lock-protected-face (~ font-lock-keyword-face))
             (jde-java-font-lock-modifier-face (~ font-lock-keyword-face)))
           `((lazy-highlight (p hilite))
+            (line-number (p dimm))
+            (line-number-current-line (p hilite))
             (link link nul)
             (link-visited vlink nul)
             (lui-button-face (p link))
@@ -638,8 +646,10 @@
             (magit-section-heading (~ outline-2))
             (magit-section-title (~ outline-2))
             (match (p hilite))
-            (markdown-italic-face (~ italic))
+            (markdown-pre-face (p f12))
+            (markdown-code-face (p f12))
             (markdown-inline-code-face (p f12))
+            (markdown-italic-face (~ italic))
             (menu nil)
             (message-cited-text (p f01) nbf)
             (message-header-cc (p f00) nbf)