diff --git a/bash/.bashrc b/bash/.bashrc
index 798bc40..549ea65 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -158,12 +158,17 @@ PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
 #Disable CapsLock
 setxkbmap -option ctrl:nocaps
 
+#Disable some CTRL for VIM commands
+bind -r '\C-s'
+stty -ixon
+
 #Paths
 export M2_HOME=/home/jfm/Tools/apache-maven
 export PATH=$PATH:$M2_HOME/bin
+export GIT_EDITOR=vim
 
 #Aliases
 alias oc="/home/jfm/Tools/openshift-origin-client/oc"
 alias code="cd /home/jfm/Customers/TDC/Code/Onboarding"
 alias prod="ssh -fN sochi"
-alias top="htop"
\ No newline at end of file
+alias top="htop"
diff --git a/i3/.i3/layouts/workspace4-work.json b/i3/.i3/layouts/workspace4-work.json
index 6a5b9e6..b820844 100644
--- a/i3/.i3/layouts/workspace4-work.json
+++ b/i3/.i3/layouts/workspace4-work.json
@@ -15,8 +15,8 @@
             "percent": 0.6,
             "swallows": [
                 {
-                    "class": "^Subl3$",
-                    "instance": "^subl3$"
+                    "class": "^URxvt$",
+                    "instance": "^vim$"
                 }
             ],
             "type": "con"
diff --git a/i3/.i3/workspaces/ws04.sh b/i3/.i3/workspaces/ws04.sh
index 027a70a..d5fbc8a 100755
--- a/i3/.i3/workspaces/ws04.sh
+++ b/i3/.i3/workspaces/ws04.sh
@@ -2,7 +2,7 @@
 . ~/.i3/env
 
 i3-msg "workspace 4:Work; append_layout ~/.i3/layouts/workspace4-work.json"
-i3-msg "workspace 4:Work; exec subl3"
+i3-msg "workspace 4:Work; exec urxvt -name vim -e vim"
 i3-msg "workspace 4:Work; exec urxvt -name shell1"
 i3-msg "workspace 4:Work; exec urxvt -name shell2"
-i3-msg "workspace 4:Work; move workspace to output $PRIMARY"
\ No newline at end of file
+i3-msg "workspace 4:Work; move workspace to output $PRIMARY"