diff --git a/installation/model/forms/database.xml b/installation/model/forms/database.xml
index 629222bde5f60..1b23399623b31 100644
--- a/installation/model/forms/database.xml
+++ b/installation/model/forms/database.xml
@@ -5,46 +5,50 @@
 			<field
 				name="db_type"
 				type="databaseconnection"
+				label="INSTL_DATABASE_TYPE_LABEL"
 				id="db_type"
 				class="inputbox"
-				label="INSTL_DATABASE_TYPE_LABEL"
 				supported="mysql,mysqli,pdomysql,postgresql,sqlsrv,sqlazure"
 				required="true"
 				default="mysqli"
 				filter="string"
 			/>
+
 			<field
 				name="db_host"
 				type="text"
+				label="INSTL_DATABASE_HOST_LABEL"
 				id="db_host"
 				class="inputbox"
-				label="INSTL_DATABASE_HOST_LABEL"
 				default="localhost"
 				required="true"
 			/>
+
 			<field
 				name="db_user"
 				type="text"
+				label="INSTL_DATABASE_USER_LABEL"
 				id="db_user"
 				class="inputbox"
-				label="INSTL_DATABASE_USER_LABEL"
 				required="true"
 			/>
+
 			<field
 				name="db_pass"
 				type="password"
+				label="INSTL_DATABASE_PASSWORD_LABEL"
 				id="db_pass"
 				class="inputbox"
-				label="INSTL_DATABASE_PASSWORD_LABEL"
 				autocomplete="off"
 				filter="raw"
 			/>
+
 			<field
 				name="db_name"
 				type="text"
+				label="INSTL_DATABASE_NAME_LABEL"
 				id="db_name"
 				class="inputbox"
-				label="INSTL_DATABASE_NAME_LABEL"
 				required="true"
 			/>
 		</fieldset>
@@ -54,21 +58,22 @@
 			<field
 				name="db_old"
 				type="radio"
+				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
 				id="db_old"
 				class="btn-group"
-				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
 				default="backup"
 				required="true"
-			>
+				>
 				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
 				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
 			</field>
+
 			<field
 				name="db_prefix"
 				type="installation.prefix"
+				label="INSTL_DATABASE_PREFIX_LABEL"
 				id="db_prefix"
 				class="inputbox"
-				label="INSTL_DATABASE_PREFIX_LABEL"
 				required="true"
 				validate="installation.prefix"
 				message="INSTL_DATABASE_PREFIX_MSG"
diff --git a/installation/model/forms/defaultlanguage.xml b/installation/model/forms/defaultlanguage.xml
index d1ccf5dbd57b2..c51e9237e060e 100644
--- a/installation/model/forms/defaultlanguage.xml
+++ b/installation/model/forms/defaultlanguage.xml
@@ -4,36 +4,38 @@
 		<field
 			name="activateMultilanguage"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE"
 			id="activateMultilanguage"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE"
 			filter="integer"
 			default="0"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="installLocalisedContent"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT"
 			id="installLocalisedContent"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT"
 			filter="integer"
 			default="1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="activatePluginLanguageCode"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN"
 			id="activatePluginLanguageCode"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN"
 			filter="integer"
 			default="0"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
diff --git a/installation/model/forms/ftp.xml b/installation/model/forms/ftp.xml
index f39a8f350c3ec..55b8880ebf744 100644
--- a/installation/model/forms/ftp.xml
+++ b/installation/model/forms/ftp.xml
@@ -5,37 +5,40 @@
 			<field
 				name="ftp_enable"
 				type="radio"
+				label="INSTL_FTP_ENABLE_LABEL"
 				id="ftp_enable"
 				class="btn-group"
-				label="INSTL_FTP_ENABLE_LABEL"
 				default="0"
 				filter="int"
 				required="true"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="ftp_user"
 				type="text"
+				label="INSTL_FTP_USER_LABEL"
 				id="ftp_user"
 				class="inputbox"
-				label="INSTL_FTP_USER_LABEL"
 			/>
+
 			<field
 				name="ftp_pass"
 				type="password"
+				label="INSTL_FTP_PASSWORD_LABEL"
 				id="ftp_pass"
 				class="inputbox"
-				label="INSTL_FTP_PASSWORD_LABEL"
 				filter="raw"
 			/>
+
 			<field
 				name="ftp_root"
 				type="text"
+				label="INSTL_FTP_ROOT_LABEL"
 				id="ftp_root"
 				class="inputbox"
-				label="INSTL_FTP_ROOT_LABEL"
 			/>
 		</fieldset>
 
@@ -44,30 +47,32 @@
 			<field
 				name="ftp_host"
 				type="text"
+				label="INSTL_FTP_HOST_LABEL"
 				id="ftp_host"
 				class="inputbox"
-				label="INSTL_FTP_HOST_LABEL"
 				default="127.0.0.1"
 			/>
+
 			<field
 				name="ftp_port"
 				type="text"
+				label="INSTL_FTP_PORT_LABEL"
 				id="ftp_port"
 				class="inputbox"
-				label="INSTL_FTP_PORT_LABEL"
 				default="21"
 				filter="int"
 			/>
+
 			<field
 				name="ftp_save"
 				type="radio"
+				label="INSTL_FTP_SAVE_LABEL"
 				id="ftp_save"
 				class="btn-group"
-				label="INSTL_FTP_SAVE_LABEL"
 				default="0"
 				required="true"
 				filter="int"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/installation/model/forms/preinstall.xml b/installation/model/forms/preinstall.xml
index fb5d624e1c10c..c4424d6c61fef 100644
--- a/installation/model/forms/preinstall.xml
+++ b/installation/model/forms/preinstall.xml
@@ -4,9 +4,9 @@
 		<field
 			name="language"
 			type="installation.language"
+			label="INSTL_LANGUAGE_LABEL"
 			id="language"
 			class="chzn-select-deselect"
-			label="INSTL_LANGUAGE_LABEL"
 			size="20"
 			default="en-GB"
 			required="true"
diff --git a/installation/model/forms/site.xml b/installation/model/forms/site.xml
index c47aec01c522e..188bcc9217f6f 100644
--- a/installation/model/forms/site.xml
+++ b/installation/model/forms/site.xml
@@ -4,9 +4,9 @@
 		<field
 			name="language"
 			type="installation.language"
+			label="INSTL_LANGUAGE_LABEL"
 			id="language"
 			class="chzn-select-deselect"
-			label="INSTL_LANGUAGE_LABEL"
 			size="20"
 			default="en-GB"
 			onchange="Install.setlanguage();"
@@ -15,18 +15,18 @@
 		<field
 			name="site_name"
 			type="text"
+			label="INSTL_SITE_NAME_LABEL"
 			id="site_name"
 			class="inputbox"
-			label="INSTL_SITE_NAME_LABEL"
 			required="true"
 		/>
 
 		<field
 			name="admin_email"
 			type="email"
+			label="INSTL_ADMIN_EMAIL_LABEL"
 			id="admin_email"
 			class="inputbox"
-			label="INSTL_ADMIN_EMAIL_LABEL"
 			validate="email"
 			required="true"
 		/>
@@ -34,18 +34,18 @@
 		<field
 			name="admin_user"
 			type="text"
+			label="INSTL_ADMIN_USER_LABEL"
 			id="admin_user"
 			class="inputbox"
-			label="INSTL_ADMIN_USER_LABEL"
 			required="true"
 		/>
 
 		<field
 			name="admin_password"
 			type="password"
+			label="INSTL_ADMIN_PASSWORD_LABEL"
 			id="admin_password"
 			class="inputbox"
-			label="INSTL_ADMIN_PASSWORD_LABEL"
 			required="true"
 			filter="raw"
 			autocomplete="off"
@@ -54,9 +54,9 @@
 		<field
 			name="admin_password2"
 			type="password"
+			label="INSTL_ADMIN_PASSWORD2_LABEL"
 			id="admin_password2"
 			class="inputbox"
-			label="INSTL_ADMIN_PASSWORD2_LABEL"
 			required="true"
 			filter="raw"
 			validate="equals"
@@ -67,21 +67,21 @@
 		<field
 			name="site_metadesc"
 			type="textarea"
+			label="INSTL_SITE_METADESC_LABEL"
 			id="site_metadesc"
 			class="text_area noResize"
-			label="INSTL_SITE_METADESC_LABEL"
 			rows="3"
 		/>
 
 		<field
 			name="site_offline"
 			type="radio"
+			label="INSTL_SITE_OFFLINE_LABEL"
 			id="site_offline"
 			class="btn-group"
 			default="0"
-			label="INSTL_SITE_OFFLINE_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
diff --git a/installation/model/forms/summary.xml b/installation/model/forms/summary.xml
index b88ebcc20ea2f..19370e95e6932 100644
--- a/installation/model/forms/summary.xml
+++ b/installation/model/forms/summary.xml
@@ -4,33 +4,36 @@
 		<field
 			name="summary_email"
 			type="radio"
+			label="INSTL_SUMMARY_EMAIL_LABEL"
 			id="summary_email"
 			class="btn-group"
 			default="0"
-			label="INSTL_SUMMARY_EMAIL_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="summary_email_passwords"
 			type="radio"
+			label="INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL"
 			id="email_passwords"
 			class="btn-group"
 			default="0"
-			label="INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field name="db_type" type="hidden" />
+
 		<field
 			name="sample_file"
 			type="installation.sample"
-			class="inputbox"
 			label="INSTL_SITE_INSTALL_SAMPLE_LABEL"
+			class="inputbox"
 		/>
 	</fieldset>
 </form>
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 3f7d93085ec88..e00420f2024af 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -384,9 +384,9 @@
 				<field
 					name="show_date_field"
 					type="list"
-					default="created"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC"
+					default="created"
 					>
 					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
 					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
@@ -396,9 +396,9 @@
 				<field
 					name="show_date_format"
 					type="text"
-					default="Y-m-d H:i:s"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC"
+					default="Y-m-d H:i:s"
 				/>
 
 				<field
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index d86ea00848c2e..a329b1bf0e438 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -94,7 +94,7 @@
 					description="MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC"
 					class="btn-group btn-group-yesno"
 					default="1"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -118,7 +118,7 @@
 					description="MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC"
 					default="1"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JSHOW</option>
 					<option value="0">JHIDE</option>
 				</field>
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index b8f8c104ce1fe..3b9fec4ea327b 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -38,9 +38,9 @@
 				<field
 					name="count"
 					type="text"
-					default="5"
 					label="MOD_POPULAR_FIELD_COUNT_LABEL"
 					description="MOD_POPULAR_FIELD_COUNT_DESC"
+					default="5"
 				/>
 
 					<field
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index 7f98a44f91d61..e7df34991f0c7 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -120,9 +120,10 @@
 
 				<field
 					name="moduleclass_sfx"
-					type="textarea" rows="3"
+					type="textarea" 
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
 				/>
 
 				<field
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index ffabce9d26689..52088a17c32c3 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -83,6 +83,7 @@
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="profilelink"
 					type="radio"
@@ -94,6 +95,7 @@
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="name"
 					type="list"
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 887b1792ddbf9..4c57369591fa5 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -27,9 +27,9 @@
 				<field
 					name="menutype"
 					type="menu"
-					clientid="0"
 					label="MOD_MENU_FIELD_MENUTYPE_LABEL"
 					description="MOD_MENU_FIELD_MENUTYPE_DESC"
+					clientid="0"
 				/>
 
 				<field
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index f03b9d47cf253..47baa1171b15d 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -52,9 +52,10 @@
 
 				<field
 					name="moduleclass_sfx"
-					type="textarea" rows="3"
+					type="textarea" 
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
 				/>
 
 				<field
diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml
index f287eaddd8005..ee17732ae3b51 100644
--- a/modules/mod_search/mod_search.xml
+++ b/modules/mod_search/mod_search.xml
@@ -54,6 +54,7 @@
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="button_pos"
 					type="list"
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index 78d477a381710..0ab4a7edec597 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -76,9 +76,10 @@
 
 				<field
 					name="moduleclass_sfx"
-					type="textarea" rows="3"
+					type="textarea" 
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
 				/>
 
 				<field
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index b8bdabc6a5d71..43ce70a13d100 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -33,9 +33,9 @@
 				<field
 					name="filter_groups"
 					type="radio"
-					class="btn-group btn-group-yesno"
 					label="MOD_USERS_LATEST_FIELD_FILTER_GROUPS_LABEL"
 					description="MOD_USERS_LATEST_FIELD_FILTER_GROUPS_DESC"
+					class="btn-group btn-group-yesno"
 					default="0"
 					>
 					<option value="1">JYES</option>
@@ -68,6 +68,7 @@
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
+
 				<field
 					name="cache_time"
 					type="text"
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 604e3bcb0b5c9..db4adcfded319 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -131,6 +131,7 @@
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
+
 				<field
 					name="cache_time"
 					type="text"
@@ -142,7 +143,8 @@
 				<field
 					name="cachemode"
 					type="hidden"
-					default="static">
+					default="static"
+					>
 					<option value="static"></option>
 				</field>
 			</fieldset>
diff --git a/plugins/authentication/cookie/cookie.xml b/plugins/authentication/cookie/cookie.xml
index c3df3ff247b76..c6466d32e90cb 100644
--- a/plugins/authentication/cookie/cookie.xml
+++ b/plugins/authentication/cookie/cookie.xml
@@ -22,8 +22,8 @@
 				<field
 					name="cookie_lifetime"
 					type="text"
-					description="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_DESC"
 					label="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_LABEL"
+					description="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_DESC"
 					default="60"
 					filter="integer"
 					required="required"
@@ -32,11 +32,12 @@
 				<field
 					name="key_length"
 					type="list"
-					description="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_DESC"
 					label="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_LABEL"
+					description="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_DESC"
 					default="16"
 					filter="integer"
-					required="required">
+					required="required"
+					>
 					<option value="8">8</option>
 					<option value="16">16</option>
 					<option value="32">32</option>
diff --git a/plugins/authentication/gmail/gmail.xml b/plugins/authentication/gmail/gmail.xml
index bb8c468f7751e..13752799d1e9a 100644
--- a/plugins/authentication/gmail/gmail.xml
+++ b/plugins/authentication/gmail/gmail.xml
@@ -25,7 +25,7 @@
 					label="PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL"
 					description="PLG_GMAIL_FIELD_APPLYSUFFIX_DESC"
 					default="0"
-				>
+					>
 					<option value="0">PLG_GMAIL_FIELD_VALUE_NOAPPLYSUFFIX</option>
 					<option value="1">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXMISSING</option>
 					<option value="2">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXALWAYS</option>
@@ -47,7 +47,7 @@
 					description="PLG_GMAIL_FIELD_VERIFYPEER_DESC"
 					default="1"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -59,6 +59,7 @@
 					description="PLG_GMAIL_FIELD_USER_BLACKLIST_DESC"
 					size="20"
 				/>
+
 				<field
 					name="backendLogin"
 					type="radio"
@@ -66,7 +67,7 @@
 					description="PLG_GMAIL_FIELD_BACKEND_LOGIN_DESC"
 					default="0"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JENABLED</option>
 					<option value="0">JDISABLED</option>
 				</field>
diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml
index 6da2a5af8dcb5..50531e50468f2 100644
--- a/plugins/authentication/ldap/ldap.xml
+++ b/plugins/authentication/ldap/ldap.xml
@@ -49,7 +49,7 @@
 					description="PLG_LDAP_FIELD_V3_DESC"
 					default="0"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -61,7 +61,7 @@
 					description="PLG_LDAP_FIELD_NEGOCIATE_DESC"
 					default="0"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -69,11 +69,11 @@
 				<field
 					name="no_referrals"
 					type="radio"
-					default="0"
-					class="btn-group btn-group-yesno"
 					label="PLG_LDAP_FIELD_REFERRALS_LABEL"
 					description="PLG_LDAP_FIELD_REFERRALS_DESC"
-				>
+					default="0"
+					class="btn-group btn-group-yesno"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -81,10 +81,10 @@
 				<field
 					name="auth_method"
 					type="list"
-					default="bind"
 					label="PLG_LDAP_FIELD_AUTHMETHOD_LABEL"
 					description="PLG_LDAP_FIELD_AUTHMETHOD_DESC"
-				>
+					default="bind"
+					>
 					<option value="search">PLG_LDAP_FIELD_VALUE_BINDSEARCH</option>
 					<option value="bind">PLG_LDAP_FIELD_VALUE_BINDUSER</option>
 				</field>
@@ -130,7 +130,6 @@
 					size="20"
 				/>
 
-
 				<field
 					name="ldap_fullname"
 					type="text"
diff --git a/plugins/content/emailcloak/emailcloak.xml b/plugins/content/emailcloak/emailcloak.xml
index c5032b85085a4..64f4536dd661e 100644
--- a/plugins/content/emailcloak/emailcloak.xml
+++ b/plugins/content/emailcloak/emailcloak.xml
@@ -22,10 +22,10 @@
 				<field
 					name="mode"
 					type="list"
-					default="1"
-					description="PLG_CONTENT_EMAILCLOAK_MODE_DESC"
 					label="PLG_CONTENT_EMAILCLOAK_MODE_LABEL"
-				>
+					description="PLG_CONTENT_EMAILCLOAK_MODE_DESC"
+					default="1"
+					>
 					<option value="0">PLG_CONTENT_EMAILCLOAK_NONLINKABLE</option>
 					<option value="1">PLG_CONTENT_EMAILCLOAK_LINKABLE</option>
 				</field>
diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml
index ff7df94192378..56e94ba1d0e04 100644
--- a/plugins/content/joomla/joomla.xml
+++ b/plugins/content/joomla/joomla.xml
@@ -31,11 +31,12 @@
 					<option value="0">JNO</option>
 				</field>
 
-				<field name="email_new_fe"
+				<field 
+					name="email_new_fe"
 					type="radio"
-					class="btn-group btn-group-yesno"
 					label="PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_LABEL"
 					description="PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_DESC"
+					class="btn-group btn-group-yesno"
 					default="1"
 					>
 					<option value="1">JYES</option>
diff --git a/plugins/content/vote/vote.xml b/plugins/content/vote/vote.xml
index b279762ee6129..f616fdc048d44 100644
--- a/plugins/content/vote/vote.xml
+++ b/plugins/content/vote/vote.xml
@@ -23,10 +23,10 @@
 				<field
 					name="position"
 					type="list"
-					default="top"
-					description="PLG_VOTE_POSITION_DESC"
 					label="PLG_VOTE_POSITION_LABEL"
-				>
+					description="PLG_VOTE_POSITION_DESC"
+					default="top"
+					>
 					<option value="top">PLG_VOTE_TOP</option>
 					<option value="bottom">PLG_VOTE_BOTTOM</option>
 				</field>
diff --git a/plugins/editors/tinymce/form/setoptions.xml b/plugins/editors/tinymce/form/setoptions.xml
index 3da7514945c9c..484effa260cd9 100644
--- a/plugins/editors/tinymce/form/setoptions.xml
+++ b/plugins/editors/tinymce/form/setoptions.xml
@@ -1,313 +1,313 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
     <field
-            name="access"
-            type="usergrouplist"
-            multiple="true"
-            class="access-select"
-            label="PLG_TINY_FIELD_SETACCESS_LABEL"
-            description="PLG_TINY_FIELD_SETACCESS_DESC"
-            labelclass="label label-success"
+        name="access"
+        type="usergrouplist"
+        label="PLG_TINY_FIELD_SETACCESS_LABEL"
+        description="PLG_TINY_FIELD_SETACCESS_DESC"
+        multiple="true"
+        class="access-select"
+        labelclass="label label-success"
     />
 
     <field
-            name="skins"
-            type="note"
-            label="PLG_TINY_FIELD_SKIN_INFO_LABEL"
-            description="PLG_TINY_FIELD_SKIN_INFO_DESC"
+        name="skins"
+        type="note"
+        label="PLG_TINY_FIELD_SKIN_INFO_LABEL"
+        description="PLG_TINY_FIELD_SKIN_INFO_DESC"
     />
 
     <field
-            name="skin"
-            type="skins"
-            label="PLG_TINY_FIELD_SKIN_LABEL"
-            description="PLG_TINY_FIELD_SKIN_DESC"
+        name="skin"
+        type="skins"
+        label="PLG_TINY_FIELD_SKIN_LABEL"
+        description="PLG_TINY_FIELD_SKIN_DESC"
     />
 
     <field
-            name="skin_admin"
-            type="skins"
-            label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
-            description="PLG_TINY_FIELD_SKIN_ADMIN_DESC"
+        name="skin_admin"
+        type="skins"
+        label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
+        description="PLG_TINY_FIELD_SKIN_ADMIN_DESC"
     />
 
     <field
-            name="mobile"
-            type="radio"
-            label="PLG_TINY_FIELD_MOBILE_LABEL"
-            description="PLG_TINY_FIELD_MOBILE_DESC"
-            class="btn-group btn-group-yesno"
-            default="0"
-    >
+        name="mobile"
+        type="radio"
+        label="PLG_TINY_FIELD_MOBILE_LABEL"
+        description="PLG_TINY_FIELD_MOBILE_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="drag_drop"
-            type="radio"
-            label="PLG_TINY_FIELD_DRAG_DROP_LABEL"
-            description="PLG_TINY_FIELD_DRAG_DROP_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="drag_drop"
+        type="radio"
+        label="PLG_TINY_FIELD_DRAG_DROP_LABEL"
+        description="PLG_TINY_FIELD_DRAG_DROP_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="path"
-            type="uploaddirs"
-            label="PLG_TINY_FIELD_CUSTOM_PATH_LABEL"
-            description="PLG_TINY_FIELD_CUSTOM_PATH_DESC"
-            class="input-xxlarge"
-            showon="drag_drop:1"
+        name="path"
+        type="uploaddirs"
+        label="PLG_TINY_FIELD_CUSTOM_PATH_LABEL"
+        description="PLG_TINY_FIELD_CUSTOM_PATH_DESC"
+        class="input-xxlarge"
+        showon="drag_drop:1"
     />
 
     <field
-            name="entity_encoding"
-            type="list"
-            label="PLG_TINY_FIELD_ENCODING_LABEL"
-            description="PLG_TINY_FIELD_ENCODING_DESC"
-            default="raw"
-    >
+        name="entity_encoding"
+        type="list"
+        label="PLG_TINY_FIELD_ENCODING_LABEL"
+        description="PLG_TINY_FIELD_ENCODING_DESC"
+        default="raw"
+        >
         <option value="named">PLG_TINY_FIELD_VALUE_NAMED</option>
         <option value="numeric">PLG_TINY_FIELD_VALUE_NUMERIC</option>
         <option value="raw">PLG_TINY_FIELD_VALUE_RAW</option>
     </field>
 
     <field
-            name="lang_mode"
-            type="radio"
-            label="PLG_TINY_FIELD_LANGSELECT_LABEL"
-            description="PLG_TINY_FIELD_LANGSELECT_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="lang_mode"
+        type="radio"
+        label="PLG_TINY_FIELD_LANGSELECT_LABEL"
+        description="PLG_TINY_FIELD_LANGSELECT_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="lang_code"
-            type="filelist"
-            label="PLG_TINY_FIELD_LANGCODE_LABEL"
-            description="PLG_TINY_FIELD_LANGCODE_DESC"
-            class="inputbox"
-            stripext="1"
-            directory="media/editors/tinymce/langs/"
-            hide_none="1"
-            default="en"
-            hide_default="1"
-            filter="\.js$"
-            size="10"
-            showon="lang_mode:0"
+        name="lang_code"
+        type="filelist"
+        label="PLG_TINY_FIELD_LANGCODE_LABEL"
+        description="PLG_TINY_FIELD_LANGCODE_DESC"
+        class="inputbox"
+        stripext="1"
+        directory="media/editors/tinymce/langs/"
+        hide_none="1"
+        default="en"
+        hide_default="1"
+        filter="\.js$"
+        size="10"
+        showon="lang_mode:0"
     />
 
     <field
-            name="text_direction"
-            type="list"
-            label="PLG_TINY_FIELD_DIRECTION_LABEL"
-            description="PLG_TINY_FIELD_DIRECTION_DESC"
-            default="ltr"
-    >
+        name="text_direction"
+        type="list"
+        label="PLG_TINY_FIELD_DIRECTION_LABEL"
+        description="PLG_TINY_FIELD_DIRECTION_DESC"
+        default="ltr"
+        >
         <option value="ltr">PLG_TINY_FIELD_VALUE_LTR</option>
         <option value="rtl">PLG_TINY_FIELD_VALUE_RTL</option>
     </field>
 
     <field
-            name="content_css"
-            type="radio"
-            label="PLG_TINY_FIELD_CSS_LABEL"
-            description="PLG_TINY_FIELD_CSS_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="content_css"
+        type="radio"
+        label="PLG_TINY_FIELD_CSS_LABEL"
+        description="PLG_TINY_FIELD_CSS_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="content_css_custom"
-            type="text"
-            label="PLG_TINY_FIELD_CUSTOM_CSS_LABEL"
-            description="PLG_TINY_FIELD_CUSTOM_CSS_DESC"
-            class="input-xxlarge"
+        name="content_css_custom"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOM_CSS_LABEL"
+        description="PLG_TINY_FIELD_CUSTOM_CSS_DESC"
+        class="input-xxlarge"
     />
 
     <field
-            name="relative_urls"
-            type="list"
-            label="PLG_TINY_FIELD_URLS_LABEL"
-            description="PLG_TINY_FIELD_URLS_DESC"
-            default="1"
-    >
+        name="relative_urls"
+        type="list"
+        label="PLG_TINY_FIELD_URLS_LABEL"
+        description="PLG_TINY_FIELD_URLS_DESC"
+        default="1"
+        >
         <option value="0">PLG_TINY_FIELD_VALUE_ABSOLUTE</option>
         <option value="1">PLG_TINY_FIELD_VALUE_RELATIVE</option>
     </field>
 
     <field
-            name="newlines"
-            type="list"
-            label="PLG_TINY_FIELD_NEWLINES_LABEL"
-            description="PLG_TINY_FIELD_NEWLINES_DESC"
-            default="0"
-    >
+        name="newlines"
+        type="list"
+        label="PLG_TINY_FIELD_NEWLINES_LABEL"
+        description="PLG_TINY_FIELD_NEWLINES_DESC"
+        default="0"
+        >
         <option value="1">PLG_TINY_FIELD_VALUE_BR</option>
         <option value="0">PLG_TINY_FIELD_VALUE_P</option>
     </field>
 
     <field
-            name="use_config_textfilters"
-            type="radio"
-            label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
-            description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
-            class="btn-group btn-group-yesno"
-            default="0"
-    >
+        name="use_config_textfilters"
+        type="radio"
+        label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
+        description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="invalid_elements"
-            type="text"
-            label="PLG_TINY_FIELD_PROHIBITED_LABEL"
-            description="PLG_TINY_FIELD_PROHIBITED_DESC"
-            showon="use_config_textfilters:0"
-            default="script,applet,iframe"
-            class="input-xxlarge"
+        name="invalid_elements"
+        type="text"
+        label="PLG_TINY_FIELD_PROHIBITED_LABEL"
+        description="PLG_TINY_FIELD_PROHIBITED_DESC"
+        showon="use_config_textfilters:0"
+        default="script,applet,iframe"
+        class="input-xxlarge"
     />
 
     <field
-            name="valid_elements"
-            type="text"
-            label="PLG_TINY_FIELD_VALIDELEMENTS_LABEL"
-            description="PLG_TINY_FIELD_VALIDELEMENTS_DESC"
-            showon="use_config_textfilters:0"
-            class="input-xxlarge"
+        name="valid_elements"
+        type="text"
+        label="PLG_TINY_FIELD_VALIDELEMENTS_LABEL"
+        description="PLG_TINY_FIELD_VALIDELEMENTS_DESC"
+        showon="use_config_textfilters:0"
+        class="input-xxlarge"
     />
 
     <field
-            name="extended_elements"
-            type="text"
-            label="PLG_TINY_FIELD_ELEMENTS_LABEL"
-            description="PLG_TINY_FIELD_ELEMENTS_DESC"
-            showon="use_config_textfilters:0"
-            class="input-xxlarge"
+        name="extended_elements"
+        type="text"
+        label="PLG_TINY_FIELD_ELEMENTS_LABEL"
+        description="PLG_TINY_FIELD_ELEMENTS_DESC"
+        showon="use_config_textfilters:0"
+        class="input-xxlarge"
     />
 
     <!-- Extra plugins -->
     <field
-            name="resizing"
-            type="radio"
-            label="PLG_TINY_FIELD_RESIZING_LABEL"
-            description="PLG_TINY_FIELD_RESIZING_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="resizing"
+        type="radio"
+        label="PLG_TINY_FIELD_RESIZING_LABEL"
+        description="PLG_TINY_FIELD_RESIZING_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="resize_horizontal"
-            type="radio"
-            label="PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL"
-            description="PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-            showon="resizing:1"
-    >
+        name="resize_horizontal"
+        type="radio"
+        label="PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL"
+        description="PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        showon="resizing:1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="element_path"
-            type="radio"
-            label="PLG_TINY_FIELD_PATH_LABEL"
-            description="PLG_TINY_FIELD_PATH_DESC"
-            class="btn-group btn-group-yesno"
-            default="0"
-    >
+        name="element_path"
+        type="radio"
+        label="PLG_TINY_FIELD_PATH_LABEL"
+        description="PLG_TINY_FIELD_PATH_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="wordcount"
-            type="radio"
-            label="PLG_TINY_FIELD_WORDCOUNT_LABEL"
-            description="PLG_TINY_FIELD_WORDCOUNT_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="wordcount"
+        type="radio"
+        label="PLG_TINY_FIELD_WORDCOUNT_LABEL"
+        description="PLG_TINY_FIELD_WORDCOUNT_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="image_advtab"
-            type="radio"
-            label="PLG_TINY_FIELD_ADVIMAGE_LABEL"
-            description="PLG_TINY_FIELD_ADVIMAGE_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="image_advtab"
+        type="radio"
+        label="PLG_TINY_FIELD_ADVIMAGE_LABEL"
+        description="PLG_TINY_FIELD_ADVIMAGE_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="advlist"
-            type="radio"
-            label="PLG_TINY_FIELD_ADVLIST_LABEL"
-            description="PLG_TINY_FIELD_ADVLIST_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="advlist"
+        type="radio"
+        label="PLG_TINY_FIELD_ADVLIST_LABEL"
+        description="PLG_TINY_FIELD_ADVLIST_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="autosave"
-            type="radio"
-            label="PLG_TINY_FIELD_SAVEWARNING_LABEL"
-            description="PLG_TINY_FIELD_SAVEWARNING_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="autosave"
+        type="radio"
+        label="PLG_TINY_FIELD_SAVEWARNING_LABEL"
+        description="PLG_TINY_FIELD_SAVEWARNING_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="contextmenu"
-            type="radio"
-            label="PLG_TINY_FIELD_CONTEXTMENU_LABEL"
-            description="PLG_TINY_FIELD_CONTEXTMENU_DESC"
-            class="btn-group btn-group-yesno"
-            default="1"
-    >
+        name="contextmenu"
+        type="radio"
+        label="PLG_TINY_FIELD_CONTEXTMENU_LABEL"
+        description="PLG_TINY_FIELD_CONTEXTMENU_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
         <option value="1">JON</option>
         <option value="0">JOFF</option>
     </field>
 
     <field
-            name="custom_plugin"
-            type="text"
-            label="PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL"
-            description="PLG_TINY_FIELD_CUSTOMPLUGIN_DESC"
-            class="input-xxlarge"
+        name="custom_plugin"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL"
+        description="PLG_TINY_FIELD_CUSTOMPLUGIN_DESC"
+        class="input-xxlarge"
     />
 
     <field
-            name="custom_button"
-            type="text"
-            label="PLG_TINY_FIELD_CUSTOMBUTTON_LABEL"
-            description="PLG_TINY_FIELD_CUSTOMBUTTON_DESC"
-            class="input-xxlarge"
+        name="custom_button"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOMBUTTON_LABEL"
+        description="PLG_TINY_FIELD_CUSTOMBUTTON_DESC"
+        class="input-xxlarge"
     />
 </form>
\ No newline at end of file
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index 5e0c759068226..42fb31ac2947f 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -32,13 +32,14 @@
 				<field
 					name="sets_amount"
 					type="number"
+					label="PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL"
+					description="PLG_TINY_FIELD_NUMBER_OF_SETS_DESC"
 					filter="int"
 					validate="number"
 					min="3"
-					label="PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL"
-					description="PLG_TINY_FIELD_NUMBER_OF_SETS_DESC"
 					default="3"
 				/>
+
 				<field
 					name="html_height"
 					type="text"
diff --git a/plugins/fields/calendar/params/calendar.xml b/plugins/fields/calendar/params/calendar.xml
index 8cf939515f3cb..161568b39bb64 100644
--- a/plugins/fields/calendar/params/calendar.xml
+++ b/plugins/fields/calendar/params/calendar.xml
@@ -5,9 +5,9 @@
 			<field
 				name="showtime"
 				type="radio"
-				class="btn-group btn-group-yesno"
 				label="PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_LABEL"
 				description="PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_DESC"
+				class="btn-group btn-group-yesno"
 				size="20"
 				default="0"
 				>
diff --git a/plugins/fields/checkboxes/checkboxes.xml b/plugins/fields/checkboxes/checkboxes.xml
index 13e34b005ab04..d596435550def 100644
--- a/plugins/fields/checkboxes/checkboxes.xml
+++ b/plugins/fields/checkboxes/checkboxes.xml
@@ -24,23 +24,24 @@
 				<field
 					name="options"
 					type="subform" layout="joomla.form.field.subform.repeatable-table"
-					icon="list" multiple="true"
-					description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
 					label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
-				>
+					description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+					icon="list" 
+					multiple="true"
+					>
 					<form hidden="true" name="list_templates_modal" repeat="true">
 						<field
 							name="name"
+							type="text"
 							label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL"
 							size="30"
-							type="text"
 						/>
 	
 						<field
 							name="value"
+							type="text"
 							label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_VALUE_LABEL"
 							size="30"
-							type="text"
 						/>
 					</form>
 				</field>
diff --git a/plugins/fields/checkboxes/params/checkboxes.xml b/plugins/fields/checkboxes/params/checkboxes.xml
index 4e1bb0f900a43..572e6b4df0358 100644
--- a/plugins/fields/checkboxes/params/checkboxes.xml
+++ b/plugins/fields/checkboxes/params/checkboxes.xml
@@ -5,23 +5,24 @@
 			<field
 				name="options"
 				type="subform" layout="joomla.form.field.subform.repeatable-table"
-				icon="list" multiple="true"
-				description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
 				label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+				icon="list" 
+				multiple="true"
 			>
 				<form hidden="true" name="list_templates_modal" repeat="true">
 					<field
 						name="name"
+						type="text"
 						label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL"
 						size="30"
-						type="text"
 					/>
 
 					<field
 						name="value"
+						type="text"
 						label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_VALUE_LABEL"
 						size="30"
-						type="text"
 					/>
 				</form>
 			</field>
diff --git a/plugins/fields/editor/editor.xml b/plugins/fields/editor/editor.xml
index 192239db46da1..2a8f81e7652aa 100644
--- a/plugins/fields/editor/editor.xml
+++ b/plugins/fields/editor/editor.xml
@@ -24,11 +24,11 @@
 				<field
 					name="buttons"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL"
 					description="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -36,38 +36,38 @@
 				<field
 					name="hide"
 					type="plugins"
-					folder="editors-xtd"
-					multiple="true"
 					label="PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL"
 					description="JGLOBAL_SELECT_SOME_OPTIONS"
+					folder="editors-xtd"
+					multiple="true"
 				/>
 
 				<field
 					name="width"
 					type="text"
-					default="100%"
 					label="PLG_FIELDS_EDITOR_PARAMS_WIDTH_LABEL"
 					description="PLG_FIELDS_EDITOR_PARAMS_WIDTH_DESC"
+					default="100%"
 					size="5"
 				/>
 
 				<field
 					name="height"
 					type="text"
-					default="250px"
 					label="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_LABEL"
 					description="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_DESC"
+					default="250px"
 					size="5"
 				/>
 
 				<field
 					name="filter"
 					type="list"
-					class="btn-group"
-					default="JComponentHelper::filterText"
 					label="PLG_FIELDS_EDITOR_PARAMS_FILTER_LABEL"
 					description="PLG_FIELDS_EDITOR_PARAMS_FILTER_DESC"
-				>
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
diff --git a/plugins/fields/editor/params/editor.xml b/plugins/fields/editor/params/editor.xml
index a148715c2d313..7760c78e87a7e 100644
--- a/plugins/fields/editor/params/editor.xml
+++ b/plugins/fields/editor/params/editor.xml
@@ -7,7 +7,7 @@
 				type="list"
 				label="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL"
 				description="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -16,10 +16,10 @@
 			<field
 				name="hide"
 				type="plugins"
-				folder="editors-xtd"
-				multiple="true"
 				label="PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL"
 				description="JGLOBAL_SELECT_SOME_OPTIONS"
+				folder="editors-xtd"
+				multiple="true"
 			/>
 
 			<field
@@ -41,10 +41,10 @@
 			<field
 				name="filter"
 				type="list"
-				class="btn-group"
 				label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
 				description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
-			>
+				class="btn-group"
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
diff --git a/plugins/fields/imagelist/imagelist.xml b/plugins/fields/imagelist/imagelist.xml
index b692c2252f023..5e318dcaedd75 100644
--- a/plugins/fields/imagelist/imagelist.xml
+++ b/plugins/fields/imagelist/imagelist.xml
@@ -24,26 +24,26 @@
 				<field
 					name="directory"
 					type="folderlist"
+					label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
+					description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
 					directory="images"
 					required="true"
 					hide_none="true"
 					hide_default="true"
 					recursive="true"
 					default="/"
-					label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
-					description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
-				>
+					>
 					<option value="/">/</option>
 				</field>
 	
 				<field
 					name="multiple"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL"
 					description="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
diff --git a/plugins/fields/imagelist/params/imagelist.xml b/plugins/fields/imagelist/params/imagelist.xml
index f89981c826d9e..667e935fb1334 100644
--- a/plugins/fields/imagelist/params/imagelist.xml
+++ b/plugins/fields/imagelist/params/imagelist.xml
@@ -5,13 +5,13 @@
 			<field
 				name="directory"
 				type="folderlist"
+				label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
+				description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
 				directory="images"
 				hide_none="true"
 				hide_default="true"
 				recursive="true"
-				label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
-				description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="/">/</option>
 			</field>
@@ -21,7 +21,7 @@
 				type="list"
 				label="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/plugins/fields/integer/integer.xml b/plugins/fields/integer/integer.xml
index 15962b50b9687..1e14250ae26dd 100644
--- a/plugins/fields/integer/integer.xml
+++ b/plugins/fields/integer/integer.xml
@@ -24,11 +24,11 @@
 				<field
 					name="multiple"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL"
 					description="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -36,9 +36,9 @@
 				<field
 					name="first"
 					type="number"
-					default="1"
 					label="PLG_FIELDS_INTEGER_PARAMS_FIRST_LABEL"
 					description="PLG_FIELDS_INTEGER_PARAMS_FIRST_DESC"
+					default="1"
 					size="5"
 					required="true"
 				/>
@@ -46,9 +46,9 @@
 				<field
 					name="last"
 					type="number"
-					default="100"
 					label="PLG_FIELDS_INTEGER_PARAMS_LAST_LABEL"
 					description="PLG_FIELDS_INTEGER_PARAMS_LAST_DESC"
+					default="100"
 					size="5"
 					required="true"
 				/>
@@ -56,9 +56,9 @@
 				<field
 					name="step"
 					type="number"
-					default="1"
 					label="PLG_FIELDS_INTEGER_PARAMS_STEP_LABEL"
 					description="PLG_FIELDS_INTEGER_PARAMS_STEP_DESC"
+					default="1"
 					size="5"
 					required="true"
 				/>
diff --git a/plugins/fields/integer/params/integer.xml b/plugins/fields/integer/params/integer.xml
index 637da7719b5f2..07b70807a3645 100644
--- a/plugins/fields/integer/params/integer.xml
+++ b/plugins/fields/integer/params/integer.xml
@@ -7,7 +7,7 @@
 				type="list"
 				label="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/plugins/fields/list/list.xml b/plugins/fields/list/list.xml
index eeede61ca276f..1c3cc2b24eeb1 100644
--- a/plugins/fields/list/list.xml
+++ b/plugins/fields/list/list.xml
@@ -22,34 +22,37 @@
 				<field
 					name="multiple"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL"
 					description="PLG_FIELDS_LIST_PARAMS_MULTIPLE_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="options"
-					type="subform" layout="joomla.form.field.subform.repeatable-table"
-					icon="list" multiple="true"
-					description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+					type="subform" 
 					label="PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL"
-				>
+					description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+					layout="joomla.form.field.subform.repeatable-table"
+					icon="list" 
+					multiple="true"
+					>
 					<form hidden="true" name="list_templates_modal" repeat="true">
 						<field
 							name="name"
+							type="text"
 							label="PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL"
 							size="30"
-							type="text"
 						/>
 	
 						<field
 							name="value"
+							type="text"
 							label="PLG_FIELDS_LIST_PARAMS_OPTIONS_VALUE_LABEL"
 							size="30"
-							type="text"
 						/>
 					</form>
 				</field>
diff --git a/plugins/fields/list/params/list.xml b/plugins/fields/list/params/list.xml
index 878384613de63..5121e6b75a618 100644
--- a/plugins/fields/list/params/list.xml
+++ b/plugins/fields/list/params/list.xml
@@ -7,31 +7,34 @@
 				type="list"
 				label="PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_LIST_PARAMS_MULTIPLE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="options"
-				type="subform" layout="joomla.form.field.subform.repeatable-table"
-				icon="list" multiple="true"
-				description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+				type="subform" 
 				label="PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+				layout="joomla.form.field.subform.repeatable-table"
+				icon="list" 
+				multiple="true"
 			>
 				<form hidden="true" name="list_templates_modal" repeat="true">
 					<field
 						name="name"
+						type="text"
 						label="PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL"
 						size="30"
-						type="text"
 					/>
 
 					<field
 						name="value"
+						type="text"
 						label="PLG_FIELDS_LIST_PARAMS_OPTIONS_VALUE_LABEL"
 						size="30"
-						type="text"
 					/>
 				</form>
 			</field>
diff --git a/plugins/fields/media/media.xml b/plugins/fields/media/media.xml
index db5f1a2f3249f..eab579ffbe010 100644
--- a/plugins/fields/media/media.xml
+++ b/plugins/fields/media/media.xml
@@ -24,21 +24,21 @@
 				<field
 					name="directory"
 					type="folderlist"
+					label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+					description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
 					directory="images"
 					hide_none="true"
 					recursive="true"
-					label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
-					description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
 				/>
 	
 				<field
 					name="preview"
 					type="list"
-					class="btn-group"
-					default="tooltip"
 					label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
 					description="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC"
-				>
+					class="btn-group"
+					default="tooltip"
+					>
 					<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
 					<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
 					<option value="false">JNO</option>
diff --git a/plugins/fields/media/params/media.xml b/plugins/fields/media/params/media.xml
index fc454e937feb9..a2c8466c2321a 100644
--- a/plugins/fields/media/params/media.xml
+++ b/plugins/fields/media/params/media.xml
@@ -5,11 +5,11 @@
 			<field
 				name="directory"
 				type="folderlist"
+				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+				description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
 				directory="images"
 				hide_none="true"
 				recursive="true"
-				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
-				description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
 			/>
 
 			<field
@@ -17,7 +17,7 @@
 				type="list"
 				label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
 				description="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
 				<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
diff --git a/plugins/fields/radio/params/radio.xml b/plugins/fields/radio/params/radio.xml
index 7a377fb9ab42b..14113613b863b 100644
--- a/plugins/fields/radio/params/radio.xml
+++ b/plugins/fields/radio/params/radio.xml
@@ -5,25 +5,25 @@
 			<field
 				name="options"
 				type="subform" 
+				label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
 				layout="joomla.form.field.subform.repeatable-table"
 				icon="list" 
 				multiple="true"
-				description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
-				label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
 			>
 				<form hidden="true" name="list_templates_modal" repeat="true">
 					<field
 						name="name"
+						type="text"
 						label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL"
 						size="30"
-						type="text"
 					/>
 
 					<field
 						name="value"
+						type="text"
 						label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_VALUE_LABEL"
 						size="30"
-						type="text"
 					/>
 				</form>
 			</field>
diff --git a/plugins/fields/radio/radio.xml b/plugins/fields/radio/radio.xml
index 3769a7c9b4e90..b1d15099da5c3 100644
--- a/plugins/fields/radio/radio.xml
+++ b/plugins/fields/radio/radio.xml
@@ -24,25 +24,25 @@
 				<field
 					name="options"
 					type="subform" 
+					label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
+					description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
 					layout="joomla.form.field.subform.repeatable-table"
 					icon="list" 
 					multiple="true"
-					description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
-					label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
-				>
+				/>
 					<form hidden="true" name="list_templates_modal" repeat="true">
 						<field
 							name="name"
+							type="text"
 							label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL"
 							size="30"
-							type="text"
 						/>
 	
 						<field
 							name="value"
+							type="text"
 							label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_VALUE_LABEL"
 							size="30"
-							type="text"
 						/>
 					</form>
 				</field>
diff --git a/plugins/fields/sql/params/sql.xml b/plugins/fields/sql/params/sql.xml
index d9622b98d6c05..7e0bbf32258d7 100644
--- a/plugins/fields/sql/params/sql.xml
+++ b/plugins/fields/sql/params/sql.xml
@@ -5,9 +5,9 @@
 			<field
 				name="query"
 				type="textarea"
-				filter="raw"
 				label="PLG_FIELDS_SQL_PARAMS_QUERY_LABEL"
 				description="PLG_FIELDS_SQL_PARAMS_QUERY_DESC"
+				filter="raw"
 				rows="10"
 				required="true"
 			/>
@@ -17,7 +17,7 @@
 				type="list"
 				label="PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/plugins/fields/sql/sql.xml b/plugins/fields/sql/sql.xml
index 865c29f8a1901..24b06fe216d06 100644
--- a/plugins/fields/sql/sql.xml
+++ b/plugins/fields/sql/sql.xml
@@ -24,9 +24,9 @@
 				<field
 					name="query"
 					type="textarea"
-					filter="raw"
 					label="PLG_FIELDS_SQL_PARAMS_QUERY_LABEL"
 					description="PLG_FIELDS_SQL_PARAMS_QUERY_DESC"
+					filter="raw"
 					rows="10"
 					required="true"
 				/>
@@ -34,11 +34,11 @@
 				<field
 					name="multiple"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL"
 					description="PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
diff --git a/plugins/fields/text/params/text.xml b/plugins/fields/text/params/text.xml
index f9a8dda4f5611..fa2b771be2450 100644
--- a/plugins/fields/text/params/text.xml
+++ b/plugins/fields/text/params/text.xml
@@ -5,10 +5,10 @@
 			<field
 				name="filter"
 				type="list"
-				class="btn-group"
 				label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
 				description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
-			>
+				class="btn-group"
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
@@ -23,9 +23,9 @@
 			<field
 				name="maxlength"
 				type="text"
-				filter="integer"
 				label="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_LABEL"
 				description="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_DESC"
+				filter="integer"
 			/>
 		</fieldset>
 	</fields>
diff --git a/plugins/fields/text/text.xml b/plugins/fields/text/text.xml
index 2c9806ff0efd0..9b59f6994043e 100644
--- a/plugins/fields/text/text.xml
+++ b/plugins/fields/text/text.xml
@@ -24,11 +24,11 @@
 				<field
 					name="filter"
 					type="list"
-					class="btn-group"
-					default="JComponentHelper::filterText"
 					label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
 					description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
-				>
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
@@ -42,9 +42,9 @@
 				<field
 					name="maxlength"
 					type="text"
-					filter="integer"
 					label="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_LABEL"
 					description="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_DESC"
+					filter="integer"
 				/>
 			</fieldset>
 		</fields>
diff --git a/plugins/fields/textarea/params/textarea.xml b/plugins/fields/textarea/params/textarea.xml
index e96bb170b9046..f74faba034c3a 100644
--- a/plugins/fields/textarea/params/textarea.xml
+++ b/plugins/fields/textarea/params/textarea.xml
@@ -21,18 +21,18 @@
 			<field
 				name="maxlength"
 				type="text"
-				filter="integer"
 				label="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL"
 				description="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_DESC"
+				filter="integer"
 			/>
 
 			<field
 				name="filter"
 				type="list"
-				class="btn-group"
 				label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL"
 				description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC"
-			>
+				class="btn-group"
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml
index 3b0dc2f0dbdae..8fcfb414e30e0 100644
--- a/plugins/fields/textarea/textarea.xml
+++ b/plugins/fields/textarea/textarea.xml
@@ -24,37 +24,37 @@
 				<field
 					name="rows"
 					type="text"
-					default="10"
 					label="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_LABEL"
 					description="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_DESC"
+					default="10"
 					size="5"
 				/>
 
 				<field
 					name="cols"
 					type="text"
-					default="10"
 					label="PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL"
 					description="PLG_FIELDS_TEXTAREA_PARAMS_COLS_DESC"
+					default="10"
 					size="5"
 				/>
 
 				<field
 					name="maxlength"
 					type="text"
-					filter="integer"
 					label="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL"
 					description="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_DESC"
+					filter="integer"
 				/>
 
 				<field
 					name="filter"
 					type="list"
-					class="btn-group"
-					default="JComponentHelper::filterText"
 					label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL"
 					description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC"
-				>
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
diff --git a/plugins/fields/url/params/url.xml b/plugins/fields/url/params/url.xml
index d8cd96d0c000c..56b01ac456fb2 100644
--- a/plugins/fields/url/params/url.xml
+++ b/plugins/fields/url/params/url.xml
@@ -5,10 +5,10 @@
 			<field
 				name="schemes"
 				type="list"
-				multiple="true"
 				label="PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL"
 				description="PLG_FIELDS_URL_PARAMS_SCHEMES_DESC"
-			>
+				multiple="true"
+				>
 				<option value="http">HTTP</option>
 				<option value="https">HTTPS</option>
 				<option value="ftp">FTP</option>
@@ -23,7 +23,7 @@
 				type="list"
 				label="PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL"
 				description="PLG_FIELDS_URL_PARAMS_RELATIVE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/plugins/fields/url/url.xml b/plugins/fields/url/url.xml
index bd4086616c8a4..d1f0293c43027 100644
--- a/plugins/fields/url/url.xml
+++ b/plugins/fields/url/url.xml
@@ -24,10 +24,10 @@
 				<field
 					name="schemes"
 					type="list"
-					multiple="true"
 					label="PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL"
 					description="PLG_FIELDS_URL_PARAMS_SCHEMES_DESC"
-				>
+					multiple="true"
+					>
 					<option value="http">HTTP</option>
 					<option value="https">HTTPS</option>
 					<option value="ftp">FTP</option>
@@ -40,11 +40,11 @@
 				<field
 					name="relative"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="1"
 					label="PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL"
 					description="PLG_FIELDS_URL_PARAMS_RELATIVE_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
diff --git a/plugins/fields/usergrouplist/params/usergrouplist.xml b/plugins/fields/usergrouplist/params/usergrouplist.xml
index da15d536254e7..8dae8d0d4cb26 100644
--- a/plugins/fields/usergrouplist/params/usergrouplist.xml
+++ b/plugins/fields/usergrouplist/params/usergrouplist.xml
@@ -7,7 +7,7 @@
 				type="list"
 				label="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC"
-			>
+				>
 				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
diff --git a/plugins/fields/usergrouplist/usergrouplist.xml b/plugins/fields/usergrouplist/usergrouplist.xml
index 480a7d158926b..a2b52ac9749d5 100644
--- a/plugins/fields/usergrouplist/usergrouplist.xml
+++ b/plugins/fields/usergrouplist/usergrouplist.xml
@@ -24,11 +24,11 @@
 				<field
 				name="multiple"
 				type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
 				label="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL"
 				description="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC"
-			>
+				class="btn-group btn-group-yesno"
+				default="0"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.xml b/plugins/quickicon/extensionupdate/extensionupdate.xml
index 04abbc62c6911..ddd948c1120ea 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.xml
+++ b/plugins/quickicon/extensionupdate/extensionupdate.xml
@@ -19,7 +19,8 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
-				<field name="context"
+				<field 
+					name="context"
 					type="text"
 					label="PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL"
 					description="PLG_QUICKICON_EXTENSIONUPDATE_GROUP_DESC"
diff --git a/plugins/system/stats/stats.xml b/plugins/system/stats/stats.xml
index e510c11302533..861cb3f613404 100644
--- a/plugins/system/stats/stats.xml
+++ b/plugins/system/stats/stats.xml
@@ -47,8 +47,8 @@
 				<field
 					name="mode"
 					type="list"
-					description="PLG_SYSTEM_STATS_MODE_DESC"
 					label="PLG_SYSTEM_STATS_MODE_LABEL"
+					description="PLG_SYSTEM_STATS_MODE_DESC"
 					default="1"
 					>
 					<option value="1">PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND</option>
diff --git a/plugins/user/profile/profile.xml b/plugins/user/profile/profile.xml
index 4f445e1696552..66380d9ff634f 100644
--- a/plugins/user/profile/profile.xml
+++ b/plugins/user/profile/profile.xml
@@ -187,8 +187,8 @@
 				<field
 					name="profile-require_address1"
 					type="list"
-					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
 					label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
diff --git a/templates/beez3/templateDetails.xml b/templates/beez3/templateDetails.xml
index 413b7277ab11a..870daa124f207 100644
--- a/templates/beez3/templateDetails.xml
+++ b/templates/beez3/templateDetails.xml
@@ -56,49 +56,80 @@
 	<config>
 		<fields name="params">
 			<fieldset name="advanced">
-				<field name="wrapperSmall"  class="validate-numeric" type="text" default="53"
+				<field 
+					name="wrapperSmall"  
+					type="text" 
 					label="TPL_BEEZ3_FIELD_WRAPPERSMALL_LABEL"
 					description="TPL_BEEZ3_FIELD_WRAPPERSMALL_DESC"
-					filter="integer" />
+					class="validate-numeric" 
+					default="53"
+					filter="integer"
+				/>
 
-				<field name="wrapperLarge"  class="validate-numeric" type="text" default="72"
+				<field 
+					name="wrapperLarge"  
+					type="text" 
 					label="TPL_BEEZ3_FIELD_WRAPPERLARGE_LABEL"
 					description="TPL_BEEZ3_FIELD_WRAPPERLARGE_DESC"
-					filter="integer" />
+					class="validate-numeric" 
+					default="72"
+					filter="integer"
+				 />
 
-				<field name="logo" type="media"
-					label="TPL_BEEZ3_FIELD_LOGO_LABEL" description="TPL_BEEZ3_FIELD_LOGO_DESC" />
+				<field 
+					name="logo"
+					type="media"
+					label="TPL_BEEZ3_FIELD_LOGO_LABEL" 
+					description="TPL_BEEZ3_FIELD_LOGO_DESC" 
+				/>
 
-				<field name="sitetitle"  type="text" default=""
+				<field 
+					name="sitetitle"  
+					type="text" 
 					label="TPL_BEEZ3_FIELD_SITETITLE_LABEL"
 					description="TPL_BEEZ3_FIELD_SITETITLE_DESC"
-					filter="string" />
+					default=""
+					filter="string" 
+				/>
 
-				<field name="sitedescription"  type="text" default=""
+				<field 
+					name="sitedescription"  
+					type="text" 
 					label="TPL_BEEZ3_FIELD_DESCRIPTION_LABEL"
 					description="TPL_BEEZ3_FIELD_DESCRIPTION_DESC"
-					filter="string" />
+					default=""
+					filter="string" 
+				/>
 
-				<field name="navposition" type="list" default="center"
+				<field 
+					name="navposition" 
+					type="list" 
 					label="TPL_BEEZ3_FIELD_NAVPOSITION_LABEL"
 					description="TPL_BEEZ3_FIELD_NAVPOSITION_DESC"
+					default="center"
 					filter="word"
-				>
+					>
 					<option value="center">TPL_BEEZ3_OPTION_AFTER_CONTENT</option>
 					<option value="left">TPL_BEEZ3_OPTION_BEFORE_CONTENT</option>
 				</field>
 
-				<field name="bootstrap" type="textarea"
+				<field 
+					name="bootstrap" 
+					type="textarea"
 					label="TPL_BEEZ3_FIELD_BOOTSTRAP_LABEL"
 					description="TPL_BEEZ3_FIELD_BOOTSTRAP_DESC"
-					rows="4" columns="30"
+					rows="4" 
+					columns="30"
 				/>
 
-				<field name="templatecolor" type="list" default="nature"
+				<field
+					name="templatecolor" 
+					type="list" 
 					label="TPL_BEEZ3_FIELD_TEMPLATECOLOR_LABEL"
 					description="TPL_BEEZ3_FIELD_TEMPLATECOLOR_DESC"
+					default="nature"
 					filter="word"
-				>
+					>
 					<option value="nature">TPL_BEEZ3_OPTION_NATURE</option>
 					<option value="personal">TPL_BEEZ3_OPTION_PERSONAL</option>
 					<option value="red">TPL_BEEZ3_OPTION_RED</option>
@@ -106,15 +137,22 @@
 					<option value="image">TPL_BEEZ3_OPTION_IMAGE</option>
 				</field>
 
-				<field name="headerImage" type="media"
+				<field 
+					name="headerImage" 
+					type="media"
 					label="TPL_BEEZ3_FIELD_HEADER_IMAGE_LABEL" 
 					description="TPL_BEEZ3_FIELD_HEADER_IMAGE_DESC" 
-					showon="templatecolor:image" />
+					showon="templatecolor:image" 
+				/>
 
-				<field name="backgroundcolor" type="color" default="#eee"
+				<field 
+					name="backgroundcolor" 
+					type="color" 
 					label="TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_LABEL"
 					description="TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_DESC"
-					showon="templatecolor:image" />
+					default="#eee"
+					showon="templatecolor:image" 
+				/>
 
 			</fieldset>
 		</fields>
diff --git a/templates/protostar/templateDetails.xml b/templates/protostar/templateDetails.xml
index d200643b3c9bd..78e1f05593c04 100644
--- a/templates/protostar/templateDetails.xml
+++ b/templates/protostar/templateDetails.xml
@@ -52,51 +52,81 @@
 	<config>
 		<fields name="params">
 			<fieldset name="advanced">
-				<field name="templateColor" class="" type="color" default="#08C"
+				<field 
+					name="templateColor" 
+					type="color" 
 					label="TPL_PROTOSTAR_COLOR_LABEL"
-					description="TPL_PROTOSTAR_COLOR_DESC" />
+					description="TPL_PROTOSTAR_COLOR_DESC" 
+					class="" 
+					default="#08C"
+				/>
 
-				<field name="templateBackgroundColor" class="" type="color" default="#F4F6F7"
+				<field 
+					name="templateBackgroundColor" 
+					type="color" 
 					label="TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL"
-					description="TPL_PROTOSTAR_BACKGROUND_COLOR_DESC" />
+					description="TPL_PROTOSTAR_BACKGROUND_COLOR_DESC" 
+					class="" 
+					default="#F4F6F7"
+				/>
 
-				<field name="logoFile" class="" type="media" default=""
+				<field 
+					name="logoFile" 
+					type="media" 
 					label="TPL_PROTOSTAR_LOGO_LABEL"
-					description="TPL_PROTOSTAR_LOGO_DESC" />
+					description="TPL_PROTOSTAR_LOGO_DESC" 
+					class="" 
+					default=""
+				/>
 
-				<field name="sitetitle"  type="text" default=""
+				<field 
+					name="sitetitle"  
+					type="text" 
 					label="JGLOBAL_TITLE"
 					description="JFIELD_ALT_PAGE_TITLE_LABEL"
-					filter="string" />
+					default=""
+					filter="string" 
+				/>
 
-				<field name="sitedescription"  type="text" default=""
+				<field 
+					name="sitedescription"  
+					type="text" 
 					label="JGLOBAL_DESCRIPTION"
 					description="JGLOBAL_SUBHEADING_DESC"
-					filter="string" />
+					default=""
+					filter="string" 
+				/>
 
-				<field name="googleFont"
+				<field 
+					name="googleFont"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="1"
 					label="TPL_PROTOSTAR_FONT_LABEL"
 					description="TPL_PROTOSTAR_FONT_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
-				<field name="googleFontName" class="" type="text" default="Open+Sans"
+				<field 
+					name="googleFontName" 
+					type="text" 
 					label="TPL_PROTOSTAR_FONT_NAME_LABEL"
 					description="TPL_PROTOSTAR_FONT_NAME_DESC" 
-					showon="googleFont:1" />
+					class="" 
+					default="Open+Sans"
+					showon="googleFont:1" 
+				/>
 
-				<field name="fluidContainer"
+				<field 
+					name="fluidContainer"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="TPL_PROTOSTAR_FLUID_LABEL"
 					description="TPL_PROTOSTAR_FLUID_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">TPL_PROTOSTAR_FLUID</option>
 					<option value="0">TPL_PROTOSTAR_STATIC</option>
 				</field>