diff --git a/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml
index 1ca2f112e..f3254be98 100644
--- a/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml
+++ b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml
@@ -1,11 +1,11 @@
 <model>
-  <mount>//OPNsense/Iperf3</mount>
-  <description>Fake model for the API - will be never stored to config (only used for defaults, validation etc.).</description>
-  <items>
-    <interface type="InterfaceField">
-      <Default>lan</Default>
-      <Required>Y</Required>
-      <Multiple>N</Multiple>
-    </interface>
-  </items>
+    <mount>//OPNsense/Iperf3</mount>
+    <description>Fake model for the API - will be never stored to config (only used for defaults, validation etc.).</description>
+    <items>
+        <interface type="InterfaceField">
+            <Default>lan</Default>
+            <Required>Y</Required>
+            <Multiple>N</Multiple>
+        </interface>
+    </items>
 </model>
diff --git a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
index 2a2f05d31..df895e986 100644
--- a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
+++ b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Redis.xml
@@ -1,108 +1,108 @@
 <model>
-  <mount>//OPNsense/redis</mount>
-  <description>Redis DB</description>
-  <items>
-    <general>
-      <enabled type="BooleanField">
-        <Default>0</Default>
-        <Required>Y</Required>
-      </enabled>
-      <listen type="InterfaceField">
-        <Required>N</Required>
-        <Multiple>Y</Multiple>
-      </listen>
-      <protected_mode type="BooleanField">
-        <Default>1</Default>
-        <Required>Y</Required>
-      </protected_mode>
-      <port type="IntegerField">
-        <MinimumValue>1</MinimumValue>
-        <MaximumValue>65536</MaximumValue>
-        <Required>N</Required>
-        <Default>6379</Default>
-        <ValidationMessage>This must be a valid port number.</ValidationMessage>
-      </port>
-      <log_level type="OptionField">
-        <Required>Y</Required>
-        <Default>warning</Default>
-        <OptionValues>
-          <debug>Debug</debug>
-          <verbose>Verbose</verbose>
-          <notice>Notice</notice>
-          <warning>Warning</warning>
-        </OptionValues>
-      </log_level>
-      <syslog_enabled type="BooleanField">
-        <Default>0</Default>
-        <Required>Y</Required>
-      </syslog_enabled>
-      <syslog_facility type="OptionField">
-        <Required>Y</Required>
-        <Default>LOCAL0</Default>
-        <OptionValues>
-          <USER>USER</USER>
-          <LOCAL0>LOCAL0</LOCAL0>
-          <LOCAL1>LOCAL1</LOCAL1>
-          <LOCAL2>LOCAL2</LOCAL2>
-          <LOCAL3>LOCAL3</LOCAL3>
-          <LOCAL4>LOCAL4</LOCAL4>
-          <LOCAL5>LOCAL5</LOCAL5>
-          <LOCAL6>LOCAL6</LOCAL6>
-          <LOCAL7>LOCAL7</LOCAL7>
-        </OptionValues>
-      </syslog_facility>
-      <databases type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>Y</Required>
-        <Default>16</Default>
-      </databases>
-    </general>
-    <security>
-      <password type="TextField">
-        <Required>N</Required>
-      </password>
-      <disable_commands type="CSVListField">
+    <mount>//OPNsense/redis</mount>
+    <description>Redis DB</description>
+    <items>
+        <general>
+            <enabled type="BooleanField">
+                <Default>0</Default>
+                <Required>Y</Required>
+            </enabled>
+            <listen type="InterfaceField">
+                <Required>N</Required>
+                <Multiple>Y</Multiple>
+            </listen>
+            <protected_mode type="BooleanField">
+                <Default>1</Default>
+                <Required>Y</Required>
+            </protected_mode>
+            <port type="IntegerField">
+                <MinimumValue>1</MinimumValue>
+                <MaximumValue>65536</MaximumValue>
+                <Required>N</Required>
+                <Default>6379</Default>
+                <ValidationMessage>This must be a valid port number.</ValidationMessage>
+            </port>
+            <log_level type="OptionField">
+                <Required>Y</Required>
+                <Default>warning</Default>
+                <OptionValues>
+                    <debug>Debug</debug>
+                    <verbose>Verbose</verbose>
+                    <notice>Notice</notice>
+                    <warning>Warning</warning>
+                </OptionValues>
+            </log_level>
+            <syslog_enabled type="BooleanField">
+                <Default>0</Default>
+                <Required>Y</Required>
+            </syslog_enabled>
+            <syslog_facility type="OptionField">
+                <Required>Y</Required>
+                <Default>LOCAL0</Default>
+                <OptionValues>
+                    <USER>USER</USER>
+                    <LOCAL0>LOCAL0</LOCAL0>
+                    <LOCAL1>LOCAL1</LOCAL1>
+                    <LOCAL2>LOCAL2</LOCAL2>
+                    <LOCAL3>LOCAL3</LOCAL3>
+                    <LOCAL4>LOCAL4</LOCAL4>
+                    <LOCAL5>LOCAL5</LOCAL5>
+                    <LOCAL6>LOCAL6</LOCAL6>
+                    <LOCAL7>LOCAL7</LOCAL7>
+                </OptionValues>
+            </syslog_facility>
+            <databases type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>Y</Required>
+                <Default>16</Default>
+            </databases>
+        </general>
+        <security>
+            <password type="TextField">
+                <Required>N</Required>
+            </password>
+            <disable_commands type="CSVListField">
       </disable_commands>
-    </security>
-    <limits>
-      <maxclients type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>N</Required>
-        <Default>10000</Default>
-      </maxclients>
-      <maxmemory type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>N</Required>
-      </maxmemory>
-      <maxmemory_policy type="OptionField">
-        <Required>Y</Required>
-        <Default>noeviction</Default>
-        <OptionValues>
-          <noeviction>noeviction</noeviction>
-          <volatile-ttl>volatile-ttl</volatile-ttl>
-          <allkeys-random>allkeys-random</allkeys-random>
-          <volatile-random>volatile-random</volatile-random>
-          <allkeys-lru>allkeys-lru</allkeys-lru>
-          <volatile-lru>volatile-lru</volatile-lru>
-        </OptionValues>
-      </maxmemory_policy>
-      <maxmemory_samples type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>N</Required>
-        <Default>5</Default>
-      </maxmemory_samples>
-    </limits>
-    <slowlog>
-      <slower_than type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>N</Required>
-        <Default>10000</Default>
-      </slower_than>
-      <max_len type="IntegerField">
-        <MinimumValue>0</MinimumValue>
-        <Required>N</Required>
-        <Default>128</Default>
-      </max_len>
-    </slowlog>
-  </items>
+        </security>
+        <limits>
+            <maxclients type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>N</Required>
+                <Default>10000</Default>
+            </maxclients>
+            <maxmemory type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>N</Required>
+            </maxmemory>
+            <maxmemory_policy type="OptionField">
+                <Required>Y</Required>
+                <Default>noeviction</Default>
+                <OptionValues>
+                    <noeviction>noeviction</noeviction>
+                    <volatile-ttl>volatile-ttl</volatile-ttl>
+                    <allkeys-random>allkeys-random</allkeys-random>
+                    <volatile-random>volatile-random</volatile-random>
+                    <allkeys-lru>allkeys-lru</allkeys-lru>
+                    <volatile-lru>volatile-lru</volatile-lru>
+                </OptionValues>
+            </maxmemory_policy>
+            <maxmemory_samples type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>N</Required>
+                <Default>5</Default>
+            </maxmemory_samples>
+        </limits>
+        <slowlog>
+            <slower_than type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>N</Required>
+                <Default>10000</Default>
+            </slower_than>
+            <max_len type="IntegerField">
+                <MinimumValue>0</MinimumValue>
+                <Required>N</Required>
+                <Default>128</Default>
+            </max_len>
+        </slowlog>
+    </items>
 </model>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
index a628f28a5..efa489b85 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
@@ -13,7 +13,7 @@
                     <Required>Y</Required>
                     <Mask>/^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z_\-]{1,32}$/u</Mask>
                     <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9, a-z, A-Z, _ and -. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
-                     <Constraints>
+                    <Constraints>
                         <check001>
                             <ValidationMessage>An ACL with this name already exists.</ValidationMessage>
                             <type>UniqueConstraint</type>