diff --git a/administrator/components/com_admin/tmpl/profile/edit.php b/administrator/components/com_admin/tmpl/profile/edit.php
index 1bfed209840bc..452013a191ca9 100644
--- a/administrator/components/com_admin/tmpl/profile/edit.php
+++ b/administrator/components/com_admin/tmpl/profile/edit.php
@@ -47,7 +47,7 @@ class="form-validate"
 			</label>
 		</div>
 		<div class="controls">
-			<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', ['onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'custom-select'], 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+			<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', ['onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'form-select'], 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
 		</div>
 	</div>
 	<div id="com_users_twofactor_forms_container">
diff --git a/administrator/components/com_banners/forms/banner.xml b/administrator/components/com_banners/forms/banner.xml
index d428bb4427447..5573fa7b135cd 100644
--- a/administrator/components/com_banners/forms/banner.xml
+++ b/administrator/components/com_banners/forms/banner.xml
@@ -43,7 +43,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			validate="options"
diff --git a/administrator/components/com_banners/forms/client.xml b/administrator/components/com_banners/forms/client.xml
index d45d8ddb6fec9..4e49fc599e17a 100644
--- a/administrator/components/com_banners/forms/client.xml
+++ b/administrator/components/com_banners/forms/client.xml
@@ -38,7 +38,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			validate="options"
diff --git a/administrator/components/com_banners/src/Service/Html/Banner.php b/administrator/components/com_banners/src/Service/Html/Banner.php
index de42469fd3e1d..cd0ae5cc85f27 100644
--- a/administrator/components/com_banners/src/Service/Html/Banner.php
+++ b/administrator/components/com_banners/src/Service/Html/Banner.php
@@ -38,7 +38,7 @@ public function clients()
 				'<label id="batch-client-lbl" for="batch-client-id">',
 				Text::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
 				'</label>',
-				'<select class="custom-select" name="batch[client_id]" id="batch-client-id">',
+				'<select class="form-select" name="batch[client_id]" id="batch-client-id">',
 				'<option value="">' . Text::_('COM_BANNERS_BATCH_CLIENT_NOCHANGE') . '</option>',
 				'<option value="0">' . Text::_('COM_BANNERS_NO_CLIENT') . '</option>',
 				HTMLHelper::_('select.options', static::clientlist(), 'value', 'text'),
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index 399aad007e9bc..b9f88d355dd02 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -112,7 +112,7 @@
 		type="list"
 		label="JSTATUS"
 		default="1"
-		class="custom-select-color-state"
+		class="form-select-color-state"
 		size="1"
 		validate="options"
 		>
@@ -235,7 +235,7 @@
 					name="category_layout"
 					type="componentlayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 					view="category"
 					useglobal="true"
 				/>
diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index 4c99f427be6b7..d55edb488f323 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -139,7 +139,7 @@ protected function getInput()
 				. ' id="' . $this->id . $group->value . '_filter_type"'
 				. ' data-parent="' . ($group->parent) . '" '
 				. ' data-id="' . ($group->value) . '" '
-				. ' class="novalidate custom-select"'
+				. ' class="novalidate form-select"'
 				. '>';
 			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST') . '</option>';
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
index 44d2577be82e3..a7a0745cce330 100644
--- a/administrator/components/com_contact/config.xml
+++ b/administrator/components/com_contact/config.xml
@@ -9,7 +9,7 @@
 			name="contact_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_contact"
 			view="contact"
@@ -482,7 +482,7 @@
 			name="category_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_contact"
 			view="category"
diff --git a/administrator/components/com_contact/forms/contact.xml b/administrator/components/com_contact/forms/contact.xml
index 0c857c8add747..60916a9a9978e 100644
--- a/administrator/components/com_contact/forms/contact.xml
+++ b/administrator/components/com_contact/forms/contact.xml
@@ -47,7 +47,7 @@
 			type="list"
 			label="JSTATUS"
 			default="1"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			validate="options"
 			>
@@ -422,7 +422,7 @@
 					name="show_info"
 					type="list"
 					label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					validate="options"
 					>
@@ -470,7 +470,7 @@
 					name="add_mailto_link"
 					type="list"
 					label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					showon="show_info:1"
 					validate="options"
@@ -591,7 +591,7 @@
 					name="show_image"
 					type="list"
 					label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					showon="show_info:1"
 					validate="options"
@@ -604,7 +604,7 @@
 					name="show_misc"
 					type="list"
 					label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					validate="options"
 					>
@@ -685,7 +685,7 @@
 					name="contact_layout"
 					type="componentlayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 					extension="com_contact"
 					view="contact"
 					useglobal="true"
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index eeff1565ebd14..2ec6ec312f6f8 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -9,7 +9,7 @@
 			name="article_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_content"
 			view="article"
@@ -521,7 +521,7 @@
 			name="category_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_content"
 			view="category"
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 6d6cf37a7d260..3e6edeca302c6 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -71,7 +71,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			>
@@ -280,7 +280,7 @@
 					name="article_layout"
 					type="componentlayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 					useglobal="true"
 					extension="com_content"
 					view="article"
@@ -312,7 +312,7 @@
 					name="show_tags"
 					type="list"
 					label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					validate="options"
 					>
@@ -324,7 +324,7 @@
 					name="show_intro"
 					type="list"
 					label="JGLOBAL_SHOW_INTRO_LABEL"
-					class="custom-select-color"
+					class="form-select-color"
 					useglobal="true"
 					validate="options"
 					>
diff --git a/administrator/components/com_content/forms/category.xml b/administrator/components/com_content/forms/category.xml
index 45a151829b385..61f0f961f177a 100644
--- a/administrator/components/com_content/forms/category.xml
+++ b/administrator/components/com_content/forms/category.xml
@@ -6,7 +6,7 @@
 				name="workflow_id"
 				type="sql"
 				label="COM_CONTENT_WORKFLOWS"
-				class="custom-select"
+				class="form-select"
 				size="1"
 				sql_select="id, title"
 				sql_from="#__workflows"
diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
index e7f2f701fbf93..e371167cd5342 100644
--- a/administrator/components/com_fields/forms/field.xml
+++ b/administrator/components/com_fields/forms/field.xml
@@ -87,7 +87,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			size="1"
 			validate="options"
@@ -307,7 +307,7 @@
 					name="layout"
 					type="fieldLayout"
 					label="COM_FIELDS_FIELD_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/components/com_fields/forms/group.xml b/administrator/components/com_fields/forms/group.xml
index cd77faf2aa4b0..2c467804befd8 100644
--- a/administrator/components/com_fields/forms/group.xml
+++ b/administrator/components/com_fields/forms/group.xml
@@ -35,7 +35,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			validate="options"
 			>
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
index 8507da224a594..0343b6c0327ff 100644
--- a/administrator/components/com_fields/tmpl/fields/default_batch_body.php
+++ b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
@@ -45,7 +45,7 @@
 					<?php echo Text::_('COM_FIELDS_BATCH_GROUP_LABEL'); ?>
 				</label>
 				<div id="batch-choose-action" class="control-group">
-					<select name="batch[group_id]" class="custom-select" id="batch-group-id">
+					<select name="batch[group_id]" class="form-select" id="batch-group-id">
 						<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
 						<option value="nogroup"><?php echo Text::_('COM_FIELDS_BATCH_GROUP_OPTION_NONE'); ?></option>
 						<?php echo HTMLHelper::_('select.options', $this->get('Groups'), 'value', 'text'); ?>
diff --git a/administrator/components/com_finder/forms/filter.xml b/administrator/components/com_finder/forms/filter.xml
index 8e5e8ff0304c2..d6dc382ebe8ea 100644
--- a/administrator/components/com_finder/forms/filter.xml
+++ b/administrator/components/com_finder/forms/filter.xml
@@ -90,7 +90,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			filter="intval"
 			size="1"
 			default="1"
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index a5e9c99ecb510..bbc53b1f1a711 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -425,7 +425,7 @@ public function select($idxQuery, $options)
 			$html .= '<div class="controls">';
 			$html .= HTMLHelper::_(
 				'select.genericlist',
-				$branches[$bk]->nodes, 't[]', 'class="custom-select advancedSelect"', 'id', 'title', $active,
+				$branches[$bk]->nodes, 't[]', 'class="form-select advancedSelect"', 'id', 'title', $active,
 				'tax-' . OutputFilter::stringURLSafe($bv->title)
 			);
 			$html .= '</div>';
diff --git a/administrator/components/com_joomlaupdate/src/Helper/Select.php b/administrator/components/com_joomlaupdate/src/Helper/Select.php
index 75681580079cd..d1b24c6dc96b8 100644
--- a/administrator/components/com_joomlaupdate/src/Helper/Select.php
+++ b/administrator/components/com_joomlaupdate/src/Helper/Select.php
@@ -39,6 +39,6 @@ public static function getMethods($default = 'hybrid', $name = 'method', $id = '
 		$options[] = HTMLHelper::_('select.option', 'hybrid', Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_HYBRID'));
 		$options[] = HTMLHelper::_('select.option', 'ftp', Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_FTP'));
 
-		return HTMLHelper::_('select.genericlist', $options, $name, 'class="custom-select"', 'value', 'text', $default, $id);
+		return HTMLHelper::_('select.genericlist', $options, $name, 'class="form-select"', 'value', 'text', $default, $id);
 	}
 }
diff --git a/administrator/components/com_languages/forms/language.xml b/administrator/components/com_languages/forms/language.xml
index e24f9ae649843..41743fedfe559 100644
--- a/administrator/components/com_languages/forms/language.xml
+++ b/administrator/components/com_languages/forms/language.xml
@@ -73,7 +73,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			size="1"
 			validate="options"
diff --git a/administrator/components/com_menus/forms/item.xml b/administrator/components/com_menus/forms/item.xml
index fbd762fcde1c9..db0570dc2c2ef 100644
--- a/administrator/components/com_menus/forms/item.xml
+++ b/administrator/components/com_menus/forms/item.xml
@@ -67,7 +67,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			filter="integer"
diff --git a/administrator/components/com_menus/forms/item_component.xml b/administrator/components/com_menus/forms/item_component.xml
index 0e4f61ba0599f..4e1db9eb92cf3 100644
--- a/administrator/components/com_menus/forms/item_component.xml
+++ b/administrator/components/com_menus/forms/item_component.xml
@@ -67,7 +67,7 @@
 				name="show_page_heading"
 				type="list"
 				label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				default=""
 				useglobal="true"
 				validate="options"
diff --git a/administrator/components/com_menus/forms/itemadmin.xml b/administrator/components/com_menus/forms/itemadmin.xml
index 2c14f635dba15..2ff65b94ca345 100644
--- a/administrator/components/com_menus/forms/itemadmin.xml
+++ b/administrator/components/com_menus/forms/itemadmin.xml
@@ -68,7 +68,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			filter="integer"
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php
index 1d5cbea0b98af..2a0d17cd0fad5 100644
--- a/administrator/components/com_menus/tmpl/items/default_batch_body.php
+++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php
@@ -52,7 +52,7 @@
 					<label id="batch-choose-action-lbl" for="batch-menu-id">
 						<?php echo Text::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
 					</label>
-					<select class="custom-select" name="batch[menu_id]" id="batch-menu-id">
+					<select class="form-select" name="batch[menu_id]" id="batch-menu-id">
 						<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
 						<?php
 						$opts     = array(
diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index 2111ccb1fa740..f25e8adde4685 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -49,7 +49,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			size="1"
 			validate="options"
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index fead614973822..f7fc6f090b835 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -50,7 +50,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			size="1"
 			validate="options"
diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
index d9138e3575aaf..7a60303d1c541 100644
--- a/administrator/components/com_modules/tmpl/module/edit_assignment.php
+++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -26,7 +26,7 @@
 <div class="control-group">
 	<label id="jform_menus-lbl" class="control-label" for="jform_assignment"><?php echo Text::_('COM_MODULES_MODULE_ASSIGN'); ?></label>
 	<div id="jform_menus" class="controls">
-		<select class="custom-select" name="jform[assignment]" id="jform_assignment">
+		<select class="form-select" name="jform[assignment]" id="jform_assignment">
 			<?php echo HTMLHelper::_('select.options', ModulesHelper::getAssignmentOptions($this->item->client_id), 'value', 'text', $this->item->assignment, true); ?>
 		</select>
 	</div>
diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml
index d691591653b34..e6f9006c17426 100644
--- a/administrator/components/com_newsfeeds/config.xml
+++ b/administrator/components/com_newsfeeds/config.xml
@@ -11,7 +11,7 @@
 			name="newsfeed_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_newsfeeds"
 			view="newsfeed"
@@ -132,7 +132,7 @@
 			name="category_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_newsfeeds"
 			view="category"
diff --git a/administrator/components/com_newsfeeds/forms/newsfeed.xml b/administrator/components/com_newsfeeds/forms/newsfeed.xml
index 4c04a9357152f..8863194efc2f7 100644
--- a/administrator/components/com_newsfeeds/forms/newsfeed.xml
+++ b/administrator/components/com_newsfeeds/forms/newsfeed.xml
@@ -34,7 +34,7 @@
 			type="list"
 			label="JSTATUS"
 			default="1"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			validate="options"
 			>
@@ -403,7 +403,7 @@
 				name="newsfeed_layout"
 				type="componentlayout"
 				label="JFIELD_ALT_LAYOUT_LABEL"
-				class="custom-select"
+				class="form-select"
 				extension="com_newsfeeds"
 				view="newsfeed"
 				useglobal="true"
diff --git a/administrator/components/com_plugins/forms/plugin.xml b/administrator/components/com_plugins/forms/plugin.xml
index 653519c4903d8..6507725728283 100644
--- a/administrator/components/com_plugins/forms/plugin.xml
+++ b/administrator/components/com_plugins/forms/plugin.xml
@@ -20,7 +20,7 @@
 			name="enabled"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			validate="options"
diff --git a/administrator/components/com_postinstall/tmpl/messages/default.php b/administrator/components/com_postinstall/tmpl/messages/default.php
index 4014336642eed..0480293f9ab95 100644
--- a/administrator/components/com_postinstall/tmpl/messages/default.php
+++ b/administrator/components/com_postinstall/tmpl/messages/default.php
@@ -40,7 +40,7 @@
 	<input type="hidden" name="task" value="">
 	<?php echo HTMLHelper::_('form.token'); ?>
 	<label for="eid" class="me-sm-2"><?php echo Text::_('COM_POSTINSTALL_MESSAGES_FOR'); ?></label>
-	<?php echo HTMLHelper::_('select.genericlist', $this->extension_options, 'eid', array('onchange' => 'this.form.submit()', 'class' => 'custom-select'), 'value', 'text', $this->eid, 'eid'); ?>
+	<?php echo HTMLHelper::_('select.genericlist', $this->extension_options, 'eid', array('onchange' => 'this.form.submit()', 'class' => 'form-select'), 'value', 'text', $this->eid, 'eid'); ?>
 </form>
 
 <?php if ($this->eid == $this->joomlaFilesExtensionId) : ?>
diff --git a/administrator/components/com_redirect/forms/link.xml b/administrator/components/com_redirect/forms/link.xml
index 5fe70508b02f8..9983b818c4c95 100644
--- a/administrator/components/com_redirect/forms/link.xml
+++ b/administrator/components/com_redirect/forms/link.xml
@@ -39,7 +39,7 @@
 			name="published"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			validate="options"
diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
index 756740c2d136e..5a197f7b1c258 100644
--- a/administrator/components/com_tags/config.xml
+++ b/administrator/components/com_tags/config.xml
@@ -9,7 +9,7 @@
 			name="tag_layout"
 			type="componentlayout"
 			label="COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_tags"
 			view="tag"
@@ -220,7 +220,7 @@
 			name="tags_layout"
 			type="componentlayout"
 			label="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL"
-			class="custom-select"
+			class="form-select"
 			menuitems="true"
 			extension="com_tags"
 			view="tags"
diff --git a/administrator/components/com_tags/forms/tag.xml b/administrator/components/com_tags/forms/tag.xml
index bbc4f0e7fd30f..70ee2b2358a38 100644
--- a/administrator/components/com_tags/forms/tag.xml
+++ b/administrator/components/com_tags/forms/tag.xml
@@ -88,7 +88,7 @@
 		name="published"
 		type="list"
 		label="JSTATUS"
-		class="custom-select-color-state"
+		class="form-select-color-state"
 		default="1"
 		size="1"
 		validate="options"
@@ -234,7 +234,7 @@
 					name="tag_layout"
 					type="componentlayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 					useglobal="true"
 					extension="com_tags"
 					view="tag"
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
index 149464f69840a..62192df127d8a 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
@@ -35,7 +35,7 @@
 							</div>
 							<div class="form-group">
 								<label for="type"><?php echo Text::_('COM_TEMPLATES_NEW_FILE_TYPE'); ?></label>
-								<select class="custom-select" data-chosen="true" name="type" id="type" required >
+								<select class="form-select" data-chosen="true" name="type" id="type" required >
 									<option value="">- <?php echo Text::_('COM_TEMPLATES_NEW_FILE_SELECT'); ?> -</option>
 									<option value="css">.css</option>
 									<option value="php">.php</option>
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index 7533ce618ca0a..083c5f7e73d88 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -72,7 +72,7 @@
 			</label>
 		</div>
 		<div class="controls">
-			<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'custom-select'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+			<?php echo HTMLHelper::_('select.genericlist', UsersHelper::getTwoFactorMethods(), 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'form-select'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
 		</div>
 	</div>
 	<div id="com_users_twofactor_forms_container">
diff --git a/administrator/components/com_users/tmpl/users/default_batch_body.php b/administrator/components/com_users/tmpl/users/default_batch_body.php
index 86b8103ae4339..68efce13795b9 100644
--- a/administrator/components/com_users/tmpl/users/default_batch_body.php
+++ b/administrator/components/com_users/tmpl/users/default_batch_body.php
@@ -38,7 +38,7 @@
 				<?php echo Text::_('COM_USERS_BATCH_GROUP'); ?>
 			</label>
 			<div id="batch-choose-action" class="combo controls">
-				<select class="custom-select" name="batch[group_id]" id="batch-group-id">
+				<select class="form-select" name="batch[group_id]" id="batch-group-id">
 					<option value=""><?php echo Text::_('JSELECT'); ?></option>
 					<?php echo HTMLHelper::_('select.options', HTMLHelper::_('user.groups')); ?>
 				</select>
diff --git a/administrator/components/com_workflow/forms/stage.xml b/administrator/components/com_workflow/forms/stage.xml
index 0e32a32cad88b..a10c429a01222 100644
--- a/administrator/components/com_workflow/forms/stage.xml
+++ b/administrator/components/com_workflow/forms/stage.xml
@@ -32,7 +32,7 @@
 			type="list"
 			label="COM_WORKFLOW_PUBLISHED_LABEL"
 			required="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			validate="options"
 			>
diff --git a/administrator/components/com_workflow/forms/transition.xml b/administrator/components/com_workflow/forms/transition.xml
index 54b52719b9e75..aff61e433371f 100644
--- a/administrator/components/com_workflow/forms/transition.xml
+++ b/administrator/components/com_workflow/forms/transition.xml
@@ -54,7 +54,7 @@
 			type="list"
 			label="COM_WORKFLOW_PUBLISHED_LABEL"
 			required="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			validate="options"
 			>
diff --git a/administrator/components/com_workflow/forms/workflow.xml b/administrator/components/com_workflow/forms/workflow.xml
index ce91bb3855de8..ba0472b638350 100644
--- a/administrator/components/com_workflow/forms/workflow.xml
+++ b/administrator/components/com_workflow/forms/workflow.xml
@@ -36,7 +36,7 @@
 			type="list"
 			label="COM_WORKFLOW_PUBLISHED_LABEL"
 			required="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			default="1"
 			validate="options"
 			>
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index bfe15a08091cb..0ce6a78436b46 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -43,7 +43,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index 2f7593a335e0c..34eb537adce79 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -118,7 +118,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_frontend/mod_frontend.xml b/administrator/modules/mod_frontend/mod_frontend.xml
index c274b6116d76b..9efcb19210c66 100644
--- a/administrator/modules/mod_frontend/mod_frontend.xml
+++ b/administrator/modules/mod_frontend/mod_frontend.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml
index c55bbe4d2f34a..5d595afbe89b8 100644
--- a/administrator/modules/mod_latest/mod_latest.xml
+++ b/administrator/modules/mod_latest/mod_latest.xml
@@ -70,7 +70,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_latestactions/mod_latestactions.xml b/administrator/modules/mod_latestactions/mod_latestactions.xml
index e9d2e7e0db2b6..4bc5e4ab57656 100644
--- a/administrator/modules/mod_latestactions/mod_latestactions.xml
+++ b/administrator/modules/mod_latestactions/mod_latestactions.xml
@@ -36,7 +36,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml
index f26541b865e17..1e47220d03e33 100644
--- a/administrator/modules/mod_logged/mod_logged.xml
+++ b/administrator/modules/mod_logged/mod_logged.xml
@@ -48,7 +48,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml
index 942e877cdd4c7..c7f74d37c8f86 100644
--- a/administrator/modules/mod_login/mod_login.xml
+++ b/administrator/modules/mod_login/mod_login.xml
@@ -27,7 +27,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_login/src/Helper/LoginHelper.php b/administrator/modules/mod_login/src/Helper/LoginHelper.php
index f25116b60e3be..0dcea31abc62a 100644
--- a/administrator/modules/mod_login/src/Helper/LoginHelper.php
+++ b/administrator/modules/mod_login/src/Helper/LoginHelper.php
@@ -57,7 +57,7 @@ function ($a, $b)
 
 		array_unshift($languages, HTMLHelper::_('select.option', '', Text::_('JDEFAULTLANGUAGE')));
 
-		return HTMLHelper::_('select.genericlist', $languages, 'lang', 'class="custom-select"', 'value', 'text', null);
+		return HTMLHelper::_('select.genericlist', $languages, 'lang', 'class="form-select"', 'value', 'text', null);
 	}
 
 	/**
diff --git a/administrator/modules/mod_loginsupport/mod_loginsupport.xml b/administrator/modules/mod_loginsupport/mod_loginsupport.xml
index 73dd57ae34b0e..400b3d4a9533d 100644
--- a/administrator/modules/mod_loginsupport/mod_loginsupport.xml
+++ b/administrator/modules/mod_loginsupport/mod_loginsupport.xml
@@ -55,7 +55,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index cc2b9b2f9aded..226a2f89ca71c 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -99,7 +99,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_messages/mod_messages.xml b/administrator/modules/mod_messages/mod_messages.xml
index 68ebdad98a872..72cfbe4ed5e06 100644
--- a/administrator/modules/mod_messages/mod_messages.xml
+++ b/administrator/modules/mod_messages/mod_messages.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
index 4091471abe694..0ca39567b79cd 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
@@ -31,7 +31,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 0db2150265745..0ca7b1ad778db 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -60,7 +60,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml
index e5a879eb3e50e..beafdee62dcee 100644
--- a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml
+++ b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
index bcf9fe4683f03..2f6bf2cacb5f9 100644
--- a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
+++ b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml
@@ -28,7 +28,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_privacy_status/mod_privacy_status.xml b/administrator/modules/mod_privacy_status/mod_privacy_status.xml
index 9ba26188168ca..7197106d04dbe 100644
--- a/administrator/modules/mod_privacy_status/mod_privacy_status.xml
+++ b/administrator/modules/mod_privacy_status/mod_privacy_status.xml
@@ -27,7 +27,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index 26a050aa02358..ef6b8eb3661d0 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -172,7 +172,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.xml b/administrator/modules/mod_sampledata/mod_sampledata.xml
index 2d8c6d3f122ea..ee3ce3756c781 100644
--- a/administrator/modules/mod_sampledata/mod_sampledata.xml
+++ b/administrator/modules/mod_sampledata/mod_sampledata.xml
@@ -31,7 +31,7 @@
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
 					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
-					class="custom-select"
+					class="form-select"
 				/>
 			</fieldset>
 		</fields>
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index 85985cba18350..028158a575308 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -52,7 +52,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml
index 5f2daa5272102..2b599c220ead7 100644
--- a/administrator/modules/mod_submenu/mod_submenu.xml
+++ b/administrator/modules/mod_submenu/mod_submenu.xml
@@ -45,7 +45,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml
index 327a204e5e9d1..1b2c7d0feb7b6 100644
--- a/administrator/modules/mod_title/mod_title.xml
+++ b/administrator/modules/mod_title/mod_title.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml
index 4a3c8b3871ef9..9859a64a1d48d 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.xml
+++ b/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/administrator/modules/mod_user/mod_user.xml b/administrator/modules/mod_user/mod_user.xml
index 274f8c49d61c7..a27ee4eab0eab 100644
--- a/administrator/modules/mod_user/mod_user.xml
+++ b/administrator/modules/mod_user/mod_user.xml
@@ -25,7 +25,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml
index 01ac2c42c8d5a..26a3486d0e05e 100644
--- a/administrator/modules/mod_version/mod_version.xml
+++ b/administrator/modules/mod_version/mod_version.xml
@@ -27,7 +27,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss
index 62c631c17eefe..e98737849b473 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -1,5 +1,9 @@
 // Custom Forms
 
+.custom-select {
+  @extend .form-select;
+}
+
 .form-select {
   max-width: $input-max-width;
   cursor: pointer;
@@ -30,29 +34,27 @@
     }
   }
 
-  // All class names are duplicated custom select and form select for b/c with bootstrap 4
-  &.custom-select-color-state, &.form-select-color-state {
+  &.form-select-success,
+  &.custom-select-success {
+    color: var(--success);
+    background-color: var(--success);
+    border-color: var(--success);
 
-    &.custom-select-success, &.form-select-success {
-      color: var(--success);
-      background-color: var(--success);
-      border-color: var(--success);
-
-      option {
-        color: $form-select-color;
-        background-color: var(--white-offset);
-      }
+    option {
+      color: $form-select-color;
+      background-color: var(--white-offset);
     }
+  }
 
-    &.custom-select-danger, &.form-select-danger {
-      color: var(--danger);
-      background-color: var(--danger);
-      border-color: var(--danger);
+  &.form-select-danger,
+  &.custom-select-danger {
+    color: var(--danger);
+    background-color: var(--danger);
+    border-color: var(--danger);
 
-      option {
-        color: $form-select-color;
-        background-color: var(--white-offset);
-      }
+    option {
+      color: $form-select-color;
+      background-color: var(--white-offset);
     }
   }
 
@@ -74,8 +76,3 @@
     background-color: $white;
   }
 }
-
-// Backwards compat with BS4
-.custom-select {
-  @extend .form-select;
-}
diff --git a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
index 3fb78deb3f309..1bedbd611fd36 100644
--- a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
@@ -94,7 +94,7 @@ customElements.define('joomla-field-module-order', class extends HTMLElement {
     const clientId = this.getAttribute('data-client-id');
     const originalOrder = this.getAttribute('data-ordering');
     const name = this.getAttribute('data-name');
-    const attr = this.getAttribute('data-client-attr') ? this.getAttribute('data-client-attr') : 'custom-select';
+    const attr = this.getAttribute('data-client-attr') ? this.getAttribute('data-client-attr') : 'form-select';
     const id = `${this.getAttribute('data-id')}`;
     const orders = [];
     const that = this;
diff --git a/build/media_source/system/js/fields/select-colour.es6.js b/build/media_source/system/js/fields/select-colour.es6.js
index e6ef5d882aeb1..9c1ecb317cfb2 100644
--- a/build/media_source/system/js/fields/select-colour.es6.js
+++ b/build/media_source/system/js/fields/select-colour.es6.js
@@ -9,26 +9,26 @@
     const self = target;
     const value = parseInt(self.value, 10);
 
-    self.classList.remove('custom-select-success', 'custom-select-danger');
+    self.classList.remove('form-select-success', 'form-select-danger');
 
     if (value === 1) {
-      self.classList.add('custom-select-success');
+      self.classList.add('form-select-success');
     } else if (value === 0 || value === -2) {
-      self.classList.add('custom-select-danger');
+      self.classList.add('form-select-danger');
     }
   };
 
   const updateSelectboxColour = () => {
-    const colourSelects = [].slice.call(document.querySelectorAll('.custom-select-color-state'));
+    const colourSelects = [].slice.call(document.querySelectorAll('.form-select-color-state'));
 
     colourSelects.forEach((colourSelect) => {
       const value = parseInt(colourSelect.value, 10);
 
       // Add class on page load
       if (value === 1) {
-        colourSelect.classList.add('custom-select-success');
+        colourSelect.classList.add('form-select-success');
       } else if (value === 0 || value === -2) {
-        colourSelect.classList.add('custom-select-danger');
+        colourSelect.classList.add('form-select-danger');
       }
 
       // Add class when value is changed
diff --git a/components/com_contact/forms/form.xml b/components/com_contact/forms/form.xml
index 59b83d61590bf..0efc05a2f896d 100644
--- a/components/com_contact/forms/form.xml
+++ b/components/com_contact/forms/form.xml
@@ -259,7 +259,7 @@
 			type="list"
 			label="JSTATUS"
 			default="1"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			validate="options"
 		>
diff --git a/components/com_contact/tmpl/categories/default.xml b/components/com_contact/tmpl/categories/default.xml
index c2b391175e703..f5a32faa588fa 100644
--- a/components/com_contact/tmpl/categories/default.xml
+++ b/components/com_contact/tmpl/categories/default.xml
@@ -30,7 +30,7 @@
 				type="list"
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -65,7 +65,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -77,7 +77,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -89,7 +89,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -103,7 +103,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -115,7 +115,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -127,7 +127,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -155,7 +155,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -167,7 +167,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -179,7 +179,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -194,7 +194,7 @@
 				type="list"
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -206,7 +206,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -218,7 +218,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -230,7 +230,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -242,7 +242,7 @@
 				type="list"
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -254,7 +254,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -266,7 +266,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -278,7 +278,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -290,7 +290,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -302,7 +302,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -314,7 +314,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -326,7 +326,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -339,7 +339,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -354,7 +354,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="hide">JHIDE</option>
@@ -367,7 +367,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -379,7 +379,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -391,7 +391,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -403,7 +403,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -416,7 +416,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -429,7 +429,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -442,7 +442,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -455,7 +455,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -468,7 +468,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -481,7 +481,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -494,7 +494,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -507,7 +507,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -520,7 +520,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -533,7 +533,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -546,7 +546,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -559,7 +559,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -571,7 +571,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -583,7 +583,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -595,7 +595,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -632,7 +632,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -686,7 +686,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -698,7 +698,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -710,7 +710,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -722,7 +722,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -745,7 +745,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_contact/tmpl/category/default.xml b/components/com_contact/tmpl/category/default.xml
index 3e4b0d76880d4..e1ca7d60b1eee 100644
--- a/components/com_contact/tmpl/category/default.xml
+++ b/components/com_contact/tmpl/category/default.xml
@@ -38,7 +38,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -50,7 +50,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -62,7 +62,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -90,7 +90,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -103,7 +103,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -115,7 +115,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -131,7 +131,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -143,7 +143,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -155,7 +155,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -167,7 +167,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -179,7 +179,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -191,7 +191,7 @@
 				type="list"
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -203,7 +203,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -215,7 +215,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -227,7 +227,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -239,7 +239,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -251,7 +251,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -263,7 +263,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -287,7 +287,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -316,7 +316,7 @@
 				name="contact_layout"
 				type="componentlayout"
 				label="JGLOBAL_FIELD_LAYOUT_LABEL"
-				class="custom-select"
+				class="form-select"
 				menuitems="true"
 				extension="com_contact"
 				view="contact"
@@ -327,7 +327,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="hide">JHIDE</option>
@@ -340,7 +340,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -352,7 +352,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -364,7 +364,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -376,7 +376,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -389,7 +389,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -403,7 +403,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -416,7 +416,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -429,7 +429,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -442,7 +442,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -455,7 +455,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -468,7 +468,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -481,7 +481,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -494,7 +494,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -507,7 +507,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -520,7 +520,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -533,7 +533,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -545,7 +545,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -557,7 +557,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -569,7 +569,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -606,7 +606,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -673,7 +673,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -685,7 +685,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -697,7 +697,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -709,7 +709,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -732,7 +732,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_contact/tmpl/contact/default.xml b/components/com_contact/tmpl/contact/default.xml
index e2b8a57d5fff9..400e35fbe4f07 100644
--- a/components/com_contact/tmpl/contact/default.xml
+++ b/components/com_contact/tmpl/contact/default.xml
@@ -40,7 +40,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="hide">JHIDE</option>
@@ -53,7 +53,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -65,7 +65,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -77,7 +77,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -89,7 +89,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -102,7 +102,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -115,7 +115,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -128,7 +128,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JYES</option>
@@ -141,7 +141,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -154,7 +154,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -167,7 +167,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -180,7 +180,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -193,7 +193,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -206,7 +206,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -219,7 +219,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -232,7 +232,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -245,7 +245,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -258,7 +258,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -270,7 +270,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -282,7 +282,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -294,7 +294,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -331,7 +331,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -355,7 +355,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -413,7 +413,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -425,7 +425,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -437,7 +437,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -449,7 +449,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
diff --git a/components/com_contact/tmpl/featured/default.xml b/components/com_contact/tmpl/featured/default.xml
index 1a3fdde7b3dc9..7b20b6a90cca7 100644
--- a/components/com_contact/tmpl/featured/default.xml
+++ b/components/com_contact/tmpl/featured/default.xml
@@ -20,7 +20,7 @@
 			label="JGLOBAL_FILTER_FIELD_LABEL"
 			default=""
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -32,7 +32,7 @@
 			type="list"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -44,7 +44,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_HEADINGS_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -56,7 +56,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -68,7 +68,7 @@
 			type="list"
 			label="JGLOBAL_EMAIL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -80,7 +80,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -92,7 +92,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -104,7 +104,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -116,7 +116,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -128,7 +128,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -140,7 +140,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -152,7 +152,7 @@
 			type="list"
 			label="JGLOBAL_PAGINATION_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -165,7 +165,7 @@
 			type="list"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="0">JHIDE</option>
@@ -181,7 +181,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -193,7 +193,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -206,7 +206,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -219,7 +219,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -233,7 +233,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -246,7 +246,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -259,7 +259,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -272,7 +272,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -285,7 +285,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -298,7 +298,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -311,7 +311,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -324,7 +324,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -337,7 +337,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -350,7 +350,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -363,7 +363,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
 				useglobal="true"
 				showon="show_info:1"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -375,7 +375,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -387,7 +387,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -399,7 +399,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -436,7 +436,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -491,7 +491,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -503,7 +503,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -515,7 +515,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -527,7 +527,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index cdbf24e8f4b3d..89a386f044fc5 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -54,7 +54,7 @@
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			size="1"
 			default="1"
 			>
diff --git a/components/com_content/tmpl/archive/default.xml b/components/com_content/tmpl/archive/default.xml
index 96f3e7ef98b35..24eb67a8176b9 100644
--- a/components/com_content/tmpl/archive/default.xml
+++ b/components/com_content/tmpl/archive/default.xml
@@ -115,7 +115,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -128,7 +128,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -142,7 +142,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option	value="0">JHIDE</option>
@@ -154,7 +154,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -166,7 +166,7 @@
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -178,7 +178,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option	value="0">JHIDE</option>
@@ -190,7 +190,7 @@
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option	value="0">JNO</option>
@@ -203,7 +203,7 @@
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				description="JGLOBAL_LINKED_TITLES_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -215,7 +215,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -227,7 +227,7 @@
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option	value="0">JNO</option>
@@ -239,7 +239,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -251,7 +251,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -263,7 +263,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -275,7 +275,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -287,7 +287,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_content/tmpl/article/default.xml b/components/com_content/tmpl/article/default.xml
index a21ef6df5f885..a4a5cc826cce6 100644
--- a/components/com_content/tmpl/article/default.xml
+++ b/components/com_content/tmpl/article/default.xml
@@ -41,7 +41,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_TITLE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -53,7 +53,7 @@
 			type="list"
 			label="JGLOBAL_LINKED_TITLES_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JYES</option>
@@ -65,7 +65,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_INTRO_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -89,7 +89,7 @@
 			type="list"
 			label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option	value="1">JSHOW</option>
@@ -101,7 +101,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_CATEGORY_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -113,7 +113,7 @@
 			type="list"
 			label="JGLOBAL_LINK_CATEGORY_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JYES</option>
@@ -125,7 +125,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -137,7 +137,7 @@
 			type="list"
 			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JYES</option>
@@ -149,7 +149,7 @@
 			type="assoc"
 			label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -160,7 +160,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_AUTHOR_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -172,7 +172,7 @@
 			type="list"
 			label="JGLOBAL_LINK_AUTHOR_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JYES</option>
@@ -184,7 +184,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -196,7 +196,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -208,7 +208,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -220,7 +220,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -232,7 +232,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_VOTE_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -244,7 +244,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_HITS_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -256,7 +256,7 @@
 			type="list"
 			label="JGLOBAL_SHOW_TAGS_LABEL"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JSHOW</option>
@@ -269,7 +269,7 @@
 			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 			useglobal="true"
-			class="custom-select-color-state"
+			class="form-select-color-state"
 			validate="options"
 			>
 			<option value="1">JYES</option>
diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml
index b1ce11d9e47df..1e60502eaba69 100644
--- a/components/com_content/tmpl/categories/default.xml
+++ b/components/com_content/tmpl/categories/default.xml
@@ -33,7 +33,7 @@
 				type="list"
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -68,7 +68,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -80,7 +80,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -92,7 +92,7 @@
 				type="list"
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -107,7 +107,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -119,7 +119,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -131,7 +131,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -159,7 +159,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -171,7 +171,7 @@
 				type="list"
 				label="COM_CONTENT_NO_ARTICLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -183,7 +183,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -195,7 +195,7 @@
 				type="list"
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -304,7 +304,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -329,7 +329,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -341,7 +341,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -363,7 +363,7 @@
 				type="list"
 				label="JGLOBAL_LIST_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -375,7 +375,7 @@
 				type="list"
 				label="JGLOBAL_LIST_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -409,7 +409,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -422,7 +422,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -437,7 +437,7 @@
 				type="componentlayout"
 				label="JGLOBAL_FIELD_LAYOUT_LABEL"
 				description="JGLOBAL_FIELD_LAYOUT_DESC"
-				class="custom-select"
+				class="form-select"
 				menuitems="true"
 				extension="com_content"
 				view="article"
@@ -448,7 +448,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -460,7 +460,7 @@
 				type="list"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -472,7 +472,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -484,7 +484,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -496,7 +496,7 @@
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -508,7 +508,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -520,7 +520,7 @@
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -532,7 +532,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -544,7 +544,7 @@
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -556,7 +556,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -568,7 +568,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -580,7 +580,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -592,7 +592,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -604,7 +604,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -617,7 +617,7 @@
 				label="JGLOBAL_SHOW_READMORE_LABEL"
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -629,7 +629,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -641,7 +641,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -654,7 +654,7 @@
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -668,7 +668,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index 7df85e3d1aaa1..abe1ede1b599b 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -48,7 +48,7 @@
 					type="list"
 	 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -60,7 +60,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_CATEGORY_TITLE"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -72,7 +72,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -84,7 +84,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -113,7 +113,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -125,7 +125,7 @@
 					type="list"
 					label="COM_CONTENT_NO_ARTICLES_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -137,7 +137,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -149,7 +149,7 @@
 					type="list"
 					label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -161,7 +161,7 @@
 					type="list"
 					label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -315,7 +315,7 @@
 					type="list"
 					label="JGLOBAL_PAGINATION_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -328,7 +328,7 @@
 					type="list"
 					label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -341,7 +341,7 @@
 					default=""
 					label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
 					useglobal="true"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="show">JSHOW</option>
@@ -359,7 +359,7 @@
 				name="article_layout" type="componentlayout"
 				label="JGLOBAL_FIELD_LAYOUT_LABEL"
 				description="JGLOBAL_FIELD_LAYOUT_DESC"
-				class="custom-select"
+				class="form-select"
 				menuitems="true"
 				extension="com_content"
 				view="article"
@@ -370,7 +370,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -383,7 +383,7 @@
 				type="list"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -396,7 +396,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -410,7 +410,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -424,7 +424,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -437,7 +437,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -450,7 +450,7 @@
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -463,7 +463,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -476,7 +476,7 @@
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -489,7 +489,7 @@
 				type="assoc"
 				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -501,7 +501,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -514,7 +514,7 @@
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -527,7 +527,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -540,7 +540,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -553,7 +553,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -566,7 +566,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -579,7 +579,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -593,7 +593,7 @@
 				label="JGLOBAL_SHOW_READMORE_LABEL"
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -605,7 +605,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -617,7 +617,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -630,7 +630,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -644,7 +644,7 @@
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -659,7 +659,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 5ac7613a331eb..a6b95a7ee0970 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -45,7 +45,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -57,7 +57,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -69,7 +69,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -97,7 +97,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -109,7 +109,7 @@
 				type="list"
 				label="COM_CONTENT_NO_ARTICLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -121,7 +121,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -133,7 +133,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -145,7 +145,7 @@
 				type="list"
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -157,7 +157,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -181,7 +181,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -208,7 +208,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -242,7 +242,7 @@
 				type="list"
 				label="JGLOBAL_LIST_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -254,7 +254,7 @@
 				type="list"
 				label="JGLOBAL_LIST_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -266,7 +266,7 @@
 				type="votelist"
 				label="JGLOBAL_LIST_VOTES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>
@@ -278,7 +278,7 @@
 				type="votelist"
 				label="JGLOBAL_LIST_RATINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>
@@ -346,7 +346,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -359,7 +359,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -407,7 +407,7 @@
 				name="article_layout" type="componentlayout"
 				label="JGLOBAL_FIELD_LAYOUT_LABEL"
 				description="JGLOBAL_FIELD_LAYOUT_DESC"
-				class="custom-select"
+				class="form-select"
 				menuitems="true"
 				extension="com_content"
 				view="article"
@@ -418,7 +418,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -430,7 +430,7 @@
 				type="list"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -442,7 +442,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -454,7 +454,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -466,7 +466,7 @@
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -478,7 +478,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -490,7 +490,7 @@
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -502,7 +502,7 @@
 				type="assoc"
 				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -513,7 +513,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -525,7 +525,7 @@
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -537,7 +537,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -549,7 +549,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -561,7 +561,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -573,7 +573,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -585,7 +585,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -598,7 +598,7 @@
 				label="JGLOBAL_SHOW_READMORE_LABEL"
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -610,7 +610,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -622,7 +622,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -635,7 +635,7 @@
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JNO</option>
@@ -649,7 +649,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 50e8d3026ef88..d8d8bb0da33c8 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -78,7 +78,7 @@
 						<?php echo Text::_('JOPTION_SELECT_TAG'); ?>
 					</label>
 				</span>
-				<select name="filter_tag" id="filter-search" class="custom-select" onchange="document.adminForm.submit();" >
+				<select name="filter_tag" id="filter-search" class="form-select" onchange="document.adminForm.submit();" >
 					<option value=""><?php echo Text::_('JOPTION_SELECT_TAG'); ?></option>
 					<?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.options', array('filter.published' => array(1), 'filter.language' => $langFilter), true), 'value', 'text', $this->state->get('filter.tag')); ?>
 				</select>
@@ -88,7 +88,7 @@
 						<?php echo Text::_('JOPTION_SELECT_MONTH'); ?>
 					</label>
 				</span>
-				<select name="filter-search" id="filter-search" class="custom-select" onchange="document.adminForm.submit();">
+				<select name="filter-search" id="filter-search" class="form-select" onchange="document.adminForm.submit();">
 					<option value=""><?php echo Text::_('JOPTION_SELECT_MONTH'); ?></option>
 					<?php echo HtmlHelper::_('select.options', HtmlHelper::_('content.months', $this->state), 'value', 'text', $this->state->get('list.filter')); ?>
 				</select>
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index e7e5f9388c278..1a653ce831b74 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -154,7 +154,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -167,7 +167,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -193,7 +193,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -206,7 +206,7 @@
 				type="list"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -219,7 +219,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -233,7 +233,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -247,7 +247,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -260,7 +260,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -273,7 +273,7 @@
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -286,7 +286,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -299,7 +299,7 @@
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -312,7 +312,7 @@
 				type="assoc"
 				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -323,7 +323,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -336,7 +336,7 @@
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -349,7 +349,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -362,7 +362,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -375,7 +375,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -388,7 +388,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -401,7 +401,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -415,7 +415,7 @@
 				label="JGLOBAL_SHOW_READMORE_LABEL"
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -427,7 +427,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -439,7 +439,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -452,7 +452,7 @@
 				type="list"
 				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -465,7 +465,7 @@
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
@@ -480,7 +480,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_finder/tmpl/search/default.xml b/components/com_finder/tmpl/search/default.xml
index 8c3e80f49b767..584661c1fcd88 100644
--- a/components/com_finder/tmpl/search/default.xml
+++ b/components/com_finder/tmpl/search/default.xml
@@ -33,7 +33,7 @@
 				label="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -45,7 +45,7 @@
 				label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -57,7 +57,7 @@
 				label="COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JYES</option>
@@ -70,7 +70,7 @@
 				label="COM_FINDER_CONFIG_SHOW_TAXONOMY_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -82,7 +82,7 @@
 				label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -102,7 +102,7 @@
 				label="COM_FINDER_CONFIG_SHOW_DATE_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -114,7 +114,7 @@
 				label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JSHOW</option>
@@ -128,7 +128,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				validate="options"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
@@ -139,7 +139,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				validate="options"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
@@ -151,7 +151,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				validate="options"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
@@ -181,7 +181,7 @@
 				description="COM_FINDER_ALLOW_EMPTY_QUERY_DESC"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JYES</option>
@@ -193,7 +193,7 @@
 				label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JYES</option>
@@ -205,7 +205,7 @@
 				label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="1">JYES</option>
@@ -242,7 +242,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				validate="options"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
diff --git a/components/com_newsfeeds/tmpl/categories/default.xml b/components/com_newsfeeds/tmpl/categories/default.xml
index a62a3fc9d9381..a37e4cbc4f248 100644
--- a/components/com_newsfeeds/tmpl/categories/default.xml
+++ b/components/com_newsfeeds/tmpl/categories/default.xml
@@ -32,7 +32,7 @@
 				type="list"
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -67,7 +67,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -79,7 +79,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -91,7 +91,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -106,7 +106,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -118,7 +118,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -130,7 +130,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -158,7 +158,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -170,7 +170,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -182,7 +182,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -199,7 +199,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="hide">JHIDE</option>
@@ -211,7 +211,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -223,7 +223,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -235,7 +235,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -247,7 +247,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -259,7 +259,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -272,7 +272,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -287,7 +287,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -299,7 +299,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -311,7 +311,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_newsfeeds/tmpl/category/default.xml b/components/com_newsfeeds/tmpl/category/default.xml
index 88949f268ab77..adf696c93d5be 100644
--- a/components/com_newsfeeds/tmpl/category/default.xml
+++ b/components/com_newsfeeds/tmpl/category/default.xml
@@ -38,7 +38,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -50,7 +50,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -62,7 +62,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -90,7 +90,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -102,7 +102,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -114,7 +114,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -129,7 +129,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="hide">JHIDE</option>
@@ -141,7 +141,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -153,7 +153,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -165,7 +165,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -177,7 +177,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -189,7 +189,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -202,7 +202,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -216,7 +216,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -228,7 +228,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -240,7 +240,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.xml b/components/com_newsfeeds/tmpl/newsfeed/default.xml
index 881398b535a6c..43e600829c0f4 100644
--- a/components/com_newsfeeds/tmpl/newsfeed/default.xml
+++ b/components/com_newsfeeds/tmpl/newsfeed/default.xml
@@ -38,7 +38,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -50,7 +50,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -62,7 +62,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -74,7 +74,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_tags/tmpl/tag/default.xml b/components/com_tags/tmpl/tag/default.xml
index ccfcf7a881bbe..0b093dc91def7 100644
--- a/components/com_tags/tmpl/tag/default.xml
+++ b/components/com_tags/tmpl/tag/default.xml
@@ -53,7 +53,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -65,7 +65,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -77,7 +77,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -135,7 +135,7 @@
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -147,7 +147,7 @@
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -168,7 +168,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -183,7 +183,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -195,7 +195,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -208,7 +208,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -251,7 +251,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_tags/tmpl/tag/list.xml b/components/com_tags/tmpl/tag/list.xml
index 996d02e10e2bf..7f54c3d272a42 100644
--- a/components/com_tags/tmpl/tag/list.xml
+++ b/components/com_tags/tmpl/tag/list.xml
@@ -52,7 +52,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -64,7 +64,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -76,7 +76,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -134,7 +134,7 @@
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -146,7 +146,7 @@
 				type="list"
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -167,7 +167,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -179,7 +179,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -191,7 +191,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -202,7 +202,7 @@
 				name="display_num"
 				type="list"
 				label="COM_TAGS_FIELD_NUMBER_ITEMS_LIST_LABEL"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -222,7 +222,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -235,7 +235,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -247,7 +247,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -300,7 +300,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_tags/tmpl/tags/default.xml b/components/com_tags/tmpl/tags/default.xml
index badc7ce00a353..33e1ba09248be 100644
--- a/components/com_tags/tmpl/tags/default.xml
+++ b/components/com_tags/tmpl/tags/default.xml
@@ -60,7 +60,7 @@
 				name="all_tags_show_description_image"
 				type="list"
 				label="COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -104,7 +104,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -115,7 +115,7 @@
 				name="all_tags_show_tag_description"
 				type="list"
 				label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -135,7 +135,7 @@
 				type="list"
 				label="JGLOBAL_HITS"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -161,7 +161,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -173,7 +173,7 @@
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -185,7 +185,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -198,7 +198,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
@@ -212,7 +212,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
-				class="custom-select-color-state"
+				class="form-select-color-state"
 				validate="options"
 				>
 				<option value="0">JHIDE</option>
diff --git a/components/com_users/tmpl/login/default.xml b/components/com_users/tmpl/login/default.xml
index 13e1075e02f6c..7a1e4178f10af 100644
--- a/components/com_users/tmpl/login/default.xml
+++ b/components/com_users/tmpl/login/default.xml
@@ -57,7 +57,7 @@
 					type="list"
 					label="JFIELD_BASIC_LOGIN_DESCRIPTION_SHOW_LABEL"
 					default="1"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
@@ -137,7 +137,7 @@
 					type="list"
 					label="JFIELD_BASIC_LOGOUT_DESCRIPTION_SHOW_LABEL"
 					default="1"
-					class="custom-select-color-state"
+					class="form-select-color-state"
 					validate="options"
 					>
 					<option value="0">JHIDE</option>
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 72eb978b19e80..8b92db57f633e 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -73,7 +73,7 @@
 						</label>
 					</div>
 					<div class="controls">
-						<?php echo HTMLHelper::_('select.genericlist', $this->twofactormethods, 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'custom-select'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+						<?php echo HTMLHelper::_('select.genericlist', $this->twofactormethods, 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange();', 'class' => 'form-select'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
 					</div>
 				</div>
 				<div id="com_users_twofactor_forms_container" class="com-users-profile__twofactor-form">
diff --git a/installation/forms/language.xml b/installation/forms/language.xml
index 756b19e335fc4..a8f0c16f4098e 100644
--- a/installation/forms/language.xml
+++ b/installation/forms/language.xml
@@ -5,7 +5,7 @@
 			name="language"
 			type="installation.language"
 			label="INSTL_SELECT_LANGUAGE_TITLE"
-			class="custom-select required ms-2"
+			class="form-select required ms-2"
 			default="en-GB"
 		/>
 	</fieldset>
diff --git a/installation/forms/setup.xml b/installation/forms/setup.xml
index 318cb21084d24..2507eb7db7a31 100644
--- a/installation/forms/setup.xml
+++ b/installation/forms/setup.xml
@@ -57,7 +57,7 @@
 			name="db_type"
 			type="databaseconnection"
 			label="INSTL_DATABASE_TYPE_DESC"
-			class="custom-select"
+			class="form-select"
 			supported="mysql,mysqli,pgsql,postgresql"
 			required="true"
 			default="mysqli"
@@ -118,7 +118,7 @@
 			name="db_encryption"
 			type="list"
 			label="INSTL_DATABASE_ENCRYPTION_MODE_LABEL"
-			class="custom-select"
+			class="form-select"
 			required="true"
 			default="0"
 			filter="integer"
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 037d355464a2f..534ea7042b368 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -33,7 +33,7 @@ body {
   background: var(--atum-bg-light);
 }
 
-.custom-select {
+.form-select {
   @extend .form-select;
 }
 
diff --git a/layouts/joomla/button/transition-button.php b/layouts/joomla/button/transition-button.php
index 6048dae41ce11..2eabf73006566 100644
--- a/layouts/joomla/button/transition-button.php
+++ b/layouts/joomla/button/transition-button.php
@@ -84,7 +84,7 @@
 			$attribs = [
 				'id'        => 'transition-select_' . (int) $row ?? '',
 				'list.attr' => [
-					'class'    => 'custom-select custom-select-sm w-auto',
+					'class'    => 'form-select form-select-sm w-auto',
 					'onchange' => "this.form.transition_id.value=this.value;Joomla.listItemTask('" . $checkboxName . $this->escape($row ?? '') . "', 'articles.runTransition')"]
 				];
 
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index 972433380f7db..0e043aff5e179 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -51,7 +51,7 @@
  * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*.
  */
 
-$class    = ' class="custom-select ' . trim($class) . '"';
+$class    = ' class="form-select ' . trim($class) . '"';
 $disabled = $disabled ? ' disabled' : '';
 $readonly = $readonly ? ' readonly' : '';
 
diff --git a/layouts/joomla/form/field/list.php b/layouts/joomla/form/field/list.php
index 5fd185b6c183d..28b2d88c877cd 100644
--- a/layouts/joomla/form/field/list.php
+++ b/layouts/joomla/form/field/list.php
@@ -51,7 +51,7 @@
 $attr = '';
 
 // Initialize the field attributes.
-$attr .= !empty($class) ? ' class="custom-select ' . $class . '"' : ' class="custom-select"';
+$attr .= !empty($class) ? ' class="form-select ' . $class . '"' : ' class="form-select"';
 $attr .= !empty($size) ? ' size="' . $size . '"' : '';
 $attr .= $multiple ? ' multiple' : '';
 $attr .= $required ? ' required' : '';
diff --git a/layouts/joomla/form/field/rules.php b/layouts/joomla/form/field/rules.php
index c9bff48b0d21e..05113eff3d4b1 100644
--- a/layouts/joomla/form/field/rules.php
+++ b/layouts/joomla/form/field/rules.php
@@ -137,7 +137,7 @@
 								<td data-label="<?php echo Text::_('JLIB_RULES_SELECT_SETTING'); ?>" headers="settings-th<?php echo $group->value; ?>">
 									<div class="d-flex align-items-center">
 										<select data-onchange-task="permissions.apply"
-												class="custom-select novalidate"
+												class="form-select novalidate"
 												name="<?php echo $name; ?>[<?php echo $action->name; ?>][<?php echo $group->value; ?>]"
 												id="<?php echo $id; ?>_<?php echo $action->name; ?>_<?php echo $group->value; ?>" >
 											<?php
diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php
index 5b560195a1384..195a71517e32e 100644
--- a/layouts/joomla/html/batch/access.php
+++ b/layouts/joomla/html/batch/access.php
@@ -19,7 +19,7 @@
 	<?php echo HTMLHelper::_(
 		'access.assetgrouplist',
 		'batch[assetgroup_id]', '',
-		'class="custom-select"',
+		'class="form-select"',
 		array(
 			'title' => Text::_('JLIB_HTML_BATCH_NOCHANGE'),
 			'id'    => 'batch-access'
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
index eabcb590dfaee..9e98e901f1bcd 100644
--- a/layouts/joomla/html/batch/adminlanguage.php
+++ b/layouts/joomla/html/batch/adminlanguage.php
@@ -16,7 +16,7 @@
 <label id="batch-language-lbl" for="batch-language-id">
 	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
 </label>
-<select name="batch[language_id]" class="custom-select" id="batch-language-id">
+<select name="batch[language_id]" class="form-select" id="batch-language-id">
 	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
 	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index 56f9c2d399d1b..7d70a34dd1cf3 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -36,7 +36,7 @@
 	<?php echo Text::_('JLIB_HTML_BATCH_MENU_LABEL'); ?>
 </label>
 <div id="batch-choose-action" class="control-group">
-	<select name="batch[category_id]" class="custom-select" id="batch-category-id">
+	<select name="batch[category_id]" class="form-select" id="batch-category-id">
 		<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
 		<?php if (isset($addRoot) && $addRoot) : ?>
 			<?php echo HTMLHelper::_('select.options', HTMLHelper::_('category.categories', $extension)); ?>
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index af2a1f0e30835..91ee759c18a98 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -16,7 +16,7 @@
 <label id="batch-language-lbl" for="batch-language-id">
 	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
 </label>
-<select name="batch[language_id]" class="custom-select" id="batch-language-id">
+<select name="batch[language_id]" class="form-select" id="batch-language-id">
 	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
 	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('contentlanguage.existing', true, true), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index 60755a0351d90..c3ac8cf85e1b6 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -16,7 +16,7 @@
 <label id="batch-tag-lbl" for="batch-tag-id">
 	<?php echo Text::_('JLIB_HTML_BATCH_TAG_LABEL'); ?>
 </label>
-<select name="batch[tag]" class="custom-select" id="batch-tag-id">
+<select name="batch[tag]" class="form-select" id="batch-tag-id">
 	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
 	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.tags', array('filter.published' => array(1))), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php
index 966e3d5df6f91..2e852cc5f4112 100644
--- a/layouts/joomla/html/batch/user.php
+++ b/layouts/joomla/html/batch/user.php
@@ -30,7 +30,7 @@
 <label id="batch-user-lbl" for="batch-user-id">
 	<?php echo Text::_('JLIB_HTML_BATCH_USER_LABEL'); ?>
 </label>
-<select name="batch[user_id]" class="custom-select" id="batch-user-id">
+<select name="batch[user_id]" class="form-select" id="batch-user-id">
 	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_USER_NOCHANGE'); ?></option>
 	<?php echo $optionNo; ?>
 	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('user.userlist'), 'value', 'text'); ?>
diff --git a/layouts/joomla/html/batch/workflowstage.php b/layouts/joomla/html/batch/workflowstage.php
index 71dce4e4ddb2f..fce3009a56d06 100644
--- a/layouts/joomla/html/batch/workflowstage.php
+++ b/layouts/joomla/html/batch/workflowstage.php
@@ -24,7 +24,7 @@
 	'group.label' => 'text',
 	'group.items' => null,
 	'list.attr' => [
-		'class' => 'custom-select'
+		'class' => 'form-select'
 	]
 );
 
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index 901f36da7934d..9dba00bef430a 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -52,7 +52,7 @@
 				<h4 class="page-header"><?php echo Text::_('JSEARCH_FILTER_LABEL'); ?></h4>
 				<?php foreach ($displayData->filters as $filter) : ?>
 					<label for="<?php echo $filter['name']; ?>" class="visually-hidden"><?php echo $filter['label']; ?></label>
-					<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="custom-select" onchange="this.form.submit()">
+					<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="form-select" onchange="this.form.submit()">
 						<?php if (!$filter['noDefault']) : ?>
 							<option value=""><?php echo $filter['label']; ?></option>
 						<?php endif; ?>
diff --git a/libraries/src/Form/Field/GroupedlistField.php b/libraries/src/Form/Field/GroupedlistField.php
index c307cb18e5411..30cd807b18aab 100644
--- a/libraries/src/Form/Field/GroupedlistField.php
+++ b/libraries/src/Form/Field/GroupedlistField.php
@@ -148,7 +148,7 @@ protected function getInput()
 		$attr = '';
 
 		// Initialize some field attributes.
-		$attr .= !empty($this->class) ? ' class="custom-select ' . $this->class . '"' : ' class="custom-select"';
+		$attr .= !empty($this->class) ? ' class="form-select ' . $this->class . '"' : ' class="form-select"';
 		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
 		$attr .= $this->multiple ? ' multiple' : '';
 		$attr .= $this->required ? ' required' : '';
diff --git a/libraries/src/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
index 4c6c86d79eb8f..842085882222c 100644
--- a/libraries/src/Form/Field/OrderingField.php
+++ b/libraries/src/Form/Field/OrderingField.php
@@ -122,7 +122,7 @@ protected function getInput()
 		$attr = '';
 
 		// Initialize some field attributes.
-		$attr .= !empty($this->class) ? ' class="custom-select' . $this->class . '"' : ' class="custom-select"';
+		$attr .= !empty($this->class) ? ' class="form-select' . $this->class . '"' : ' class="form-select"';
 		$attr .= $this->disabled ? ' disabled' : '';
 		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
 
diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php
index 2b9bd6e8c2b10..bb2c44dd6936e 100644
--- a/libraries/src/HTML/Helpers/Select.php
+++ b/libraries/src/HTML/Helpers/Select.php
@@ -137,8 +137,8 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
 		$id = $options['id'] !== false ? $options['id'] : $name;
 		$id = str_replace(array('[', ']', ' '), '', $id);
 
-		// If if the selectbox contains "custom-select-color-state" then load the JS file
-		if (strpos($attribs, 'custom-select-color-state') !== false)
+		// If the selectbox contains "form-select-color-state" then load the JS file
+		if (strpos($attribs, 'form-select-color-state') !== false)
 		{
 			HTMLHelper::_('script', 'system/fields/select-colour.min.js', array('version' => 'auto', 'relative' => true));
 		}
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index 3472b424aac43..16cb3425761cb 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -37,7 +37,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index c4adb4b3674d8..c1b54de43bcdd 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -122,7 +122,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index c5777b134a953..aa67116126530 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -536,7 +536,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 6b05084291d12..90e1b2050cee7 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -96,7 +96,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index f89b615a3ed2d..9a4468a1e4e6d 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -87,7 +87,7 @@
 					label="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_LABEL"
 					default=""
 					filter="integer"
-					class="custom-select-color"
+					class="form-select-color"
 					showon="item_title:1"
 					validate="options"
 					>
@@ -226,7 +226,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index dde456f74e728..780f977f610e4 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -121,7 +121,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
  				/>
 
 				<field
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index d80175914351f..931f08a34b51e 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -115,7 +115,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 9cdc77e84e2b1..314d6c82fb4d3 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -72,7 +72,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index 3ad189bf32b8f..ef66918686351 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -49,7 +49,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index 1dda2d75b5c74..4cc15effdf0a7 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -139,7 +139,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml
index 4a5fd21c389ac..9780739868225 100644
--- a/modules/mod_finder/mod_finder.xml
+++ b/modules/mod_finder/mod_finder.xml
@@ -119,7 +119,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index cac70ba46db69..6c9f14c81df29 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -26,7 +26,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index c48afd151c80c..b7182b2a8916c 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -146,7 +146,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index e56836dcc114f..36b950b13f23d 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -135,7 +135,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 48b0b70bcb387..5ef7e5e989249 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -122,7 +122,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml
index 943cfdc55fc45..063c0aa2c469a 100644
--- a/modules/mod_random_image/mod_random_image.xml
+++ b/modules/mod_random_image/mod_random_image.xml
@@ -64,7 +64,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 7db744508bf80..57089de1a87e3 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -48,7 +48,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index e8cad43ac8e47..54a397ee053cb 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -72,7 +72,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml
index 3bb41ef886e24..5f2a3898c2569 100644
--- a/modules/mod_syndicate/mod_syndicate.xml
+++ b/modules/mod_syndicate/mod_syndicate.xml
@@ -58,7 +58,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml
index 2dd5c1bc3210d..cf08db8dec2c9 100644
--- a/modules/mod_tags_popular/mod_tags_popular.xml
+++ b/modules/mod_tags_popular/mod_tags_popular.xml
@@ -134,7 +134,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 					default="_:default"
 				/>
 
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index 50a08ff971d16..aeb97aa3f524c 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -64,7 +64,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index 7e8c5cf73c71f..373f8949d3009 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -48,7 +48,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml
index e1e96b17f5a81..ba4dbc86dda16 100644
--- a/modules/mod_whosonline/mod_whosonline.xml
+++ b/modules/mod_whosonline/mod_whosonline.xml
@@ -54,7 +54,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 382e06cadc3d0..73967341ad76d 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -107,7 +107,7 @@
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					class="custom-select"
+					class="form-select"
 				/>
 
 				<field
diff --git a/plugins/editors/tinymce/src/Field/UploaddirsField.php b/plugins/editors/tinymce/src/Field/UploaddirsField.php
index c3e4b2182c764..898190cb064a2 100644
--- a/plugins/editors/tinymce/src/Field/UploaddirsField.php
+++ b/plugins/editors/tinymce/src/Field/UploaddirsField.php
@@ -85,7 +85,7 @@ protected function getInput()
 		}
 
 		// Create a regular list.
-		$html[] = HTMLHelper::_('select.genericlist', $options, $this->name, 'class="custom-select"', 'value', 'text', $this->value, $this->id);
+		$html[] = HTMLHelper::_('select.genericlist', $options, $this->name, 'class="form-select"', 'value', 'text', $this->value, $this->id);
 
 		return implode($html);
 	}
diff --git a/templates/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss b/templates/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
index f2b5c41ac8d70..a1aa0da7cba28 100644
--- a/templates/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
+++ b/templates/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
@@ -1,5 +1,9 @@
 // Custom Forms
 
+.custom-select {
+  @extend .form-select;
+}
+
 .form-select {
   max-width: $input-max-width;
   cursor: pointer;
@@ -35,27 +39,25 @@
     }
   }
 
-  // All class names are duplicated custom select and form select for b/c with bootstrap 4
-  &.custom-select-color-state, &.form-select-color-state {
+  &.form-select-success,
+  &.custom-select-success {
+    color: $success;
+    background-color: $success;
 
-    &.custom-select-success, &.form-select-success {
-      color: $success;
-      background-color: $success;
-
-      option {
-        color: $form-select-color;
-        background-color: $white;
-      }
+    option {
+      color: $form-select-color;
+      background-color: $white;
     }
+  }
 
-    &.custom-select-danger, &.form-select-danger {
-      color: $danger;
-      background-color: $danger;
+  &.form-select-danger,
+  &.custom-select-danger {
+    color: $danger;
+    background-color: $danger;
 
-      option {
-        color: $form-select-color;
-        background-color: $white;
-      }
+    option {
+      color: $form-select-color;
+      background-color: $white;
     }
   }
 
@@ -67,10 +69,6 @@
 }
 
 // Backwards compat with BS4
-.custom-select {
-  @extend .form-select;
-}
-
 .form-group {
   @extend .mb-3;
 }