jao-greenish -> jao-dark

3 files changed, 16 insertions, 15 deletions

diff --git a/init.org b/init.org
index 036553e..f22ce99 100644
--- a/init.org
+++ b/init.org
@@ -414,7 +414,7 @@
 
       (defun jao-themes-setup ()
         (let ((dark (jao-colors-scheme-dark-p)))
-          (load-theme (if dark 'jao-greenish 'jao-light) t)))
+          (load-theme (if dark 'jao-dark 'jao-light) t)))
 
       (when (and window-system (not (eq window-system 'pgtk)))
         (jao-themes-setup))
@@ -451,7 +451,6 @@
         (setq jao-exwm-enabled-p t)
         (display-time-mode -1)
         (jao-ednc-setup 95)
-        ;; (jao-toggle-inactive-mode-line t)
         (exwm-enable)
         (jao-trisect t)
         (message "Welcome to exwm"))
diff --git a/lib/themes/jao-greenish-theme.el b/lib/themes/jao-dark-theme.el
index 11b7a59..d914ecb 100644
--- a/lib/themes/jao-greenish-theme.el
+++ b/lib/themes/jao-dark-theme.el
@@ -1,4 +1,4 @@
-;;; jao-greenish-theme.el --- a dark theme with green accent -*- lexical-binding: t; -*-
+;;; jao-dark-theme.el --- a dark theme with blue-green accent -*- lexical-binding: t; -*-
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: themes
@@ -16,7 +16,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-(jao-define-custom-theme jao-greenish
+(jao-define-custom-theme jao-dark
   (:names (bg "#282b33" nil nil)
           (bg-alt "#1f2024" nil nil)
           (fg "#c6c6c6")
@@ -24,6 +24,7 @@
           (fg-1 "#868686")
           (fg-2 "#666666")
           (blue "#819cd6")
+          (blueish "#6e7899")
           (dark-blue "#616c96")
           (green "#5b94ab")
           (yellow "antiquewhite3")
@@ -31,20 +32,20 @@
           (orange "#a6c1e0")
           (orange2 "#dd8844")
           (red "#e1c1ee" "#ff6655" "red")
-          (comments "lightskyblue4")
-          (constants "#a6c1e0")
+          (comments "lightblue4")
+          (constants "honeydew4")
           (dimm-line-fg "#3f3f3f")
           (dimm-line "#6f6f6f")
           (error "#e1c1ee")
           (functions "#7ebebd")
           (functions2 "#44b9b1")
-          (keywords "paleturquoise3")
+          (keywords "cadetblue3" "paleturquoise3")
           (keywords2 "#51afef")
           (modeline-bg "#22242b")
           (modeline-bg-inactive "#24262d")
           (region "#41454b")
-          (strings "#6e7899" "azure4")
-          (success "#5b94ab" "#99bb66")
+          (strings "honeydew3")
+          (success "#5b94ab")
           (warning "#cfcf9c")
           (warning2 "#ECBE7B"))
   (:palette (fg "#c6c6c6")
@@ -61,9 +62,9 @@
             (comment ((c comments)))
             (keyword ((c keywords)))
             (function ((c functions)))
-            (type ((c strings)))
+            (type ((c constants)))
             (variable-name ((c nil)))
-            (constant ((c blue)))
+            (constant ((c constants)))
             (string ((c strings)))
             (error ((c warning2)))
             (warning ((c warning)))
@@ -76,8 +77,8 @@
             (outline-3 ((c keywords2) bf))
             (outline-4 ((c functions2) bf))
             (outline-5 ((c nil)))
-            (f00 ((c "lightcyan3")))
-            (f01 ((c "darkslategray3")))
+            (f00 ((c "darkslategray3")))
+            (f01 ((c blueish)))
             (f02 ((c "lightblue3")))
             (f10 ((c "cadetblue4")))
             (f11 ((c "lightskyblue2")))
@@ -128,8 +129,8 @@
             (w3m-tab-background (c nil nil))
             (w3m-tab-line (c 0 0) ul)))
 
-;; (enable-theme 'jao-greenish)
+;; (enable-theme 'jao-dark)
 ;; (jao-minibuffer-adjust-mode-line-faces)
 
 
-(provide 'jao-greenish-theme)
+(provide 'jao-dark-theme)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index 02c141c..0a5c95a 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -1039,6 +1039,7 @@
           `((telega-button (~ button))
             (telega-button-active (~ button))
             (telega-msg-heading (p f00))
+            (telega-msg-self-title (p f01))
             (telega-root-heading (p hilite))
             (term (~ default))
             (tool-bar (~ default))