[neo-/mutt] make use of local mail setup and add light and dark theme

8 files changed, 312 insertions, 216 deletions

diff --git a/mutt/passwords b/mutt/passwords
deleted file mode 100644
index 172224a..0000000
--- a/mutt/passwords
+++ /dev/null
diff --git a/mutt/solarized-dark-256 b/mutt/solarized-dark-256
deleted file mode 100644
index a3e2893..0000000
--- a/mutt/solarized-dark-256
+++ /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        default        "(florian|fischer|fischerling)"
-# 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        default       
-color error         color160        default       
-color tilde         color235        default       
-color message       color37         default       
-color markers       color160        default
-color attachment    color254        default       
-color search        color61         default       
-#color status        J_black         J_status        
-color status        color241        color235        
-color indicator     color234        color136        
-color tree          color136        default                                   # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-color index         color160        default       "~D(!~p|~p)"               # deleted
-color index         color235        default       ~F                         # flagged
-color index         color166        default       ~=                         # duplicate messages
-color index         color240        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         color160        default       "~A"                        # all messages
-color index         color166        default       "~E"                        # expired messages
-color index         color33         default       "~N"                        # new messages
-color index         color33         default       "~O"                        # old messages
-color index         color61         default       "~Q"                        # messages that have been replied to
-color index         color240        default       "~R"                        # read messages
-color index         color33         default       "~U"                        # unread messages
-color index         color33         default       "~U~$"                      # unread, unreferenced messages
-color index         color241        default       "~v"                        # messages part of a collapsed thread
-color index         color241        default       "~P"                        # messages from me
-color index         color37         default       "~p!~F"                     # messages to me
-color index         color37         default       "~N~p!~F"                   # new messages to me
-color index         color37         default       "~U~p!~F"                   # unread messages to me
-color index         color240        default       "~R~p!~F"                   # messages to me
-color index         color160        default       "~F"                        # flagged messages
-color index         color160        default       "~F~p"                      # flagged messages to me
-color index         color160        default       "~N~F"                      # new flagged messages
-color index         color160        default       "~N~F~p"                    # new flagged messages to me
-color index         color160        default       "~U~F~p"                    # new flagged messages to me
-color index         color235        color160        "~D"                        # deleted messages
-color index         color245        default       "~v~(!~N)"                  # collapsed thread with no unread
-color index         color136        default       "~v~(~N)"                   # collapsed thread with some unread
-color index         color64         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         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        default       "^"
-color hdrdefault    color240        default       
-color header        color241        default       "^(From)"
-color header        color33         default       "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        color33         default       
-color quoted1       color37         default       
-color quoted2       color136        default       
-color quoted3       color160        default       
-color quoted4       color166        default       
-
-color signature     color240        default       
-color bold          color235        default       
-color underline     color235        default       
-color normal        color244        default       
-#
-color body          color245        default       "[;:][-o][)/(|]"    # emoticons
-color body          color245        default       "[;:][)(|]"         # emoticons
-color body          color245        default       "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          color245        default       "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          color245        default       "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          color160        default       "(BAD signature)"
-color body          color37         default       "(Good signature)"
-color body          color234        default       "^gpg: Good signature .*"
-color body          color241        default       "^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        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        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        default       "<[Gg]>"                            # <g>
-color body          color230        default       "<[Bb][Gg]>"                        # <bg>
-color body          color136        default       " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-color body          color33         default       "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-color body          color33         default       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-color body         color33         default       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-color body          color33         default       "( *[-+=#*~_]){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/solarized-dark.muttrc b/mutt/solarized-dark.muttrc
new file mode 100644
index 0000000..e9d6def
--- /dev/null
+++ b/mutt/solarized-dark.muttrc
@@ -0,0 +1,151 @@
+# 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/solarized-light.muttrc b/mutt/solarized-light.muttrc
new file mode 100644
index 0000000..3c119fb
--- /dev/null
+++ b/mutt/solarized-light.muttrc
@@ -0,0 +1,151 @@
+# 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/theme.muttrc b/mutt/theme.muttrc
new file mode 120000
index 0000000..0d8ef07
--- /dev/null
+++ b/mutt/theme.muttrc
@@ -0,0 +1 @@
+solarized-dark.muttrc
\ No newline at end of file
diff --git a/muttrc b/muttrc
index 597daa8..175e5a6 100644
--- a/muttrc
+++ b/muttrc
@@ -1,50 +1,17 @@
-################# IMAP ####################
-set imap_user=aj46ezos
-# Automatically log in to this mailbox at startup
-set folder="imaps://$imap_user@faumail.uni-erlangen.de/"
+################# MAILDIR ####################
+set mbox_type=Maildir
+set folder=~/.local/share/maildir/FAU
 # Define the = shortcut, and the entry point for the folder browser (c?)
-set spoolfile="+INBOX"
+set spoolfile="+/INBOX"
 set record="+Sent"
 set postponed="+Drafts"
 
-# activate TLS if available on the server
-set ssl_starttls=yes
-# always use SSL when connecting to a server
-set ssl_force_tls=yes
-# Don't wait to enter mailbox manually 
-unset imap_passive        
-# Automatically poll subscribed mailboxes for new mail (new in 1.5.11)
-set imap_check_subscribed
-# Reduce polling frequency to a sane level
-set mail_check=60
-# And poll the current mailbox more often (not needed with IDLE in post 1.5.11)
-set timeout=10
-# keep a cache of headers for faster loading (1.5.9+?)
-set header_cache=~/.hcache
-# Display download progress every 5K
-set net_inc=5
-
-
 ############### SMTP #######################
 
 set realname = 'Florian Fischer'
 set from = "florian.fl.fischer@fau.de"
 set use_from = yes
 
-set smtp_url="smtps://$imap_user@smtp-auth.uni-erlangen.de"
-
-
-############### PASSWORDS ##################
-# the passwords are stored in the file .mutt/passwords
-# and this file is read and evaluated before mutt is started.
-# the file format should be:
-#   export <var> <passwd>
-#
-# see: http://www.mail-archive.com/mutt-users@mutt.org/msg36375.html
-
-set smtp_pass=$FAU_PASS
-set imap_pass=$FAU_PASS
-
 ############### GPG ########################
 
 source ~/.mutt/gpg.rc
@@ -65,9 +32,6 @@ set query_command= "khard email --parsable %s"
 bind editor <Tab> complete-query
 bind editor ^T    complete
 
-# open links with urlscan
-macro pager,index \cb <pipe-entry>'urlscan -n | dmenu -l 15 | xargs -r $BROWSER '<enter> 'Follow links with urlscan'
-
 ############## Bindings ####################
 
 bind pager j next-line
@@ -81,4 +45,4 @@ bind attach,index G last-entry
 
 ############## COLOR #######################
 
-source ~/.mutt/solarized-dark-256
+source ~/.mutt/theme.muttrc
diff --git a/scripts/mutt.sh b/scripts/mutt.sh
deleted file mode 100755
index 31702ca..0000000
--- a/scripts/mutt.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# read the password file
-pwds=`gpg -d ~/.mutt/passwords`
-eval "$pwds"
-# execute mutt in a terminal if we are in a graphical session ( X or Wayland )
-# and TERM is linux => this script was started not from a terminal 
-if [ "$DISPLAY" ] || [ "$WAYLAND_DISPLAY" ] && [ "$TERM" == "linux" ]
-then
-    # change font size on my main laptop
-    if [ "$(hostname)" = "fishtank" ]
-    then
-        exec urxvt -fn "xft: Terminess Powerline:pixelsize=18" -e "mutt"
-    else
-        exec urxvt -e "mutt"
-    fi
-else
-    exec mutt "$@"
-fi
diff --git a/setup.py b/setup.py
index 555db8d..dfe6c06 100755
--- a/setup.py
+++ b/setup.py
@@ -56,9 +56,10 @@ def dotfile_loc_helper(quiet):
         else:
             return e
 
+mutt_target = [("muttrc", home_dir + "/.muttrc"),
+               ("mutt", home_dir + "/.mutt")]
 
 # targets are a list of tuples<file name, link destination> and/or functions
-
 targets = {
         "lumail":
             [("config/lumail/lumail.lua", config_dir + "/lumail/lumail.lua")],
@@ -78,10 +79,8 @@ targets = {
             ("xprofile", home_dir + "/.xprofile"),
             dotfile_loc_helper,
             ("Xresources", home_dir + "/.Xresources")],
-        "mutt":
-            [("muttrc", home_dir + "/.muttrc"),
-            ("mutt", home_dir + "/.mutt"),
-            ("scripts/mutt.sh", home_dir+"/.local/bin/mutt.sh")],
+        "mutt": mutt_target,
+        "neomutt": mutt_target,
         "zshrc":
             [("zshrc", home_dir + "/.zshrc")],
         "i3":