Overhaul 16-color styling (#271)

Includes regenerated terminal themes.
2025-11-17 07:23:39 -05:00 · 2021-07-11 20:00:38 -04:00
parent d954737e00
commit ad9610cdab
14 changed files with 148 additions and 139 deletions
--- a/Dark.Xresources
+++ b/Dark.Xresources
@@ -4,12 +4,12 @@
 *.cursorColor:  #ABB2BF

 ! black
-*.color0:       #5C6370
-*.color8:       #4B5263
+*.color0:       #2C323C
+*.color8:       #3E4452

 ! red
 *.color1:       #E06C75
-*.color9:       #BE5046
+*.color9:       #E06C75

 ! green
 *.color2:       #98C379
@@ -17,7 +17,7 @@

 ! yellow
 *.color3:       #E5C07B
-*.color11:      #D19A66
+*.color11:      #E5C07B

 ! blue
 *.color4:       #61AFEF
@@ -32,6 +32,6 @@
 *.color14:      #56B6C2

 ! white
-*.color7:       #ABB2BF
-*.color15:      #3E4452
+*.color7:       #5C6370
+*.color15:      #ABB2BF

--- a/Dark.alacritty
+++ b/Dark.alacritty
@@ -7,12 +7,23 @@ colors:

  # Cursor colors
  cursor:
-    text: '0x5c6370'
-    cursor: '0xabb2bf'
+    text: '0x2c323c'
+    cursor: '0x5c6370'

  # Normal colors
  normal:
-    black:   '0x5c6370'
+    black:   '0x2c323c'
+    red:     '0xe06c75'
+    green:   '0x98c379'
+    yellow:  '0xe5c07b'
+    blue:    '0x61afef'
+    magenta: '0xc678dd'
+    cyan:    '0x56b6c2'
+    white:   '0x5c6370'
+
+  # Bright colors
+  bright:
+    black:   '0x3e4452'
    red:     '0xe06c75'
    green:   '0x98c379'
    yellow:  '0xe5c07b'
@@ -21,14 +32,3 @@ colors:
    cyan:    '0x56b6c2'
    white:   '0xabb2bf'

-  # Bright colors
-  bright:
-    black:   '0x4b5263'
-    red:     '0xbe5046'
-    green:   '0x98c379'
-    yellow:  '0xd19a66'
-    blue:    '0x61afef'
-    magenta: '0xc678dd'
-    cyan:    '0x56b6c2'
-    white:   '0x3e4452'
-
--- a/Dark.colorscheme
+++ b/Dark.colorscheme
@@ -8,13 +8,13 @@ Color=40,44,52
 Color=40,44,52

 [Color0]
-Color=92,99,112
+Color=44,50,60

 [Color0Faint]
-Color=92,99,112
+Color=44,50,60

 [Color0Intense]
-Color=75,82,99
+Color=62,68,82

 [Color1]
 Color=224,108,117
@@ -23,7 +23,7 @@ Color=224,108,117
 Color=224,108,117

 [Color1Intense]
-Color=190,80,70
+Color=224,108,117

 [Color2]
 Color=152,195,121
@@ -41,7 +41,7 @@ Color=229,192,123
 Color=229,192,123

 [Color3Intense]
-Color=209,154,102
+Color=229,192,123

 [Color4]
 Color=97,175,239
@@ -71,13 +71,13 @@ Color=86,182,194
 Color=86,182,194

 [Color7]
-Color=171,178,191
+Color=92,99,112

 [Color7Faint]
-Color=171,178,191
+Color=92,99,112

 [Color7Intense]
-Color=62,68,82
+Color=171,178,191

 [Foreground]
 Color=171,178,191
--- a/Dark.itermcolors
+++ b/Dark.itermcolors
@@ -7,11 +7,11 @@
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.4392156862745098</real>
+		<real>0.23529411764705882</real>
 		<key>Green Component</key>
-		<real>0.38823529411764707</real>
+		<real>0.19607843137254902</real>
 		<key>Red Component</key>
-		<real>0.3607843137254902</real>
+		<real>0.17254901960784313</real>
 	</dict>
 	<key>Ansi 1 Color</key>
 	<dict>
@@ -40,11 +40,11 @@
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.4</real>
+		<real>0.4823529411764706</real>
 		<key>Green Component</key>
-		<real>0.6039215686274509</real>
+		<real>0.7529411764705882</real>
 		<key>Red Component</key>
-		<real>0.8196078431372549</real>
+		<real>0.8980392156862745</real>
 	</dict>
 	<key>Ansi 12 Color</key>
 	<dict>
@@ -84,11 +84,11 @@
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.3215686274509804</real>
+		<real>0.7490196078431373</real>
 		<key>Green Component</key>
-		<real>0.26666666666666666</real>
+		<real>0.6980392156862745</real>
 		<key>Red Component</key>
-		<real>0.24313725490196078</real>
+		<real>0.6705882352941176</real>
 	</dict>
 	<key>Ansi 2 Color</key>
 	<dict>
@@ -150,33 +150,33 @@
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.7490196078431373</real>
+		<real>0.4392156862745098</real>
 		<key>Green Component</key>
-		<real>0.6980392156862745</real>
+		<real>0.38823529411764707</real>
 		<key>Red Component</key>
-		<real>0.6705882352941176</real>
+		<real>0.3607843137254902</real>
 	</dict>
 	<key>Ansi 8 Color</key>
 	<dict>
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.38823529411764707</real>
-		<key>Green Component</key>
 		<real>0.3215686274509804</real>
+		<key>Green Component</key>
+		<real>0.26666666666666666</real>
 		<key>Red Component</key>
-		<real>0.29411764705882354</real>
+		<real>0.24313725490196078</real>
 	</dict>
 	<key>Ansi 9 Color</key>
 	<dict>
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Blue Component</key>
-		<real>0.27450980392156865</real>
+		<real>0.4588235294117647</real>
 		<key>Green Component</key>
-		<real>0.3137254901960784</real>
+		<real>0.4235294117647059</real>
 		<key>Red Component</key>
-		<real>0.7450980392156863</real>
+		<real>0.8784313725490196</real>
 	</dict>
 	<key>Background Color</key>
 	<dict>
--- a/Dark.kitty
+++ b/Dark.kitty
@@ -1,20 +1,20 @@
 # Cursor
-cursor                   #abb2bf
-cursor_text_color        #5c6370
+cursor                   #5c6370
+cursor_text_color        #2c323c

 # Special
 foreground               #abb2bf
 background               #282c34
-selection_foreground     #5c6370
-selection_background     #abb2bf
+selection_foreground     #2c323c
+selection_background     #5c6370

 # Black
-color0                   #5c6370
-color8                   #4b5263
+color0                   #2c323c
+color8                   #3e4452

 # Red
 color1                   #e06c75
-color9                   #be5046
+color9                   #e06c75

 # Green
 color2                   #98c379
@@ -22,7 +22,7 @@ color10                  #98c379

 # Yellow
 color3                   #e5c07b
-color11                  #d19a66
+color11                  #e5c07b

 # Blue
 color4                   #61afef
@@ -37,5 +37,5 @@ color6                   #56b6c2
 color14                  #56b6c2

 # White
-color7                   #abb2bf
-color15                  #3e4452
+color7                   #5c6370
+color15                  #abb2bf
--- a/Dark.terminal
+++ b/Dark.terminal
@@ -6,7 +6,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs
+	LjE3MjU0OTAxOTYgMC4xOTYwNzg0MzE0IDAuMjM1Mjk0MTE3NgAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -24,7 +24,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjI5NDExNzY0NzEgMC4zMjE1Njg2Mjc1IDAuMzg4MjM1Mjk0MQAQAYAC0hAREhNaJGNs
+	LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -69,7 +69,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	Ljc0NTA5ODAzOTIgMC4zMTM3MjU0OTAyIDAuMjc0NTA5ODAzOQAQAYAC0hAREhNaJGNs
+	Ljg3ODQzMTM3MjUgMC40MjM1Mjk0MTE4IDAuNDU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -78,7 +78,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
+	LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -87,7 +87,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjgxOTYwNzg0MzEgMC42MDM5MjE1Njg2IDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs
+	Ljg5ODAzOTIxNTcgMC43NTI5NDExNzY1IDAuNDgyMzUyOTQxMgAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -132,7 +132,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
+	LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -168,7 +168,7 @@
 	<data>
 	YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
 	AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
-	LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
+	LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
 	YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
 	dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
 	AAAZAAAAAAAAAAAAAAAAAAAA2Q==