diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index ffcf9bd42e..0bf5f0c952 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -2515,7 +2515,7 @@ public static function array_flatten( $array, $keys = 'keep' ) {
 			if ( is_array( $value ) ) {
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
 			} elseif ( $keys === 'keep' ) {
-					$return[ $key ] = $value;
+				$return[ $key ] = $value;
 			} else {
 				$return[] = $value;
 			}
diff --git a/classes/models/FrmDb.php b/classes/models/FrmDb.php
index 876dbe2a7d..212fa0873d 100644
--- a/classes/models/FrmDb.php
+++ b/classes/models/FrmDb.php
@@ -649,9 +649,9 @@ public static function prepend_and_or_where( $starts_with = ' WHERE ', $where =
 		if ( ! $where ) {
 			$where = '';
 		} elseif ( is_array( $where ) ) {
-				global $wpdb;
-				self::get_where_clause_and_values( $where, $starts_with );
-				$where = $wpdb->prepare( $where['where'], $where['values'] ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			global $wpdb;
+			self::get_where_clause_and_values( $where, $starts_with );
+			$where = $wpdb->prepare( $where['where'], $where['values'] ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 		} else {
 			$where = $starts_with . $where;
 		}
diff --git a/phpcs.xml b/phpcs.xml
index 9e1bdd9293..5183c282b0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -225,7 +225,65 @@
 	<rule ref="Universal.Operators.StrictComparisons">
 		<severity>8</severity>
 		<type>error</type>
-	</rule> 
+	</rule>
+
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="exact" value="true" />
+			<property name="ignoreIndentationTokens" type="array">
+				<element value="T_COMMENT" />
+				<element value="T_DOC_COMMENT_OPEN_TAG" />
+			</property>
+		</properties>
+		<exclude-pattern>views/*</exclude-pattern>
+		<!-- Most of these files include inline HTML. Ideally we would move this code to view files. -->
+		<exclude-pattern>helpers/FrmEntriesHelper.php</exclude-pattern>
+		<exclude-pattern>stripe/models/FrmTransLiteAction.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmAddonsController.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmAddonsHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmDb.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmTipsHelper.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmOnSubmitHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmSalesApi.php</exclude-pattern>
+		<exclude-pattern>stripe/controllers/FrmTransLitePaymentsController.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmStylesCardHelper.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmAppController.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmEntryValidate.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmEntriesListHelper.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmWelcomeTourController.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmDashboardHelper.php</exclude-pattern>
+		<exclude-pattern>stripe/helpers/FrmStrpLiteAppHelper.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmFormsListHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmField.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmFormsHelper.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmSMTPController.php</exclude-pattern>
+		<exclude-pattern>stripe/helpers/FrmStrpLiteConnectHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmHoneypot.php</exclude-pattern>
+		<exclude-pattern>stripe/helpers/FrmTransLiteAppHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/fields/FrmFieldType.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmStylesController.php</exclude-pattern>
+		<exclude-pattern>stripe/helpers/FrmTransLiteListHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmSolution.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmFieldsHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/fields/FrmFieldTextarea.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmPluginSearch.php</exclude-pattern>
+		<exclude-pattern>classes/models/fields/FrmFieldPhone.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmStylesHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/fields/FrmFieldName.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmListHelper.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmFormTemplatesHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmFormAction.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmHtmlHelper.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmFormMigratorsHelper.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmFormsController.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmCssScopeHelper.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmFormMigrator.php</exclude-pattern>
+		<exclude-pattern>classes/controllers/FrmFieldsController.php</exclude-pattern>
+		<exclude-pattern>classes/models/FrmEntryMeta.php</exclude-pattern>
+		<exclude-pattern>classes/helpers/FrmAppHelper.php</exclude-pattern>
+		<exclude-pattern>classes/widgets/FrmShowForm.php</exclude-pattern>
+		<exclude-pattern>square/helpers/FrmSquareLiteConnectHelper.php</exclude-pattern>
+	</rule>
 
 	<!-- Custom Formidable sniffs (defined in phpcs-sniffs/Formidable/ruleset.xml) -->
 	<rule ref="Formidable" />