LCARSified colors a bit

3 files changed, 55 insertions, 55 deletions

diff --git a/Xdefaults b/Xdefaults
index ad634f7..325f2f3 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -1,4 +1,4 @@
-! -*- mode: conf-xdefaults rainbow -*-
+! -*- mode: conf-xdefaults mode:rainbow -*-
 ! General
 urxvt*loginShell:      true
 urxvt*scrollBar:       false
@@ -27,32 +27,32 @@ urxvt*cursorColor: #DCDCCC
 urxvt*shading:     20
 urxvt*transparent: true
 ! - color scheme
-urxvt.background:  #252A2B
-urxvt.foreground:  #EEEEEC
+urxvt.background:  #000000
+urxvt.foreground:  #FF9900
 ! black + red
-urxvt*color0: #0C191C
-urxvt*color1: #A40000
+urxvt*color0: #CC6699
+urxvt*color1: #FF9966
 ! green + yellow
-urxvt*color2: #4E9A06
-urxvt*color3: #EDD400
+urxvt*color2: #9999FF
+urxvt*color3: #FFCC99
 ! blue + purple
-urxvt*color4: #204A87
-urxvt*color5: #5C3566
+urxvt*color4: #CC6666
+urxvt*color5: #9999CC
 ! cyan + white
-urxvt*color6: cyan3
-urxvt*color7: #BABDB6
+urxvt*color6: #CC99CC
+urxvt*color7: #000000
 ! bright-black + birhgt-red
-urxvt*color8: #252A2B
-urxvt*color9: #EF2929
+urxvt*color8: #DD77AA
+urxvt*color9: #FFAA77
 ! bright-green + bright-yellow
-urxvt*color10: #8AE234
-urxvt*color11: #FCE84F
+urxvt*color10: #AAAAFF
+urxvt*color11: #FFDDAA
 ! bright-blue + bright-purple
-urxvt*color12: #729FCF
-urxvt*color13: #AD8FA8
+urxvt*color12: #DD7777
+urxvt*color13: #AAAADD
 ! bright-cyan + bright-white
-urxvt*color14: cyan
-urxvt*color15: #EEEEEC
+urxvt*color14: #DDAADD
+urxvt*color15: #FF0000
 
 xterm*background: #252A2B
 xterm*foreground: #EEEEEC
diff --git a/mutt/colors.muttrc b/mutt/colors.muttrc
index a4a1394..b73436b 100644
--- a/mutt/colors.muttrc
+++ b/mutt/colors.muttrc
@@ -6,11 +6,11 @@
 color normal default default
 
 # main colors
-color status    default        black
-color indicator default        black
-color tree      blue         default
-color error     brightred    default
-color message   brightyellow default
+color status    color0       default
+color indicator brightcolor4 color7
+color tree      color5       default
+color error     brightcolor7 default
+color message   color3       default
 
 # uncolor certain messages
 uncolor index "~P"
@@ -20,45 +20,45 @@ uncolor index "~T"
 uncolor index "~D"
 
 # and recolor them appropriately
-color index yellow        default "~P"
-color index green         default "~u"
-color index brightgreen   default "~N ~u"  # new ML mail
-color index brightyellow  default "~N !~u" # new non-ML mail
-color index brightmagenta default "~T"
-color index red           default "~D"
+color index color3        default "~P"
+color index color2        default "~u"
+color index brightcolor2  default "~N ~u"  # new ML mail
+color index brightcolor3  default "~N !~u" # new non-ML mail
+color index brightcolor5  default "~T"
+color index color1        default "~D"
 
 # set up the headers
-color header yellow black "^from:"
-color header yellow black "^to:"
-color header yellow black "^cc:"
-color header yellow black "^date:"
-color header yellow black "^subject:"
+color header color5 color7 "^from:"
+color header color5 color7 "^to:"
+color header color5 color7 "^cc:"
+color header color5 color7 "^date:"
+color header color5 color7 "^subject:"
 
 # message bodies
-color attachment yellow default
-color search     red    black
-color signature  cyan   default
-color tilde      blue   default
+color attachment color3 default
+color search     color1 color0
+color signature  color6 default
+color tilde      color4 default
 
 # urls
-color body brightblue default "(^|<| )mailto:[^ ]+@[^ ]( |>|$)"
-color body brightblue default "(^|<| )(http|https|ftp|file|telnet|news|finger)://[^ ]+( |>|$)"
+color body brightcolor4 default "(^|<| )mailto:[^ ]+@[^ ]( |>|$)"
+color body brightcolor4 default "(^|<| )(http|https|ftp|file|telnet|news|finger)://[^ ]+( |>|$)"
 
 # smileys
-color body brightmagenta default "(^| )+(|[<>|])[8;:](|[^ ])[)(/|DOPS]( |$)+"
-color body brightmagenta default "(^| )+[)(/|DOPS](|[^ ])[8;:](|[<>|])( |$)+"
+color body brightcolor5 default "(^| )+(|[<>|])[8;:](|[^ ])[)(/|DOPS]( |$)+"
+color body brightcolor5 default "(^| )+[)(/|DOPS](|[^ ])[8;:](|[<>|])( |$)+"
 
 # *bold*, _underline_  and /italic/
-color body brightcyan default "(^| )\\*[^*]+\\*( |$)"
-color body brightcyan default "(^| )_[^_]+_( |$)"
-color body brightcyan default "(^| )/[^/]+/( |$)"
+color body brightcolor6 default "(^| )\\*[^*]+\\*( |$)"
+color body brightcolor6 default "(^| )_[^_]+_( |$)"
+color body brightcolor6 default "(^| )/[^/]+/( |$)"
 
 # quote blocks
-color quoted  brightblue    default
-color quoted1 brightgreen   default
-color quoted2 brightyellow  default
-color quoted3 brightmagenta default
-color quoted4 blue          default
-color quoted5 green         default
-color quoted6 yellow        default
-color quoted7 magenta       default
+color quoted  brightcolor0  default
+color quoted1 brightcolor1  default
+color quoted2 brightcolor2  default
+color quoted3 brightcolor3  default
+color quoted4 brightcolor4  default
+color quoted5 brightcolor5  default
+color quoted6 brightcolor6  default
+color quoted7 brightdefault default
diff --git a/muttrc b/muttrc
index 21a7cae..ebcc001 100644
--- a/muttrc
+++ b/muttrc
@@ -49,7 +49,7 @@ set tilde                                            # show tildes like in vim
 unset markers                                        # no ugly plus signs
 auto_view text/html                                  # view html automatically
 alternative_order text/plain text/enriched text/html # save html for last
-set quote_regexp      = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+set quote_regexp      = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+| {4}"
 
 # formats
 set status_format = "-%r %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]   (%s/%S) %> (%P)   "