diff --git a/src/components/com_weblinks/tmpl/categories/default.xml b/src/components/com_weblinks/tmpl/categories/default.xml
index 396c898..e267f66 100644
--- a/src/components/com_weblinks/tmpl/categories/default.xml
+++ b/src/components/com_weblinks/tmpl/categories/default.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-	<layout title="com_weblinks_categories_view_default_title" option="com_weblinks_categories_view_default_option">
+	<layout title="COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_TITLE" option="com_weblinks_categories_view_default_option">
 		<help
 			key="JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORIES"
 		/>
 		<message>
-			<![CDATA[com_weblinks_categories_view_default_desc]]>
+			<![CDATA[COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_DESC]]>
 		</message>
 	</layout>
 
@@ -13,8 +13,8 @@
 	<fields name="request">
 		<fieldset name="request"
 		>
-			<field 
-				name="id" 
+			<field
+				name="id"
 				type="category"
 				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
 				extension="com_weblinks"
@@ -25,240 +25,256 @@
 	</fields>
 
 	<!-- Add fields to the parameters object for the layout. -->
-<fields name="params">
-	<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
-		<field 
-			name="show_base_description" 
-			type="list"
-			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
-			class="form-select-color-state"
-			useglobal="true"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+			<field
+				name="show_base_description"
+				type="list"
+				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+				class="form-select-color-state"
+				useglobal="true"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="categories_description" 
-			type="textarea"
-			label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
-			cols="25"
-			rows="5"
-		/>
+			<field
+				name="categories_description"
+				type="textarea"
+				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+				cols="25"
+				rows="5"
+			/>
 
-		<field 
-			name="maxLevelcat" 
-			type="list"
-			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-			useglobal="true"
-			>
-			<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
+				name="maxLevelcat"
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				useglobal="true"
+				validate="options"
+				>
+				<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>
 
-		<field 
-			name="show_empty_categories_cat" 
-			type="list"
-			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_empty_categories_cat"
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_subcat_desc_cat" 
-			type="list"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_subcat_desc_cat"
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_cat_num_links_cat" 
-			type="list"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
-	</fieldset>
+			<field
+				name="show_cat_num_links_cat"
+				type="list"
+				label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
 
-	<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS" description="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL">
-		<field 
-			name="show_category_title" 
-			type="list"
-			label="JGLOBAL_SHOW_CATEGORY_TITLE"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+		<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS" description="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL">
+			<field
+				name="show_category_title"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_description" 
-			type="list"
-			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_description"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_description_image" 
-			type="list"
-			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_description_image"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="maxLevel" 
-			type="list"
-			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-			useglobal="true"
-			>
-			<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="maxLevel"
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<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="list"
-			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_empty_categories"
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_subcat_desc" 
-			type="list"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_subcat_desc"
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_cat_num_links" 
-			type="list"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_cat_num_links"
+				type="list"
+				label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-	</fieldset>
+		</fieldset>
 
-	<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL">
-		<field
-			name="filter_field"
-			type="list"
-			label="JGLOBAL_FILTER_FIELD_LABEL"
-			default=""
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="hide">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL">
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				default=""
+				useglobal="true"
+				class="form-select-color-state"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field	
-			name="show_pagination_limit" 
-			type="list"
-			label="JGLOBAL_DISPLAY_SELECT_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_pagination_limit"
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_headings" 
-			type="list"
-			label="JGLOBAL_SHOW_HEADINGS_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_headings"
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_link_description" 
-			type="list"
-			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_link_description"
+				type="list"
+				label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				validate="options"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_link_hits" 
-			type="list"
-			label="JGLOBAL_HITS"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+			<field
+				name="show_link_hits"
+				type="list"
+				label="JGLOBAL_HITS"
+				useglobal="true"
+				class="form-select-color-state"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field 
-			name="show_pagination" 
-			type="list"
-			label="JGLOBAL_PAGINATION_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-			<option value="2">JGLOBAL_AUTO</option>
-		</field>
+			<field
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
 
-		<field 
-			name="show_pagination_results" 
-			type="list"
-			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-			useglobal="true"
-			class="form-select-color-state"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
-	</fieldset>
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
 
-</fields>
+	</fields>
 </metadata>