diff --git a/spacemacs b/spacemacs
index 3f11ba3..dd0169e 100644
--- a/spacemacs
+++ b/spacemacs
@@ -210,8 +210,8 @@ layers configuration. You are free to put any user code."
 
   (require 'helm-bookmark)
   (xterm-mouse-mode -1)
-  (setq-default tab-width 8 indent-tabs-mode t)
-  (global-set-key (kbd "TAB") 'self-insert-command)
+  (setq tab-width 2)
+  (setq-default indent-tabs-mode nil)
   (when (fboundp 'electric-indent-mode) (electric-indent-mode -1))
 
   (global-auto-revert-mode t)