diff --git a/nvim/init.vim b/nvim/init.vim
index be30931..96b13f8 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -75,8 +75,11 @@ set ruler               " Show the line and column numbers of the cursor.
 set number              " Show the line numbers on the left side.
 set formatoptions+=o    " Continue comment marker in new lines.
 set textwidth=0         " Hard-wrap long lines as you type them.
+set softtabstop=4       " Finetunes the amount of white space to be added.
 set tabstop=4           " Render TABs using this many spaces.
 set shiftwidth=4        " Indentation amount for < and > commands.
+set smarttab            " Indent with tabs, align with spaces.
+set expandtab           " When on, uses space instead of tabs.
 
 set noerrorbells        " No beeps.
 set modeline            " Enable modeline.