diff --git a/scripts/astyle.options b/scripts/astyle.options
index 1c46ce82a9c..2552a8a06dc 100644
--- a/scripts/astyle.options
+++ b/scripts/astyle.options
@@ -1,16 +1,23 @@
+
 --preserve-date
 --indent-preprocessor
---brackets=break
 --convert-tabs
 --indent=spaces=2
 --indent-classes
 --indent-labels
 --indent-namespaces
 --indent-switches
---one-line=keep-blocks
 --max-instatement-indent=40
 --min-conditional-indent=-1
 --suffix=none
---pad=oper
---pad=paren-in
---unpad=paren
+--break-after-logical
+--style=allman
+--align-pointer=name
+--align-reference=name
+--keep-one-line-statements
+--keep-one-line-blocks
+#--remove-brackets
+--pad-paren-in
+--pad-oper
+--unpad-paren
+--pad-header