up

15 files changed, 142 insertions, 557 deletions

diff --git a/.config/env b/.config/env
index c75c94e..76cafbe 100644
--- a/.config/env
+++ b/.config/env
@@ -36,6 +36,7 @@ export TERMINAL='st'
 export BROWSER='firefox'
 export READER='zathura'
 export FILE='lf'
+export MAIL="$XDG_DATA_HOME"/mail
 
 # UTF-8
 export CHARSET='UTF-8'
diff --git a/.config/isyncrc b/.config/isyncrc
new file mode 100644
index 0000000..87aaa2b
--- /dev/null
+++ b/.config/isyncrc
@@ -0,0 +1,101 @@
+# vim filetype=conf
+
+IMAPStore gmx_rbo-remote
+Host imap.gmx.com
+Port 993
+User rbo@gmx.us
+PassCmd "pass show mutt/gmx_rbo"
+AuthMechs LOGIN
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+MaildirStore gmx_rbo-local
+SubFolders Verbatim
+Path  ~/.local/share/mail/gmx_rbo/
+Inbox ~/.local/share/mail/gmx_rbo/INBOX
+
+Channel gmx_rbo
+Expunge Both
+Far :gmx_rbo-remote:
+Near :gmx_rbo-local:
+Patterns *
+Create Both
+SyncState *
+MaxMessages 0
+ExpireUnread no
+# End profile
+
+## IMAPStore gmail_br-remote
+## Host imap.gmail.com
+## Port 993
+## User bousset.rudy@gmail.com
+## PassCmd "pass show mutt/gmail_br"
+## AuthMechs LOGIN
+## SSLType IMAPS
+## CertificateFile /etc/ssl/cert.pem
+##
+## MaildirStore gmail_br-local
+## SubFolders Verbatim
+## Path /var/mail/jozan/gmail_br/
+## Inbox /var/mail/jozan/gmail_br/INBOX
+##
+## Channel gmail_br
+## Expunge Both
+## Far :gmail_br-remote:
+## Near :gmail_br-local:
+## Patterns *
+## Create Both
+## SyncState *
+## MaxMessages 0
+## ExpireUnread no
+## # End profile
+##
+## IMAPStore gmail_oon-remote
+## Host imap.gmail.com
+## Port 993
+## User olsen.oyvind.nor@gmail.com
+## PassCmd "pass show mutt/gmail_oon"
+## AuthMechs LOGIN
+## SSLType IMAPS
+## CertificateFile /etc/ssl/cert.pem
+##
+## MaildirStore gmail_oon-local
+## SubFolders Verbatim
+## Path /var/mail/jozan/gmail_oon/
+## Inbox /var/mail/jozan/gmail_oon/INBOX
+##
+## Channel gmail_oon
+## Expunge Both
+## Far :gmail_oon-remote:
+## Near :gmail_oon-local:
+## Patterns *
+## Create Both
+## SyncState *
+## MaxMessages 0
+## ExpireUnread no
+## # End profile
+##
+## IMAPStore gmail_tos-remote
+## Host imap.gmail.com
+## Port 993
+## User towerofsilence777@gmail.com
+## PassCmd "pass show mutt/gmail_tos"
+## AuthMechs LOGIN
+## SSLType IMAPS
+## CertificateFile /etc/ssl/cert.pem
+##
+## MaildirStore gmail_tos-local
+## SubFolders Verbatim
+## Path /var/mail/jozan/gmail_tos/
+## Inbox /var/mail/jozan/gmail_tos/INBOX
+##
+## Channel gmail_tos
+## Expunge Both
+## Far :gmail_tos-remote:
+## Near :gmail_tos-local:
+## Patterns *
+## Create Both
+## SyncState *
+## MaxMessages 0
+## ExpireUnread no
+## # End profile
diff --git a/.config/mbsync/mbsyncrc b/.config/mbsync/mbsyncrc
deleted file mode 100644
index cd1f02e..0000000
--- a/.config/mbsync/mbsyncrc
+++ /dev/null
@@ -1,185 +0,0 @@
-# vim filetype=conf
-
-#IMAPStore main-remote
-#Host 127.0.0.1
-#Port 1143
-#User rrbo@proton.me
-#PassCmd "pass show mutt/main"
-## AuthMechs LOGIN
-#SSLType None
-# CertificateFile /etc/ssl/cert.pem
-
-IMAPStore gmx_rbo-remote
-Host imap.gmx.com
-Port 993
-User rbo@gmx.us
-PassCmd "pass show mutt/gmx_rbo"
-AuthMechs LOGIN
-SSLType IMAPS
-CertificateFile /etc/ssl/cert.pem
-
-MaildirStore gmx_rbo-local
-SubFolders Verbatim
-Path /var/mail/jozan/gmx_rbo/
-Inbox /var/mail/jozan/gmx_rbo/INBOX
-
-Channel gmx_rbo
-Expunge Both
-Far :gmx_rbo-remote:
-Near :gmx_rbo-local:
-Patterns *
-Create Both
-SyncState *
-MaxMessages 0
-ExpireUnread no
-# End profile
-
-IMAPStore gmail_br-remote
-Host imap.gmail.com
-Port 993
-User bousset.rudy@gmail.com
-PassCmd "pass show mutt/gmail_br"
-AuthMechs LOGIN
-SSLType IMAPS
-CertificateFile /etc/ssl/cert.pem
-
-MaildirStore gmail_br-local
-SubFolders Verbatim
-Path /var/mail/jozan/gmail_br/
-Inbox /var/mail/jozan/gmail_br/INBOX
-
-Channel gmail_br
-Expunge Both
-Far :gmail_br-remote:
-Near :gmail_br-local:
-Patterns *
-Create Both
-SyncState *
-MaxMessages 0
-ExpireUnread no
-# End profile
-
-IMAPStore gmail_oon-remote
-Host imap.gmail.com
-Port 993
-User olsen.oyvind.nor@gmail.com
-PassCmd "pass show mutt/gmail_oon"
-AuthMechs LOGIN
-SSLType IMAPS
-CertificateFile /etc/ssl/cert.pem
-
-MaildirStore gmail_oon-local
-SubFolders Verbatim
-Path /var/mail/jozan/gmail_oon/
-Inbox /var/mail/jozan/gmail_oon/INBOX
-
-Channel gmail_oon
-Expunge Both
-Far :gmail_oon-remote:
-Near :gmail_oon-local:
-Patterns *
-Create Both
-SyncState *
-MaxMessages 0
-ExpireUnread no
-# End profile
-
-IMAPStore gmail_tos-remote
-Host imap.gmail.com
-Port 993
-User towerofsilence777@gmail.com
-PassCmd "pass show mutt/gmail_tos"
-AuthMechs LOGIN
-SSLType IMAPS
-CertificateFile /etc/ssl/cert.pem
-
-MaildirStore gmail_tos-local
-SubFolders Verbatim
-Path /var/mail/jozan/gmail_tos/
-Inbox /var/mail/jozan/gmail_tos/INBOX
-
-Channel gmail_tos
-Expunge Both
-Far :gmail_tos-remote:
-Near :gmail_tos-local:
-Patterns *
-Create Both
-SyncState *
-MaxMessages 0
-ExpireUnread no
-# End profile
-
-# IMAPStore ss_perso-remote
-# Host next.optimails.com
-# Port 993
-# User rbousset@secuserve.com
-# PassCmd "pass show mutt/ss_perso"
-# AuthMechs LOGIN
-# SSLType IMAPS
-# CertificateFile /etc/ssl/cert.pem
-#
-# MaildirStore ss_perso-local
-# SubFolders Verbatim
-# Path /var/mail/jozan/ss_perso/
-# Inbox /var/mail/jozan/ss_perso/INBOX
-#
-# Channel ss_perso
-# Expunge Both
-# Far :ss_perso-remote:
-# Near :ss_perso-local:
-# Patterns *
-# Create Both
-# SyncState *
-# MaxMessages 0
-# ExpireUnread no
-# # End profile
-#
-# IMAPStore ss_exploit-remote
-# Host next.optimails.com
-# Port 993
-# User exploitation@secuserve.com
-# PassCmd "pass show mutt/ss_exploit"
-# AuthMechs LOGIN
-# SSLType IMAPS
-# CertificateFile /etc/ssl/cert.pem
-#
-# MaildirStore ss_exploit-local
-# SubFolders Verbatim
-# Path /var/mail/jozan/ss_exploit/
-# Inbox /var/mail/jozan/ss_exploit/INBOX
-#
-# Channel ss_exploit
-# Expunge Both
-# Far :ss_exploit-remote:
-# Near :ss_exploit-local:
-# Patterns *
-# Create Both
-# SyncState *
-# MaxMessages 0
-# ExpireUnread no
-# # End profile
-#
-# IMAPStore ss_support-remote
-# Host next.optimails.com
-# Port 993
-# User support@secuserve.com
-# PassCmd "pass show mutt/ss_support"
-# AuthMechs LOGIN
-# SSLType IMAPS
-# CertificateFile /etc/ssl/cert.pem
-#
-# MaildirStore ss_support-local
-# SubFolders Verbatim
-# Path /var/mail/jozan/ss_support/
-# Inbox /var/mail/jozan/ss_support/INBOX
-#
-# Channel ss_support
-# Expunge Both
-# Far :ss_support-remote:
-# Near :ss_support-local:
-# Patterns *
-# Create Both
-# SyncState *
-# MaxMessages 0
-# ExpireUnread no
-# # End profile
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 0919535..3282f7f 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -1,7 +1,9 @@
+# vim: filetype=conf
+
 defaults
 auth	on
 tls	on
-tls_trust_file	/etc/ssl/cert.pem
+tls_trust_file	/etc/ssl/certs/ca-certificates.crt
 logfile /home/jozan/.config/msmtp/msmtp.log
 
 account gmx_rbo
@@ -11,26 +13,26 @@ account gmx_rbo
   user rbo@gmx.us
   passwordeval "pass show mutt/gmx_rbo"
 
-account gmail_br
-  host smtp.gmail.com
-  port 587
-  from Rudy Bousset
-  user bousset.rudy@gmail.com
-  passwordeval "pass show mutt/gmail_br"
-
-account gmail_oon
-  host smtp.gmail.com
-  port 587
-  from Joe
-  user olsen.oyvind.nor@gmail.com
-  passwordeval "pass show mutt/gmail_oon"
-
-account gmail_tos
-  host smtp.gmail.com
-  port 587
-  from Tower Of Silence
-  user towerofsilence777@gmail.com
-  passwordeval "pass show mutt/gmail_tos"
+# account gmail_br
+#   host smtp.gmail.com
+#   port 587
+#   from Rudy Bousset
+#   user bousset.rudy@gmail.com
+#   passwordeval "pass show mutt/gmail_br"
+#
+# account gmail_oon
+#   host smtp.gmail.com
+#   port 587
+#   from Joe
+#   user olsen.oyvind.nor@gmail.com
+#   passwordeval "pass show mutt/gmail_oon"
+#
+# account gmail_tos
+#   host smtp.gmail.com
+#   port 587
+#   from Tower Of Silence
+#   user towerofsilence777@gmail.com
+#   passwordeval "pass show mutt/gmail_tos"
 
 # account ss_perso
 #   host next.optimails.com
diff --git a/.config/mutt/accounts/1-gmx_rbo.muttrc b/.config/mutt/accounts/1-gmx_rbo.muttrc
index 4c260a5..287edda 100644
--- a/.config/mutt/accounts/1-gmx_rbo.muttrc
+++ b/.config/mutt/accounts/1-gmx_rbo.muttrc
@@ -1,9 +1,9 @@
 # vim: filetype=neomuttrc
 # muttrc file for account bousset.rudy@gmail.com
-set realname = "Rudy Bousset"
+set realname = "joe"
 set from = "rbo@gmx.us"
 set sendmail = "msmtp -a gmx_rbo"
-alias me Rudy Bousset <rbo@gmx.us>
+alias me joe <rbo@gmx.us>
 set folder = "$MAIL/gmx_rbo"
 set header_cache = $XDG_RUNTIME_DIR/mutt/gmx_rbo/headers
 set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmx_rbo/bodies
@@ -18,7 +18,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmx_rbo<enter>" "run mbsync to sync rbo@gmx.us"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync gmx_rbo<enter>" "run mbsync to sync rbo@gmx.us"
 unmailboxes *
 
 mailboxes "=INBOX" "=Sent" "=Drafts" "=Spam" "=Trash" "=Keep"
diff --git a/.config/mutt/accounts/4-gmail_br.muttrc b/.config/mutt/accounts/4-gmail_br.muttrc
deleted file mode 100644
index ac92a3c..0000000
--- a/.config/mutt/accounts/4-gmail_br.muttrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account bousset.rudy@gmail.com
-set realname = "Rudy Bousset"
-set from = "bousset.rudy@gmail.com"
-set sendmail = "msmtp -a gmail_br"
-alias me Rudy Bousset <bousset.rudy@gmail.com>
-set folder = "$MAIL/gmail_br"
-set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_br/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_br/bodies
-set mbox_type = Maildir
-set crypt_autosign = yes
-set signature = $XDG_CONFIG_HOME/mutt/sig/2-gmail_br
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind index gg first-entry
-bind pager gg top
-bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_br<enter>" "run mbsync to sync bousset.rudy@gmail.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
-
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
-set record = ""
-macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
-set postponed = "+[Gmail]/Drafts"
-macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
-macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
-macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
-macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
-set trash = "+[Gmail]/Trash"
diff --git a/.config/mutt/accounts/4-ss_perso.muttrc b/.config/mutt/accounts/4-ss_perso.muttrc
deleted file mode 100644
index 9b8d5d1..0000000
--- a/.config/mutt/accounts/4-ss_perso.muttrc
+++ /dev/null
@@ -1,47 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account rbousset@secuserve.com
-set realname = "Rudy Bousset"
-set from = "rbousset@secuserve.com"
-set sendmail = "msmtp -a ss_perso"
-alias me Rudy Bousset <rbousset@secuserve.com>
-set folder = "$MAIL/ss_perso"
-set header_cache = $XDG_RUNTIME_DIR/mutt/ss_perso/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_perso/bodies
-set mbox_type = Maildir
-set crypt_autosign = yes
-set signature = $XDG_CONFIG_HOME/mutt/sig/5-ss_perso
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind index gg first-entry
-bind pager gg top
-bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_perso<enter>" "run mbsync to sync rbousset@secuserve.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=Sent" "=Drafts" "=Junk" "=Trash" "=Keep" "=NEWS" "=Calendrier" "=T&AOI-ches" "=Notes" "=Reports" "=Reports/OTRS" "=Reports/Trello" "=Reports/Teams" "=Reports/Unimus" "=Reports/vzdump"
-
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
-set record = "+Sent"
-macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
-set postponed = "+Drafts"
-macro index,pager gS "<change-folder>=Junk<enter>" "go to junk"
-macro index,pager MS ";<save-message>=Junk<enter>" "move mail to junk"
-macro index,pager CS ";<copy-message>=Junk<enter>" "copy mail to junk"
-macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
-set trash = "+Trash"
-macro index,pager gn "<change-folder>=NEWS<enter>" "go to news"
-macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to news"
-macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to news"
diff --git a/.config/mutt/accounts/5-gmail_oon.muttrc b/.config/mutt/accounts/5-gmail_oon.muttrc
deleted file mode 100644
index 09e1b14..0000000
--- a/.config/mutt/accounts/5-gmail_oon.muttrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account olsen.oyvind.nor@gmail.com
-set realname = "Joe"
-set from = "olsen.oyvind.nor@gmail.com"
-set sendmail = "msmtp -a gmail_oon"
-alias me Joe <olsen.oyvind.nor@gmail.com>
-set folder = "$MAIL/gmail_oon"
-set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_oon/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_oon/bodies
-set mbox_type = Maildir
-set crypt_autosign = yes
-set signature = $XDG_CONFIG_HOME/mutt/sig/3-gmail_oon
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind index gg first-entry
-bind pager gg top
-bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_oon<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
-
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
-set record = ""
-macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
-set postponed = "+[Gmail]/Drafts"
-macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
-macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
-macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
-macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
-set trash = "+[Gmail]/Trash"
diff --git a/.config/mutt/accounts/5-ss_exploit.muttrc b/.config/mutt/accounts/5-ss_exploit.muttrc
deleted file mode 100644
index b763ba0..0000000
--- a/.config/mutt/accounts/5-ss_exploit.muttrc
+++ /dev/null
@@ -1,70 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account support@secuserve.com
-set realname = "Team Exploitation SecuServe"
-set from = "exploitation@secuserve.com"
-set sendmail = "msmtp -a ss_exploit"
-alias me Team Exploitation SecuServe <exploitation@secuserve.com>
-set folder = "$MAIL/ss_exploit"
-set header_cache = $XDG_RUNTIME_DIR/mutt/ss_exploit/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_exploit/bodies
-set mbox_type = Maildir
-set crypt_autosign = no
-set signature = $XDG_CONFIG_HOME/mutt/sig/6-ss_exploit
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind index gg first-entry
-bind pager gg top
-bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_exploit<enter>" "run mbsync to sync exploitation@secuserve.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=INBOX/- Secuserve" "=INBOX/Altospam" "=INBOX/BAT" "=INBOX/DEBUG" "=INBOX/Erreurs (boite recept)" \
-		  "=INBOX/Erreurs (boite recept)/Erreur SI local" "=INBOX/Erreurs (boite recept)/Erreur diverses" "=INBOX/Erreurs (boite recept)/Erreur transport" "=INBOX/Notification" "=INBOX/Postfix SMTP server errors" "=INBOX/Spamtiometre" \
-		  "=INBOX/TSRC sync" "=INBOX/Trait&AOk-" "=INBOX/replication" \
-		  "=Sent" "=Drafts" "=SPAM" "=SPAM/SPAMS_NONTRAITES" "=SPAM/SPAMS_TRAITES" "=SPAM/SPAM_TRAP" \
-		  "=Trash" "=Trash/DOC-SUPPORT" "=Trash/Deleted Messages" "=Trash/Depassement de quota" "=Trash/ESET Antispam" \
-		  "=Trash/GIP-RENATER" "=Trash/MIGRATION-CLIENT" "=Trash/MIGRATION-CLIENT/Cahors" "=Trash/Messages journaliers" "=Trash/Messages journaliers/configs" "=Trash/Messages journaliers/quarantaine" "=Trash/Messages journaliers/rapport quarantaine journalier" "=Trash/PUB" \
-		  "=Trash/Rapport-Astreintes" "=Trash/Reseaux" "=Trash/Stalker" "=Trash/Technique" "=Trash/procedures" \
-		  "=&AMk-l&AOk-ments envoy&AOk-s" "=Brouillons" "=Calendrier" "=Calendrier/Astreintes" "=Calendrier/Conges" \
-		  "=&AMk-l&AOk-ments supprim&AOk-s" "=Alert FireWall" \
-		  "=Alert-Monitoring" "=Archive" "=Archives" "=Archives/2009" "=Archives/2010" "=Archives/2011" \
-		  "=Archives/2012" "=Archives/2013" "=Archives/2014" "=Archives/2015" "=Archives/2016" "=Archives/2017" \
-		  "=Archives/2022" "=Backups" \
-		  "=Complaints" "=Complaints/Complaint La Poste" "=Complaints/Complaint Outlook et Hotmail" "=Contacts" "=Contacts/Clients" "=Courrier ind&AOk-sirable" \
-		  "=Courrier ind&AOk-sirable/SPAM by St&AOk-phane &- Peggy" "=DNS" "=DNS/DNS - MX Status" "=DNS/MxToolBox" "=DNS/Report domain" "=DNS/Report domain/Report domain - Google" \
-		  "=DNS/Report domain/Report domain - Yahoo" "=Erreurs" "=Fournisseurs" "=Fournisseurs/Applications" "=Fournisseurs/Applications/Communigate" \
-		  "=Fournisseurs/Cisco" "=Fournisseurs/DigiCert" "=Fournisseurs/Gandi" "=Fournisseurs/Hebergement" "=Fournisseurs/Hebergement/Global SP" "=Fournisseurs/Hebergement/OVH" \
-		  "=Fournisseurs/Hebergement/OVH/OVH - Message vocaux" "=Fournisseurs/Hebergement/Online" "=Fournisseurs/Hebergement/Owentis" "=Fournisseurs/Hebergement/Owentis/Equinix" "=Fournisseurs/Hebergement/Owentis/Global Switch" "=Incident" \
-		  "=Info Exploitation" "=Info Exploitation/Autre-Licence" "=Info Exploitation/Certificat" "=Info Exploitation/History" "=Info Exploitation/Licence-Antivirus" "=Info Exploitation/Maintenance Datacenter" \
-		  "=Info Exploitation/Pkg-Information" "=Info Exploitation/RBLS" "=Info Exploitation/Support-Technique-Interne" "=Interventions" "=Journal" "=Junk" \
-		  "=MEP" "=MEP/Attente retour Dev" "=MEP/Done" "=MEP/En-cours" "=MEP/wblist" "=Notes" \
-		  "=Report domain/Report domain - Google" "=Report domain/Report domain - Yahoo" \
-		  "=SVN" "=Statistiques" "=Statistiques/Stats clients" "=Statistiques/Stats fournisseurs" "=Supervision" \
-		  "=Supervision/Alarme Lyon" "=Supervision/Alert-Monitoring" "=Supervision/Alerte-Nagios" "=Supervision/Zabbix" "=T&AOI-ches" \
-		  "=main courante" "=main courante/Done"
-
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
-set record = "+Sent"
-macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
-set postponed = "+Drafts"
-macro index,pager gS "<change-folder>=SPAM<enter>" "go to spam"
-macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to spam"
-macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to spam"
-macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
-set trash = "+Trash"
-macro index,pager gc "<change-folder>=Calendrier<enter>" "go to calendar"
-macro index,pager Mc ";<save-message>=Calendrier<enter>" "move mail to calendar"
-macro index,pager Cc ";<copy-message>=Calendrier<enter>" "copy mail to calendar"
diff --git a/.config/mutt/accounts/6-gmail_tos.muttrc b/.config/mutt/accounts/6-gmail_tos.muttrc
deleted file mode 100644
index 55bb1a1..0000000
--- a/.config/mutt/accounts/6-gmail_tos.muttrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account towerofsilence777@gmail.com
-set realname = "Tower Of Silence - Joe"
-set from = "towerofsilence777@gmail.com"
-set sendmail = "msmtp -a gmail_tos"
-alias me Tower Of Silence - Joe <towerofsilence777@gmail.com>
-set folder = "$MAIL/gmail_tos"
-set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_tos/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_tos/bodies
-set mbox_type = Maildir
-set crypt_autosign = yes
-set signature = $XDG_CONFIG_HOME/mutt/sig/4-gmail_tos
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind index gg first-entry
-bind pager gg top
-bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_tos<enter>" "run mbsync to sync towerofsilence777@gmail.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
-
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent"
-set record = ""
-macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts"
-set postponed = "+[Gmail]/Drafts"
-macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam"
-macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam"
-macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam"
-macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash"
-set trash = "+[Gmail]/Trash"
diff --git a/.config/mutt/accounts/6-ss_support.muttrc b/.config/mutt/accounts/6-ss_support.muttrc
deleted file mode 100644
index e602796..0000000
--- a/.config/mutt/accounts/6-ss_support.muttrc
+++ /dev/null
@@ -1,86 +0,0 @@
-# vim: filetype=neomuttrc
-# muttrc file for account support@secuserve.com
-set realname = "Support SecuServe"
-set from = "support@secuserve.com"
-set sendmail = "msmtp -a ss_support"
-alias me Support SecuServe <support@secuserve.com>
-set folder = "$MAIL/ss_support"
-set header_cache = $XDG_RUNTIME_DIR/mutt/ss_support/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_support/bodies
-set mbox_type = Maildir
-set crypt_autosign = no
-set signature = $XDG_CONFIG_HOME/mutt/sig/7-ss_support
-
-bind index,pager gg noop
-bind index,pager g noop
-bind index,pager M noop
-bind index,pager C noop
-bind pager gg top
-bind pager G bottom
-bind index gg first-entry
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_support<enter>" "run mbsync to sync support@secuserve.com"
-unmailboxes *
-
-mailboxes "=INBOX" "=INBOX/ALFRESCO" "=INBOX/FIN EVAL" "=INBOX/NAS" "=INBOX/Owentis notif" \
-		  "=INBOX/WEBSITE" "=INBOX/infonews" "=INBOX/mdp Ofii" "=INBOX/retour_fic2020" "=INBOX/support-zammad" \
-		  "=Sent" "=Drafts" "=SPAM" "=Trash" \
-		  "=&AMk-l&AOk-ments envoy&AOk-s" "=Brouillons" "=A FAIRE" "=A-NEWS" "=ACT! Support" "=ALERT SMS" \
-		  "=ALTV2" "=Alerte" "=Archive" "=Archive/2012-07" "=Archive/2012-08" \
-		  "=Archive/2012-09" "=Archive/2012-10" "=Archive/2012-11" "=Archive/2012-12" "=Archive/2013-01" \
-		  "=Archive/2013-02" "=Archive/2013-03" "=Archive/2013-04" "=Archive/2013-05" "=Archive/2013-06" \
-		  "=Archive/2013-07" "=Archive/2013-08" "=Archive/2013-09" "=Archive/2013-10" "=Archive/2013-11" \
-		  "=Archive/2013-12" "=Archive/2014-01" "=Archive/2014-02" "=Archive/2014-03" "=Archive/2014-04" \
-		  "=Archive/2014-05" "=Archive/2014-06" "=Archive/2014-07" "=Archive/2014-08" "=Archive/2014-09" \
-		  "=Archive/2014-10" "=Archive/2014-11" "=Archive/2014-12" "=Archive/2015-01" "=Archive/2015-02" \
-		  "=Archive/2015-03" "=Archive/2015-04" "=Archive/2015-05" "=Archive/2015-06" "=Archive/2015-07" \
-		  "=Archive/2015-08" "=Archive/2015-09" "=Archive/2015-10" "=Archive/2015-11" "=Archive/2015-12" \
-		  "=Archive/2016-01" "=Archive/2016-02" "=Archive/2016-03" "=Archive/2016-04" "=Archive/2016-05" \
-		  "=Archive/2016-06" "=Archive/2016-07" "=Archive/2016-08" "=Archive/2016-09" "=Archive/2016-10" \
-		  "=Archive/2016-11" "=Archive/2016-12" "=Archive/2017-01" "=Archive/2017-02" "=Archive/2017-03" \
-		  "=Archive/2017-04" "=Archive/2017-05" "=Archive/2017-06" "=Archive/2017-07" "=Archive/2017-08" \
-		  "=Archive/2017-09" "=Archive/2017-10" "=Archive/2017-11" "=Archive/2017-12" "=Archive/2018-01" \
-		  "=Archives" "=Archives/2020" "=Archives/2021" "=BUG" \
-		  "=C FAIT" "=CAMPAGNE RETOUR" "=CAMPAGNE RETOUR/Enqu&AOo-te de satisfaction e-securemail" "=CAMPAGNE RETOUR/Infonews@secuserve.com" "=CAMPAGNE RETOUR/feedbackcommunication" \
-		  "=CAMPAGNE RETOUR/feedbackmails" "=CAMPAGNE RETOUR/feedbackmails-ng" "=Calendrier" "=Commandes" "=Contacts" \
-		  "=Contacts sugg&AOk-r&AOk-s" "=Contacts/Agenda Secuserve" "=Contacts/Client_test" "=Contacts/TEST CONTACT" \
-		  "=ESET Antispam" "=ESET Antispam/El&AOk-ments infect&AOk-s" "=El&AOk-ments d&AOk-tect&AOk-s" "=Faux-Negatifs/non_traites.2018" "=Faux-Negatifs/non_traites.2019" \
-		  "=Faux-Negatifs/non_traites.2020" "=Faux-Negatifs/non_traites.2021" "=Faux-Negatifs/non_traites.2022" "=Faux-Negatifs/traites.2018" "=Faux-Negatifs/traites.2019" \
-		  "=Faux-Negatifs/traites.2020" "=Faux-Negatifs/traites.2021" "=Faux-Negatifs/traites.2022" "=Faux-Positifs/non_traites.2018" "=Faux-Positifs/non_traites.2019" \
-		  "=Faux-Positifs/non_traites.2020" "=Faux-Positifs/non_traites.2021" "=Faux-Positifs/non_traites.2022" "=Faux-Positifs/traites.2018" "=Faux-Positifs/traites.2019" \
-		  "=Faux-Positifs/traites.2020" "=Faux-Positifs/traites.2021" "=Faux-Positifs/traites.2022" "=Flux RSS" "=Flux d&IBk-informations" \
-		  "=IRD SLA" "=IRD Sympa" "=IRD Sympa/NOTIFICATION" "=Infected Items" "=Informations technique" \
-		  "=Journal" "=Junk" "=MX out" "=Microsoft Support" "=Migrations" \
-		  "=NEWS" "=Notes" "=PROJETS" "=PROJETS/AEFE" "=PROJETS/Amplivia" \
-		  "=PROJETS/Amplivia/GrandLyon" "=PROJETS/CC Erdre Gesvres" "=PROJETS/Chateau de Versailles" "=PROJETS/IRD" "=PROJETS/Lardy" \
-		  "=PROJETS/MTDS (Maroc)" "=PROJETS/SITTI" "=PROJETS/Secuserve" "=PROJETS/Secuserve/AltermimeV2" "=PROJETS/Secuserve/Bandeau de feedback" \
-		  "=PROJETS/Secuserve/Captcha" "=PROJETS/Secuserve/Certificats" "=PROJETS/Secuserve/Documentations" "=PROJETS/Secuserve/Gestion des droits" "=PROJETS/Secuserve/Sharecan" \
-		  "=Param&AOg-tres d&IBk-action de conversation" "=Param&AOg-tres des &AOk-tapes rapides" "=Partenaires" "=Partenaires/BoostMymailSupport" "=Partenaires/Globalsp" \
-		  "=Partenaires/Globalsp/Ofii" "=Partenaires/Iroquois" "=RAPPORT quarantaine" "=RAPPORT quarantaine/Licences" "=Restaurations GSP" \
-		  "=SAGE" "=SOCIAL" "=Support" \
-		  "=Support.CG" "=Support/Formation console d'administration" "=Support_client_secuserve_communigate" "=T&AOI-ches"
- 
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-set spoolfile = "+INBOX"
-macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
-set record = "+Sent"
-macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
-set postponed = "+Drafts"
-macro index,pager gS "<change-folder>=SPAM<enter>" "go to spam"
-macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to spam"
-macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to spam"
-macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
-set trash = "+Trash"
-macro index,pager gn "<change-folder>=NEWS<enter>" "go to news"
-macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to news"
-macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to news"
-macro index,pager gc "<change-folder>=Calendrier<enter>" "go to calendar"
-macro index,pager Mc ";<save-message>=Calendrier<enter>" "move mail to calendar"
-macro index,pager Cc ";<copy-message>=Calendrier<enter>" "copy mail to calendar"
diff --git a/.config/mutt/defaults.muttrc b/.config/mutt/defaults.muttrc
index 2f4b4bd..0a714bd 100644
--- a/.config/mutt/defaults.muttrc
+++ b/.config/mutt/defaults.muttrc
@@ -82,6 +82,7 @@ bind pager j next-line
 bind pager k previous-line
 bind pager l view-attachments
 bind index D delete-message
+bind index x delete-message
 bind index U undelete-message
 bind index L limit
 bind index h noop
@@ -179,7 +180,7 @@ color index_author brightred default "~N"
 
 # Tagged mail is highlighted:
 color index default color088 "~T"
-color index_author default default "~T"
+color index_author default color088 "~T"
 color index_subject default default "~T"
 
 # Shaded for deleted
@@ -248,4 +249,4 @@ 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.*"
-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<>\"]"
+color body green 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<>\"]"
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 750cbc1..d3fa6f3 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -1,7 +1,7 @@
 text/plain; $EDITOR %s ;
 text/html; w3m -o display_link_number=1 -I %{charset} -T text/html; copiousoutput;
 text/calendar; vcal -all %s; copiousoutput;
-image/*; nsxiv -abf %s ;
+image/*; nsxiv -ab %s ;
 video/*; mpv --quiet %s &; copiousoutput;
 audio/*; mpv %s ;
 application/pdf; zathura %s ;
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 7877696..f902400 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -1,11 +1,11 @@
 # vim: filetype=neomuttrc
 source $XDG_CONFIG_HOME/mutt/defaults.muttrc
 source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc
-macro index,pager <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager 1    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager <f4> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager 4    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
-macro index,pager 5    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
-macro index,pager <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
-macro index,pager 6    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
+macro index,pager <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo@gmx.us"
+macro index,pager 1    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-gmx_rbo.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbo@gmx.us"
+# macro index,pager <f4> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
+# macro index,pager 4    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/4-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
+# macro index,pager <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
+# macro index,pager 5    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
+# macro index,pager <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
+# macro index,pager 6    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
diff --git a/.config/mutt/sig/1-main b/.config/mutt/sig/1-main
index 8dd6a60..ebd66b8 100644
--- a/.config/mutt/sig/1-main
+++ b/.config/mutt/sig/1-main
@@ -1,3 +1,3 @@
-Rudy Bousset
-jozanofastora.xyz
+joe
+jozan.org
 +337 86 27 02 09