diff --git a/mail.org b/mail.org
index 08da880..596adcb 100644
--- a/mail.org
+++ b/mail.org
@@ -911,194 +911,63 @@ p.wait()
 #+end_src
 
 ** Colors
-*** New
 #+begin_src conf
-color attachment  color109 color234
-color bold        color229 color234
-color error       color167 color234
-color hdrdefault  color246 color234
+color attachment  color109 color235
+color bold        color229 color235
+color error       color167 color235
+color hdrdefault  color246 color235
 color indicator   color223 color237
-color markers     color243 color234
-color normal      color223 color234
-color quoted      color250 color234
-color quoted1     color108 color234
-color quoted2     color250 color234
-color quoted3     color108 color234
-color quoted4     color250 color234
-color quoted5     color108 color234
-color search      color234 color208
-color signature   color108 color234
-color status      color234 color250
-color tilde       color243 color234
-color tree        color142 color234
+color markers     color243 color235
+color normal      color223 color235
+color prompt      color223 color235
+color quoted      color250 color235
+color quoted1     color108 color235
+color quoted2     color250 color235
+color quoted3     color108 color235
+color quoted4     color250 color235
+color quoted5     color108 color235
+color search      color235 color208
+color signature   color108 color235
+color status      color245 color235
+color tilde       color243 color235
+color tree        color142 color235
 color underline   color223 color239
 
-color sidebar_divider    color250 color234
-color sidebar_new        color142 color234
+color sidebar_divider    color250 color235
+color sidebar_new        color142 color235
 
-color index color142 color234 ~N
-color index color108 color234 ~O
-color index color109 color234 ~P
-color index color214 color234 ~F
-color index color175 color234 ~Q
-color index color167 color234 ~=
-color index color234 color223 ~T
-color index color234 color167 ~D
+color index color142 color235 ~N
+color index color108 color235 ~O
+color index color109 color235 ~P
+color index color214 color235 ~F
+color index color175 color235 ~Q
+color index color167 color235 ~=
+color index color235 color223 ~T
+color index color235 color167 ~D
 
-color header color214 color234 "^(To:|From:)"
-color header color142 color234 "^Subject:"
-color header color108 color234 "^X-Spam-Status:"
-color header color108 color234 "^Received:"
+color header color214 color235 "^(To:|Cc:|Bcc:|From:)"
+color header color142 color235 "^Subject:"
+color header color108 color235 "^X-Spam-Status:"
+color header color108 color235 "^Received:"
 
-color body color142 color234 "[a-z]{3,255}://[-a-zA-Z0-9@:%._\\+~#=/?&,]+"
-color body color142 color234 "[a-zA-Z]([-a-zA-Z0-9_]+\\.){2,255}[-a-zA-Z0-9_]{2,255}"
-color body color208 color234 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
-color body color208 color234 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
-color body color234 color214 "[;:]-*[)>(<lt;|]"
-color body color229 color234 "\\*[- A-Za-z]+\\*"
+color body color142 color235 "[a-z]{3,256}://[-a-zA-Z0-9@:%._\\+~#=/?&,]+"
+color body color208 color235 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+color body color208 color235 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+color body color235 color214 "[;:]-*[)>(<lt;|]"
+color body color229 color235 "\\*[- A-Za-z]+\\*"
 
-color body color214 color234 "^-.*PGP.*-*"
-color body color142 color234 "^gpg: Good signature from"
-color body color167 color234 "^gpg: Can't.*$"
-color body color214 color234 "^gpg: WARNING:.*$"
-color body color167 color234 "^gpg: BAD signature from"
-color body color167 color234 "^gpg: Note: This key has expired!"
-color body color214 color234 "^gpg: There is no indication that the signature belongs to the owner."
-color body color214 color234 "^gpg: can't handle these multiple signatures"
-color body color214 color234 "^gpg: signature verification suppressed"
-color body color214 color234 "^gpg: invalid node with packet of type"
-
-color body color142 color234 "^Good signature from:"
-color body color167 color234 "^.?BAD.? signature from:"
-color body color142 color234 "^Verification successful"
-color body color167 color234 "^Verification [^s][^[:space:]]*$"
-
-color compose header            color223 color234
-color compose security_encrypt  color175 color234
-color compose security_sign     color109 color234
-color compose security_both     color142 color234
-color compose security_none     color208 color234
+color body color214 color235 "^-.*PGP.*-*"
+color body color142 color235 "^gpg: Good signature from"
+color body color167 color235 "^gpg: Can't.*$"
+color body color214 color235 "^gpg: WARNING:.*$"
+color body color167 color235 "^gpg: BAD signature from"
+color body color167 color235 "^gpg: Note: This key has expired!"
+color body color214 color235 "^gpg: There is no indication that the signature belongs to the owner."
+color body color214 color235 "^gpg: can't handle these multiple signatures"
+color body color214 color235 "^gpg: signature verification suppressed"
+color body color214 color235 "^gpg: invalid node with packet of type"
 #+end_src
 
-# *** Basic colors
-# #+BEGIN_SRC conf
-# color normal      color021       color000
-# color error       color021       color000
-# color tilde       color021       color000
-# color message     color021       color000
-# color markers     color021       color000
-# color attachment  color021       color000
-# color search      color000       color003
-# color status      color016       color000
-# color indicator   color000       color021
-# color tree        color021       color000
-# color progress    color000       color021
-
-# # basic monocolor screen
-# mono  bold      bold
-# mono  underline underline
-# mono  indicator reverse
-# mono  error     bold
-# #+END_SRC
-
-# *** Index
-# #+begin_src conf
-# color index color021       color000 "~A"      # All messages
-# color index brightcolor006 color000 "~N"      # New messages
-# color index color020       color000 "~O"      # Old messages
-# color index color020       color000 "~Q"      # messages that have been replied to
-# color index color021       color000 "~R"      # read messages
-# color index color006       color000 "~U"      # unread messages
-# color index color021       color000 "~R~p!~F" # messages to me
-# color index brightcolor006 color000 "~N~p!~F" # new messages to me
-# color index brightcolor006 color000 "~U~p!~F" # unread messages to me
-# color index color005       color000 "~F"      # flagged messages
-# color index color005       color000 "~F~p"    # flagged messages to me
-# color index brightcolor006 color000 "~N~F"    # new flagged messages
-# color index brightcolor006 color000 "~N~F~p"  # new flagged messages to me
-# color index brightcolor006 color000 "~U~F~p"  # new flagged messages to me
-# color index brightcolor000 color001 "~D"      # deleted messages
-
-# color index brightcolor021 color019 "~v~(!~N)"    # collapsed thread with no unread
-# color index brightcolor006 color019 "~v~(~N)"     # collapsed thread with some unread
-# color index brightcolor006 color019 "~N~v~(~N)"   # collapsed thread with unread parent
-# color index brightcolor005 color019 "~v~(~F)!~N"  # collapsed thread with flagged, no unread
-# color index brightcolor006 color019 "~v~(~F~N)"   # collapsed thread with some unread & flagged
-# color index brightcolor006 color019 "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-# color index brightcolor005 color019 "~N~v~(~F)"   # collapsed thread with unread parent, no unread inside, but some flagged
-# color index brightcolor000 color001 "~v~(~D)"     # thread with deleted (doesn't differentiate between all or partial)
-# #+end_src
-
-# *** Sidebar
-# #+begin_src conf
-#  color sidebar_indicator color000       color021  # Mailbox is open
-#  color sidebar_highlight color000       color003  # Mailbox is highlighted
-#  color sidebar_new       brightcolor006 color000  # Mailbox contains new mail
-#  color sidebar_ordinary  color021       color000  # Mailbox contains new mail
-# #+end_src
-
-# *** Message headers
-# #+BEGIN_SRC conf
-# color hdrdefault color006       color000
-# color header     brightcolor006 color000 "^(From)"
-# color header     brightcolor004 color000 "^(Subject)"
-# #+END_SRC
-
-# *** Attachments
-# #+begin_src conf
-# # Color if the attachment is autoviewed
-# color   attach_headers     brightgreen     default    "Autoview"
-# # Color only the brackets around the headers
-# color   attach_headers     brightyellow    default    "^\\[--"
-# color   attach_headers     brightyellow    default    "--]$"
-# # Color the mime type and the size
-# color   attach_headers     green           default    "Type: [a-z]+/[a-z0-9\-]+"
-# color   attach_headers     green           default    "Size: [0-9\.]+[KM]"
-# # Color GPGME signature checks
-# color   attach_headers     brightgreen     default    "Good signature from.*"
-# color   attach_headers     brightred       default    "Bad signature from.*"
-# color   attach_headers     brightred       default    "BAD signature from.*"
-# color   attach_headers     brightred       default    "Note: This key has expired!"
-# color   attach_headers     brightmagenta   default    "Problem signature from.*"
-# color   attach_headers     brightmagenta   default    "WARNING: This key is not certified with a trusted signature!"
-# color   attach_headers     brightmagenta   default    "         There is no indication that the signature belongs to the owner."
-# color   attach_headers     brightmagenta   default    "can't handle these multiple signatures"
-# color   attach_headers     brightmagenta   default    "signature verification suppressed"
-# color   attach_headers     brightmagenta   default    "invalid node with packet of type"
-# #+end_src
-# *** Body
-# #+BEGIN_SRC conf
-# color quoted        color002       color000
-# color quoted1       color003       color000
-# color quoted2       color004       color000
-# color quoted3       color005       color000
-# color quoted4       color006       color000
-
-# color signature     color021       color000
-# color bold          brightcolor021 color000
-# color underline     brightcolor021 color000
-# color normal        color021       color000
-# #+END_SRC
-
-# *** PGP
-# #+BEGIN_SRC conf
-# color body  color001 color000         "(BAD signature)"
-# color body  color002 color000         "(Good signature)"
-# color body  color002 color000         "^gpg: Good signature .*"
-# color body  color002 color000         "^gpg: "
-# color body  color002 color000         "^gpg: BAD signature from.*"
-# #+END_SRC
-
-# *** Urls
-# #+BEGIN_SRC conf
-# color body color006 color000         "([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<>\"]"
-# #+END_SRC
-
-# *** Emails
-# #+BEGIN_SRC conf
-# color body color006 color000 "((@(([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]\\])"
-# #+END_SRC
-
 ** Contacts with Mu
 #+BEGIN_SRC conf
 set query_command="mu cfind '%s' -o mutt-ab"