diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index d68509812bbcd..05e60522471df 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -6,33 +6,36 @@
 		<field
 			name="caching"
 			type="list"
-			default="2"
 			label="COM_CONFIG_FIELD_CACHE_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_DESC"
-			filter="integer">
+			default="2"
+			filter="integer"
+			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE</option>
 		</field>
+
 		<field
 			name="cache_handler"
 			type="cachehandler"
-			default=""
 			label="COM_CONFIG_FIELD_CACHE_HANDLER_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_HANDLER_DESC"
+			default=""
 			filter="word"
-			showon="caching:1,2">
-		</field>
+			showon="caching:1,2"
+		/>
 
 		<field
 			name="cache_platformprefix"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
 			filter="integer"
-			showon="caching:1,2">
+			showon="caching:1,2"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -40,25 +43,27 @@
 		<field
 			name="cachetime"
 			type="number"
-			min="1"
-			default="15"
 			label="COM_CONFIG_FIELD_CACHE_TIME_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_TIME_DESC"
+			min="1"
+			default="15"
 			required="true"
 			filter="integer"
 			validate="number"
+			size="6"
 			showon="caching:1,2"
-			size="6" />
+		/>
 
 		<field
 			name="memcache_persist"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
 			showon="caching:1,2[AND]cache_handler:memcache"
-			filter="integer">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -66,12 +71,13 @@
 		<field
 			name="memcache_compress"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
 			showon="caching:1,2[AND]cache_handler:memcache"
-			filter="integer">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -79,32 +85,35 @@
 		<field
 			name="memcache_server_host"
 			type="text"
-			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
-			showon="caching:1,2[AND]cache_handler:memcache"
+			default="localhost"
 			filter="string"
-			size="25" />
+			size="25"
+			showon="caching:1,2[AND]cache_handler:memcache"
+		/>
 
 		<field
 			name="memcache_server_port"
 			type="text"
-			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
-			showon="caching:1,2[AND]cache_handler:memcache"
+			default="11211"
 			filter="integer"
-			size="5" />
+			size="5"
+			showon="caching:1,2[AND]cache_handler:memcache"
+		/>
 
 		<field
 			name="memcached_persist"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
 			showon="caching:1,2[AND]cache_handler:memcached"
-			filter="integer">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -112,12 +121,13 @@
 		<field
 			name="memcached_compress"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
 			showon="caching:1,2[AND]cache_handler:memcached"
-			filter="integer">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -125,32 +135,35 @@
 		<field
 			name="memcached_server_host"
 			type="text"
-			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
-			showon="caching:1,2[AND]cache_handler:memcached"
+			default="localhost"
 			filter="string"
-			size="25" />
+			size="25"
+			showon="caching:1,2[AND]cache_handler:memcached"
+		/>
 
 		<field
 			name="memcached_server_port"
 			type="text"
-			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
-			showon="caching:1,2[AND]cache_handler:memcached"
+			default="11211"
 			filter="integer"
-			size="5" />
+			size="5"
+			showon="caching:1,2[AND]cache_handler:memcached"
+		/>
 
 		<field
 			name="redis_persist"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			filter="integer"
-			showon="caching:1,2[AND]cache_handler:redis">
+			showon="caching:1,2[AND]cache_handler:redis"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -158,22 +171,24 @@
 		<field
 			name="redis_server_host"
 			type="text"
-			default="localhost"
 			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
+			default="localhost"
 			filter="string"
+			size="25"
 			showon="caching:1,2[AND]cache_handler:redis"
-			size="25" />
+		/>
 
 		<field
 			name="redis_server_port"
 			type="text"
-			default="6379"
 			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
+			default="6379"
 			filter="integer"
+			size="5"
 			showon="caching:1,2[AND]cache_handler:redis"
-			size="5" />
+		/>
 
 		<field
 			name="redis_server_auth"
@@ -181,19 +196,21 @@
 			label="COM_CONFIG_FIELD_REDIS_AUTH_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_AUTH_DESC"
 			filter="raw"
-			showon="caching:1,2[AND]cache_handler:redis"
 			autocomplete="off"
-			size="30" />
+			size="30"
+			showon="caching:1,2[AND]cache_handler:redis"
+		/>
 
 		<field
 			name="redis_server_db"
 			type="text"
-			default="0"
 			label="COM_CONFIG_FIELD_REDIS_DB_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_DB_DESC"
+			default="0"
 			filter="integer"
+			size="4"
 			showon="caching:1,2[AND]cache_handler:redis"
-			size="4" />
+		/>
 	</fieldset>
 
 	<fieldset
@@ -210,7 +227,8 @@
 			label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
 			supported="mysql,mysqli,pdomysql,postgresql,sqlsrv,sqlazure"
-			filter="string" />
+			filter="string"
+		/>
 
 		<field
 			name="host"
@@ -219,7 +237,8 @@
 			description="COM_CONFIG_FIELD_DATABASE_HOST_DESC"
 			required="true"
 			filter="string"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="user"
@@ -228,7 +247,8 @@
 			description="COM_CONFIG_FIELD_DATABASE_USERNAME_DESC"
 			required="true"
 			filter="string"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="db"
@@ -237,16 +257,18 @@
 			description="COM_CONFIG_FIELD_DATABASE_NAME_DESC"
 			required="true"
 			filter="string"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="dbprefix"
 			type="text"
-			default="jos_"
 			label="COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_PREFIX_DESC"
+			default="jos_"
 			filter="string"
-			size="10" />
+			size="10"
+		/>
 	</fieldset>
 
 	<fieldset
@@ -255,11 +277,12 @@
 		<field
 			name="debug"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -267,11 +290,12 @@
 		<field
 			name="debug_lang"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_LANG_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -283,11 +307,12 @@
 		<field
 			name="ftp_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_FTP_ENABLE_LABEL"
 			description="COM_CONFIG_FIELD_FTP_ENABLE_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -298,8 +323,9 @@
 			label="COM_CONFIG_FIELD_FTP_HOST_LABEL"
 			description="COM_CONFIG_FIELD_FTP_HOST_DESC"
 			filter="string"
+			size="14"
 			showon="ftp_enable:1"
-			size="14" />
+		/>
 
 		<field
 			name="ftp_port"
@@ -307,8 +333,9 @@
 			label="COM_CONFIG_FIELD_FTP_PORT_LABEL"
 			description="COM_CONFIG_FIELD_FTP_PORT_DESC"
 			filter="string"
+			size="8"
 			showon="ftp_enable:1"
-			size="8" />
+		/>
 
 		<field
 			name="ftp_user"
@@ -316,9 +343,10 @@
 			label="COM_CONFIG_FIELD_FTP_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_FTP_USERNAME_DESC"
 			filter="string"
-			showon="ftp_enable:1"
 			autocomplete="off"
-			size="25" />
+			size="25"
+			showon="ftp_enable:1"
+		/>
 
 		<field
 			name="ftp_pass"
@@ -326,18 +354,20 @@
 			label="COM_CONFIG_FIELD_FTP_PASSWORD_LABEL"
 			description="COM_CONFIG_FIELD_FTP_PASSWORD_DESC"
 			filter="raw"
-			showon="ftp_enable:1"
 			autocomplete="off"
-			size="25" />
+			size="25"
+			showon="ftp_enable:1"
+		/>
 
 		<field
 			name="ftp_root"
 			type="text"
 			label="COM_CONFIG_FIELD_FTP_ROOT_LABEL"
-			showon="ftp_enable:1"
 			description="COM_CONFIG_FIELD_FTP_ROOT_DESC"
 			filter="string"
-			size="50" />
+			size="50"
+			showon="ftp_enable:1"
+		/>
 	</fieldset>
 
 	<fieldset
@@ -346,11 +376,12 @@
 		<field
 			name="proxy_enable"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_PROXY_ENABLE_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_ENABLE_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -361,8 +392,9 @@
 			label="COM_CONFIG_FIELD_PROXY_HOST_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_HOST_DESC"
 			filter="string"
+			size="14"
 			showon="proxy_enable:1"
-			size="14" />
+		/>
 
 		<field
 			name="proxy_port"
@@ -370,8 +402,9 @@
 			label="COM_CONFIG_FIELD_PROXY_PORT_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_PORT_DESC"
 			filter="string"
+			size="8"
 			showon="proxy_enable:1"
-			size="8" />
+		/>
 
 		<field
 			name="proxy_user"
@@ -379,9 +412,10 @@
 			label="COM_CONFIG_FIELD_PROXY_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_USERNAME_DESC"
 			filter="string"
-			showon="proxy_enable:1"
 			autocomplete="off"
-			size="25" />
+			size="25"
+			showon="proxy_enable:1"
+		/>
 
 		<field
 			name="proxy_pass"
@@ -389,9 +423,10 @@
 			label="COM_CONFIG_FIELD_PROXY_PASSWORD_LABEL"
 			description="COM_CONFIG_FIELD_PROXY_PASSWORD_DESC"
 			filter="raw"
-			showon="proxy_enable:1"
 			autocomplete="off"
-			size="25" />
+			size="25"
+			showon="proxy_enable:1"
+		/>
 	</fieldset>
 
 	<fieldset
@@ -400,9 +435,10 @@
 		<field
 			name="offset"
 			type="timezone"
-			default="UTC"
 			label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL"
-			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC">
+			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"
+			default="UTC"
+			>
 			<option value="UTC">JLIB_FORM_VALUE_TIMEZONE_UTC</option>
 		</field>
 	</fieldset>
@@ -479,9 +515,9 @@
 			label="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC"
 			default="/usr/sbin/sendmail"
-			showon="mailonline:1[AND]mailer:sendmail"
 			filter="string"
 			size="30"
+			showon="mailonline:1[AND]mailer:sendmail"
 		/>
 
 		<field
@@ -490,9 +526,9 @@
 			label="COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC"
 			default="localhost"
-			showon="mailonline:1[AND]mailer:smtp"
 			filter="string"
 			size="30"
+			showon="mailonline:1[AND]mailer:smtp"
 		/>
 
 		<field
@@ -501,10 +537,10 @@
 			label="COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC"
 			default="25"
-			showon="mailonline:1[AND]mailer:smtp"
 			required="true"
 			filter="string"
 			size="6"
+			showon="mailonline:1[AND]mailer:smtp"
 		/>
 
 		<field
@@ -513,8 +549,8 @@
 			label="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC"
 			default="none"
-			showon="mailonline:1[AND]mailer:smtp"
 			filter="word"
+			showon="mailonline:1[AND]mailer:smtp"
 			>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="ssl">COM_CONFIG_FIELD_VALUE_SSL</option>
@@ -528,8 +564,8 @@
 			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			showon="mailonline:1[AND]mailer:smtp"
 			filter="integer"
+			showon="mailonline:1[AND]mailer:smtp"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -540,10 +576,10 @@
 			type="text"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC"
-			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			filter="string"
 			autocomplete="off"
 			size="30"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 		/>
 
 		<field
@@ -551,10 +587,10 @@
 			type="password"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC"
-			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			filter="raw"
 			autocomplete="off"
 			size="30"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 		/>
 
 	</fieldset>
@@ -569,7 +605,8 @@
 			description="COM_CONFIG_FIELD_METADESC_DESC"
 			filter="string"
 			cols="60"
-			rows="3" />
+			rows="3"
+		/>
 
 		<field
 			name="MetaKeys"
@@ -578,13 +615,16 @@
 			description="COM_CONFIG_FIELD_METAKEYS_DESC"
 			filter="string"
 			cols="60"
-			rows="3" />
+			rows="3"
+		/>
 
-		<field name="robots"
+		<field
+			name="robots"
 			type="list"
 			label="JFIELD_METADATA_ROBOTS_LABEL"
 			description="JFIELD_METADATA_ROBOTS_DESC"
-			default="">
+			default=""
+			>
 			<option value="">JGLOBAL_INDEX_FOLLOW</option>
 			<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
 			<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
@@ -598,19 +638,22 @@
 			description="JFIELD_META_RIGHTS_DESC"
 			filter="string"
 			cols="60"
-			rows="2" />
+			rows="2"
+		/>
 
 		<field
 			name="MetaAuthor"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_METAAUTHOR_LABEL"
 			description="COM_CONFIG_FIELD_METAAUTHOR_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="MetaVersion"
 			type="radio"
@@ -618,7 +661,8 @@
 			default="0"
 			label="COM_CONFIG_FIELD_METAVERSION_LABEL"
 			description="COM_CONFIG_FIELD_METAVERSION_DESC"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -631,11 +675,12 @@
 		<field
 			name="sef"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_SEF_URL_LABEL"
 			description="COM_CONFIG_FIELD_SEF_URL_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -643,12 +688,13 @@
 		<field
 			name="sef_rewrite"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_SEF_REWRITE_LABEL"
 			description="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-			showon="sef:1">
+			showon="sef:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -656,12 +702,13 @@
 		<field
 			name="sef_suffix"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_SEF_SUFFIX_LABEL"
 			description="COM_CONFIG_FIELD_SEF_SUFFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-			showon="sef:1">
+			showon="sef:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -669,12 +716,13 @@
 		<field
 			name="unicodeslugs"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_UNICODESLUGS_LABEL"
 			description="COM_CONFIG_FIELD_UNICODESLUGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
-			showon="sef:1">
+			showon="sef:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -682,10 +730,11 @@
 		<field
 			name="sitename_pagetitles"
 			type="list"
-			default="0"
 			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
 			description="COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC"
-			filter="integer">
+			default="0"
+			filter="integer"
+			>
 			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
 			<option value="0">JNO</option>
@@ -702,16 +751,18 @@
 			label="COM_CONFIG_FIELD_TEMP_PATH_LABEL"
 			description="COM_CONFIG_FIELD_TEMP_PATH_DESC"
 			filter="string"
-			size="50" />
+			size="50"
+		/>
 
 		<field
 			name="gzip"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -719,10 +770,11 @@
 		<field
 			name="error_reporting"
 			type="list"
-			default="default"
 			label="COM_CONFIG_FIELD_ERROR_REPORTING_LABEL"
 			description="COM_CONFIG_FIELD_ERROR_REPORTING_DESC"
-			filter="cmd">
+			default="default"
+			filter="cmd"
+			>
 			<option value="default">COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT</option>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="simple">COM_CONFIG_FIELD_VALUE_SIMPLE</option>
@@ -733,10 +785,11 @@
 		<field
 			name="force_ssl"
 			type="list"
-			default="-1"
 			label="COM_CONFIG_FIELD_FORCE_SSL_LABEL"
 			description="COM_CONFIG_FIELD_FORCE_SSL_DESC"
-			filter="integer">
+			default="-1"
+			filter="integer"
+			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_ENTIRE_SITE</option>
@@ -749,62 +802,68 @@
 		<field
 			name="lifetime"
 			type="number"
-			min="1"
-			default="15"
 			label="COM_CONFIG_FIELD_SESSION_TIME_LABEL"
 			description="COM_CONFIG_FIELD_SESSION_TIME_DESC"
+			min="1"
+			default="15"
 			required="true"
 			filter="integer"
 			validate="number"
-			size="6" />
+			size="6"
+		/>
 
 		<field
 			name="session_handler"
 			type="sessionhandler"
-			default="none"
 			label="COM_CONFIG_FIELD_SESSION_HANDLER_LABEL"
 			description="COM_CONFIG_FIELD_SESSION_HANDLER_DESC"
-			filter="word" />
+			default="none"
+			filter="word"
+		/>
 
 		<field
 			name="session_memcache_server_host"
 			type="text"
-			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
 			filter="string"
+			size="25"
 			showon="session_handler:memcache"
-			size="25" />
+		/>
 
 		<field
 			name="session_memcache_server_port"
 			type="text"
-			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			default="11211"
 			filter="integer"
+			size="5"
 			showon="session_handler:memcache"
-			size="5" />
+		/>
 
 		<field
 			name="session_memcached_server_host"
 			type="text"
-			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
 			filter="string"
+			size="25"
 			showon="session_handler:memcached"
-			size="25" />
+		/>
 
 		<field
 			name="session_memcached_server_port"
 			type="text"
-			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			default="11211"
 			filter="integer"
+			size="5"
 			showon="session_handler:memcached"
-			size="5" />
+		/>
 	</fieldset>
 
 	<fieldset
@@ -818,16 +877,18 @@
 			description="COM_CONFIG_FIELD_SITE_NAME_DESC"
 			required="true"
 			filter="string"
-			size="50" />
+			size="50"
+		/>
 
 		<field
 			name="offline"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
 			label="COM_CONFIG_FIELD_SITE_OFFLINE_LABEL"
 			description="COM_CONFIG_FIELD_SITE_OFFLINE_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -835,11 +896,12 @@
 		<field
 			name="display_offline_message"
 			type="list"
-			default="1"
 			label="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL"
 			description="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC"
+			default="1"
 			filter="integer"
-			showon="offline:1">
+			showon="offline:1"
+			>
 			<option value="0">JHIDE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE</option>
@@ -853,22 +915,25 @@
 			filter="safehtml"
 			cols="60"
 			rows="2"
-			showon="offline:1[AND]display_offline_message:1" />
+			showon="offline:1[AND]display_offline_message:1"
+		/>
 
 		<field
 			name="offline_image"
 			type="media"
 			label="COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL"
 			description="COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC"
-			showon="offline:1" />
+			showon="offline:1"
+		/>
 
 		<field
 			name="frontediting"
 			type="list"
-			default="1"
 			label="COM_CONFIG_FRONTEDITING_LABEL"
 			description="COM_CONFIG_FRONTEDITING_DESC"
-			filter="integer">
+			default="1"
+			filter="integer"
+			>
 			<option value="2">COM_CONFIG_FRONTEDITING_MENUSANDMODULES</option>
 			<option value="1">COM_CONFIG_FRONTEDITING_MODULES</option>
 			<option value="0">JNONE</option>
@@ -877,38 +942,42 @@
 		<field
 			name="editor"
 			type="plugins"
-			folder="editors"
-			default="tinymce"
 			label="COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC"
-			filter="cmd" />
+			folder="editors"
+			default="tinymce"
+			filter="cmd"
+		/>
 
 		<field
 			name="captcha"
 			type="plugins"
-			folder="captcha"
-			default="0"
 			label="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC"
-			filter="cmd">
+			folder="captcha"
+			default="0"
+			filter="cmd"
+			>
 			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
 
 		<field
 			name="access"
 			type="accesslevel"
-			default="1"
 			label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
-			filter="integer" />
+			default="1"
+			filter="integer"
+		/>
 
 		<field
 			name="list_limit"
 			type="list"
-			default="20"
 			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC"
-			filter="integer">
+			default="20"
+			filter="integer"
+			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
 			<option value="15">J15</option>
@@ -924,10 +993,11 @@
 		<field
 			name="feed_limit"
 			type="list"
-			default="10"
 			label="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC"
-			filter="integer">
+			default="10"
+			filter="integer"
+			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
 			<option value="15">J15</option>
@@ -941,14 +1011,14 @@
 		<field
 			name="feed_email"
 			type="list"
-			default="none"
 			label="COM_CONFIG_FIELD_FEED_EMAIL_LABEL"
 			description="COM_CONFIG_FIELD_FEED_EMAIL_DESC"
-			filter="word">
+			default="none"
+			filter="word"
+			>
 			<option value="author">COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL</option>
 			<option value="site">COM_CONFIG_FIELD_VALUE_SITE_EMAIL</option>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NO_EMAIL</option>
-
 		</field>
 	</fieldset>
 
@@ -963,14 +1033,16 @@
 			description="COM_CONFIG_FIELD_LOG_PATH_DESC"
 			required="true"
 			filter="string"
-			size="50" />
+			size="50"
+		/>
 
 		<field
 			name="helpurl"
 			type="helpsite"
 			label="COM_CONFIG_FIELD_HELP_SERVER_LABEL"
 			description="COM_CONFIG_FIELD_HELP_SERVER_DESC"
-			showDefault="false" />
+			showDefault="false"
+		/>
 	</fieldset>
 
 	<fieldset
@@ -982,7 +1054,8 @@
 			label="COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL"
 			description="COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC"
 			filter="string"
-			size="40" />
+			size="40"
+		/>
 
 		<field
 			name="cookie_path"
@@ -990,7 +1063,8 @@
 			label="COM_CONFIG_FIELD_COOKIE_PATH_LABEL"
 			description="COM_CONFIG_FIELD_COOKIE_PATH_DESC"
 			filter="string"
-			size="40" />
+			size="40"
+		/>
 	</fieldset>
 
 	<fieldset
@@ -1003,49 +1077,68 @@
 			label="FIELD_RULES_LABEL"
 			translate_label="false"
 			validate="rules"
-			filter="rules">
+			filter="rules"
+			>
 			<action
 				name="core.login.site"
+				description="COM_CONFIG_ACTION_LOGIN_SITE_DESC"
 				title="JACTION_LOGIN_SITE"
-				description="COM_CONFIG_ACTION_LOGIN_SITE_DESC" />
+			/>
+
 			<action
 				name="core.login.admin"
+				description="COM_CONFIG_ACTION_LOGIN_ADMIN_DESC"
 				title="JACTION_LOGIN_ADMIN"
-				description="COM_CONFIG_ACTION_LOGIN_ADMIN_DESC" />
+			/>
+
 			<action
 				name="core.login.offline"
+				description="COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC"
 				title="JACTION_LOGIN_OFFLINE"
-				description="COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC" />
+			/>
+
 			<action
 				name="core.admin"
+				description="COM_CONFIG_ACTION_ADMIN_DESC"
 				title="JACTION_ADMIN_GLOBAL"
-				description="COM_CONFIG_ACTION_ADMIN_DESC" />
+			/>
+
 			<action
 				name="core.manage"
+				description="COM_CONFIG_ACTION_MANAGE_DESC"
 				title="JACTION_MANAGE"
-				description="COM_CONFIG_ACTION_MANAGE_DESC" />
+			/>
+
 			<action
 				name="core.create"
+				description="COM_CONFIG_ACTION_CREATE_DESC"
 				title="JACTION_CREATE"
-				description="COM_CONFIG_ACTION_CREATE_DESC" />
+			/>
+
 			<action
 				name="core.delete"
+				description="COM_CONFIG_ACTION_DELETE_DESC"
 				title="JACTION_DELETE"
-				description="COM_CONFIG_ACTION_DELETE_DESC" />
+			/>
+
 			<action
 				name="core.edit"
+				description="COM_CONFIG_ACTION_EDIT_DESC"
 				title="JACTION_EDIT"
-				description="COM_CONFIG_ACTION_EDIT_DESC" />
+			/>
+
 			<action
 				name="core.edit.state"
 				title="JACTION_EDITSTATE"
-				description="COM_CONFIG_ACTION_EDITSTATE_DESC" />
+				description="COM_CONFIG_ACTION_EDITSTATE_DESC"
+			/>
+
 			<action
 				name="core.edit.own"
 				title="JACTION_EDITOWN"
-				description="COM_CONFIG_ACTION_EDITOWN_DESC" />
+				description="COM_CONFIG_ACTION_EDITOWN_DESC"
+			/>
 		</field>
-
 	</fieldset>
 
 	<fieldset
@@ -1057,12 +1150,14 @@
 			name="filters"
 			type="filters"
 			label="COM_CONFIG_TEXT_FILTERS"
-			filter="" />
+			filter=""
+		/>
 	</fieldset>
 
 	<fieldset>
 		<field
 			name="asset_id"
-			type="hidden" />
+			type="hidden"
+		/>
 	</fieldset>
 </form>