diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index 29cf786..e4e988f 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -9,7 +9,6 @@
 			name="captcha"
 			type="plugins"
 			label="COM_WEBLINKS_FIELD_CAPTCHA_LABEL"
-			description="COM_WEBLINKS_FIELD_CAPTCHA_DESC"
 			default=""
 			folder="captcha"
 			filter="cmd"
@@ -37,10 +36,9 @@
 			layout="joomla.form.field.radio.switcher"
 			default="0"
 			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
-			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
 			>
-			<option value="1">JYES</option>
 			<option value="0">JNO</option>
+			<option value="1">JYES</option>
 		</field>
 
 		<field
@@ -48,7 +46,6 @@
 			type="text"
 			filter="integer"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
-			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
 			default="5"
 			showon="save_history:1"
 		/>
@@ -61,8 +58,8 @@
 			label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
 			description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
 			>
-			<option value="1">JYES</option>
 			<option value="0">JNO</option>
+			<option value="1">JYES</option>
 		</field>
 
 		<field
@@ -132,10 +129,9 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
-			description="COM_WEBLINKS_FIELD_SHOW_TAGS_DESC"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 	</fieldset>
 
@@ -149,7 +145,6 @@
 			type="componentlayout"
 			class="form-select"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			description="JGLOBAL_FIELD_LAYOUT_DESC"
 			menuitems="true"
 			extension="com_weblinks"
 			view="category"
@@ -160,11 +155,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
 		</field>
 
 		<field
@@ -173,10 +167,9 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -185,16 +178,14 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
 			name="maxLevel"
 			type="list"
-			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
 			>
@@ -212,11 +203,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -224,11 +214,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
 		</field>
 
 		<field
@@ -236,11 +225,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -248,11 +236,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			label="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL"
-			description="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC"
 			default="1"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 	</fieldset>
 
@@ -267,18 +254,15 @@
 			layout="joomla.form.field.radio.switcher"
 			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>
-
+			<option value="1">JSHOW</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>
@@ -295,10 +279,9 @@
 			layout="joomla.form.field.radio.switcher"
 			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>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -306,11 +289,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
 		</field>
 
 		<field
@@ -318,11 +300,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			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>
+			<option value="1">JSHOW</option>
 		</field>
 	</fieldset>
 
@@ -335,7 +316,6 @@
 			name="filter_field"
 			type="list"
 			default="1"
-			description="JGLOBAL_FILTER_FIELD_DESC"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
 			>
 			<option value="1">JSHOW</option>
@@ -348,7 +328,6 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
-			description="JGLOBAL_DISPLAY_SELECT_DESC"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -359,11 +338,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			description="JGLOBAL_SHOW_HEADINGS_DESC"
 			label="JGLOBAL_SHOW_HEADINGS_LABEL"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -371,11 +349,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -383,11 +360,10 @@
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
 			default="1"
-			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
 			label="JGLOBAL_HITS"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -395,7 +371,6 @@
 			type="list"
 			default="2"
 			label="JGLOBAL_PAGINATION_LABEL"
-			description="JGLOBAL_PAGINATION_DESC"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -408,10 +383,9 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-			description="JGLOBAL_PAGINATION_RESULTS_DESC"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 	</fieldset>
 
@@ -426,10 +400,9 @@
 			layout="joomla.form.field.radio.switcher"
 			default="1"
 			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-			description="JGLOBAL_SHOW_FEED_LINK_DESC"
 			>
-			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 
 		<field
@@ -440,8 +413,8 @@
 			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
 			default="0"
 		>
+			<option value="0">JHIDE</option>
 			<option value="1">JYES</option>
-			<option value="0">JNO</option>
 		</field>
 	</fieldset>