diff --git a/Config/phpcs.xml b/Config/phpcs.xml
index d68beef..4dd5f84 100755
--- a/Config/phpcs.xml
+++ b/Config/phpcs.xml
@@ -34,6 +34,7 @@
 <exclude-pattern>[abcdef0-9]{32}/*</exclude-pattern>
 <arg value="q"/>
 <arg name="colors"/>
+<arg name="tab-width" value="4"/>
 <rule ref="Generic.Classes.DuplicateClassName"/>
 <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
 <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall">
@@ -204,13 +205,22 @@
         <property name="ignoreNewlines" value="true"/>
     </properties>
 </rule>
-<rule ref="Squiz.WhiteSpace.OperatorSpacing">
+<!--<rule ref="Squiz.WhiteSpace.OperatorSpacing">
     <properties>
         <property name="ignoreNewlines" value="true"/>
     </properties>
-    <exclude-pattern>*HttpUri.js</exclude-pattern><!-- Regex false positive -->
+    <exclude-pattern>*HttpUri.js</exclude-pattern>--><!-- Regex false positive -->
+<!--</rule>-->
+<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing">
+    <exclude-pattern>*DataMapperAbstract.php</exclude-pattern>
 </rule>
-<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
 <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 <rule ref="Zend.Files.ClosingTag"/>
+<rule ref="Generic.WhiteSpace.ScopeIndent">
+    <properties>
+        <property name="tabIndent" value="true" />
+    </properties>
+    <exclude-pattern>*ResponseType.js</exclude-pattern>
+    <exclude-pattern>*HttpUri.js</exclude-pattern>
+</rule>
 </ruleset>
\ No newline at end of file