diff --git a/spacemacs b/spacemacs
index edd431c..f757edd 100644
--- a/spacemacs
+++ b/spacemacs
@@ -337,10 +337,13 @@ explicitly specified that a variable should be set before a package is loaded,
 you should place your code here."
   (evil-set-initial-state 'term-mode 'emacs)
 
-  (setq tab-width 2)
-  (setq js-indent-level 2)
-  (setq c-basic-offset 2)
-  (setq indent-tabs-mode nil)
+  (setq-default tab-width 2)
+  (setq-default default-tab-width 2)
+  (setq-default indent-tabs-mode nil)
+
+  (setq-default js-indent-level 2)
+  (setq-default c-basic-offset 2)
+  (setq-default sgml-basic-offset 2)
   (setq-default spacemacs-show-trailing-whitespace nil)
 )