Clean mutt config

12 files changed, 27 insertions, 975 deletions

diff --git a/mutt/.mutt/colors/base.muttrc b/mutt/.mutt/colors.muttrc
index 714121c..59e1c6e 100644
--- a/mutt/.mutt/colors/base.muttrc
+++ b/mutt/.mutt/colors.muttrc
@@ -1,3 +1,4 @@
+# color normal     color247      default
 color normal     color247      default
 color attachment color110      default
 color error      red           default
@@ -10,11 +11,12 @@ color sidebar_flagged   color6    default
 color sidebar_indicator color232  color178
 color sidebar_new       color2    default
 
-color index color248        default         "~R"
-color index color140        default         "~U"
-color index color2          default         "~Q"
-color index color1          default         "~D"
-color index color136        default         "~F"
+color index color248 default "~R"
+color index color253 default "~p"
+color index color195 default "~U"
+color index color2   default "~Q"
+color index color1   default "~D"
+color index color209 default "~F"
 
 color quoted        cyan            default
 color quoted1       magenta         default
@@ -25,4 +27,9 @@ color header yellow  default "^(To)"
 color header magenta default "^(Subject)"
 color header red     default "^(CC)"
 
-# vim: ft=muttrc
+color normal color253 default
+color status green    black
+# color index  color253 default "~R"
+# color index  color1   default "~F"
+# color index  color13  default "~O"
+# color index  color13  default "~N"
diff --git a/mutt/.mutt/colors/nord.muttrc b/mutt/.mutt/colors/nord.muttrc
deleted file mode 100644
index 18d7071..0000000
--- a/mutt/.mutt/colors/nord.muttrc
+++ /dev/null
@@ -1,8 +0,0 @@
-color normal color253 default
-color status green    black
-color index  color253 default "~R"
-color index  color1   default "~F"
-color index  color13  default "~O"
-color index  color13  default "~N"
-
-# vim: ft=muttrc
diff --git a/mutt/.mutt/colors/solarized.light.muttrc b/mutt/.mutt/colors/solarized.light.muttrc
deleted file mode 100644
index 2d4d05a..0000000
--- a/mutt/.mutt/colors/solarized.light.muttrc
+++ /dev/null
@@ -1,5 +0,0 @@
-color status green white
-color normal color11 default
-color index color11  default "~R"
-
-# vim: ft=muttrc
diff --git a/mutt/.mutt/id_enpc b/mutt/.mutt/id_enpc
index 82bca7d..ff947fe 100644
--- a/mutt/.mutt/id_enpc
+++ b/mutt/.mutt/id_enpc
@@ -2,18 +2,15 @@ set from = "urbain.vaes@enpc.fr"
 set sendmail="/usr/bin/msmtp -a enpc"
 
 set spoolfile = "+Enpc/Enpc"
+set record    = "+Enpc/Enpc.sent"
 set postponed = "+Enpc/Enpc.drafts"
 set trash     = "+Enpc/Enpc.bin"
 
-# Record not necessary because outlook saves messages
-unset record
-
 macro index,pager gs "<change-folder> +Enpc/Enpc.sent<enter>"
 macro index,pager gd "<change-folder> $postponed<enter>"
 macro index,pager gb "<change-folder> $trash<enter>"
 macro index,pager ga "<change-folder> +Enpc/Enpc.archive<enter>"
-macro index,pager s "<save-message>=Enpc/Enpc.archive<enter><sync-mailbox>"
+macro index,pager a "<save-message>=Enpc/Enpc.archive<enter><sync-mailbox>"
 
-folder-hook 'Enpc*' 'source ~/.mutt/id_enpc'
 # vim: ft=muttrc
 
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index a75c088..816a564 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -3,13 +3,11 @@ set folder = ~/.mail
 set alias_file = ~/.mutt/alias
 set header_cache = ~/.mutt/cache/headers
 set message_cachedir = ~/.mutt/cache/bodies
-set certificate_file = ~/.mutt/certificates
 set mailcap_path = ~/.mutt/mailcap
 set tmpdir = ~/.mutt/temp
 
 # Source crypto, aliases, mailboxes
-source ~/.mutt/colors/base.muttrc
-source `FILE=$HOME/.mutt/colors/$COLORSCHEME.muttrc; if [ ! -s "$FILE" ]; then FILE=$HOME/.mutt/colors/nord.muttrc; fi; echo "$FILE"`
+source ~/.mutt/colors.muttrc
 source ~/.mutt/crypto
 source ~/.mutt/alias
 source ~/.mutt/mailboxes
@@ -20,6 +18,8 @@ set realname = "Urbain Vaes"
 set from = "Urbain Vaes"
 set reverse_alias
 set sort = reverse-date
+# set sort = reverse-threads
+# set sort_aux = last-date-received
 set weed
 set abort_nosubject=no
 unset markers
@@ -66,12 +66,12 @@ set editor="$EDITOR"
 set include=yes
 
 # Index
-set index_format="%X %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
+set index_format="%4C %X %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
 
 # Macros
 macro index,pager gp "<change-folder> +Personal/Personal<enter>"
 macro index,pager gi "<change-folder> +Imperial/Imperial<enter>"
-macro index,pager gw "<change-folder> +Enpc/Enpc<enter>"
+macro index,pager ge "<change-folder> +Enpc/Enpc<enter>"
 macro pager u "<pipe-message>urlview\n"
 
 # Key bindings
@@ -91,8 +91,12 @@ bind pager j next-entry
 bind pager k previous-entry
 bind pager R group-reply
 
+# Attachment
 macro compose \CA "!mutt_attach\n"
 
+# Flow text
+set text_flowed
+
 # Hooks
 folder-hook 'Enpc*' 'source ~/.mutt/id_enpc'
 folder-hook 'Imperial*' 'source ~/.mutt/id_imperial'
@@ -107,4 +111,6 @@ set reverse_name
 alternates ".*@vaes.uk"
 
 # HTML email
-macro compose 5 "F $HOME/.mutt/filter\ny^T^Utext/html; charset=utf-8\n"
+macro compose 5 "F $HOME/.mutt/filter<enter>y^T^Utext/html; charset=utf-8<enter><enter>"
+
+# vim: ft=muttrc
diff --git a/mutt/.mutt/solarized/README.md b/mutt/.mutt/solarized/README.md
deleted file mode 100644
index d1062ea..0000000
--- a/mutt/.mutt/solarized/README.md
+++ /dev/null
@@ -1,101 +0,0 @@
-Solarized Colorscheme for Mutt
-==============================
-
-Developed by Ethan Schoonover <es@ethanschoonover.com>
-
-See the [homepage for the Solarized colorscheme][solarized] for versions for 
-Vim, popular terminal emulators and other applications.
-
-If you have come across this colorscheme via the [mutt-only repository on 
-github][mutt-solarized-github], see the link above to the Solarized homepage or
-visit the [github repository for Solarized][solarized-github].
-
-[solarized]: http://ethanschoonover.com/solarized
-[solarized-github]: https://github.com/altercation/solarized
-[mutt-solarized-github]: https://github.com/altercation/mutt-colors-solarized
-
-Installation
-------------
-
-1. Move the mutt-colors-solarized directory into the same location as your 
-   muttrc. Alternately, you can copy just the version of the colorscheme you 
-   will be using (see below for details).
-
-2. Source the colorscheme in your muttrc. Only one of the following, depending 
-   on the light or dark background you wish to use, and whether you want to use 
-   the native 16 colors of your terminal emulator or the approximatation 
-   provided by the 256 color values. See note below for recommendations.
-
-    source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc
-    source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc
-    source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc
-    source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc
-
-Note: You can safely ignore the compile colors script and the template file.  
-They are used only for creating the actual colorscheme files. If you want to 
-modify the colorscheme or colors, you can use the compile script and template 
-to do so.
-
-Which Variation?
-----------------
-
-See the [Solarized homepage][solarized] for screenshots which will help you 
-select either the light or dark background.
-
-A thornier question is whether to use the 16 color version or the 256 color 
-version. I have spent a great deal of time refining this colorscheme and for 
-the most accurate experience I recommend that you set your terminal emulator to 
-use the Solarized colorvalues with the 16 color mutt colorschemes in this 
-distribution. Terminal colorschemes/values are available at the homepage linked 
-to above.
-
-The 256 color versions provide an approximate experience of the colorscheme in 
-most regards, though the carefully selected monotones are crudely replaced by 
-neutral tones.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are 
-matched in sRGB space.
-
-    SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      sRGB        HSB
-    --------- ------- ---- -------  ----------- ---------- ----------- -----------
-    base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-    base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-    base01    #586e75 10/7 brgreen  240 #4e4e4e 45 -07 -07  88 110 117 194  25  46
-    base00    #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195  23  51
-    base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-    base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-    base2     #eee8d5  7/7 white    254 #d7d7af 92 -00  10 238 232 213  44  11  93
-    base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-    yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-    orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-    red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-    magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-    violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-    blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-    cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-    green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-
-License
--------
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mutt/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc b/mutt/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc
deleted file mode 100644
index e9d6def..0000000
--- a/mutt/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          yellow          default         "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         yellow          default         "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         brightwhite     "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         yellow          cyan            "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         yellow          J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        default         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        brightwhite     "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        cyan            "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        red             "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        brightyellow    default         
-color error         red             default         
-color tilde         black           default         
-color message       cyan            default         
-color markers       red             white           
-color attachment    white           default         
-color search        brightmagenta   default         
-#color status        J_black         J_status        
-color status        brightyellow    black           
-color indicator     brightblack     yellow          
-color tree          yellow          default                                     # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-#color index         red             default         "~D(!~p|~p)"               # deleted
-#color index         black           default         ~F                         # flagged
-#color index         brightred       default         ~=                         # duplicate messages
-#color index         brightgreen     default         "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index         J_base          default         "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index         red             default         "~A"                        # all messages
-color index         brightred       default         "~E"                        # expired messages
-color index         blue            default         "~N"                        # new messages
-color index         blue            default         "~O"                        # old messages
-color index         brightmagenta   default         "~Q"                        # messages that have been replied to
-color index         brightgreen     default         "~R"                        # read messages
-color index         blue            default         "~U"                        # unread messages
-color index         blue            default         "~U~$"                      # unread, unreferenced messages
-color index         brightyellow    default         "~v"                        # messages part of a collapsed thread
-color index         brightyellow    default         "~P"                        # messages from me
-color index         cyan            default         "~p!~F"                     # messages to me
-color index         cyan            default         "~N~p!~F"                   # new messages to me
-color index         cyan            default         "~U~p!~F"                   # unread messages to me
-color index         brightgreen     default         "~R~p!~F"                   # messages to me
-color index         red             default         "~F"                        # flagged messages
-color index         red             default         "~F~p"                      # flagged messages to me
-color index         red             default         "~N~F"                      # new flagged messages
-color index         red             default         "~N~F~p"                    # new flagged messages to me
-color index         red             default         "~U~F~p"                    # new flagged messages to me
-color index         black           red             "~D"                        # deleted messages
-color index         brightcyan      default         "~v~(!~N)"                  # collapsed thread with no unread
-color index         yellow          default         "~v~(~N)"                   # collapsed thread with some unread
-color index         green           default         "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         red             black           "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         yellow          black           "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         green           black           "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         green           black           "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         cyan            black           "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         yellow          red             "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         yellow          default         "~(~N)"                    # messages in threads with some unread
-#color index         green           default         "~S"                       # superseded messages
-#color index         red             default         "~T"                       # tagged messages
-#color index         brightred       red             "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        brightgreen     default         "^"
-color hdrdefault    brightgreen     default         
-color header        brightyellow    default         "^(From)"
-color header        blue            default         "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        blue            default         
-color quoted1       cyan            default         
-color quoted2       yellow          default         
-color quoted3       red             default         
-color quoted4       brightred       default         
-
-color signature     brightgreen     default         
-color bold          black           default         
-color underline     black           default         
-color normal        default         default         
-#
-color body          brightcyan      default         "[;:][-o][)/(|]"    # emoticons
-color body          brightcyan      default         "[;:][)(|]"         # emoticons
-color body          brightcyan      default         "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          brightcyan      default         "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          brightcyan      default         "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          red             default         "(BAD signature)"
-color body          cyan            default         "(Good signature)"
-color body          brightblack     default         "^gpg: Good signature .*"
-color body          brightyellow    default         "^gpg: "
-color body          brightyellow    red             "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          red             default         "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        default         "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          brightwhite     default         "<[Gg]>"                            # <g>
-#color body          brightwhite     default         "<[Bb][Gg]>"                        # <bg>
-#color body          yellow          default         " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          blue            default         "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          blue            default         "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         blue            default         "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          blue            default         "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         yellow          "
-#folder-hook gmail/important    "color status        J_black         yellow          "
-
diff --git a/mutt/.mutt/solarized/mutt-colors-solarized-dark-256.muttrc b/mutt/.mutt/solarized/mutt-colors-solarized-dark-256.muttrc
deleted file mode 100644
index b318651..0000000
--- a/mutt/.mutt/solarized/mutt-colors-solarized-dark-256.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          color136        color234        "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         color136        color234        "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         color230        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         color136        color37         "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         color136        J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        color234        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        color230        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        color37         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        color160        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        color241        color234        
-color error         color160        color234        
-color tilde         color235        color234        
-color message       color37         color234        
-color markers       color160        color254        
-color attachment    color254        color234        
-color search        color61         color234        
-#color status        J_black         J_status        
-color status        color241        color235        
-color indicator     color234        color136        
-color tree          color136        color234                                    # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-#color index         color160        color234        "~D(!~p|~p)"               # deleted
-#color index         color235        color234        ~F                         # flagged
-#color index         color166        color234        ~=                         # duplicate messages
-#color index         color240        color234        "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index         J_base          color234        "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index         color160        color234        "~A"                        # all messages
-color index         color166        color234        "~E"                        # expired messages
-color index         color33         color234        "~N"                        # new messages
-color index         color33         color234        "~O"                        # old messages
-color index         color61         color234        "~Q"                        # messages that have been replied to
-color index         color240        color234        "~R"                        # read messages
-color index         color33         color234        "~U"                        # unread messages
-color index         color33         color234        "~U~$"                      # unread, unreferenced messages
-color index         color241        color234        "~v"                        # messages part of a collapsed thread
-color index         color241        color234        "~P"                        # messages from me
-color index         color37         color234        "~p!~F"                     # messages to me
-color index         color37         color234        "~N~p!~F"                   # new messages to me
-color index         color37         color234        "~U~p!~F"                   # unread messages to me
-color index         color240        color234        "~R~p!~F"                   # messages to me
-color index         color160        color234        "~F"                        # flagged messages
-color index         color160        color234        "~F~p"                      # flagged messages to me
-color index         color160        color234        "~N~F"                      # new flagged messages
-color index         color160        color234        "~N~F~p"                    # new flagged messages to me
-color index         color160        color234        "~U~F~p"                    # new flagged messages to me
-color index         color235        color160        "~D"                        # deleted messages
-color index         color245        color234        "~v~(!~N)"                  # collapsed thread with no unread
-color index         color136        color234        "~v~(~N)"                   # collapsed thread with some unread
-color index         color64         color234        "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         color160        color235        "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         color136        color235        "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         color64         color235        "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         color64         color235        "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         color37         color235        "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         color136        color160        "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         color136        color234        "~(~N)"                    # messages in threads with some unread
-#color index         color64         color234        "~S"                       # superseded messages
-#color index         color160        color234        "~T"                       # tagged messages
-#color index         color166        color160        "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        color240        color234        "^"
-color hdrdefault    color240        color234        
-color header        color241        color234        "^(From)"
-color header        color33         color234        "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        color33         color234        
-color quoted1       color37         color234        
-color quoted2       color136        color234        
-color quoted3       color160        color234        
-color quoted4       color166        color234        
-
-color signature     color240        color234        
-color bold          color235        color234        
-color underline     color235        color234        
-color normal        color244        color234        
-#
-color body          color245        color234        "[;:][-o][)/(|]"    # emoticons
-color body          color245        color234        "[;:][)(|]"         # emoticons
-color body          color245        color234        "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          color245        color234        "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          color245        color234        "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          color160        color234        "(BAD signature)"
-color body          color37         color234        "(Good signature)"
-color body          color234        color234        "^gpg: Good signature .*"
-color body          color241        color234        "^gpg: "
-color body          color241        color160        "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          color160        color234        "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        color234        "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          color230        color234        "<[Gg]>"                            # <g>
-#color body          color230        color234        "<[Bb][Gg]>"                        # <bg>
-#color body          color136        color234        " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          color33         color234        "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          color33         color234        "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         color33         color234        "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          color33         color234        "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         color136        "
-#folder-hook gmail/important    "color status        J_black         color136        "
-
diff --git a/mutt/.mutt/solarized/mutt-colors-solarized-light-16.muttrc b/mutt/.mutt/solarized/mutt-colors-solarized-light-16.muttrc
deleted file mode 100644
index 3c119fb..0000000
--- a/mutt/.mutt/solarized/mutt-colors-solarized-light-16.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          yellow          default         "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         yellow          default         "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         brightblack     "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         yellow          cyan            "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         yellow          J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        default         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        brightblack     "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        cyan            "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        red             "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        brightblue      default         
-color error         red             default         
-color tilde         white           default         
-color message       cyan            default         
-color markers       red             black           
-color attachment    black           default         
-color search        brightmagenta   default         
-#color status        J_black         J_status        
-color status        brightblue      white           
-color indicator     brightwhite     yellow          
-color tree          yellow          default                                     # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-#color index         red             default         "~D(!~p|~p)"               # deleted
-#color index         white           default         ~F                         # flagged
-#color index         brightred       default         ~=                         # duplicate messages
-#color index         brightcyan      default         "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index         J_base          default         "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index         red             default         "~A"                        # all messages
-color index         brightred       default         "~E"                        # expired messages
-color index         blue            default         "~N"                        # new messages
-color index         blue            default         "~O"                        # old messages
-color index         brightmagenta   default         "~Q"                        # messages that have been replied to
-color index         brightcyan      default         "~R"                        # read messages
-color index         blue            default         "~U"                        # unread messages
-color index         blue            default         "~U~$"                      # unread, unreferenced messages
-color index         brightblue      default         "~v"                        # messages part of a collapsed thread
-color index         brightblue      default         "~P"                        # messages from me
-color index         cyan            default         "~p!~F"                     # messages to me
-color index         cyan            default         "~N~p!~F"                   # new messages to me
-color index         cyan            default         "~U~p!~F"                   # unread messages to me
-color index         brightcyan      default         "~R~p!~F"                   # messages to me
-color index         red             default         "~F"                        # flagged messages
-color index         red             default         "~F~p"                      # flagged messages to me
-color index         red             default         "~N~F"                      # new flagged messages
-color index         red             default         "~N~F~p"                    # new flagged messages to me
-color index         red             default         "~U~F~p"                    # new flagged messages to me
-color index         white           red             "~D"                        # deleted messages
-color index         brightgreen     default         "~v~(!~N)"                  # collapsed thread with no unread
-color index         yellow          default         "~v~(~N)"                   # collapsed thread with some unread
-color index         green           default         "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         red             white           "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         yellow          white           "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         green           white           "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         green           white           "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         cyan            white           "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         yellow          red             "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         yellow          default         "~(~N)"                    # messages in threads with some unread
-#color index         green           default         "~S"                       # superseded messages
-#color index         red             default         "~T"                       # tagged messages
-#color index         brightred       red             "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        brightcyan      default         "^"
-color hdrdefault    brightcyan      default         
-color header        brightblue      default         "^(From)"
-color header        blue            default         "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        blue            default         
-color quoted1       cyan            default         
-color quoted2       yellow          default         
-color quoted3       red             default         
-color quoted4       brightred       default         
-
-color signature     brightcyan      default         
-color bold          white           default         
-color underline     white           default         
-color normal        default         default         
-#
-color body          brightgreen     default         "[;:][-o][)/(|]"    # emoticons
-color body          brightgreen     default         "[;:][)(|]"         # emoticons
-color body          brightgreen     default         "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          brightgreen     default         "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          brightgreen     default         "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          red             default         "(BAD signature)"
-color body          cyan            default         "(Good signature)"
-color body          brightwhite     default         "^gpg: Good signature .*"
-color body          brightblue      default         "^gpg: "
-color body          brightblue      red             "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          red             default         "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        default         "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          brightblack     default         "<[Gg]>"                            # <g>
-#color body          brightblack     default         "<[Bb][Gg]>"                        # <bg>
-#color body          yellow          default         " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          blue            default         "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          blue            default         "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         blue            default         "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          blue            default         "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         yellow          "
-#folder-hook gmail/important    "color status        J_black         yellow          "
-
diff --git a/mutt/.mutt/solarized/mutt-colors-solarized-light-256.muttrc b/mutt/.mutt/solarized/mutt-colors-solarized-light-256.muttrc
deleted file mode 100644
index 4b3861d..0000000
--- a/mutt/.mutt/solarized/mutt-colors-solarized-light-256.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          color136        color233        "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         color136        color233        "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         color233        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         color136        color37         "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         color136        J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        color233        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        color233        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        color37         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        color160        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        color244        color233        
-color error         color160        color233        
-color tilde         color254        color233        
-color message       color37         color233        
-color markers       color160        color234        
-color attachment    color234        color233        
-color search        color61         color233        
-#color status        J_black         J_status        
-color status        color244        color254        
-color indicator     color230        color136        
-color tree          color136        color233                                    # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-#color index         color160        color233        "~D(!~p|~p)"               # deleted
-#color index         color254        color233        ~F                         # flagged
-#color index         color166        color233        ~=                         # duplicate messages
-#color index         color245        color233        "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index         J_base          color233        "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index         color160        color233        "~A"                        # all messages
-color index         color166        color233        "~E"                        # expired messages
-color index         color33         color233        "~N"                        # new messages
-color index         color33         color233        "~O"                        # old messages
-color index         color61         color233        "~Q"                        # messages that have been replied to
-color index         color245        color233        "~R"                        # read messages
-color index         color33         color233        "~U"                        # unread messages
-color index         color33         color233        "~U~$"                      # unread, unreferenced messages
-color index         color244        color233        "~v"                        # messages part of a collapsed thread
-color index         color244        color233        "~P"                        # messages from me
-color index         color37         color233        "~p!~F"                     # messages to me
-color index         color37         color233        "~N~p!~F"                   # new messages to me
-color index         color37         color233        "~U~p!~F"                   # unread messages to me
-color index         color245        color233        "~R~p!~F"                   # messages to me
-color index         color160        color233        "~F"                        # flagged messages
-color index         color160        color233        "~F~p"                      # flagged messages to me
-color index         color160        color233        "~N~F"                      # new flagged messages
-color index         color160        color233        "~N~F~p"                    # new flagged messages to me
-color index         color160        color233        "~U~F~p"                    # new flagged messages to me
-color index         color254        color160        "~D"                        # deleted messages
-color index         color239        color233        "~v~(!~N)"                  # collapsed thread with no unread
-color index         color136        color233        "~v~(~N)"                   # collapsed thread with some unread
-color index         color64         color233        "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         color160        color254        "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         color136        color254        "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         color64         color254        "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         color64         color254        "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         color37         color254        "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         color136        color160        "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         color136        color233        "~(~N)"                    # messages in threads with some unread
-#color index         color64         color233        "~S"                       # superseded messages
-#color index         color160        color233        "~T"                       # tagged messages
-#color index         color166        color160        "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        color245        color233        "^"
-color hdrdefault    color245        color233        
-color header        color244        color233        "^(From)"
-color header        color33         color233        "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        color33         color233        
-color quoted1       color37         color233        
-color quoted2       color136        color233        
-color quoted3       color160        color233        
-color quoted4       color166        color233        
-
-color signature     color245        color233        
-color bold          color254        color233        
-color underline     color254        color233        
-color normal        color240        color233        
-#
-color body          color239        color233        "[;:][-o][)/(|]"    # emoticons
-color body          color239        color233        "[;:][)(|]"         # emoticons
-color body          color239        color233        "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          color239        color233        "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          color239        color233        "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          color160        color233        "(BAD signature)"
-color body          color37         color233        "(Good signature)"
-color body          color230        color233        "^gpg: Good signature .*"
-color body          color244        color233        "^gpg: "
-color body          color244        color160        "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          color160        color233        "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        color233        "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          color233        color233        "<[Gg]>"                            # <g>
-#color body          color233        color233        "<[Bb][Gg]>"                        # <bg>
-#color body          color136        color233        " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          color33         color233        "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          color33         color233        "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         color33         color233        "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          color33         color233        "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         color136        "
-#folder-hook gmail/important    "color status        J_black         color136        "
-
diff --git a/mutt/.mutt/solarized/mutt-colors-solarized-template.muttrc b/mutt/.mutt/solarized/mutt-colors-solarized-template.muttrc
deleted file mode 100644
index 491cbe6..0000000
--- a/mutt/.mutt/solarized/mutt-colors-solarized-template.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          J_yellow        J_bg            "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         J_yellow        J_bg            "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         J_base3         "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         J_yellow        J_cyan          "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         J_yellow        J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        J_bg            "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        J_base3         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        J_cyan          "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        J_red           "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        J_base00        J_bg            
-color error         J_red           J_bg            
-color tilde         J_base02        J_bg            
-color message       J_cyan          J_bg            
-color markers       J_red           J_base2         
-color attachment    J_base2         J_bg            
-color search        J_violet        J_bg            
-#color status        J_black         J_status        
-color status        J_statusfg      J_statusbg      
-color indicator     J_base03        J_yellow        
-color tree          J_yellow        J_bg                                        # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-#color index         J_red           J_bg            "~D(!~p|~p)"               # deleted
-#color index         J_base02        J_bg            ~F                         # flagged
-#color index         J_orange        J_bg            ~=                         # duplicate messages
-#color index         J_base01        J_bg            "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
-#color index         J_base          J_bg            "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
-color index         J_red           J_bg            "~A"                        # all messages
-color index         J_orange        J_bg            "~E"                        # expired messages
-color index         J_blue          J_bg            "~N"                        # new messages
-color index         J_blue          J_bg            "~O"                        # old messages
-color index         J_violet        J_bg            "~Q"                        # messages that have been replied to
-color index         J_base01        J_bg            "~R"                        # read messages
-color index         J_blue          J_bg            "~U"                        # unread messages
-color index         J_blue          J_bg            "~U~$"                      # unread, unreferenced messages
-color index         J_base00        J_bg            "~v"                        # messages part of a collapsed thread
-color index         J_base00        J_bg            "~P"                        # messages from me
-color index         J_cyan          J_bg            "~p!~F"                     # messages to me
-color index         J_cyan          J_bg            "~N~p!~F"                   # new messages to me
-color index         J_cyan          J_bg            "~U~p!~F"                   # unread messages to me
-color index         J_base01        J_bg            "~R~p!~F"                   # messages to me
-color index         J_red           J_bg            "~F"                        # flagged messages
-color index         J_red           J_bg            "~F~p"                      # flagged messages to me
-color index         J_red           J_bg            "~N~F"                      # new flagged messages
-color index         J_red           J_bg            "~N~F~p"                    # new flagged messages to me
-color index         J_red           J_bg            "~U~F~p"                    # new flagged messages to me
-color index         J_base02        J_red           "~D"                        # deleted messages
-color index         J_base1         J_bg            "~v~(!~N)"                  # collapsed thread with no unread
-color index         J_yellow        J_bg            "~v~(~N)"                   # collapsed thread with some unread
-color index         J_green         J_bg            "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         J_red           J_statusbg      "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         J_yellow        J_statusbg      "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         J_green         J_statusbg      "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         J_green         J_statusbg      "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         J_cyan          J_statusbg      "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         J_yellow        J_red           "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         J_yellow        J_bg            "~(~N)"                    # messages in threads with some unread
-#color index         J_green         J_bg            "~S"                       # superseded messages
-#color index         J_red           J_bg            "~T"                       # tagged messages
-#color index         J_orange        J_red           "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        J_base01        J_bg            "^"
-color hdrdefault    J_base01        J_bg            
-color header        J_base00        J_bg            "^(From)"
-color header        J_blue          J_bg            "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        J_blue          J_bg            
-color quoted1       J_cyan          J_bg            
-color quoted2       J_yellow        J_bg            
-color quoted3       J_red           J_bg            
-color quoted4       J_orange        J_bg            
-
-color signature     J_base01        J_bg            
-color bold          J_base02        J_bg            
-color underline     J_base02        J_bg            
-color normal        J_fg            J_bg            
-#
-color body          J_base1         J_bg            "[;:][-o][)/(|]"    # emoticons
-color body          J_base1         J_bg            "[;:][)(|]"         # emoticons
-color body          J_base1         J_bg            "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          J_base1         J_bg            "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          J_base1         J_bg            "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          J_red           J_bg            "(BAD signature)"
-color body          J_cyan          J_bg            "(Good signature)"
-color body          J_base03        J_bg            "^gpg: Good signature .*"
-color body          J_base00        J_bg            "^gpg: "
-color body          J_base00        J_red           "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          J_red           J_bg            "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        J_bg            "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          J_base3         J_bg            "<[Gg]>"                            # <g>
-#color body          J_base3         J_bg            "<[Bb][Gg]>"                        # <bg>
-#color body          J_yellow        J_bg            " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          J_blue          J_bg            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          J_blue          J_bg            "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         J_blue          J_bg            "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          J_blue          J_bg            "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         J_yellow        "
-#folder-hook gmail/important    "color status        J_black         J_yellow        "
-
diff --git a/mutt/.mutt/solarized/mutt-compile-colors.sh b/mutt/.mutt/solarized/mutt-compile-colors.sh
deleted file mode 100755
index f59fa58..0000000
--- a/mutt/.mutt/solarized/mutt-compile-colors.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# ---------------------------------------------------------------------
-# SOLARIZED color values
-# ---------------------------------------------------------------------
-# Download palettes and files from: http://ethanschoonover.com/solarized
-# 
-# SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-# --------- ------- ---- -------  ----------- ---------- ----------- -----------
-# base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-# base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-# base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-# base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-# base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-# base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-# base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-# base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-# yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-# orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-# red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-# magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-# violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-# blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-# cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-# green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-
-cat > palette_dark.tmp <<SETPALETTEDARK
-J_base03        ,color234        ,brightblack     ,
-J_base02        ,color235        ,black           ,
-J_base01        ,color240        ,brightgreen     ,
-J_base00        ,color241        ,brightyellow    ,
-J_base0         ,color244        ,brightblue      ,
-J_base1         ,color245        ,brightcyan      ,
-J_base2         ,color254        ,white           ,
-J_base3         ,color230        ,brightwhite     ,
-J_yellow        ,color136        ,yellow          ,
-J_orange        ,color166        ,brightred       ,
-J_red           ,color160        ,red             ,
-J_magenta       ,color125        ,magenta         ,
-J_violet        ,color61         ,brightmagenta   ,
-J_blue          ,color33         ,blue            ,
-J_cyan          ,color37         ,cyan            ,
-J_green         ,color64         ,green           ,
-J_bg            ,color234        ,default         ,
-J_fg            ,color244        ,default         ,
-J_statusfg      ,color241        ,brightyellow    ,
-J_statusbg      ,color235        ,black           ,
-SETPALETTEDARK
-cat > palette_light.tmp <<SETPALETTELIGHT
-J_base3         ,color233        ,brightblack     ,
-J_base2         ,color234        ,black           ,
-J_base1         ,color239        ,brightgreen     ,
-J_base0         ,color240        ,brightyellow    ,
-J_base00        ,color244        ,brightblue      ,
-J_base01        ,color245        ,brightcyan      ,
-J_base02        ,color254        ,white           ,
-J_base03        ,color230        ,brightwhite     ,
-J_yellow        ,color136        ,yellow          ,
-J_orange        ,color166        ,brightred       ,
-J_red           ,color160        ,red             ,
-J_magenta       ,color125        ,magenta         ,
-J_violet        ,color61         ,brightmagenta   ,
-J_blue          ,color33         ,blue            ,
-J_cyan          ,color37         ,cyan            ,
-J_green         ,color64         ,green           ,
-J_bg            ,color233        ,default         ,
-J_fg            ,color240        ,default         ,
-J_statusfg      ,color244        ,brightblue      ,
-J_statusbg      ,color254        ,white           ,
-SETPALETTELIGHT
-
-MUTTSOURCE="mutt-colors-solarized-template.muttrc"
-MUTTTARGET="mutt-colors-solarized"
-MUTTSUFFIX=".muttrc"
-rm "$MUTTTARGET-dark-256$MUTTSUFFIX"
-rm "$MUTTTARGET-dark-16$MUTTSUFFIX"
-rm "$MUTTTARGET-light-256$MUTTSUFFIX"
-rm "$MUTTTARGET-light-16$MUTTSUFFIX"
-
-awk 'NR==FNR {a[$1]=$2;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
-    palette_dark.tmp $MUTTSOURCE > "$MUTTTARGET-dark-256$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$3;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
-    palette_dark.tmp $MUTTSOURCE > "$MUTTTARGET-dark-16$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$2;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
-    palette_light.tmp $MUTTSOURCE > "$MUTTTARGET-light-256$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$3;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
-    palette_light.tmp $MUTTSOURCE > "$MUTTTARGET-light-16$MUTTSUFFIX"
-
-rm palette_light.tmp
-rm palette_dark.tmp