diff --git a/goimapnotify/.config/goimapnotify/uni.conf b/goimapnotify/.config/goimapnotify/ugent.conf
similarity index 51%
rename from goimapnotify/.config/goimapnotify/uni.conf
rename to goimapnotify/.config/goimapnotify/ugent.conf
index 7b33b67..0d19b61 100644
--- a/goimapnotify/.config/goimapnotify/uni.conf
+++ b/goimapnotify/.config/goimapnotify/ugent.conf
@@ -1,13 +1,13 @@
 {
-  "host": "correo.ugr.es",
+  "host": "outlook.office365.com",
   "port": 993,
   "tls": true,
   "tlsOptions": {
     "rejectUnauthorized": true
   },
-  "username": "akasroua@correo.ugr.es",
-  "passwordCmd": "pass mail/uni",
-  "onNewMail": "mbsync uni",
+  "username": "amin.kasrouaouam@ugent.be",
+  "passwordCmd": "pass mail/ugent",
+  "onNewMail": "mbsync ugent",
   "onNewMailPost": "notmuch new",
   "boxes": [
     "INBOX"
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 6093c76..eb8b695 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -47,64 +47,69 @@ Expunge Both
 SyncState *
 
 
-# Get all the channels together into a group.
 Group gmail
 Channel sync-gmail-default
 Channel sync-gmail-sent
 Channel sync-gmail-trash
 Channel sync-gmail-junk
 
-IMAPAccount uni
-Host correo.ugr.es
-User akasroua
-PassCmd "pass mail/uni"
+IMAPAccount ugent
+Host outlook.office365.com
+User amin.kasrouaouam@ugent.be
+PassCmd "pass mail/ugent"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore uni-remote
-Account uni
+IMAPStore ugent-remote
+Account ugent
 
-MaildirStore uni-local
+MaildirStore ugent-local
 Subfolders Verbatim
 # The trailing "/" is important
-Path ~/.mail/uni/
-Inbox ~/.mail/uni/INBOX/
+Path ~/.mail/ugent/
+Inbox ~/.mail/ugent/inbox/
 
-Channel uni-default
-Far :uni-remote:
-Near :uni-local:
+Channel ugent-default
+Far :ugent-remote:
+Near :ugent-local:
 Create Both
 Expunge Both
 SyncState *
 
 
-Channel uni-sent
-Far :uni-remote:"Sent"
-Near :uni-local:sent
+Channel ugent-sent
+Far :ugent-remote:"Sent Items"
+Near :ugent-local:sent
 Create Both
 Expunge Both
 SyncState *
 
 
-Channel uni-trash
-Far :uni-remote:"Trash"
-Near :uni-local:trash
+Channel ugent-trash
+Far :ugent-remote:"Deleted Items"
+Near :ugent-local:trash
 Create Both
 Expunge Both
 SyncState *
 
 
-Channel uni-archive
-Far :uni-remote:"BUZONdeEntradaUGR"
-Near :uni-local:archive
+Channel ugent-archive
+Far :ugent-remote:"Archive"
+Near :ugent-local:archive
 Create Both
 Expunge Both
 SyncState *
 
+Channel ugent-junk
+Far :ugent-remote:"Junk Email"
+Near :ugent-local:junk
+Create Both
+Expunge Both
+SyncState *
 
-# Get all the channels together into a group.
-Group uni
-Channel uni-default
-Channel uni-sent
-Channel uni-trash
-Channel uni-archive
+Group ugent
+Channel ugent-default
+Channel ugent-sent
+Channel ugent-trash
+Channel ugent-archive
+Channel ugent-junk
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index c0c9a06..bfd1422 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -12,9 +12,9 @@ from akasroua@gmail.com
 user akasroua@gmail.com
 passwordeval "pass mail/gmail"
 
-account uni
-host correo.ugr.es
+account ugent
+host smtp.office365.com
 port 587
-from akasroua@correo.ugr.es
-user akasroua@correo.ugr.es
-passwordeval "pass mail/uni"
+from amin.kasrouaouam@ugent.be
+user amin.kasrouaouam@ugent.be
+passwordeval "pass mail/ugent"
diff --git a/neomutt/.config/neomutt/accounts/uni.muttrc b/neomutt/.config/neomutt/accounts/ugent.muttrc
similarity index 59%
rename from neomutt/.config/neomutt/accounts/uni.muttrc
rename to neomutt/.config/neomutt/accounts/ugent.muttrc
index d5fd1f2..204fee3 100644
--- a/neomutt/.config/neomutt/accounts/uni.muttrc
+++ b/neomutt/.config/neomutt/accounts/ugent.muttrc
@@ -1,9 +1,9 @@
 # vim: filetype=neomuttrc
 # muttrc file for account coolneng
 set realname = "Amin Kasrou Aouam"
-set from = "akasroua@correo.ugr.es"
-set sendmail = "~/.config/neomutt/etc/sendmail uni"
-set folder = "~/.mail/uni"
+set from = "amin.kasrouaouam@ugent.be"
+set sendmail = "~/.config/neomutt/etc/sendmail ugent"
+set folder = "~/.mail/ugent"
 
 set mbox_type = Maildir
 set ssl_starttls = yes
@@ -13,12 +13,13 @@ bind index,pager gg noop
 bind index,pager g noop
 bind index gg first-entry
 unmailboxes *
-mailboxes =INBOX =trash =sent =archive
-macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox."
+mailboxes =inbox =sent =trash =archive =junk
+macro index,pager gi "<change-folder>=inbox<enter>" "Go to inbox."
 macro index,pager gs "<change-folder>=sent<enter>" "Go to sent."
 macro index,pager gt "<change-folder>=trash<enter>" "Go to trash."
 macro index,pager ga "<change-folder>=archive<enter>" "Go to archive."
-set spoolfile = "+INBOX"
+macro index,pager gj "<change-folder>=junk<enter>" "Go to junk."
+set spoolfile = "+inbox"
 set record = "+sent"
 set postponed = ""
-set trash = "+trash"
+set trash = "+deleted"
diff --git a/neomutt/.config/neomutt/etc/sendmail b/neomutt/.config/neomutt/etc/sendmail
index 1092c1e..c2a69de 100755
--- a/neomutt/.config/neomutt/etc/sendmail
+++ b/neomutt/.config/neomutt/etc/sendmail
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nix-shell -p python38 --command "python ~/.local/bin/MIMEmbellish | msmtp -a $1 -t"
+nix-shell -p python39 --command "python ~/.local/bin/MIMEmbellish | msmtp -a $1 -t"
diff --git a/neomutt/.config/neomutt/personal.muttrc b/neomutt/.config/neomutt/personal.muttrc
index d9fd52c..3ef74b8 100644
--- a/neomutt/.config/neomutt/personal.muttrc
+++ b/neomutt/.config/neomutt/personal.muttrc
@@ -1,4 +1,4 @@
 macro index,pager i2 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/gmail.muttrc<enter><change-folder>!<enter>'
 source /home/coolneng/.config/neomutt/accounts/gmail.muttrc
-macro index,pager i1 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/uni.muttrc<enter><change-folder>!<enter>'
-source /home/coolneng/.config/neomutt/accounts/uni.muttrc
+macro index,pager i1 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/ugent.muttrc<enter><change-folder>!<enter>'
+source /home/coolneng/.config/neomutt/accounts/ugent.muttrc