diff --git a/.bashrc b/.bashrc
index 3bf61e6..e05dcf3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -63,11 +63,11 @@ case "$HOSTNAME" in
 esac
 
 if [ "$USER" == "root" ]; then
-    PS1=$PS1"\[\e[04;31m\]\u\[\e[00m\]"
+    PS_COLOR=31
 else
-    PS1=$PS1"\u"
+    PS1=$PS1"\u@"
 fi
-PS1=$PS1'@\[\e[$PS_COLOR;01m\]\h\[\e[00m\]:\[\e[01;34m\]\W\[\e[00m\]'
+PS1=$PS1'\[\e[$PS_COLOR;01m\]\h\[\e[00m\]:\[\e[01;34m\]\W\[\e[00m\]'
 PS1=$PS1'\[`if [ $? -eq 0 ]; then echo -ne "\033[0;32m"; else echo -ne "\033[0;31m"; fi`\]'
 PS1=$PS1'\$\[\033[0m\] '
 
diff --git a/.procmailrc b/.procmailrc
index a92a671..778c576 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -29,6 +29,8 @@ INCLUDERC=$PMDIR/rc.system
 
 #INCLUDERC=$PMDIR/rc.priority
 
+INCLUDERC=$PMDIR/rc.list
+
 INCLUDERC=$PMDIR/rc.common
 
 INCLUDERC=$PMDIR/rc.amis
@@ -39,9 +41,9 @@ INCLUDERC=$PMDIR/rc.epita
 
 INCLUDERC=$PMDIR/rc.projects
 
-INCLUDERC=$PMDIR/rc.newslettre
+INCLUDERC=$PMDIR/rc.escrime
 
-INCLUDERC=$PMDIR/rc.list
+INCLUDERC=$PMDIR/rc.newslettre
 
 INCLUDERC=$PMDIR/rc.notify