diff --git a/phpcs-sniffs/Formidable/ruleset.xml b/phpcs-sniffs/Formidable/ruleset.xml
index e9cacf1a77..5cff08c243 100644
--- a/phpcs-sniffs/Formidable/ruleset.xml
+++ b/phpcs-sniffs/Formidable/ruleset.xml
@@ -1,4 +1,35 @@
 <?xml version="1.0"?>
 <ruleset name="Formidable">
 	<description>Custom sniffs for Formidable Forms</description>
+
+	<!-- Whitespace -->
+	<rule ref="Formidable.WhiteSpace.BlankLineAfterClosingBrace" />
+	<rule ref="Formidable.WhiteSpace.BlankLineBeforeReturnAfterBrace" />
+	<rule ref="Formidable.WhiteSpace.ConsecutiveAssignmentSpacing" />
+	<rule ref="Formidable.WhiteSpace.ShortFunctionBlankLine" />
+	<rule ref="Formidable.WhiteSpace.NoBlankLineInShortIf" />
+	<rule ref="Formidable.WhiteSpace.NoBlankLineAfterLoopOpen" />
+	<rule ref="Formidable.WhiteSpace.NoBlankLineAfterIfOpen" />
+
+	<!-- Code Analysis -->
+	<rule ref="Formidable.CodeAnalysis.SimplifyIfReturn" />
+	<rule ref="Formidable.CodeAnalysis.SimplifyIssetFalsyCheck" />
+	<rule ref="Formidable.CodeAnalysis.SimplifyIssetTruthyCheck" />
+	<rule ref="Formidable.CodeAnalysis.SimplifyIssetEmptyCheck" />
+	<rule ref="Formidable.CodeAnalysis.SimplifyDualConditionToTernary" />
+	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnParameter" />
+	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnAssignedVariable" />
+	<rule ref="Formidable.CodeAnalysis.RedundantParentheses" />
+	<rule ref="Formidable.CodeAnalysis.RedundantIconEchoArg" />
+	<rule ref="Formidable.CodeAnalysis.RedundantTruthyBeforeStringComparison" />
+	<rule ref="Formidable.CodeAnalysis.RedundantIssetBeforeNotEmpty" />
+	<rule ref="Formidable.CodeAnalysis.RedundantNotIssetBeforeEmpty" />
+	<rule ref="Formidable.CodeAnalysis.RemoveRedundantWpdbPrefix" />
+	<rule ref="Formidable.CodeAnalysis.PreferStrictComparison" />
+	<rule ref="Formidable.CodeAnalysis.PreferStrictInArray" />
+	<rule ref="Formidable.CodeAnalysis.PreferObGetClean" />
+	<rule ref="Formidable.CodeAnalysis.PreferKsesEcho" />
+	<rule ref="Formidable.CodeAnalysis.MoveVariableBelowEarlyReturn" />
+	<rule ref="Formidable.CodeAnalysis.StrictComparisonForIntFunctions" />
+	<rule ref="Formidable.CodeAnalysis.FlipNegativeTernary" />
 </ruleset>
diff --git a/phpcs.xml b/phpcs.xml
index db73d69242..9e1bdd9293 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -227,35 +227,6 @@
 		<type>error</type>
 	</rule> 
 
-	<!-- Custom Formidable sniffs -->
-	<!-- Whitespace -->
-	<rule ref="Formidable.WhiteSpace.BlankLineAfterClosingBrace" />
-	<rule ref="Formidable.WhiteSpace.BlankLineBeforeReturnAfterBrace" />
-	<rule ref="Formidable.WhiteSpace.ConsecutiveAssignmentSpacing" />
-	<rule ref="Formidable.WhiteSpace.ShortFunctionBlankLine" />
-	<rule ref="Formidable.WhiteSpace.NoBlankLineInShortIf" />
-	<rule ref="Formidable.WhiteSpace.NoBlankLineAfterLoopOpen" />
-	<rule ref="Formidable.WhiteSpace.NoBlankLineAfterIfOpen" />
-
-	<!-- Code Analysis -->
-	<rule ref="Formidable.CodeAnalysis.SimplifyIfReturn" />
-	<rule ref="Formidable.CodeAnalysis.SimplifyIssetFalsyCheck" />
-	<rule ref="Formidable.CodeAnalysis.SimplifyIssetTruthyCheck" />
-	<rule ref="Formidable.CodeAnalysis.SimplifyIssetEmptyCheck" />
-	<rule ref="Formidable.CodeAnalysis.SimplifyDualConditionToTernary" />
-	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnParameter" />
-	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnAssignedVariable" />
-	<rule ref="Formidable.CodeAnalysis.RedundantParentheses" />
-	<rule ref="Formidable.CodeAnalysis.RedundantIconEchoArg" />
-	<rule ref="Formidable.CodeAnalysis.RedundantTruthyBeforeStringComparison" />
-	<rule ref="Formidable.CodeAnalysis.RedundantIssetBeforeNotEmpty" />
-	<rule ref="Formidable.CodeAnalysis.RedundantNotIssetBeforeEmpty" />
-	<rule ref="Formidable.CodeAnalysis.RemoveRedundantWpdbPrefix" />
-	<rule ref="Formidable.CodeAnalysis.PreferStrictComparison" />
-	<rule ref="Formidable.CodeAnalysis.PreferStrictInArray" />
-	<rule ref="Formidable.CodeAnalysis.PreferObGetClean" />
-	<rule ref="Formidable.CodeAnalysis.PreferKsesEcho" />
-	<rule ref="Formidable.CodeAnalysis.MoveVariableBelowEarlyReturn" />
-	<rule ref="Formidable.CodeAnalysis.StrictComparisonForIntFunctions" />
-	<rule ref="Formidable.CodeAnalysis.FlipNegativeTernary" />
+	<!-- Custom Formidable sniffs (defined in phpcs-sniffs/Formidable/ruleset.xml) -->
+	<rule ref="Formidable" />
 </ruleset>