diff --git a/bashrc b/bashrc
index 6800bd7..c5c9033 100644
--- a/bashrc
+++ b/bashrc
@@ -123,7 +123,8 @@ alias poule='git pull'
 alias makew='make'
 
 alias BSI2='cd ~/Documents/UniGE/BSI2*/'
-alias BSI3='cd ~/Documents/UniGE/BSI3*/'
+BSI3_PATH='/home/frank/Documents/UniGE/BSI3 - 2013-2014/'
+alias BSI3='cd "$BSI3_PATH"'
 
 OCTOPUS=~/.my_utils/octopus.sh
 alias dual='$OCTOPUS monitor dual'
@@ -237,6 +238,14 @@ extract()
 }
 # }}}
 
+function study()
+{
+	builtin cd "$BSI3_PATH"
+	echo -e "$RED WORK TO DO SOON:$BLUE"
+	calendar -A10
+	echo -e -n "$DFT"
+}
+
 
 ## FIXME TO IMPROVE WITH VARIOUS locations (ex: ro 1; ro 2; ro 3)
 RO_ROOT_DIRECTORY=/dev/shm/ro_$USER
@@ -341,3 +350,5 @@ export MANPATH=$MANPATH:$DEVKITARM/man
 
 #Launch startx when login
 [[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx
+
+calendar -f ~/calendar
diff --git a/chooseWP.sh b/chooseWP.sh
index 8ce1161..249d3da 100755
--- a/chooseWP.sh
+++ b/chooseWP.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 wallpaper_path=/home/frank/Pictures/wallpapers/
 image=$(ls $wallpaper_path | grep -E '(jpg|png)$' | sort -R | tail -1)
-feh --bg-fill $wallpaper_path/$image &
+feh --no-fehbg --bg-fill $wallpaper_path/$image &
diff --git a/mutt/muttrc b/mutt/muttrc
index b6ae7ef..e93b262 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -56,10 +56,14 @@ set abort_unmodified=ask-yes #réponse non modifiée
 
 set fast_reply="yes" # Yeah, I know what person I want to reply to!
 
-set attribution="On %d, that guy, %n, wrote %c characters saying:"
+set attribution="On %d, %n, wrote %c characters saying:"
 
 set indent_string=">"
 
+#set max_line_length = 80
+#set stuff_quoted
+set text_flowed
+
 
 ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
diff --git a/vim/vimrc b/vim/vimrc
index a527ed9..3e527d8 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -85,7 +85,7 @@ set list
 "set listchars=tab:>-,trail:.,eol:¬
 "set listchars=tab:▸-,trail:.,eol:¬
 
-set listchars=tab:\|\ "Cool for ifs/whiles
+set listchars=tab:\|\-"Cool for ifs/whiles
 set listchars+=trail:· "For eol with spaces
 set listchars+=eol:↲ "To show eol;not very useful with trail, but cool anyway :p
 set listchars+=nbsp:⍽ "For unbreakeable spaces
@@ -97,6 +97,8 @@ set title "titre du terminal
 
 set autoindent
 set smartindent
+set copyindent
+set preserveindent
 
 "highlight identic words
 autocmd CursorMoved *
@@ -143,7 +145,7 @@ inoremap § <esc>/<+.\{-1,}+><return>c/+>/e<return>
 
 
 "Automatic line wrap/br when writing mails in mutt
-au BufRead /dev/shm/mutt-* set tw=80
+au BufRead /dev/shm/mutt-* set tw=80 fo+=aw
 
 "Automatic documentation
 autocmd BufNewFile,BufRead *.py set keywordprg=pydoc