diff --git a/runastyle.bat b/runastyle.bat
index 613468951..32f2cfb5e 100644
--- a/runastyle.bat
+++ b/runastyle.bat
@@ -5,6 +5,7 @@ SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs
 
 astyle %STYLE% %OPTIONS% cli/*.cpp
 astyle %STYLE% %OPTIONS% cli/*.h
+astyle %STYLE% %OPTIONS% democlient/*.cpp
 astyle %STYLE% %OPTIONS% gui/*.cpp
 astyle %STYLE% %OPTIONS% gui/*.h
 astyle %STYLE% %OPTIONS% -r gui/test/*.cpp
@@ -12,9 +13,8 @@ astyle %STYLE% %OPTIONS% -r gui/test/*.h
 astyle %STYLE% %OPTIONS% lib/*.cpp
 astyle %STYLE% %OPTIONS% lib/*.h
 astyle %STYLE% %OPTIONS% test/*.cpp
+astyle %STYLE% %OPTIONS% test/cfg/*.cpp
 astyle %STYLE% %OPTIONS% test/*.h
-
 astyle %STYLE% %OPTIONS% tools/*.cpp
-
-astyle %STYLE% %OPTIONS% htdocs/archive/*.c
-astyle %STYLE% %OPTIONS% htdocs/archive/*.h
+astyle %STYLE% %OPTIONS% -r samples/*.c
+astyle %STYLE% %OPTIONS% -r samples/*.cpp