diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index 04e0079..3ff5602 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset name="component"
+	<fieldset
+		name="component"
 		label="COM_WEBLINKS_COMPONENT_LABEL"
 		description="COM_WEBLINKS_COMPONENT_DESC"
-	>
-
+		>
 		<field
 			name="captcha"
 			type="plugins"
@@ -18,11 +18,13 @@
 			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
 
-		<field name="target" type="list"
+		<field
+			name="target"
+			type="list"
 			default="0"
 			description="COM_WEBLINKS_FIELD_TARGET_DESC"
 			label="COM_WEBLINKS_FIELD_TARGET_LABEL"
-		>
+			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
 			<option value="2">JBROWSERTARGET_POPUP</option>
@@ -40,7 +42,7 @@
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
-		
+
 		<field
 			name="history_limit"
 			type="text"
@@ -50,26 +52,34 @@
 			default="5"
 		/>
 
-		<field	name="count_clicks" type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
-				description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
+		<field
+			name="count_clicks"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
+			label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
+			description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
-		<field	name="icons" type="list"
-				default="1"
-				label="COM_WEBLINKS_FIELD_ICON_LABEL"
-				description="COM_WEBLINKS_FIELD_ICON_DESC"
-				filter="integer">
-				<option value="0">COM_WEBLINKS_FIELD_ICON_OPTION_TEXT</option>
-				<option value="1">COM_WEBLINKS_FIELD_ICON_OPTION_ICON</option>
-				<option value="2">COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK</option>
+		<field
+			name="icons"
+			type="list"
+			default="1"
+			label="COM_WEBLINKS_FIELD_ICON_LABEL"
+			description="COM_WEBLINKS_FIELD_ICON_DESC"
+			filter="integer"
+			>
+			<option value="0">COM_WEBLINKS_FIELD_ICON_OPTION_TEXT</option>
+			<option value="1">COM_WEBLINKS_FIELD_ICON_OPTION_ICON</option>
+			<option value="2">COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK</option>
 		</field>
 
-		<field name="link_icons" type="media"
+		<field
+			name="link_icons"
+			type="media"
 			description="COM_WEBLINKS_FIELD_CONFIG_ICON_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL"
 		/>
@@ -78,19 +88,22 @@
 			name="float_first"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_LABEL"
-			description="COM_WEBLINKS_FLOAT_DESC">
-				<option value="right">COM_WEBLINKS_RIGHT</option>
-				<option value="left">COM_WEBLINKS_LEFT</option>
-				<option value="none">COM_WEBLINKS_NONE</option>
+			description="COM_WEBLINKS_FLOAT_DESC"
+			>
+			<option value="right">COM_WEBLINKS_RIGHT</option>
+			<option value="left">COM_WEBLINKS_LEFT</option>
+			<option value="none">COM_WEBLINKS_NONE</option>
 		</field>
+
 		<field
 			name="float_second"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_LABEL"
-			description="COM_WEBLINKS_FLOAT_DESC">
-				<option value="right">COM_WEBLINKS_RIGHT</option>
-				<option value="left">COM_WEBLINKS_LEFT</option>
-				<option value="none">COM_WEBLINKS_NONE</option>
+			description="COM_WEBLINKS_FLOAT_DESC"
+			>
+			<option value="right">COM_WEBLINKS_RIGHT</option>
+			<option value="left">COM_WEBLINKS_LEFT</option>
+			<option value="none">COM_WEBLINKS_NONE</option>
 		</field>
 
 		<field
@@ -100,20 +113,21 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
-			description="COM_WEBLINKS_FIELD_SHOW_TAGS_DESC">
+			description="COM_WEBLINKS_FIELD_SHOW_TAGS_DESC"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-
 	</fieldset>
 
-	<fieldset name="category"
+	<fieldset
+		name="category"
 		label="JCATEGORY"
 		description="COM_WEBLINKS_CATEGORY_DESC"
-	>
-
+		>
 		<field
-			name="category_layout" type="componentlayout"
+			name="category_layout"
+			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
 			description="JGLOBAL_FIELD_LAYOUT_DESC"
 			menuitems="true"
@@ -121,158 +135,182 @@
 			view="category"
 		/>
 
-		<field name="show_category_title" type="radio"
-				class="btn-group btn-group-yesno"
-				label="JGLOBAL_SHOW_CATEGORY_TITLE"
-				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
-				default="1"
+		<field
+			name="show_category_title"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			default="1"
 			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_description"
+		<field
+			name="show_description"
 			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_description_image"
+		<field
+			name="show_description_image"
 			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="maxLevel" type="list"
-				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
-				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-				default="-1"
+		<field
+			name="maxLevel"
+			type="list"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			default="-1"
 			>
-				<option value="0">JNONE</option>
-				<option value="-1">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
 		</field>
 
-		<field name="show_empty_categories" type="radio"
-				class="btn-group btn-group-yesno"
-				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-				description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
-				default="0"
+		<field
+			name="show_empty_categories"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+			default="0"
 			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
-			</field>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
 
-		<field name="show_subcat_desc" type="radio"
+		<field
+			name="show_subcat_desc"
+			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
 			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_cat_num_links" type="radio"
+		<field
+			name="show_cat_num_links"
+			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_cat_tags" type="radio"
+		<field
+			name="show_cat_tags"
+			type="radio"
 			label="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL"
 			description="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="categories"
+		label="JCATEGORIES"
+		description="COM_WEBLINKS_CATEGORIES_DESC"
 		>
+		<field
+			name="show_base_description"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+
+		</field>
+
+		<field
+			name="maxLevelcat"
+			type="list"
+			default="-1"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field
+			name="show_empty_categories_cat"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-	</fieldset>
-
-	<fieldset name="categories"
-		label="JCATEGORIES"
-		description="COM_WEBLINKS_CATEGORIES_DESC"
-	>
-			<field name="show_base_description" type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
-				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+		<field
+			name="show_subcat_desc_cat"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="maxLevelcat" type="list"
-				default="-1"
-				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
-				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+		<field
+			name="show_cat_num_links_cat"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
+			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			>
-				<option value="-1">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
-
-			</field>
-			<field name="show_empty_categories_cat" type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
-				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-				description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
-			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
-			</field>
-
-			<field name="show_subcat_desc_cat" type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
-				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-			>
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
-			</field>
-
-			<field name="show_cat_num_links_cat" type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
-				label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-			>
-
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
-			</field>
-
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
 	</fieldset>
 
-
-	<fieldset name="list_layout"
+	<fieldset
+		name="list_layout"
 		label="JGLOBAL_LIST_LAYOUT_OPTIONS"
 		description="COM_WEBLINKS_LIST_LAYOUT_DESC"
-	>
-
+		>
 		<field
 			name="filter_field"
 			type="list"
@@ -280,70 +318,81 @@
 			description="JGLOBAL_FILTER_FIELD_DESC"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
 			>
-				<option value="1">JSHOW</option>
-				<option value="hide">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="hide">JHIDE</option>
 		</field>
 
 		<field
 			name="show_pagination_limit"
-			type="radio" default="1"
+			type="radio"
+			default="1"
 			class="btn-group btn-group-yesno"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
-			description="JGLOBAL_DISPLAY_SELECT_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_headings" type="radio"
+		<field
+			name="show_headings"
+			type="radio"
 			default="1"
 			class="btn-group btn-group-yesno"
 			description="JGLOBAL_SHOW_HEADINGS_DESC"
 			label="JGLOBAL_SHOW_HEADINGS_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_link_description" type="radio"
+		<field
+			name="show_link_description"
+			type="radio"
 			default="1"
 			class="btn-group btn-group-yesno"
 			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_link_hits" type="radio"
+		<field
+			name="show_link_hits"
+			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
 			label="JGLOBAL_HITS"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
 
-		<field name="show_pagination"
+		<field
+			name="show_pagination"
 			type="list"
 			default="2"
 			label="JGLOBAL_PAGINATION_LABEL"
-			description="JGLOBAL_PAGINATION_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
-				<option value="2">JGLOBAL_AUTO</option>
+			description="JGLOBAL_PAGINATION_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+			<option value="2">JGLOBAL_AUTO</option>
 		</field>
 
-		<field name="show_pagination_results"
+		<field
+			name="show_pagination_results"
 			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-			description="JGLOBAL_PAGINATION_RESULTS_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
-
 	</fieldset>
 
 	<fieldset
@@ -351,30 +400,32 @@
 		label="JGLOBAL_INTEGRATION_LABEL"
 		description="COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC"
 		>
-
 		<field
 			name="show_feed_link"
 			type="radio"
 			class="btn-group btn-group-yesno"
 			default="1"
 			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-			description="JGLOBAL_SHOW_FEED_LINK_DESC">
-				<option value="1">JSHOW</option>
-				<option value="0">JHIDE</option>
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
-
 	</fieldset>
 
-	<fieldset name="permissions"
+	<fieldset
+		name="permissions"
 		description="JCONFIG_PERMISSIONS_DESC"
 		label="JCONFIG_PERMISSIONS_LABEL"
-	>
-
-		<field name="rules" type="rules"
+		>
+		<field
+			name="rules"
+			type="rules"
 			component="com_weblinks"
 			filter="rules"
 			validate="rules"
 			label="JCONFIG_PERMISSIONS_LABEL"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>
diff --git a/src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml b/src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml
index 0a09af3..c06a48f 100644
--- a/src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml
+++ b/src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml
@@ -8,6 +8,7 @@
 			description="COM_WEBLINKS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="published"
 			type="status"
@@ -17,6 +18,7 @@
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="category_id"
 			type="category"
@@ -27,6 +29,7 @@
 			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
+
 		<field
 			name="access"
 			type="accesslevel"
@@ -36,6 +39,7 @@
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
+
 		<field
 			name="language"
 			type="contentlanguage"
@@ -46,6 +50,7 @@
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
 			<option value="*">JALL</option>
 		</field>
+
 		<field
 			name="tag"
 			type="tag"
@@ -56,6 +61,7 @@
 			>
 			<option value="">JOPTION_SELECT_TAG</option>
 		</field>
+
 		<field
 			name="level"
 			type="integer"
@@ -70,6 +76,7 @@
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
+
 	<fields name="list">
 		<field
 			name="fullordering"
@@ -95,6 +102,7 @@
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
diff --git a/src/administrator/components/com_weblinks/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml
index 0d020e4..9acd378 100644
--- a/src/administrator/components/com_weblinks/models/forms/weblink.xml
+++ b/src/administrator/components/com_weblinks/models/forms/weblink.xml
@@ -3,7 +3,6 @@
 	<fieldset
 		addfieldpath="/administrator/components/com_categories/models/fields"
 		>
-
 		<field
 			name="id"
 			type="text"
@@ -18,7 +17,8 @@
 			name="title"
 			type="text"
 			class="input-xxlarge input-large-text"
-			size="40" label="JGLOBAL_TITLE"
+			size="40"
+			label="JGLOBAL_TITLE"
 			description="COM_WEBLINKS_FIELD_TITLE_DESC"
 			required="true"
 		/>
@@ -47,7 +47,8 @@
 			type="url"
 			class="span12"
 			filter="url"
-			size="40" label="COM_WEBLINKS_FIELD_URL_LABEL"
+			size="40"
+			label="COM_WEBLINKS_FIELD_URL_LABEL"
 			description="COM_WEBLINKS_FIELD_URL_DESC"
 			required="true"
 		/>
@@ -66,7 +67,8 @@
 			name="hits"
 			type="text"
 			class="readonly"
-			size="6" label="JGLOBAL_HITS"
+			size="6"
+			label="JGLOBAL_HITS"
 			description="COM_WEBLINKS_HITS_DESC"
 			readonly="true"
 			filter="unset"
@@ -80,7 +82,7 @@
 			class="chzn-color-state"
 			size="1"
 			default="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -109,7 +111,7 @@
 			type="contentlanguage"
 			label="JFIELD_LANGUAGE_LABEL"
 			description="COM_WEBLINKS_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="*">JALL</option>
 		</field>
 
@@ -152,7 +154,8 @@
 			type="text"
 			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
 			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
-			size="20" />
+			size="20"
+		/>
 
 		<field
 			name="modified"
@@ -253,7 +256,6 @@
 			name="jbasic"
 			label="COM_WEBLINKS_FIELDSET_OPTIONS"
 			>
-
 			<field
 				name="target"
 				type="list"
@@ -261,7 +263,7 @@
 				label="COM_WEBLINKS_FIELD_TARGET_LABEL"
 				description="COM_WEBLINKS_FIELD_TARGET_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JBROWSERTARGET_PARENT</option>
 				<option value="1">JBROWSERTARGET_NEW</option>
 				<option value="2">JBROWSERTARGET_POPUP</option>
@@ -305,7 +307,6 @@
 			name="images"
 			label="JGLOBAL_FIELDSET_IMAGE_OPTIONS"
 			>
-
 			<field
 				name="image_first"
 				type="media"
@@ -319,7 +320,7 @@
 				label="COM_WEBLINKS_FLOAT_LABEL"
 				description="COM_WEBLINKS_FLOAT_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="right">COM_WEBLINKS_RIGHT</option>
 				<option value="left">COM_WEBLINKS_LEFT</option>
 				<option value="none">COM_WEBLINKS_NONE</option>
@@ -359,8 +360,8 @@
 				type="list"
 				label="COM_WEBLINKS_FLOAT_LABEL"
 				description="COM_WEBLINKS_FLOAT_DESC"
-				useglobal="true"
 				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="right">COM_WEBLINKS_RIGHT</option>
 				<option value="left">COM_WEBLINKS_LEFT</option>
 				<option value="none">COM_WEBLINKS_NONE</option>
@@ -392,13 +393,12 @@
 			name="jmetadata"
 			label="JGLOBAL_FIELDSET_METADATA_OPTIONS"
 			>
-
 			<field
 				name="robots"
 				type="list"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
 				description="JFIELD_METADATA_ROBOTS_DESC"
-			>
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
 				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
diff --git a/src/components/com_weblinks/models/forms/weblink.xml b/src/components/com_weblinks/models/forms/weblink.xml
index ad350d0..4145369 100644
--- a/src/components/com_weblinks/models/forms/weblink.xml
+++ b/src/components/com_weblinks/models/forms/weblink.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset addfieldpath="/administrator/components/com_categories/models/fields">
-		<field name="id" type="hidden"
+		<field
+			name="id"
+			type="hidden"
 			label="WEBLINK_ID_LABEL"
 			readonly="true"
 			required="true"
@@ -14,23 +16,30 @@
 			name="contenthistory"
 			type="contenthistory"
 			data-typeAlias="com_weblinks.weblink"
-			label="JTOOLBAR_VERSIONS" />
+			label="JTOOLBAR_VERSIONS"
+		/>
 
-		<field name="title" type="text"
+		<field
+			name="title"
+			type="text"
 			description="COM_WEBLINKS_FIELD_TITLE_DESC"
 			label="JGLOBAL_TITLE"
 			required="true"
 			size="30"
 		/>
 
-		<field name="alias" type="text"
+		<field
+			name="alias"
+			type="text"
 			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
 			label="JFIELD_ALIAS_LABEL"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 			size="45"
 		/>
 
-		<field name="description" type="editor"
+		<field
+			name="description"
+			type="editor"
 			buttons="true"
 			hide="pagebreak,readmore"
 			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
@@ -39,24 +48,30 @@
 			asset_id="com_weblinks"
 		/>
 
-		<field name="state" type="list"
+		<field
+			name="state"
+			type="list"
 			default="1"
 			description="JFIELD_PUBLISHED_DESC"
 			label="JSTATUS"
 			size="1"
-		>
+			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 		</field>
 
-		<field name="catid" type="categoryedit"
+		<field
+			name="catid"
+			type="categoryedit"
 			description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
 			extension="com_weblinks"
 			label="JCATEGORY"
 			required="true"
 		/>
 
-		<field name="url" type="url"
+		<field
+			name="url"
+			type="url"
 			filter="url"
 			description="COM_WEBLINKS_FIELD_URL_DESC"
 			label="COM_WEBLINKS_FIELD_URL_LABEL"
@@ -69,16 +84,19 @@
 			type="contentlanguage"
 			label="JFIELD_LANGUAGE_LABEL"
 			description="JFIELD_LANGUAGE_DESC"
-			class="inputbox">
+			class="inputbox"
+			>
 			<option value="*">JALL</option>
 		</field>
 
-		<field name="tags"
+		<field
+			name="tags"
 			type="tag"
 			label="JTAG"
 			description="JTAG_DESC"
 			class="inputbox"
-			multiple="true" />
+			multiple="true"
+		/>
 
 		<field
 			name="version_note"
@@ -87,7 +105,8 @@
 			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
 			class="inputbox"
 			size="45"
-			labelclass="control-label" />
+			labelclass="control-label"
+		/>
 
 		<field
 			name="captcha"
@@ -97,53 +116,58 @@
 			validate="captcha"
 			namespace="weblink"
 		/>
-
 	</fieldset>
+
 	<fields name="metadata">
-		<fieldset name="jmetadata"
-			label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		<fieldset
+			name="jmetadata"
+			label="JGLOBAL_FIELDSET_METADATA_OPTIONS"
+			>
+			<field
+				name="robots"
+				type="hidden"
+				filter="unset"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
 
-				<field name="robots"
-					type="hidden"
-					filter="unset"
-					label="JFIELD_METADATA_ROBOTS_LABEL"
-					description="JFIELD_METADATA_ROBOTS_DESC"
-					labelclass="control-label"
-					>
-					<option value="">JGLOBAL_USE_GLOBAL</option>
-					<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
-					<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
-					<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
-					<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
-				</field>
+			<field
+				name="author"
+				type="hidden"
+				filter="unset"
+				label="JAUTHOR"
+				description="JFIELD_METADATA_AUTHOR_DESC"
+				size="20"
+				labelclass="control-label"
+			/>
 
-				<field name="author"
-					type="hidden"
-					filter="unset"
-					label="JAUTHOR"
-					description="JFIELD_METADATA_AUTHOR_DESC"
-					size="20"
-					labelclass="control-label"
-				/>
-
-				<field name="rights"
-					type="hidden"
-					label="JFIELD_META_RIGHTS_LABEL"
-					filter="unset"
-					description="JFIELD_META_RIGHTS_DESC"
-					required="false"
-					labelclass="control-label"
-				/>
-
-				<field name="xreference"
-					type="hidden"
-					filter="unset"
-					label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
-					description="COM_CONTENT_FIELD_XREFERENCE_DESC"
-					class="inputbox"
-					size="20"
-					labelclass="control-label" />
+			<field
+				name="rights"
+				type="hidden"
+				label="JFIELD_META_RIGHTS_LABEL"
+				filter="unset"
+				description="JFIELD_META_RIGHTS_DESC"
+				required="false"
+				labelclass="control-label"
+			/>
 
+			<field
+				name="xreference"
+				type="hidden"
+				filter="unset"
+				label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
+				description="COM_CONTENT_FIELD_XREFERENCE_DESC"
+				class="inputbox"
+				size="20"
+				labelclass="control-label"
+			/>
 		</fieldset>
 	</fields>
 </form>