diff --git a/.astylerc b/.astylerc
index 70b47e0ec..73e2b67a7 100644
--- a/.astylerc
+++ b/.astylerc
@@ -7,10 +7,9 @@
 # astyle --suffix=none --options=.astylerc filename.cpp
 
 style=java
-indent=tab
+indent=tab=2
 attach-closing-while
 indent-switches
-indent-after-parens
 indent-preproc-block
 indent-preproc-define
 indent-col1-comments
@@ -18,8 +17,8 @@ pad-oper
 pad-comma
 pad-header
 unpad-paren
-align-pointer=name
-align-reference=name
+align-pointer=type
+align-reference=type
 break-closing-braces
 break-one-line-headers
 attach-return-type