diff --git a/config.yaml b/config.yaml
index 53e25b6..ebb2d13 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,8 +2,10 @@ actions:
   pre:
     vundle-install: test -e ~/.vim/bundle/Vundle.vim || (mkdir -p ~/.vim/bundle; git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim )
   vundle-refresh: vim +VundleClean! +VundleInstall +VundleInstall! +qall
-  cache-font: fc-cache -f -v
-  reload-xresources: xrdb ~/.Xresources
+  font-cache: fc-cache -f -v
+  xresources-reload: xrdb ~/.Xresources
+  zsh-source: source ~/.zshrc
+  bash-source: source ~/.bashrc
 config:
   backup: true
   create: true
@@ -12,6 +14,8 @@ dotfiles:
   f_bashrc:
     src: bashrc
     dst: ~/.bashrc
+    actions:
+    - bash-source
   f_vimrc:
     src: vimrc
     dst: ~/.vimrc
@@ -25,7 +29,7 @@ dotfiles:
     src: Xresources
     dst: ~/.Xresources
     actions:
-    - reload-xresources
+    - xresources-reload
   f_i3_config:
     src: i3_config
     dst: ~/.config/i3/config
@@ -36,7 +40,7 @@ dotfiles:
     src: fonts/Inconsolata-Regular/Inconsolata-Regular.ttf
     dst: ~/.fonts/Inconsolata-Regular/Inconsolata-Regular.ttf
     actions:
-    - cache-font
+    - font-cache
   f_gdbinit:
     src: gdbinit
     dst: ~/.gdbinit
@@ -46,6 +50,8 @@ dotfiles:
   f_zshrc:
     src: zshrc
     dst: ~/.zshrc
+    actions:
+    - zsh-source
   d_oh-my-zsh:
     src: oh-my-zsh
     dst: ~/.oh-my-zsh
@@ -53,9 +59,17 @@ dotfiles:
     src: zsh/marc-pygmalion.zsh-theme
     dst: ~/.oh-my-zsh/themes/marc-pygmalion.zsh-theme
 profiles:
+  home:
+    include:
+    - zsh
+    - vim
+    - x11
+    - i3
+    - font
+    - git
+    - gdb
   laptop:
     include:
-    - bash
     - zsh
     - vim
     - x11
@@ -65,7 +79,6 @@ profiles:
     - gdb
   work:
     include:
-    - bash
     - zsh
     - vim
     - x11
diff --git a/dotfiles/i3status_config b/dotfiles/i3status_config
index 09039d2..435833a 100644
--- a/dotfiles/i3status_config
+++ b/dotfiles/i3status_config
@@ -4,7 +4,7 @@ general {
 	interval = 1
 }
 
-{%@@ if profile == "workstation" @@%}
+{%@@ if profile == "work" @@%}
 order += "load"
 order += "memory"
 order += "tztime local"
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 3abcd0d..8ce61aa 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -92,8 +92,8 @@ set undolevels=1337
 set tabstop=4
 set softtabstop=4
 set shiftwidth=4
-set noexpandtab " tabs are not spaces
-" set expandtab " tabs are spaces
+" set noexpandtab " tabs are not spaces
+set expandtab " tabs are spaces
 set smartindent
 
 " Whitespaces
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
index 6abcd99..6295b17 100755
--- a/dotfiles/xinitrc
+++ b/dotfiles/xinitrc
@@ -1,6 +1,10 @@
 export TERM="xterm-256color"
-
 xrdb -load $HOME/.Xresources
+export SHELL="/bin/zsh"
+setxkbmap -layout us
+
+export LANG="en_US.UTF-8"
+export LANGUAGE="en_US.UTF-8"
 
 {%@@ if profile == "work" @@%}
 /share/bin/isda