diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css
index 29e708cc..4d974a75 100644
--- a/assets/css/um-styles.css
+++ b/assets/css/um-styles.css
@@ -881,10 +881,10 @@ small.um-max-filesize span{
 	- Customize Select2 CSS
 */
 
-.select2-container.select2-container--open {
+.um-field .select2-container.select2-container--open {
 	z-index: 9999999;
 }
-.select2.select2-container .select2-selection {
+.um-field .select2.select2-container .select2-selection {
 	display: block !important;
 	height: 40px;
 	padding: 0 0 0 12px !important;
@@ -909,11 +909,11 @@ small.um-max-filesize span{
 	background-color: #fff !important;
 	border: 1px solid #ddd !important;
 }
-.rtl .select2.select2-container .select2-selection {
+.rtl .um-field .select2.select2-container .select2-selection {
 	padding: 0 12px 0 0 !important;
 }
 
-.select2.select2-container .select2-selection .select2-selection__arrow {
+.um-field .select2.select2-container .select2-selection .select2-selection__arrow {
 	display: inline-block !important;
 	width: 34px !important;
 	height: 100% !important;
@@ -928,12 +928,12 @@ small.um-max-filesize span{
 	background: transparent !important;
 	border-left: 0 !important;
 }
-.rtl .select2.select2-container .select2-selection .select2-selection__arrow {
+.rtl .um-field .select2.select2-container .select2-selection .select2-selection__arrow {
 	right: initial !important;
 	left: 0 !important;
 }
 
-.select2.select2-container .select2-selection .select2-selection__arrow:before {
+.um-field .select2.select2-container .select2-selection .select2-selection__arrow:before {
 	content: "\f3d0" !important;
 	font-size: 28px !important;
 	font-family: "Ionicons" !important;
@@ -946,16 +946,16 @@ small.um-max-filesize span{
 	color: #aaaaaa;
 }
 
-.select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
+.um-field .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
 	display: none;
 }
 
-.select2-container.select2-container--open .select2-dropdown {
+.um-field .select2-container.select2-container--open .select2-dropdown {
 	border: 1px solid #ddd !important;
 	border-radius: 0;
 }
 
-.select2-container.select2-container--open .select2-dropdown .select2-results li {
+.um-field .select2-container.select2-container--open .select2-dropdown .select2-results li {
 	list-style: none;
 	display: list-item;
 	background-image: none;
@@ -967,24 +967,24 @@ small.um-max-filesize span{
 	min-height: 1em !important;
 }
 
-.select2.select2-container .select2-selection.select2-selection--multiple {
+.um-field .select2.select2-container .select2-selection.select2-selection--multiple {
 	height: auto !important;
 	line-height: 0.8 !important;
 	min-height: 40px;
 	padding-bottom: 4px !important;
 }
 
-.select2-container--default .select2-selection--single .select2-selection__rendered {
+.um-field .select2-container--default .select2-selection--single .select2-selection__rendered {
 	line-height: 37px;
 	padding-left: 0 !important;
 	padding-right: 24px !important;
 }
-.rtl .select2-container--default .select2-selection--single .select2-selection__rendered {
+.rtl .um-field .select2-container--default .select2-selection--single .select2-selection__rendered {
 	padding-left: 24px !important;
 	padding-right: 0 !important;
 }
 
-.select2-container--default .select2-selection--multiple .select2-selection__rendered {
+.um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered {
 	line-height: 37px;
 	box-sizing: border-box;
 	list-style: none;
@@ -994,23 +994,23 @@ small.um-max-filesize span{
 	width: 100%;
 	font-size: 13px;
 }
-.rtl .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered {
 	padding-left: 30px !important;
 	padding-right: 0 !important;
 }
 
-.select2-results li.select2-results__option.select2-results__option--highlighted {
+.um-field .select2-results li.select2-results__option.select2-results__option--highlighted {
 	background: none !important;
 	background: #f4f4f4 !important;
 	color: #666 !important;
 }
-.select2-container--default .select2-results__option[aria-selected="true"] {
+.um-field .select2-container--default .select2-results__option[aria-selected="true"] {
 	background-color: #ddd;
 }
 
 
-.select2-container--default .select2-selection--single .select2-selection__clear,
-.select2-container--default .select2-selection--multiple .select2-selection__clear {
+.um-field .select2-container--default .select2-selection--single .select2-selection__clear,
+.um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
 	color: #aaaaaa !important;
 	font-size: 28px;
 	font-weight: normal;
@@ -1020,42 +1020,42 @@ small.um-max-filesize span{
 	text-align: center;
 	width: 1em;
 }
-.rtl .select2-container--default .select2-selection--single .select2-selection__clear,
-.rtl .select2-container--default .select2-selection--multiple .select2-selection__clear {
+.rtl .um-field .select2-container--default .select2-selection--single .select2-selection__clear,
+.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
 	left: 0;
 	right: initial;
 }
 
-.select2-container--default .select2-selection--multiple .select2-selection__clear {
+.um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
 	position: absolute;
 }
 
-.select2-container--default .select2-selection--multiple .select2-selection__choice {
+.um-field .select2-container--default .select2-selection--multiple .select2-selection__choice {
 	margin: 5px 5px 0 0;
+	max-height: 28px;
 	padding: 3px 3px 3px 5px;
 }
-.rtl .select2-container--default .select2-selection--multiple .select2-selection__choice{
+.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__choice{
 	margin: 5px 0 0 5px;
-	max-height: 28px;
 	padding: 3px 5px 3px 3px;
 }
 
-.um .um-form .select2-container .select2-search.select2-search--inline{
+.um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline{
 	margin: 5px 5px 0 0;
 	padding: 0px;
 }
-.rtl .um .um-form .select2-container .select2-search.select2-search--inline{
+.rtl .um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline{
 	margin: 5px 0 0 5px;
 }
 
-.um .um-form .select2-container .select2-search.select2-search--inline > input {
+.um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline > input {
 	border: none !important;
 	padding: 0 !important;
 	border-radius: 0 !important;
 	max-height: 28px;
 }
 
-.um .um-form .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+.um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
 	overflow-x: hidden;
 	text-overflow: ellipsis;
 	max-width: 100%;