diff --git a/gitconfig b/gitconfig
index ca36e17..946ca21 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,3 +13,5 @@
     ready = rebase -i @{u}
 [push]
     default = current
+[color]
+    ui = true
diff --git a/vimrc b/vimrc
index e0ef743..11a65fa 100644
--- a/vimrc
+++ b/vimrc
@@ -39,7 +39,7 @@ set backup
 set backupdir=~/.backup/
 
 "" tabs and stuff
-set smartindent
+set nosmartindent
 set shiftwidth=4
 set softtabstop=4
 set expandtab " use spaces