diff --git a/Utils/ftpfct.sh b/Utils/ftpfct.sh
index ee0018a..1c7429a 100755
--- a/Utils/ftpfct.sh
+++ b/Utils/ftpfct.sh
@@ -34,12 +34,12 @@ while true; do
 		set_fan full_speed
 		echo "full speed"
 		REFRESH=10
-	elif [ $TEMP -lt 46 ]; then
-		set_fan 1
+	elif [ $TEMP -lt 48 ]; then
+		set_fan 0
 		echo "lt 46"
 		REFRESH=10
 	elif [ $TEMP -lt 56 ]; then
-		set_fan 3
+		set_fan 2
 		echo "lt 56"
 		REFRESH=5
 	elif [ $TEMP -lt 66 ]; then
diff --git a/Xmodmap b/Xmodmap
index 6c33398..fc8d79b 100644
--- a/Xmodmap
+++ b/Xmodmap
@@ -16,4 +16,11 @@
 ! Control_R
 
 !Espace insécable: Shift-Space ou Compose-Space-Space
-keycode 65 = space nobreakspace emspace
+!keycode 65 = space nobreakspace emspace
+
+remove Lock = Caps_Lock
+remove Control = Control_L
+keysym Control_L = Caps_Lock
+keysym Caps_Lock = Control_L
+add Lock = Caps_Lock
+add Control = Control_L
diff --git a/bashrc b/bashrc
index b35ea98..3f3c1db 100644
--- a/bashrc
+++ b/bashrc
@@ -8,7 +8,7 @@ PROMPT_COMMAND='history -a'
 
 
 alias dvorak='setxkbmap dvorak; setxkbmap -option compose:ralt'
-dvorak
+#dvorak
 alias qwertz='setxkbmap ch,fr'
 
 
diff --git a/inputrc b/inputrc
index 07c14db..4f94fa8 100644
--- a/inputrc
+++ b/inputrc
@@ -1,5 +1,5 @@
-set editing-mode vi
-set keymap vi-command
+#set editing-mode vi
+#set keymap vi-command
 set completion-ignore-case on
 #set completion-map-case on
 #set show-all-if-ambiguous on
diff --git a/mutt/muttrc b/mutt/muttrc
index c968520..12ae612 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -70,7 +70,7 @@ set sort_aux = 'reverse-last-date-received'
 set auto_tag = yes
 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 fast_reply=yes # Yeah, I know what person I want to reply to!
 set attribution="On %d, %n, wrote %c characters saying:"
 set indent_string="> "
 
@@ -125,3 +125,11 @@ set sleep_time=0
 macro attach 'V' "<pipe-entry>cat > /dev/shm/mail.html && firefox /dev/shm/mail.html && rm /dev/shm/mail.html<enter>"
 
 set display_filter=~/.mutt/test.sh
+
+
+#Spamcop things. This file is public on git.. Meh
+macro index \cx ":set autoedit=no mime_forward=yes  editor=\"/bin/true\"\n<tag-prefix><forward-message>submit.zxDB3O8TzLOF2Khd@spam.spamcop.net\n<send-message>:set autoedit=yes mime_forward=no editor=\"/usr/bin/editor\"\n" \
+        "Forward mail to SpamCop"
+
+macro pager \cx ":set autoedit=no mime_forward=yes  editor=\"/bin/true\"\n<tag-prefix><forward-message>submit.zxDB3O8TzLOF2Khd@spam.spamcop.net\n<send-message>:set autoedit=yes mime_forward=no editor=\"/usr/bin/editor\"\n" \
+                "Forward mail to SpamCop"
diff --git a/ssh/config b/ssh/config
index 5f01146..10eb4c9 100644
--- a/ssh/config
+++ b/ssh/config
@@ -39,6 +39,12 @@ host chuck
 
 host pc69240
 	user villaro0
+	ProxyCommand  ssh cuilxa nc %h %p
+
+host bluewhale03
+	user villaro0
+	ProxyCommand  ssh cuilxa nc %h %p
+
 
 host cuilxa
 	hostname cuilxa.unige.ch
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 93e0beb..5897838 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -78,3 +78,4 @@ relayage
 renewability
 malloc'ed
 interdisciplinarity
+pluviometry
diff --git a/vim/spell/fr.utf-8.spl b/vim/spell/fr.utf-8.spl
index 3331935..1f6ede5 100644
Binary files a/vim/spell/fr.utf-8.spl and b/vim/spell/fr.utf-8.spl differ
diff --git a/vim/vimrc b/vim/vimrc
index c7638ba..c2852af 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -9,7 +9,7 @@ hi clear SpellBad
 hi SpellBad cterm=underline,bold ctermfg=lightblue
 
 set spell
-set spelllang=en,fr
+set spelllang=en_gb,fr
 
 "set viminfo+=n~/Private/.viminfo
 "set directory=/dev/shm/vimfr
diff --git a/xinitrc b/xinitrc
index f99dc67..9e73739 100644
--- a/xinitrc
+++ b/xinitrc
@@ -17,15 +17,13 @@ source ~/.bashrc
 wmname LG3D
 
 #Keyboard setup +compose key for "ŭ" (Win-b u) for esperanto
-setxkbmap -model pc104 -layout ch -variant fr -option compose:lwin
+setxkbmap -model pc104 -layout dvorak -option compose:ralt
 
 xbindkeysrc &
 
 
 #My pinkie hurts :'(
-if [ -s ~/.Xmodmap ]; then
-	xmodmap ~/.Xmodmap
-fi
+xmodmap ~/.Xmodmap
 
 $OCTOPUS init-all 1>> /dev/shm/Octopus_logs 2>> /dev/shm/Octopus_logs &
 ftpfct.sh >/dev/null || true &
@@ -61,7 +59,6 @@ redshift -l 46:6 || true &
 mpc ls | mpc add
 mpc random on
 
-dvorak
 
 
 #ssh-agent -t 10 /home/frank/Programmation/dotfiles/dwm/dwm