diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml
index 50531e50468f2..228458251504d 100644
--- a/plugins/authentication/ldap/ldap.xml
+++ b/plugins/authentication/ldap/ldap.xml
@@ -18,7 +18,6 @@
 	</languages>
 	<config>
 		<fields name="params">
-
 			<fieldset name="basic">
 				<field
 					name="host"
@@ -113,7 +112,6 @@
 					size="20"
 				/>
 
-
 				<field
 					name="username"
 					type="text"
@@ -157,7 +155,6 @@
 					size="20"
 				/>
 			</fieldset>
-
 		</fields>
 	</config>
 </extension>
diff --git a/plugins/content/emailcloak/emailcloak.xml b/plugins/content/emailcloak/emailcloak.xml
index 64f4536dd661e..a1a06b3b8231e 100644
--- a/plugins/content/emailcloak/emailcloak.xml
+++ b/plugins/content/emailcloak/emailcloak.xml
@@ -30,7 +30,6 @@
 					<option value="1">PLG_CONTENT_EMAILCLOAK_LINKABLE</option>
 				</field>
 			</fieldset>
-
 		</fields>
 	</config>
 </extension>
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index e2c27c9467aa3..68d548be83958 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -23,9 +23,12 @@
 	</languages>
 	<config>
 		<fields name="params">
-
 			<fieldset name="basic">
-				<field name="configuration" type="tinymcebuilder" hiddenLabel="true" />
+				<field 
+				       name="configuration" 
+				       type="tinymcebuilder" 
+				       hiddenLabel="true" 
+				 />
 			</fieldset>
 
 			<fieldset name="advanced" label="PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS">
diff --git a/plugins/fields/checkboxes/checkboxes.xml b/plugins/fields/checkboxes/checkboxes.xml
index d596435550def..851eb8296fb2b 100644
--- a/plugins/fields/checkboxes/checkboxes.xml
+++ b/plugins/fields/checkboxes/checkboxes.xml
@@ -23,9 +23,10 @@
 			<fieldset name="basic">
 				<field
 					name="options"
-					type="subform" layout="joomla.form.field.subform.repeatable-table"
+					type="subform" 
 					label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
 					description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+					layout="joomla.form.field.subform.repeatable-table"
 					icon="list" 
 					multiple="true"
 					>
diff --git a/plugins/fields/checkboxes/params/checkboxes.xml b/plugins/fields/checkboxes/params/checkboxes.xml
index 572e6b4df0358..fc0d047c514ac 100644
--- a/plugins/fields/checkboxes/params/checkboxes.xml
+++ b/plugins/fields/checkboxes/params/checkboxes.xml
@@ -4,9 +4,10 @@
 		<fieldset name="fieldparams">
 			<field
 				name="options"
-				type="subform" layout="joomla.form.field.subform.repeatable-table"
+				type="subform" 
 				label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
 				description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+				layout="joomla.form.field.subform.repeatable-table"
 				icon="list" 
 				multiple="true"
 			>
diff --git a/plugins/fields/list/params/list.xml b/plugins/fields/list/params/list.xml
index 5121e6b75a618..5cb097fa88162 100644
--- a/plugins/fields/list/params/list.xml
+++ b/plugins/fields/list/params/list.xml
@@ -21,7 +21,7 @@
 				layout="joomla.form.field.subform.repeatable-table"
 				icon="list" 
 				multiple="true"
-			>
+				>
 				<form hidden="true" name="list_templates_modal" repeat="true">
 					<field
 						name="name"
diff --git a/plugins/fields/radio/params/radio.xml b/plugins/fields/radio/params/radio.xml
index 14113613b863b..bf3d4c5a120c9 100644
--- a/plugins/fields/radio/params/radio.xml
+++ b/plugins/fields/radio/params/radio.xml
@@ -10,7 +10,7 @@
 				layout="joomla.form.field.subform.repeatable-table"
 				icon="list" 
 				multiple="true"
-			>
+				>
 				<form hidden="true" name="list_templates_modal" repeat="true">
 					<field
 						name="name"
diff --git a/plugins/fields/radio/radio.xml b/plugins/fields/radio/radio.xml
index 19316a8ca9407..450df04e83a16 100644
--- a/plugins/fields/radio/radio.xml
+++ b/plugins/fields/radio/radio.xml
@@ -29,7 +29,7 @@
 					layout="joomla.form.field.subform.repeatable-table"
 					icon="list" 
 					multiple="true"
-				>
+					>
 					<form hidden="true" name="list_templates_modal" repeat="true">
 						<field
 							name="name"
diff --git a/plugins/fields/sql/sql.xml b/plugins/fields/sql/sql.xml
index 24b06fe216d06..85b06086d2476 100644
--- a/plugins/fields/sql/sql.xml
+++ b/plugins/fields/sql/sql.xml
@@ -26,8 +26,8 @@
 					type="textarea"
 					label="PLG_FIELDS_SQL_PARAMS_QUERY_LABEL"
 					description="PLG_FIELDS_SQL_PARAMS_QUERY_DESC"
-					filter="raw"
 					rows="10"
+					filter="raw"
 					required="true"
 				/>
 	
diff --git a/plugins/fields/textarea/params/textarea.xml b/plugins/fields/textarea/params/textarea.xml
index f74faba034c3a..876ec9fb1322c 100644
--- a/plugins/fields/textarea/params/textarea.xml
+++ b/plugins/fields/textarea/params/textarea.xml
@@ -43,7 +43,6 @@
 				<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
 				<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
 			</field>
-
 		</fieldset>
 	</fields>
 </form>
diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml
index 8fcfb414e30e0..15826b4b5c503 100644
--- a/plugins/fields/textarea/textarea.xml
+++ b/plugins/fields/textarea/textarea.xml
@@ -64,7 +64,6 @@
 					<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
 					<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
 				</field>
-
 			</fieldset>
 		</fields>
 	</config>
diff --git a/plugins/fields/usergrouplist/usergrouplist.xml b/plugins/fields/usergrouplist/usergrouplist.xml
index a2b52ac9749d5..d5995c7a2715a 100644
--- a/plugins/fields/usergrouplist/usergrouplist.xml
+++ b/plugins/fields/usergrouplist/usergrouplist.xml
@@ -22,16 +22,16 @@
 		<fields name="params">
 			<fieldset name="basic">
 				<field
-				name="multiple"
-				type="radio"
-				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>
+					name="multiple"
+					type="radio"
+					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>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/plugins/system/languagecode/languagecode.php b/plugins/system/languagecode/languagecode.php
index 1f9c1de321fc6..e781ad3946d80 100644
--- a/plugins/system/languagecode/languagecode.php
+++ b/plugins/system/languagecode/languagecode.php
@@ -146,9 +146,9 @@ public function onContentPrepareForm($form, $data)
 								<field
 									name="' . strtolower($tag) . '"
 									type="text"
+									label="' . $tag . '"
 									description="' . htmlspecialchars(JText::sprintf('PLG_SYSTEM_LANGUAGECODE_FIELD_DESC', $language['name']), ENT_COMPAT, 'UTF-8') . '"
 									translate_description="false"
-									label="' . $tag . '"
 									translate_label="false"
 									size="7"
 									filter="cmd"
diff --git a/plugins/user/profile/profile.xml b/plugins/user/profile/profile.xml
index 66380d9ff634f..d111dfe8ea566 100644
--- a/plugins/user/profile/profile.xml
+++ b/plugins/user/profile/profile.xml
@@ -271,6 +271,7 @@
 					<option value="1">JOPTION_OPTIONAL</option>
 					<option value="0">JDISABLED</option>
 				</field>
+
 				<field
 					name="profile-require_favoritebook"
 					type="list"
@@ -292,6 +293,7 @@
 					<option	value="1">JOPTION_OPTIONAL</option>
 					<option	value="0">JDISABLED</option>
 				</field>
+
 				<field
 					name="profile-require_dob"
 					type="list"