diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index b895ec7..a3fdffc 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -6,7 +6,7 @@ multipantalla &
 gap=8
 pad=6
 panel=22
-b_width=4
+b_width=2
 export b_width
 export gap
 export pad
@@ -73,7 +73,7 @@ bspc rule -a Zathura                    state=tiled
 bspc rule -a Oblogout                   layer=above
 
 bspc config external_rules_command "$HOME/.config/bspwm/external_rules.sh"
-2bspwm &
+bbspwm &
 
 # shellcheck source=/dev/null
 . "$HOME/.config/bspwm/autostart"
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini
index e6216a2..d99751d 100644
--- a/.config/gtk-2.0/gtkfilechooser.ini
+++ b/.config/gtk-2.0/gtkfilechooser.ini
@@ -1,7 +1,7 @@
 [Filechooser Settings]
 StartupMode=cwd
 LocationMode=path-bar
-ShowHidden=true
+ShowHidden=false
 ExpandFolders=false
 ShowSizeColumn=true
 GeometryX=209
diff --git a/.config/nvim/ftdetect/logfile.vim b/.config/nvim/ftdetect/logfile.vim
new file mode 100644
index 0000000..3c7220c
--- /dev/null
+++ b/.config/nvim/ftdetect/logfile.vim
@@ -0,0 +1,14 @@
+" Auto-detect a NeoMutt log file
+
+autocmd BufRead * call <SID>neomutt_log()
+
+function! s:neomutt_log()
+	let match = '\v^\[\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\] NeoMutt'
+
+	let line = getline (1)
+	if (line !~ match)
+		return
+	endif
+
+	set filetype=neomuttlog
+endfunction
diff --git a/.config/nvim/ftdetect/mail.vim b/.config/nvim/ftdetect/mail.vim
new file mode 100644
index 0000000..6cbf23f
--- /dev/null
+++ b/.config/nvim/ftdetect/mail.vim
@@ -0,0 +1 @@
+au BufNewFile,BufRead neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\} set filetype=mail
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index edbe857..d5a072e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -27,12 +27,12 @@ Plug 'junegunn/vim-plug'
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'jiangmiao/auto-pairs'
 Plug 'zchee/deoplete-jedi'
-Plug 'w0rp/ale'
+Plug 'w0rp/ale', { 'for': ['python', 'bash', 'dash', 'zsh'] }
 Plug 'sbdchd/neoformat'
 Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeFind', 'NERDTreeToggle'] }
 Plug 'christoomey/vim-tmux-navigator'
-Plug 'lervag/vimtex', { 'for': 'tex' }
-Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
+Plug 'lervag/vimtex', { 'for': ['tex'] }
+Plug 'plasticboy/vim-markdown', { 'for': ['markdown'] }
 Plug 'zefei/vim-wintabs'
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
 Plug 'chrisbra/vim-diff-enhanced'
@@ -64,7 +64,6 @@ set shell=/bin/zsh                          " Setting shell to zsh
 set number                                  " Line numbers on
 set showmode                                " Always show mode
 set mousemodel=popup
-set linebreak
 set breakindent
 set textwidth=120                           " Text width is 120 characters
 set cmdheight=1                             " Command line height
@@ -127,6 +126,7 @@ set completeopt-=preview
 set completeopt+=noinsert,longest,noselect,menuone
 set formatoptions+=n
 let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
+set matchpairs=(:),{:},[:],<:>
 
 " Display all matching files when we tab complete
 set wildmenu
diff --git a/.config/nvim/syntax/neomuttlog.vim b/.config/nvim/syntax/neomuttlog.vim
new file mode 100644
index 0000000..85e56f3
--- /dev/null
+++ b/.config/nvim/syntax/neomuttlog.vim
@@ -0,0 +1,65 @@
+" Vim syntax file
+" Language:  NeoMutt log files
+" Maintainer:  Richard Russon <rich@flatcap.org>
+" Last Change:  2018-02-16
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax match neolog_date     "\v^\[\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\] *" conceal
+syntax match neolog_version  "\v<NeoMutt-\d{8}(-\d+-\x+)*(-dirty)*>"
+syntax match neolog_banner   "\v^\[\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\] .*" contains=neolog_date,neolog_version
+syntax match neolog_function "\v%26v\i+\(\)"
+
+syntax match neolog_perror_key  "\v%22v\<P\> " conceal transparent
+syntax match neolog_error_key   "\v%22v\<E\> " conceal transparent
+syntax match neolog_warning_key "\v%22v\<W\> " conceal transparent
+syntax match neolog_message_key "\v%22v\<M\> " conceal transparent
+syntax match neolog_debug1_key  "\v%22v\<1\> " conceal transparent
+syntax match neolog_debug2_key  "\v%22v\<2\> " conceal transparent
+syntax match neolog_debug3_key  "\v%22v\<3\> " conceal transparent
+syntax match neolog_debug4_key  "\v%22v\<4\> " conceal transparent
+syntax match neolog_debug5_key  "\v%22v\<5\> " conceal transparent
+
+syntax match neolog_perror  "\v%22v\<P\> .*" contains=neolog_perror_key,neolog_function
+syntax match neolog_error   "\v%22v\<E\> .*" contains=neolog_error_key,neolog_function
+syntax match neolog_warning "\v%22v\<W\> .*" contains=neolog_warning_key,neolog_function
+syntax match neolog_message "\v%22v\<M\> .*" contains=neolog_message_key,neolog_function
+syntax match neolog_debug1  "\v%22v\<1\> .*" contains=neolog_debug1_key,neolog_function
+syntax match neolog_debug2  "\v%22v\<2\> .*" contains=neolog_debug2_key,neolog_function
+syntax match neolog_debug3  "\v%22v\<3\> .*" contains=neolog_debug3_key,neolog_function
+syntax match neolog_debug4  "\v%22v\<4\> .*" contains=neolog_debug4_key,neolog_function
+syntax match neolog_debug5  "\v%22v\<5\> .*" contains=neolog_debug5_key,neolog_function
+
+if exists('g:neolog_default_colors')
+  highlight neolog_date     ctermfg=cyan    guifg=#40ffff
+  highlight neolog_banner   ctermfg=magenta guifg=#ff00ff
+  highlight neolog_version  cterm=reverse   
+  highlight neolog_function                 guibg=#282828
+
+  highlight neolog_perror  ctermfg=red    guifg=#ff8080
+  highlight neolog_error   ctermfg=red    guifg=#ff8080
+  highlight neolog_warning ctermfg=yellow guifg=#ffff80
+  highlight neolog_message ctermfg=green  guifg=#80ff80
+  highlight neolog_debug1  ctermfg=white  guifg=#ffffff
+  highlight neolog_debug2  ctermfg=white  guifg=#ffffff
+  highlight neolog_debug3  ctermfg=grey   guifg=#c0c0c0
+  highlight neolog_debug4  ctermfg=grey   guifg=#c0c0c0
+  highlight neolog_debug5  ctermfg=grey   guifg=#c0c0c0
+endif
+
+highlight link neolog_perror_key  neolog_perror
+highlight link neolog_error_key   neolog_error
+highlight link neolog_warning_key neolog_warning
+highlight link neolog_message_key neolog_message
+highlight link neolog_debug1_key  neolog_debug1
+highlight link neolog_debug2_key  neolog_debug2
+highlight link neolog_debug3_key  neolog_debug3
+highlight link neolog_debug4_key  neolog_debug4
+highlight link neolog_debug5_key  neolog_debug5
+
+let b:current_syntax = "neomuttlog"
+
+" vim: ts=2 et tw=100 sw=2 sts=0 ft=vim
diff --git a/.config/nvim/syntax/neomuttrc.vim b/.config/nvim/syntax/neomuttrc.vim
index c56041f..7ff8987 100644
--- a/.config/nvim/syntax/neomuttrc.vim
+++ b/.config/nvim/syntax/neomuttrc.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:	NeoMutt setup files
 " Maintainer:	Guillaume Brogi <gui-gui@netcourrier.com>
-" Last Change:	2017-09-17
+" Last Change:	2018-03-25
 " Original version based on syntax/muttrc.vim
 
-" This file covers NeoMutt 20170912
+" This file covers NeoMutt 2018-03-23
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -146,41 +146,40 @@ function! s:escapesConditionals(baseName, sequence, alignment, secondary)
 	endif
 endfunction
 
-" The following info was pulled from hdr_format_str in hdrline.c
-call s:escapesConditionals('IndexFormat', '[AaBbCcDdEeFfgHIiJKLlMmNnOPqrSsTtuvWXxYyZz(<[{]\|G[a-zA-Z]\+', 1, 1)
-" The following info was pulled from alias_format_str in addrbook.c
+" CHECKED 2018-04-18
+" Ref: index_format_str() in hdrline.c
+call s:escapesConditionals('IndexFormat', '[AaBbCcDdEeFfgHIiJKLlMmNnOPqRrSsTtuvWXxYyZz(<[{]\|G[a-zA-Z]\+', 1, 1)
+" Ref: alias_format_str() in addrbook.c
 syntax match muttrcAliasFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[afnrt%]/
-" The following info was pulled from newsgroup_format_str in browser.c
+" Ref: group_index_format_str() in browser.c
 call s:escapesConditionals('GroupIndexFormat', '[CdfMNns]', 1, 1)
-" The following info was pulled from cb_format_str in sidebar.c
+" Ref: sidebar_format_str() in sidebar.c
 call s:escapesConditionals('SidebarFormat', '[BdFLNnSt!]', 1, 1)
-" The following info was pulled from query_format_str in query.c
+" Ref: query_format_str() in query.c
 call s:escapesConditionals('QueryFormat', '[acent]', 0, 1)
-" The following info was pulled from mutt_attach_fmt in recvattach.c
+" Ref: attach_format_str() in recvattach.c
 call s:escapesConditionals('AttachFormat', '[CcDdeFfIMmnQsTtuX]', 1, 1)
-" The following info was pulled from compose_format_str in compose.c
+" Ref: compose_format_str() in compose.c
 syntax match muttrcComposeFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[ahlv%]/
 syntax match muttrcComposeFormatEscapes contained /%[>|*]./
-" The following info was pulled from folder_format_str in browser.c
-call s:escapesConditionals('FolderFormat', '[CDdfFglNstu]', 1, 0)
-" The following info was pulled from mix_entry_fmt in remailer.c
+" Ref: folder_format_str() in browser.c
+call s:escapesConditionals('FolderFormat', '[CDdFfglmNnstu]', 1, 0)
+" Ref: mix_format_str() in remailer.c
 call s:escapesConditionals('MixFormat', '[acns]', 0, 0)
-" The following info was pulled from crypt_entry_fmt in crypt-gpgme.c
-" and pgp_entry_fmt in pgpkey.c (note that crypt_entry_fmt supports
-" 'p', but pgp_entry_fmt does not).
-call s:escapesConditionals('PGPFormat', '[acfklnptu[]', 0, 0)
-" The following info was pulled from _mutt_fmt_pgp_command in
-" pgpinvoke.c
-call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1)
-" The following info was pulled from status_format_str in status.c
-call s:escapesConditionals('StatusFormat', '[bdFfhLlMmnoPprSstuVu]', 1, 1)
-" This matches the documentation, but directly contradicts the code
-" (according to the code, this should be identical to the
-" muttrcPGPCmdFormatEscapes
-syntax match muttrcPGPGetKeysFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[acfklntu[%]/
-" The following info was pulled from _mutt_fmt_smime_command in
-" smime.c
+" Ref: status_format_str() in status.c
+call s:escapesConditionals('StatusFormat', '[bdFfhLlMmnoPpRrSstuVv]', 1, 1)
+" Ref: fmt_smime_command() in ncrypt/smime.c
 call s:escapesConditionals('SmimeFormat', '[aCcdfiks]', 0, 1)
+" Ref: crypt_format_str() in ncrypt/crypt_gpgme.c
+" Ref: pgp_entry_fmt() in ncrypt/pgpkey.c
+" Note: crypt_format_str() supports 'p', but pgp_entry_fmt() does not
+call s:escapesConditionals('PGPFormat', '[acfklnptu[]', 0, 0)
+" Ref: fmt_pgp_command() ncrypt/pgpinvoke.c
+call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1)
+
+" This matches the documentation, but directly contradicts the code
+" (according to the code, this should be identical to the muttrcPGPCmdFormatEscapes
+syntax match muttrcPGPGetKeysFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[acfklntu[%]/
 
 syntax region muttrcTimeEscapes contained start=+%{+ end=+}+ contains=muttrcStrftimeEscapes
 syntax region muttrcTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
@@ -188,36 +187,36 @@ syntax region muttrcTimeEscapes contained start=+%(+ end=+)+ contains=muttrcStrf
 syntax region muttrcTimeEscapes contained start=+%<+ end=+>+ contains=muttrcStrftimeEscapes
 syntax region muttrcPGPTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
 
-syntax match muttrcVarEqualsAliasFmt contained skipwhite "=" nextgroup=muttrcAliasFormatStr
-syntax match muttrcVarEqualsAttachFmt contained skipwhite "=" nextgroup=muttrcAttachFormatStr
-syntax match muttrcVarEqualsComposeFmt contained skipwhite "=" nextgroup=muttrcComposeFormatStr
-syntax match muttrcVarEqualsFolderFmt contained skipwhite "=" nextgroup=muttrcFolderFormatStr
-syntax match muttrcVarEqualsIdxFmt contained skipwhite "=" nextgroup=muttrcIndexFormatStr
-syntax match muttrcVarEqualsGrpIdxFmt contained skipwhite "=" nextgroup=muttrcGroupIndexFormatStr
-syntax match muttrcVarEqualsMixFmt contained skipwhite "=" nextgroup=muttrcMixFormatStr
-syntax match muttrcVarEqualsPGPFmt contained skipwhite "=" nextgroup=muttrcPGPFormatStr
-syntax match muttrcVarEqualsQueryFmt contained skipwhite "=" nextgroup=muttrcQueryFormatStr
-syntax match muttrcVarEqualsPGPCmdFmt contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
-syntax match muttrcVarEqualsSdbFmt contained skipwhite "=" nextgroup=muttrcSidebarFormatStr
-syntax match muttrcVarEqualsStatusFmt contained skipwhite "=" nextgroup=muttrcStatusFormatStr
+syntax match muttrcVarEqualsAliasFmt      contained skipwhite "=" nextgroup=muttrcAliasFormatStr
+syntax match muttrcVarEqualsAttachFmt     contained skipwhite "=" nextgroup=muttrcAttachFormatStr
+syntax match muttrcVarEqualsComposeFmt    contained skipwhite "=" nextgroup=muttrcComposeFormatStr
+syntax match muttrcVarEqualsFolderFmt     contained skipwhite "=" nextgroup=muttrcFolderFormatStr
+syntax match muttrcVarEqualsGrpIdxFmt     contained skipwhite "=" nextgroup=muttrcGroupIndexFormatStr
+syntax match muttrcVarEqualsIdxFmt        contained skipwhite "=" nextgroup=muttrcIndexFormatStr
+syntax match muttrcVarEqualsMixFmt        contained skipwhite "=" nextgroup=muttrcMixFormatStr
+syntax match muttrcVarEqualsPGPCmdFmt     contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
+syntax match muttrcVarEqualsPGPFmt        contained skipwhite "=" nextgroup=muttrcPGPFormatStr
 syntax match muttrcVarEqualsPGPGetKeysFmt contained skipwhite "=" nextgroup=muttrcPGPGetKeysFormatStr
-syntax match muttrcVarEqualsSmimeFmt contained skipwhite "=" nextgroup=muttrcSmimeFormatStr
-syntax match muttrcVarEqualsStrftimeFmt contained skipwhite "=" nextgroup=muttrcStrftimeFormatStr
+syntax match muttrcVarEqualsQueryFmt      contained skipwhite "=" nextgroup=muttrcQueryFormatStr
+syntax match muttrcVarEqualsSdbFmt        contained skipwhite "=" nextgroup=muttrcSidebarFormatStr
+syntax match muttrcVarEqualsSmimeFmt      contained skipwhite "=" nextgroup=muttrcSmimeFormatStr
+syntax match muttrcVarEqualsStatusFmt     contained skipwhite "=" nextgroup=muttrcStatusFormatStr
+syntax match muttrcVarEqualsStrftimeFmt   contained skipwhite "=" nextgroup=muttrcStrftimeFormatStr
 
 syntax match muttrcVPrefix contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 
+" CHECKED 2018-04-18
 " List of the different screens in mutt
-" UPDATE
-syntax keyword muttrcMenu contained alias attach browser compose editor index pager postpone pgp mix query generic
+syntax keyword muttrcMenu contained alias attach browser compose editor generic index key_select_pgp key_select_smime mix pager pgp postpone query smime
 syntax match muttrcMenuList "\S\+" contained contains=muttrcMenu
 syntax match muttrcMenuCommas /,/ contained
 
+" CHECKED 2018-04-18
 " List of hooks in Commands in init.h
-" UPDATE
 syntax keyword muttrcHooks contained skipwhite
-			\ account-hook append-hook charset-hook
-			\ close-hook crypt-hook fcc-hook fcc-save-hook folder-hook iconv-hook mbox-hook
-			\ message-hook open-hook pgp-hook reply-hook save-hook send-hook send2-hook
+			\ account-hook append-hook close-hook crypt-hook fcc-hook fcc-save-hook
+			\ folder-hook iconv-hook mbox-hook message-hook open-hook pgp-hook
+			\ reply-hook save-hook send-hook send2-hook
 syntax keyword muttrcHooks skipwhite shutdown-hook startup-hook timeout-hook nextgroup=muttrcCommand
 
 syntax region muttrcSpamPattern	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
@@ -373,23 +372,24 @@ syntax keyword muttrcMonoAttrib	contained bold none normal reverse standout unde
 syntax keyword muttrcMono	contained mono		skipwhite nextgroup=muttrcColorField,muttrcColorCompose
 syntax match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono
 
+" CHECKED 2018-04-18
 " List of fields in Fields in color.c
-" UPDATE
 syntax keyword muttrcColorField skipwhite contained
-			\ attach_headers attachment bold error hdrdefault index_author index_collapsed
-			\ index_date index_label index_number index_size index_subject index_tags
-			\ indicator markers message normal progress prompt quoted search sidebar_divider
+			\ attachment attach_headers body bold error hdrdefault header index
+			\ index_author index_collapsed index_date index_flags index_label
+			\ index_number index_size index_subject index_tag index_tags indicator
+			\ markers message normal progress prompt quoted search sidebar_divider
 			\ sidebar_flagged sidebar_highlight sidebar_indicator sidebar_new
 			\ sidebar_ordinary sidebar_spoolfile signature status tilde tree underline
-			\ body header index index_flags index_tag
 			\ nextgroup=muttrcColor
 syntax match   muttrcColorField	contained "\<quoted\d\=\>"
 
 syntax match muttrcColorCompose skipwhite contained /\s*compose\s*/ nextgroup=muttrcColorComposeField
+
+" CHECKED 2018-04-18
 " List of fields in ComposeFields in color.c
-" UPDATE
 syntax keyword muttrcColorComposeField skipwhite contained
-			\ header security_encrypt security_sign security_both security_none
+			\ header security_both security_encrypt security_none security_sign
 			\ nextgroup=muttrcColorFG,muttrcColorFGNL
 syntax region muttrcColorLine keepend start=/^\s*color\s\+/ skip=+\\$+ end=+$+ contains=muttrcColorKeyword,muttrcComment,muttrcUnHighlightSpace
 
@@ -412,103 +412,107 @@ function! s:boolQuadGen(type, vars, deprecated)
 	exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:invvars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr'
 endfunction
 
+" CHECKED 2018-04-18
 " List of DT_BOOL in MuttVars in init.h
-" UPDATE
 call s:boolQuadGen('Bool', [
-			\ 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'askbcc', 'askcc',
-			\ 'ask_follow_up', 'ask_x_comment_to', 'attach_split', 'autoedit', 'auto_tag',
-			\ 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly', 'check_mbox_size',
-			\ 'check_new', 'collapse_all', 'collapse_flagged', 'collapse_unread',
-			\ 'confirmappend', 'confirmcreate', 'crypt_autoencrypt', 'crypt_autopgp',
-			\ 'crypt_autosign', 'crypt_autosmime', 'crypt_confirmhook',
-			\ 'crypt_opportunistic_encrypt', 'crypt_replyencrypt', 'crypt_replysign',
-			\ 'crypt_replysignencrypted', 'crypt_timestamp', 'crypt_use_gpgme',
-			\ 'crypt_use_pka', 'delete_untag', 'digest_collapse', 'duplicate_threads',
-			\ 'edit_headers', 'encode_from', 'fast_reply', 'fcc_clear', 'flag_safe',
-			\ 'followup_to', 'force_name', 'forward_decode', 'forward_decrypt',
-			\ 'forward_quote', 'forward_references', 'hdrs', 'header',
-			\ 'header_cache_compress', 'header_color_partial', 'help', 'hidden_host',
-			\ 'hide_limited', 'hide_missing', 'hide_thread_subject', 'hide_top_limited',
-			\ 'hide_top_missing', 'history_remove_dups', 'honor_disposition', 'idn_decode',
-			\ 'idn_encode', 'ignore_linear_white_space', 'ignore_list_reply_to',
-			\ 'imap_check_subscribed', 'imap_idle', 'imap_list_subscribed', 'imap_passive',
-			\ 'imap_peek', 'imap_servernoise', 'implicit_autoview', 'include_onlyfirst',
-			\ 'keep_flagged', 'mailcap_sanitize', 'mail_check_recent', 'mail_check_stats',
+			\ 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'askbcc',
+			\ 'askcc', 'ask_follow_up', 'ask_x_comment_to', 'attach_split', 'autoedit',
+			\ 'auto_tag', 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly',
+			\ 'change_folder_next', 'check_mbox_size', 'check_new', 'collapse_all',
+			\ 'collapse_flagged', 'collapse_unread', 'confirmappend', 'confirmcreate',
+			\ 'crypt_autoencrypt', 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime',
+			\ 'crypt_confirmhook', 'crypt_opportunistic_encrypt', 'crypt_replyencrypt',
+			\ 'crypt_replysign', 'crypt_replysignencrypted', 'crypt_timestamp',
+			\ 'crypt_use_gpgme', 'crypt_use_pka', 'delete_untag', 'digest_collapse',
+			\ 'duplicate_threads', 'edit_headers', 'encode_from', 'fast_reply',
+			\ 'fcc_clear', 'flag_safe', 'followup_to', 'force_name', 'forward_decode',
+			\ 'forward_decrypt', 'forward_quote', 'forward_references', 'hdrs',
+			\ 'header', 'header_cache_compress', 'header_color_partial', 'help',
+			\ 'hidden_host', 'hide_limited', 'hide_missing', 'hide_thread_subject',
+			\ 'hide_top_limited', 'hide_top_missing', 'history_remove_dups',
+			\ 'honor_disposition', 'idn_decode', 'idn_encode', 'ignore_list_reply_to',
+			\ 'imap_check_subscribed', 'imap_idle', 'imap_list_subscribed',
+			\ 'imap_passive', 'imap_peek', 'imap_servernoise', 'implicit_autoview',
+			\ 'include_onlyfirst', 'keep_flagged', 'mailcap_sanitize',
 			\ 'maildir_check_cur', 'maildir_header_cache_verify', 'maildir_trash',
-			\ 'markers', 'mark_old', 'menu_move_off', 'menu_scroll', 'message_cache_clean',
-			\ 'meta_key', 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject',
+			\ 'mail_check_recent', 'mail_check_stats', 'markers', 'mark_old',
+			\ 'menu_move_off', 'menu_scroll', 'message_cache_clean', 'meta_key',
+			\ 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject',
 			\ 'mime_type_query_first', 'narrow_tree', 'nm_record', 'nntp_listgroup',
-			\ 'nntp_load_description', 'pager_stop', 'pgp_auto_decode', 'pgp_autoinline',
-			\ 'pgp_check_exit', 'pgp_ignore_subkeys', 'pgp_long_ids', 'pgp_replyinline',
-			\ 'pgp_retainable_sigs', 'pgp_self_encrypt', 'pgp_show_unusable',
-			\ 'pgp_strict_enc', 'pgp_use_gpg_agent', 'pipe_decode', 'pipe_split',
-			\ 'pop_auth_try_all', 'pop_last', 'postpone_encrypt', 'print_decode',
-			\ 'print_split', 'prompt_after', 'read_only', 'reflow_space_quotes',
-			\ 'reflow_text', 'reply_self', 'reply_with_xorig', 'resolve',
-			\ 'resume_draft_files', 'resume_edited_draft_files', 'reverse_alias',
-			\ 'reverse_name', 'reverse_realname', 'rfc2047_parameters', 'save_address',
-			\ 'save_empty', 'save_name', 'save_unsubscribed', 'score', 'show_new_news',
-			\ 'show_only_unread', 'sidebar_folder_indent', 'sidebar_new_mail_only',
-			\ 'sidebar_next_new_wrap', 'sidebar_on_right', 'sidebar_short_path',
-			\ 'sidebar_visible', 'sig_dashes', 'sig_on_top', 'smart_wrap',
-			\ 'smime_ask_cert_label', 'smime_decrypt_use_default_key', 'smime_is_default',
-			\ 'smime_self_encrypt', 'sort_re', 'ssl_force_tls', 'ssl_use_sslv2',
-			\ 'ssl_use_sslv3', 'ssl_usesystemcerts', 'ssl_use_tlsv1', 'ssl_use_tlsv1_1',
-			\ 'ssl_use_tlsv1_2', 'ssl_verify_dates', 'ssl_verify_host',
-			\ 'ssl_verify_partial_chains', 'status_on_top', 'strict_threads', 'suspend',
-			\ 'text_flowed', 'thorough_search', 'thread_received', 'tilde', 'ts_enabled',
-			\ 'uncollapse_jump', 'uncollapse_new', 'use_8bitmime', 'use_domain',
-			\ 'use_envelope_from', 'use_from', 'use_ipv6', 'user_agent',
-			\ 'virtual_spoolfile', 'wait_key', 'weed', 'wrap_search', 'write_bcc',
-			\ 'x_comment_to'
+			\ 'nntp_load_description', 'pager_stop', 'pgp_autoinline',
+			\ 'pgp_auto_decode', 'pgp_check_exit', 'pgp_ignore_subkeys', 'pgp_long_ids',
+			\ 'pgp_replyinline', 'pgp_retainable_sigs', 'pgp_self_encrypt',
+			\ 'pgp_show_unusable', 'pgp_strict_enc', 'pgp_use_gpg_agent', 'pipe_decode',
+			\ 'pipe_split', 'pop_auth_try_all', 'pop_last', 'postpone_encrypt',
+			\ 'print_decode', 'print_split', 'prompt_after', 'read_only',
+			\ 'reflow_space_quotes', 'reflow_text', 'reply_self', 'reply_with_xorig',
+			\ 'resolve', 'resume_draft_files', 'resume_edited_draft_files',
+			\ 'reverse_alias', 'reverse_name', 'reverse_realname', 'rfc2047_parameters',
+			\ 'save_address', 'save_empty', 'save_name', 'save_unsubscribed', 'score',
+			\ 'show_new_news', 'show_only_unread', 'sidebar_folder_indent',
+			\ 'sidebar_new_mail_only', 'sidebar_next_new_wrap', 'sidebar_on_right',
+			\ 'sidebar_short_path', 'sidebar_visible', 'sig_dashes', 'sig_on_top',
+			\ 'smart_wrap', 'smime_ask_cert_label', 'smime_decrypt_use_default_key',
+			\ 'smime_is_default', 'smime_self_encrypt', 'sort_re', 'ssl_force_tls',
+			\ 'ssl_usesystemcerts', 'ssl_use_sslv2', 'ssl_use_sslv3', 'ssl_use_tlsv1',
+			\ 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_verify_dates',
+			\ 'ssl_verify_host', 'ssl_verify_partial_chains', 'status_on_top',
+			\ 'strict_threads', 'suspend', 'text_flowed', 'thorough_search',
+			\ 'thread_received', 'tilde', 'ts_enabled', 'uncollapse_jump',
+			\ 'uncollapse_new', 'user_agent', 'use_8bitmime', 'use_domain',
+			\ 'use_envelope_from', 'use_from', 'use_ipv6', 'virtual_spoolfile',
+			\ 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to'
 			\ ], 0)
 
+" CHECKED 2018-04-18
 " Deprecated Bools
-" UPDATE
 " List of DT_SYNONYM synonyms of Bools in MuttVars in init.h
 call s:boolQuadGen('Bool', [
-			\ 'edit_hdrs', 'envelope_from', 'forw_decode', 'forw_decrypt', 'forw_quote',
-			\ 'pgp_autoencrypt', 'pgp_autosign', 'pgp_auto_traditional',
-			\ 'pgp_create_traditional', 'pgp_replyencrypt', 'pgp_replysign',
-			\ 'pgp_replysignencrypted', 'xterm_set_titles'
+			\ 'edit_hdrs', 'envelope_from', 'forw_decode', 'forw_decrypt',
+			\ 'forw_quote', 'ignore_linear_white_space', 'pgp_autoencrypt',
+			\ 'pgp_autosign', 'pgp_auto_traditional', 'pgp_create_traditional',
+			\ 'pgp_replyencrypt', 'pgp_replysign', 'pgp_replysignencrypted',
+			\ 'xterm_set_titles'
 			\ ], 1)
 
+" CHECKED 2018-04-18
 " List of DT_QUAD in MuttVars in init.h
-" UPDATE
 call s:boolQuadGen('Quad', [
 			\ 'abort_noattach', 'abort_nosubject', 'abort_unmodified', 'bounce',
 			\ 'catchup_newsgroup', 'copy', 'crypt_verify_sig', 'delete', 'fcc_attach',
 			\ 'followup_to_poster', 'forward_edit', 'honor_followup_to', 'include',
-			\ 'mime_forward', 'mime_forward_rest', 'move', 'pgp_encrypt_self',
-			\ 'pgp_mime_auto', 'pop_delete', 'pop_reconnect', 'post_moderated', 'postpone',
-			\ 'print', 'quit', 'recall', 'reply_to', 'smime_encrypt_self', 'ssl_starttls',
+			\ 'mime_forward', 'mime_forward_rest', 'move', 'pgp_mime_auto',
+			\ 'pop_delete', 'pop_reconnect', 'postpone', 'post_moderated', 'print',
+			\ 'quit', 'recall', 'reply_to', 'ssl_starttls'
 			\ ], 0)
 
+" CHECKED 2018-04-18
 " Deprecated Quads
-" UPDATE
 " List of DT_SYNONYM synonyms of Quads in MuttVars in init.h
 call s:boolQuadGen('Quad', [
-			\ 'mime_fwd', 'pgp_verify_sig'
+			\ 'mime_fwd', 'pgp_encrypt_self', 'pgp_verify_sig', 'smime_encrypt_self'
 			\ ], 1)
 
+" CHECKED 2018-04-18
 " List of DT_NUMBER in MuttVars in init.h
-" UPDATE
 syntax keyword muttrcVarNum	skipwhite contained
 			\ connect_timeout debug_level history imap_keepalive imap_pipeline_depth
-			\ imap_poll_timeout mail_check mail_check_stats_interval menu_context net_inc
-			\ nm_db_limit nm_open_timeout nm_query_window_current_position
+			\ imap_poll_timeout mail_check mail_check_stats_interval menu_context
+			\ net_inc nm_db_limit nm_open_timeout nm_query_window_current_position
 			\ nm_query_window_duration nntp_context nntp_poll pager_context
 			\ pager_index_lines pgp_timeout pop_checkinterval read_inc reflow_wrap
-			\ save_history score_threshold_delete score_threshold_flag score_threshold_read
-			\ search_context sendmail_wait sidebar_width skip_quoted_offset sleep_time
-			\ smime_timeout ssl_min_dh_prime_bits time_inc timeout wrap wrap_headers
-			\ wrapmargin write_inc
+			\ save_history score_threshold_delete score_threshold_flag
+			\ score_threshold_read search_context sendmail_wait sidebar_component_depth
+			\ sidebar_width skip_quoted_offset sleep_time smime_timeout
+			\ ssl_min_dh_prime_bits timeout time_inc wrap wrap_headers write_inc
+			\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+syntax keyword muttrcVarDeprecatedNum	contained skipwhite
+			\ wrapmargin
 			\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 
+" CHECKED 2018-04-18
 " List of DT_STRING in MuttVars in init.h
-" UPDATE
 " Special cases first, and all the rest at the end
-" A lot of special cases are format, flatcap compiled a list here https://pastebin.com/raw/5QXhiP6L
 " Formats themselves must be updated in their respective groups
 " See s:escapesConditionals
 syntax match muttrcVarStr	contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
@@ -521,19 +525,19 @@ syntax keyword muttrcVarStr	contained skipwhite attribution index_format message
 syntax keyword muttrcVarDeprecatedStr	contained skipwhite hdr_format msg_format nextgroup=muttrcVarEqualsIdxFmt
 syntax keyword muttrcVarStr	contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt
 syntax keyword muttrcVarStr	contained skipwhite
-			\ pgp_decode_command pgp_verify_command pgp_decrypt_command
-			\ pgp_clearsign_command pgp_sign_command pgp_encrypt_sign_command
-			\ pgp_encrypt_only_command pgp_import_command pgp_export_command
-			\ pgp_verify_key_command pgp_list_secring_command pgp_list_pubring_command
+			\ pgp_clearsign_command pgp_decode_command pgp_decrypt_command
+			\ pgp_encrypt_only_command pgp_encrypt_sign_command pgp_export_command
+			\ pgp_import_command pgp_list_pubring_command pgp_list_secring_command
+			\ pgp_sign_command pgp_verify_command pgp_verify_key_command
 			\ nextgroup=muttrcVarEqualsPGPCmdFmt
 syntax keyword muttrcVarStr	contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt
 syntax keyword muttrcVarStr	contained skipwhite pgp_getkeys_command nextgroup=muttrcVarEqualsPGPGetKeysFmt
 syntax keyword muttrcVarStr	contained skipwhite query_format nextgroup=muttrcVarEqualsQueryFmt
 syntax keyword muttrcVarStr	contained skipwhite
-			\ smime_decrypt_command smime_verify_command smime_verify_opaque_command
-			\ smime_sign_command smime_sign_opaque_command smime_encrypt_command
-			\ smime_pk7out_command smime_get_cert_command smime_get_signer_cert_command
-			\ smime_import_cert_command smime_get_cert_email_command
+			\ smime_decrypt_command smime_encrypt_command smime_get_cert_command
+			\ smime_get_cert_email_command smime_get_signer_cert_command
+			\ smime_import_cert_command smime_pk7out_command smime_sign_command
+			\ smime_verify_command smime_verify_opaque_command
 			\ nextgroup=muttrcVarEqualsSmimeFmt
 syntax keyword muttrcVarStr	contained skipwhite ts_icon_format ts_status_format status_format nextgroup=muttrcVarEqualsStatusFmt
 " Deprecated format
@@ -543,26 +547,29 @@ syntax keyword muttrcVarStr	contained skipwhite group_index_format nextgroup=mut
 syntax keyword muttrcVarStr	contained skipwhite sidebar_format nextgroup=muttrcVarEqualsSdbFmt
 syntax keyword muttrcVarStr	contained skipwhite
 			\ assumed_charset attach_charset attach_sep attribution_locale charset
-			\ config_charset content_type default_hook dsn_notify dsn_return empty_subject
-			\ escape forward_attribution_intro forward_attribution_trailer forward_format
-			\ header_cache_pagesize hidden_tags hostname imap_authenticators
-			\ imap_delim_chars imap_headers imap_login imap_pass imap_user indent_string
-			\ mailcap_path mark_macro_prefix mh_seq_flagged mh_seq_replied mh_seq_unseen
-			\ mime_type_query_command newsgroups_charset news_server nm_default_uri
-			\ nm_exclude_tags nm_query_type nm_query_window_current_search
-			\ nm_query_window_timebase nm_record_tags nm_unread_tag nntp_authenticators
-			\ nntp_pass nntp_user pgp_self_encrypt_as pgp_sign_as pipe_sep
-			\ pop_authenticators pop_host pop_pass pop_user post_indent_string
-			\ postpone_encrypt_as preconnect realname send_charset
+			\ config_charset content_type default_hook dsn_notify dsn_return
+			\ empty_subject escape forward_attribution_intro forward_attribution_trailer
+			\ forward_format header_cache_pagesize hidden_tags hostname
+			\ imap_authenticators imap_delim_chars imap_headers imap_login imap_pass
+			\ imap_user indent_string mailcap_path mark_macro_prefix mh_seq_flagged
+			\ mh_seq_replied mh_seq_unseen mime_type_query_command newsgroups_charset
+			\ news_server nm_default_uri nm_exclude_tags nm_query_type
+			\ nm_query_window_current_search nm_query_window_timebase nm_record_tags
+			\ nm_unread_tag nntp_authenticators nntp_pass nntp_user pgp_default_key
+			\ pgp_sign_as pipe_sep pop_authenticators pop_host pop_pass pop_user
+			\ postpone_encrypt_as post_indent_string preconnect realname send_charset
 			\ show_multipart_alternative sidebar_delim_chars sidebar_divider_char
 			\ sidebar_indent_string simple_search smime_default_key smime_encrypt_with
-			\ smime_self_encrypt_as smime_sign_digest_alg smtp_authenticators smtp_pass
-			\ smtp_url spam_separator ssl_ciphers tunnel
+			\ smime_sign_as smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url
+			\ spam_separator ssl_ciphers tunnel
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 " Deprecated strings
 syntax keyword muttrcVarDeprecatedStr	contained skipwhite
-			\ forw_format indent_str post_indent_str smime_sign_as
+			\ forw_format indent_str pgp_self_encrypt_as post_indent_str
+			\ smime_self_encrypt_as
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+
+" CHECKED 2018-04-18
 " List of DT_ADDRESS
 syntax keyword muttrcVarStr	contained skipwhite envelope_from_address from nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 " List of DT_HCACHE
@@ -571,6 +578,8 @@ syntax keyword muttrcVarStr	contained skipwhite header_cache_backend nextgroup=m
 syntax keyword muttrcVarStr	contained skipwhite mbox_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 " List of DT_MBTABLE
 syntax keyword muttrcVarStr	contained skipwhite flag_chars from_chars status_chars to_chars nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+
+" CHECKED 2018-04-18
 " List of DT_PATH
 syntax keyword muttrcVarStr	contained skipwhite
 			\ alias_file certificate_file debug_file display_filter editor entropy_file
@@ -580,20 +589,24 @@ syntax keyword muttrcVarStr	contained skipwhite
 			\ smime_certificates smime_keys spoolfile ssl_ca_certificates_file
 			\ ssl_client_cert tmpdir trash visual
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
-" List of deprecated DT_PATH
-syntax keyword muttrcVarDeprecatedStr	contained skipwhite print_cmd nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+
+" CHECKED 2018-04-18
 " List of DT_REGEX
 syntax keyword muttrcVarStr	contained skipwhite
-			\ attach_keyword gecos_mask mask pgp_decryption_okay pgp_good_sign quote_regexp
-			\ reply_regexp smileys
+			\ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign
+			\ quote_regex reply_regex smileys
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+" List of deprecated DT_PATH
+syntax keyword muttrcVarDeprecatedStr	contained skipwhite print_cmd nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
+" List of deprecated DT_REGEX
+syntax keyword muttrcVarDeprecatedStr	contained skipwhite abort_noattach_regexp attach_keyword quote_regexp reply_regexp nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 " List of DT_SORT
 syntax keyword muttrcVarStr	contained skipwhite
 			\ pgp_sort_keys sidebar_sort_method sort sort_alias sort_aux sort_browser
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 
+" CHECKED 2018-04-18
 " List of commands in Commands in init.h
-" UPDATE
 " Remember to remove hooks, they have already been dealt with
 syntax keyword muttrcCommand	skipwhite charset-hook nextgroup=muttrcRXString
 syntax keyword muttrcCommand	skipwhite unhook nextgroup=muttrcHooks
@@ -606,19 +619,16 @@ syntax keyword muttrcCommand	skipwhite unalias nextgroup=muttrcUnAliasKey,muttrc
 syntax keyword muttrcCommand	skipwhite set unset reset toggle nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr,muttrcVarDeprecatedBool,muttrcVarDeprecatedQuad,muttrcVarDeprecatedStr
 syntax keyword muttrcCommand	skipwhite exec nextgroup=muttrcFunction
 syntax keyword muttrcCommand	skipwhite
-			\ alternative_order attachments auto_view hdr_order ifdef ifndef ignore lua
-			\ lua-source mailboxes mailto_allow mime_lookup my_hdr push score setenv
-			\ sidebar_whitelist source subjectrx tag-formats tag-transforms
-			\ unalternative_order unattachments unauto_view uncolor unhdr_order unignore
-			\ unmailboxes unmailto_allow unmime_lookup unmono unmy_hdr unscore unsetenv
-			\ unsidebar_whitelist unsubjectrx unvirtual-mailboxes virtual-mailboxes
+			\ alternative_order attachments auto_view finish hdr_order ifdef ifndef
+			\ ignore lua lua-source mailboxes mailto_allow mime_lookup my_hdr push score
+			\ setenv sidebar_whitelist source subjectrx subscribe-to tag-formats
+			\ tag-transforms unalternative_order unattachments unauto_view uncolor
+			\ unhdr_order unignore unmailboxes unmailto_allow unmime_lookup unmono
+			\ unmy_hdr unscore unsetenv unsidebar_whitelist unsubjectrx unsubscribe-from
+			\ unvirtual-mailboxes virtual-mailboxes
 
+" CHECKED 2018-04-18
 " List of functions in functions.h
-" UPDATE
-syntax match muttrcFunction contained "\<accept\>"
-syntax match muttrcFunction contained "\<append\>"
-syntax match muttrcFunction contained "\<attach-file\>"
-syntax match muttrcFunction contained "\<attach-key\>"
 syntax match muttrcFunction contained "\<accept\>"
 syntax match muttrcFunction contained "\<append\>"
 syntax match muttrcFunction contained "\<attach-file\>"
@@ -629,8 +639,8 @@ syntax match muttrcFunction contained "\<backspace\>"
 syntax match muttrcFunction contained "\<backward-char\>"
 syntax match muttrcFunction contained "\<backward-word\>"
 syntax match muttrcFunction contained "\<bol\>"
-syntax match muttrcFunction contained "\<bottom\>"
 syntax match muttrcFunction contained "\<bottom-page\>"
+syntax match muttrcFunction contained "\<bottom\>"
 syntax match muttrcFunction contained "\<bounce-message\>"
 syntax match muttrcFunction contained "\<break-thread\>"
 syntax match muttrcFunction contained "\<buffy-cycle\>"
@@ -640,10 +650,10 @@ syntax match muttrcFunction contained "\<catchup\>"
 syntax match muttrcFunction contained "\<chain-next\>"
 syntax match muttrcFunction contained "\<chain-prev\>"
 syntax match muttrcFunction contained "\<change-dir\>"
-syntax match muttrcFunction contained "\<change-folder\>"
 syntax match muttrcFunction contained "\<change-folder-readonly\>"
-syntax match muttrcFunction contained "\<change-newsgroup\>"
+syntax match muttrcFunction contained "\<change-folder\>"
 syntax match muttrcFunction contained "\<change-newsgroup-readonly\>"
+syntax match muttrcFunction contained "\<change-newsgroup\>"
 syntax match muttrcFunction contained "\<change-vfolder\>"
 syntax match muttrcFunction contained "\<check-new\>"
 syntax match muttrcFunction contained "\<check-traditional-pgp\>"
@@ -651,8 +661,8 @@ syntax match muttrcFunction contained "\<clear-flag\>"
 syntax match muttrcFunction contained "\<collapse-all\>"
 syntax match muttrcFunction contained "\<collapse-parts\>"
 syntax match muttrcFunction contained "\<collapse-thread\>"
-syntax match muttrcFunction contained "\<complete\>"
 syntax match muttrcFunction contained "\<complete-query\>"
+syntax match muttrcFunction contained "\<complete\>"
 syntax match muttrcFunction contained "\<compose-to-sender\>"
 syntax match muttrcFunction contained "\<copy-file\>"
 syntax match muttrcFunction contained "\<copy-message\>"
@@ -665,7 +675,6 @@ syntax match muttrcFunction contained "\<decode-copy\>"
 syntax match muttrcFunction contained "\<decode-save\>"
 syntax match muttrcFunction contained "\<decrypt-copy\>"
 syntax match muttrcFunction contained "\<decrypt-save\>"
-syntax match muttrcFunction contained "\<delete\>"
 syntax match muttrcFunction contained "\<delete-char\>"
 syntax match muttrcFunction contained "\<delete-entry\>"
 syntax match muttrcFunction contained "\<delete-mailbox\>"
@@ -673,13 +682,13 @@ syntax match muttrcFunction contained "\<delete-message\>"
 syntax match muttrcFunction contained "\<delete-pattern\>"
 syntax match muttrcFunction contained "\<delete-subthread\>"
 syntax match muttrcFunction contained "\<delete-thread\>"
+syntax match muttrcFunction contained "\<delete\>"
 syntax match muttrcFunction contained "\<detach-file\>"
 syntax match muttrcFunction contained "\<display-address\>"
 syntax match muttrcFunction contained "\<display-filename\>"
 syntax match muttrcFunction contained "\<display-message\>"
 syntax match muttrcFunction contained "\<display-toggle-weed\>"
 syntax match muttrcFunction contained "\<downcase-word\>"
-syntax match muttrcFunction contained "\<edit\>"
 syntax match muttrcFunction contained "\<edit-bcc\>"
 syntax match muttrcFunction contained "\<edit-cc\>"
 syntax match muttrcFunction contained "\<edit-description\>"
@@ -700,6 +709,7 @@ syntax match muttrcFunction contained "\<edit-subject\>"
 syntax match muttrcFunction contained "\<edit-to\>"
 syntax match muttrcFunction contained "\<edit-type\>"
 syntax match muttrcFunction contained "\<edit-x-comment-to\>"
+syntax match muttrcFunction contained "\<edit\>"
 syntax match muttrcFunction contained "\<end-cond\>"
 syntax match muttrcFunction contained "\<enter-command\>"
 syntax match muttrcFunction contained "\<enter-mask\>"
@@ -722,11 +732,13 @@ syntax match muttrcFunction contained "\<get-children\>"
 syntax match muttrcFunction contained "\<get-message\>"
 syntax match muttrcFunction contained "\<get-parent\>"
 syntax match muttrcFunction contained "\<goto-folder\>"
+syntax match muttrcFunction contained "\<goto-parent\>"
 syntax match muttrcFunction contained "\<group-reply\>"
 syntax match muttrcFunction contained "\<half-down\>"
 syntax match muttrcFunction contained "\<half-up\>"
 syntax match muttrcFunction contained "\<help\>"
 syntax match muttrcFunction contained "\<history-down\>"
+syntax match muttrcFunction contained "\<history-search\>"
 syntax match muttrcFunction contained "\<history-up\>"
 syntax match muttrcFunction contained "\<imap-fetch-mail\>"
 syntax match muttrcFunction contained "\<imap-logout-all\>"
@@ -738,29 +750,32 @@ syntax match muttrcFunction contained "\<kill-eow\>"
 syntax match muttrcFunction contained "\<kill-line\>"
 syntax match muttrcFunction contained "\<kill-word\>"
 syntax match muttrcFunction contained "\<last-entry\>"
-syntax match muttrcFunction contained "\<limit\>"
 syntax match muttrcFunction contained "\<limit-current-thread\>"
+syntax match muttrcFunction contained "\<limit\>"
 syntax match muttrcFunction contained "\<link-threads\>"
 syntax match muttrcFunction contained "\<list-reply\>"
-syntax match muttrcFunction contained "\<mail\>"
 syntax match muttrcFunction contained "\<mail-key\>"
+syntax match muttrcFunction contained "\<mail\>"
 syntax match muttrcFunction contained "\<mark-as-new\>"
 syntax match muttrcFunction contained "\<mark-message\>"
 syntax match muttrcFunction contained "\<middle-page\>"
 syntax match muttrcFunction contained "\<mix\>"
-syntax match muttrcFunction contained "\<modify-labels\>"
 syntax match muttrcFunction contained "\<modify-labels-then-hide\>"
+syntax match muttrcFunction contained "\<modify-labels\>"
+syntax match muttrcFunction contained "\<modify-tags-then-hide\>"
+syntax match muttrcFunction contained "\<modify-tags\>"
 syntax match muttrcFunction contained "\<new-mime\>"
 syntax match muttrcFunction contained "\<next-entry\>"
 syntax match muttrcFunction contained "\<next-line\>"
-syntax match muttrcFunction contained "\<next-new\>"
 syntax match muttrcFunction contained "\<next-new-then-unread\>"
+syntax match muttrcFunction contained "\<next-new\>"
 syntax match muttrcFunction contained "\<next-page\>"
 syntax match muttrcFunction contained "\<next-subthread\>"
 syntax match muttrcFunction contained "\<next-thread\>"
 syntax match muttrcFunction contained "\<next-undeleted\>"
-syntax match muttrcFunction contained "\<next-unread\>"
 syntax match muttrcFunction contained "\<next-unread-mailbox\>"
+syntax match muttrcFunction contained "\<next-unread\>"
+syntax match muttrcFunction contained "\<noop\>"
 syntax match muttrcFunction contained "\<parent-message\>"
 syntax match muttrcFunction contained "\<pgp-menu\>"
 syntax match muttrcFunction contained "\<pipe-entry\>"
@@ -769,8 +784,8 @@ syntax match muttrcFunction contained "\<post-message\>"
 syntax match muttrcFunction contained "\<postpone-message\>"
 syntax match muttrcFunction contained "\<previous-entry\>"
 syntax match muttrcFunction contained "\<previous-line\>"
-syntax match muttrcFunction contained "\<previous-new\>"
 syntax match muttrcFunction contained "\<previous-new-then-unread\>"
+syntax match muttrcFunction contained "\<previous-new\>"
 syntax match muttrcFunction contained "\<previous-page\>"
 syntax match muttrcFunction contained "\<previous-subthread\>"
 syntax match muttrcFunction contained "\<previous-thread\>"
@@ -781,8 +796,8 @@ syntax match muttrcFunction contained "\<print-message\>"
 syntax match muttrcFunction contained "\<purge-message\>"
 syntax match muttrcFunction contained "\<purge-thread\>"
 syntax match muttrcFunction contained "\<quasi-delete\>"
-syntax match muttrcFunction contained "\<query\>"
 syntax match muttrcFunction contained "\<query-append\>"
+syntax match muttrcFunction contained "\<query\>"
 syntax match muttrcFunction contained "\<quit\>"
 syntax match muttrcFunction contained "\<quote-char\>"
 syntax match muttrcFunction contained "\<read-subthread\>"
@@ -800,40 +815,41 @@ syntax match muttrcFunction contained "\<resend-message\>"
 syntax match muttrcFunction contained "\<root-message\>"
 syntax match muttrcFunction contained "\<save-entry\>"
 syntax match muttrcFunction contained "\<save-message\>"
-syntax match muttrcFunction contained "\<search\>"
 syntax match muttrcFunction contained "\<search-next\>"
 syntax match muttrcFunction contained "\<search-opposite\>"
 syntax match muttrcFunction contained "\<search-reverse\>"
 syntax match muttrcFunction contained "\<search-toggle\>"
+syntax match muttrcFunction contained "\<search\>"
 syntax match muttrcFunction contained "\<select-entry\>"
 syntax match muttrcFunction contained "\<select-new\>"
 syntax match muttrcFunction contained "\<send-message\>"
 syntax match muttrcFunction contained "\<set-flag\>"
 syntax match muttrcFunction contained "\<shell-escape\>"
 syntax match muttrcFunction contained "\<show-limit\>"
+syntax match muttrcFunction contained "\<show-log-messages\>"
 syntax match muttrcFunction contained "\<show-version\>"
-syntax match muttrcFunction contained "\<sidebar-next\>"
 syntax match muttrcFunction contained "\<sidebar-next-new\>"
+syntax match muttrcFunction contained "\<sidebar-next\>"
 syntax match muttrcFunction contained "\<sidebar-open\>"
 syntax match muttrcFunction contained "\<sidebar-page-down\>"
 syntax match muttrcFunction contained "\<sidebar-page-up\>"
-syntax match muttrcFunction contained "\<sidebar-prev\>"
 syntax match muttrcFunction contained "\<sidebar-prev-new\>"
+syntax match muttrcFunction contained "\<sidebar-prev\>"
 syntax match muttrcFunction contained "\<sidebar-toggle-virtual\>"
 syntax match muttrcFunction contained "\<sidebar-toggle-visible\>"
 syntax match muttrcFunction contained "\<skip-quoted\>"
 syntax match muttrcFunction contained "\<smime-menu\>"
-syntax match muttrcFunction contained "\<sort\>"
 syntax match muttrcFunction contained "\<sort-mailbox\>"
 syntax match muttrcFunction contained "\<sort-reverse\>"
-syntax match muttrcFunction contained "\<subscribe\>"
+syntax match muttrcFunction contained "\<sort\>"
 syntax match muttrcFunction contained "\<subscribe-pattern\>"
+syntax match muttrcFunction contained "\<subscribe\>"
 syntax match muttrcFunction contained "\<sync-mailbox\>"
 syntax match muttrcFunction contained "\<tag-entry\>"
 syntax match muttrcFunction contained "\<tag-message\>"
 syntax match muttrcFunction contained "\<tag-pattern\>"
-syntax match muttrcFunction contained "\<tag-prefix\>"
 syntax match muttrcFunction contained "\<tag-prefix-cond\>"
+syntax match muttrcFunction contained "\<tag-prefix\>"
 syntax match muttrcFunction contained "\<tag-subthread\>"
 syntax match muttrcFunction contained "\<tag-thread\>"
 syntax match muttrcFunction contained "\<toggle-disposition\>"
@@ -845,8 +861,8 @@ syntax match muttrcFunction contained "\<toggle-recode\>"
 syntax match muttrcFunction contained "\<toggle-subscribed\>"
 syntax match muttrcFunction contained "\<toggle-unlink\>"
 syntax match muttrcFunction contained "\<toggle-write\>"
-syntax match muttrcFunction contained "\<top\>"
 syntax match muttrcFunction contained "\<top-page\>"
+syntax match muttrcFunction contained "\<top\>"
 syntax match muttrcFunction contained "\<transpose-chars\>"
 syntax match muttrcFunction contained "\<uncatchup\>"
 syntax match muttrcFunction contained "\<undelete-entry\>"
@@ -854,8 +870,8 @@ syntax match muttrcFunction contained "\<undelete-message\>"
 syntax match muttrcFunction contained "\<undelete-pattern\>"
 syntax match muttrcFunction contained "\<undelete-subthread\>"
 syntax match muttrcFunction contained "\<undelete-thread\>"
-syntax match muttrcFunction contained "\<unsubscribe\>"
 syntax match muttrcFunction contained "\<unsubscribe-pattern\>"
+syntax match muttrcFunction contained "\<unsubscribe\>"
 syntax match muttrcFunction contained "\<untag-pattern\>"
 syntax match muttrcFunction contained "\<upcase-word\>"
 syntax match muttrcFunction contained "\<update-encoding\>"
@@ -863,8 +879,8 @@ syntax match muttrcFunction contained "\<verify-key\>"
 syntax match muttrcFunction contained "\<vfolder-from-query\>"
 syntax match muttrcFunction contained "\<vfolder-window-backward\>"
 syntax match muttrcFunction contained "\<vfolder-window-forward\>"
-syntax match muttrcFunction contained "\<view-attach\>"
 syntax match muttrcFunction contained "\<view-attachments\>"
+syntax match muttrcFunction contained "\<view-attach\>"
 syntax match muttrcFunction contained "\<view-file\>"
 syntax match muttrcFunction contained "\<view-mailcap\>"
 syntax match muttrcFunction contained "\<view-name\>"
@@ -1029,4 +1045,5 @@ let b:current_syntax = "neomuttrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-"EOF	vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim
+
+" vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim isk+=-
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index 5c1c727..6d3c72d 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -37,6 +37,7 @@ alias mount='mount -v | column -t'
 alias umount='umount -v'
 
 # Con opciones por defecto
+alias ncdu='ncdu --color dark -rr -x --exclude .git'
 alias rg='rg -p'
 alias ytdl='youtube-dl -ic'
 alias ls='ls -F --color=always --group-directories-first'
diff --git a/.tmux.conf b/.tmux.conf
index 9e74593..ccc113f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -71,11 +71,11 @@ bind-key T              command-prompt 'rename-window %%'
 bind-key S              command-prompt 'rename-session %%'
 bind-key r              source-file    $HOME/.tmux.conf \; display "Config Reloaded!"
 
-# Cambiar de pane usando alt-flecha sin prefijo
-bind-key -n M-Left      select-pane -L
-bind-key -n M-Right     select-pane -R
-bind-key -n M-Up        select-pane -U
-bind-key -n M-Down      select-pane -D
+# Cambiar de pane usando flecha con prefijo
+bind-key Left           select-pane -L
+bind-key Right          select-pane -R
+bind-key Up             select-pane -U
+bind-key Down           select-pane -D
 
 # Trocar panes usando alt-flecha con prefijo
 bind-key M-Left         swap-pane -s {left-of}
@@ -118,10 +118,10 @@ bind-key 0              select-window -t :0
 # Movimiento de ventanas
 bind-key Enter          new-window
 bind-key Tab            choose-window
-bind-key -n S-left      prev
-bind-key -n S-right     next
-bind-key -n C-left      swap-window -t -1
-bind-key -n C-right     swap-window -t +1
+bind-key S-left         prev
+bind-key S-right        next
+bind-key C-left         swap-window -t -1
+bind-key C-right        swap-window -t +1
 
 # Urlview
 bind-key u              capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "urlview" '$SHELL -c "urlview < /tmp/tmux-buffer"'
@@ -131,13 +131,13 @@ bind-key [              copy-mode
 bind-key ]              paste-buffer
 
 # Copy/paste. Seleccionar texto con el mouse lo copia automaticamente al clipboard
-bind-key -T              copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i -p -b"
-bind-key p               run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
-bind -n C-S-v            run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
-bind-key C-S-v           run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
+bind-key -T             copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i -p -b"
+bind-key p              run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
+bind -n C-S-v           run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
+bind-key C-S-v          run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
 
 # Prender y apagar statusbar
-bind-key /               set-option -g status
+bind-key /              set-option -g status
 
 # Better mouse support
 set -g @prevent-scroll-for-fullscreen-alternate-buffer 'on'
diff --git a/.zshrc b/.zshrc
index 1f66065..755b7c5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,16 @@
 # -*- mode: shell-script -*-
 # vim:ft=zsh
 
+# framebuffer colors {{{
+if [ "$TERM" = "linux" ]; then
+    _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p'
+    for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do
+        echo -en "$i"
+    done
+    clear
+fi
+# }}}
+
 # Zplugin {{{
 ### Added by Zplugin's installer
 source '/home/deadguy/.zplugin/bin/zplugin.zsh'
diff --git a/paketes.txt b/paketes.txt
index f606ffb..3476a8f 100644
--- a/paketes.txt
+++ b/paketes.txt
@@ -2,10 +2,12 @@ acpi
 acpid
 android-file-transfer
 atool
+audacity
 autoconf
 automake
 autopep8
 b43-fwcutter
+bat
 bison
 bmenu
 bspwm
@@ -86,12 +88,15 @@ mlocate
 mpc
 mpd
 mpv
+msmtp
 nano
+ncdu
 ncmpcpp
 neomutt
 network-manager-applet
 nfs-utils
 nilfs-utils
+notmuch
 ntfs-3g
 oblogout
 odt2txt
@@ -102,8 +107,10 @@ parallel
 patch
 pavucontrol
 perl-curses-ui
+perl-glib-object-introspection
 perl-image-exiftool
 perl-lwp-protocol-https
+perl-text-charwidth
 pkgconf
 pulseaudio-jack
 pygmentize
@@ -121,11 +128,13 @@ python-setproctitle
 python-virtualenv
 qt5ct
 ranger
+realtime-privileges
 reiserfsprogs
 ripgrep
 rofi
 rp-pppoe
 rsync
+rtirq
 s-nail
 sc3-plugins
 seahorse
@@ -141,7 +150,6 @@ texlive-fontsextra
 texlive-formatsextra
 texlive-science
 the_silver_searcher
-tk
 tlp
 tmux
 transmission-cli
diff --git a/paurketos.txt b/paurketos.txt
index 4dd4c97..18e1776 100644
--- a/paurketos.txt
+++ b/paurketos.txt
@@ -27,6 +27,7 @@ pmount
 proggyfonts
 pymdown-extensions
 python-proc
+realtimeconfigquickscan-git
 reaper
 shadowfox-updater
 terminus-font-ll2-td1