AyeCode / invoicing

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Switch Indentation +23 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * This is a file takes advantage of anonymous functions to to load the latest version of the AyeCode UI Settings.
  */
@@ -6,41 +6,41 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.2.40";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    add_action('after_setup_theme', function () {
+	    global $ayecode_ui_version,$ayecode_ui_file_key;
+	    $this_version = "0.2.40";
+	    if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
+		    $ayecode_ui_version = $this_version ;
+		    $ayecode_ui_file_key = wp_hash( __FILE__ );
+	    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    add_action('after_setup_theme', function () {
+	    global $ayecode_ui_file_key;
+	    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+		    include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+		    include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    if(!function_exists('aui')){
+	    function aui(){
+		    if(!class_exists("AUI",false)){
+			    return false;
+		    }
+		    return AUI::instance();
+	    }
 }

vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

Switch Indentation +2098 added lines, -2098 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * A class for adjusting AyeCode UI settings on WordPress
  *
@@ -12,84 +12,84 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
+    if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
 
-	/**
+	    /**
 	 * A Class to be able to change settings for Font Awesome.
 	 *
 	 * Class AyeCode_UI_Settings
 	 * @ver 1.0.0
 	 * @todo decide how to implement textdomain
 	 */
-	class AyeCode_UI_Settings {
+	    class AyeCode_UI_Settings {
 
-		/**
+		    /**
 		 * Class version version.
 		 *
 		 * @var string
 		 */
-		public $version = '0.2.40';
+		    public $version = '0.2.40';
 
-		/**
+		    /**
 		 * Class textdomain.
 		 *
 		 * @var string
 		 */
-		public $textdomain = 'aui';
+		    public $textdomain = 'aui';
 
-		/**
+		    /**
 		 * Latest version of Bootstrap at time of publish published.
 		 *
 		 * @var string
 		 */
-		public $latest = "5.2.2";
+		    public $latest = "5.2.2";
 
-		/**
+		    /**
 		 * Current version of select2 being used.
 		 *
 		 * @var string
 		 */
-		public $select2_version = "4.0.11";
+		    public $select2_version = "4.0.11";
 
-		/**
+		    /**
 		 * The title.
 		 *
 		 * @var string
 		 */
-		public $name = 'AyeCode UI';
+		    public $name = 'AyeCode UI';
 
-		/**
+		    /**
 		 * The relative url to the assets.
 		 *
 		 * @var string
 		 */
-		public $url = '';
+		    public $url = '';
 
-		/**
+		    /**
 		 * Holds the settings values.
 		 *
 		 * @var array
 		 */
-		private $settings;
+		    private $settings;
 
-		/**
+		    /**
 		 * AyeCode_UI_Settings instance.
 		 *
 		 * @access private
 		 * @since  1.0.0
 		 * @var    AyeCode_UI_Settings There can be only one!
 		 */
-		private static $instance = null;
+		    private static $instance = null;
 
 
-		/**
+		    /**
 		 * Main AyeCode_UI_Settings Instance.
 		 *
 		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
@@ -98,34 +98,34 @@ 
 		 * @static
 		 * @return AyeCode_UI_Settings - Main instance.
 		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+		    public static function instance() {
+			    if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
 
-				self::$instance = new AyeCode_UI_Settings;
+				    self::$instance = new AyeCode_UI_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				    add_action( 'init', array( self::$instance, 'init' ) ); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+				    if ( is_admin() ) {
+					    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+					    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
 
-					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+					    // Maybe show example page
+					    add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
 
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
-					}
-				}
+					    if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+						    add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
+					    }
+				    }
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+				    add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
 
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
+				    do_action( 'ayecode_ui_settings_loaded' );
+			    }
 
-			return self::$instance;
-		}
+			    return self::$instance;
+		    }
 
-		/**
+		    /**
 		 * Add custom colors to the color selector.
 		 *
 		 * @param $theme_colors
@@ -134,359 +134,359 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+		    public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
 
 
-			$setting = wp_get_global_settings();
+			    $setting = wp_get_global_settings();
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
-					$theme_colors[$color['slug']] = esc_attr($color['name']);
-				}
-			}
+			    if(!empty($setting['color']['palette']['custom'])){
+				    foreach($setting['color']['palette']['custom'] as $color){
+					    $theme_colors[$color['slug']] = esc_attr($color['name']);
+				    }
+			    }
 
-			return $theme_colors;
-		}
+			    return $theme_colors;
+		    }
 
-		/**
+		    /**
 		 * Setup some constants.
 		 */
-		public function constants(){
-			define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
-			define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
-			define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
-			define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
-			define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
-			define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
-			define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
-			define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
-			define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
-			define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
-			define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
-			define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
-			define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
-			define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
-			define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
-			define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
-				define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INFO_COLOR' ) ) {
-				define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
-				define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
-				define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
-				define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
-				define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DARK_COLOR' ) ) {
-				define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
-				define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
-				define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
-				define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
-				define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
-				define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
-				define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
-				define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
-			}
-
-		}
-
-		public static function get_colors( $original = false){
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				return array();
-			}
-			if ( $original ) {
-				return array(
-					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
-					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
-					'info'      => AUI_INFO_COLOR_ORIGINAL,
-					'warning'   => AUI_WARNING_COLOR_ORIGINAL,
-					'danger'    => AUI_DANGER_COLOR_ORIGINAL,
-					'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
-					'light'     => AUI_LIGHT_COLOR_ORIGINAL,
-					'dark'      => AUI_DARK_COLOR_ORIGINAL,
-					'white'     => AUI_WHITE_COLOR_ORIGINAL,
-					'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
-					'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
-					'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
-					'gray'      => AUI_GRAY_COLOR_ORIGINAL,
-					'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
-					'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
-					'black'     => AUI_BLACK_COLOR_ORIGINAL,
-				);
-			}
-
-			return array(
-				'primary'   => AUI_PRIMARY_COLOR,
-				'secondary' => AUI_SECONDARY_COLOR,
-				'info'      => AUI_INFO_COLOR,
-				'warning'   => AUI_WARNING_COLOR,
-				'danger'    => AUI_DANGER_COLOR,
-				'success'   => AUI_SUCCESS_COLOR,
-				'light'     => AUI_LIGHT_COLOR,
-				'dark'      => AUI_DARK_COLOR,
-				'white'     => AUI_WHITE_COLOR,
-				'purple'    => AUI_PURPLE_COLOR,
-				'salmon'    => AUI_SALMON_COLOR,
-				'cyan'      => AUI_CYAN_COLOR,
-				'gray'      => AUI_GRAY_COLOR,
-				'indigo'    => AUI_INDIGO_COLOR,
-				'orange'    => AUI_ORANGE_COLOR,
-				'black'     => AUI_BLACK_COLOR,
-			);
-		}
-
-		/**
+		    public function constants(){
+			    define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
+			    define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
+			    define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
+			    define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
+			    define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
+			    define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
+			    define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
+			    define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
+			    define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
+			    define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
+			    define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
+			    define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
+			    define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
+			    define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
+			    define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
+			    define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
+
+			    if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+				    define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
+				    define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_INFO_COLOR' ) ) {
+				    define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
+				    define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
+				    define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
+				    define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
+				    define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_DARK_COLOR' ) ) {
+				    define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
+				    define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
+				    define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
+				    define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
+				    define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
+				    define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
+				    define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
+				    define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
+			    }
+			    if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
+				    define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+			    }
+
+		    }
+
+		    public static function get_colors( $original = false){
+
+			    if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+				    return array();
+			    }
+			    if ( $original ) {
+				    return array(
+					    'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
+					    'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
+					    'info'      => AUI_INFO_COLOR_ORIGINAL,
+					    'warning'   => AUI_WARNING_COLOR_ORIGINAL,
+					    'danger'    => AUI_DANGER_COLOR_ORIGINAL,
+					    'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
+					    'light'     => AUI_LIGHT_COLOR_ORIGINAL,
+					    'dark'      => AUI_DARK_COLOR_ORIGINAL,
+					    'white'     => AUI_WHITE_COLOR_ORIGINAL,
+					    'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
+					    'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
+					    'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
+					    'gray'      => AUI_GRAY_COLOR_ORIGINAL,
+					    'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
+					    'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
+					    'black'     => AUI_BLACK_COLOR_ORIGINAL,
+				    );
+			    }
+
+			    return array(
+				    'primary'   => AUI_PRIMARY_COLOR,
+				    'secondary' => AUI_SECONDARY_COLOR,
+				    'info'      => AUI_INFO_COLOR,
+				    'warning'   => AUI_WARNING_COLOR,
+				    'danger'    => AUI_DANGER_COLOR,
+				    'success'   => AUI_SUCCESS_COLOR,
+				    'light'     => AUI_LIGHT_COLOR,
+				    'dark'      => AUI_DARK_COLOR,
+				    'white'     => AUI_WHITE_COLOR,
+				    'purple'    => AUI_PURPLE_COLOR,
+				    'salmon'    => AUI_SALMON_COLOR,
+				    'cyan'      => AUI_CYAN_COLOR,
+				    'gray'      => AUI_GRAY_COLOR,
+				    'indigo'    => AUI_INDIGO_COLOR,
+				    'orange'    => AUI_ORANGE_COLOR,
+				    'black'     => AUI_BLACK_COLOR,
+			    );
+		    }
+
+		    /**
 		 * Add admin body class to show when BS5 is active.
 		 *
 		 * @param $classes
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
-			$classes .= ' aui_bs5';
+		    public function add_bs5_admin_body_class( $classes = '' ) {
+			    $classes .= ' aui_bs5';
 
-			return $classes;
-		}
+			    return $classes;
+		    }
 
-		/**
+		    /**
 		 * Add a body class to show when BS5 is active.
 		 *
 		 * @param $classes
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_body_class( $classes ) {
-			$classes[] = 'aui_bs5';
+		    public function add_bs5_body_class( $classes ) {
+			    $classes[] = 'aui_bs5';
 
-			return $classes;
-		}
+			    return $classes;
+		    }
 
-		/**
+		    /**
 		 * Initiate the settings and add the required action hooks.
 		 */
-		public function init() {
-            global $aui_bs5;
-
-			// Maybe fix settings
-			if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
-				$db_settings = get_option( 'ayecode-ui-settings' );
-				if ( ! empty( $db_settings ) ) {
-					$db_settings['css_backend'] = 'compatibility';
-					$db_settings['js_backend'] = 'core-popper';
-					update_option( 'ayecode-ui-settings', $db_settings );
-					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
-				}
-			}
-
-			$this->constants();
-			$this->settings = $this->get_settings();
-			$this->url = $this->get_url();
-
-            // define the version
-			$aui_bs5 = $this->settings['bs_ver'] === '5';
-
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
-				add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
-				add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
-			}
-
-			/**
+		    public function init() {
+                global $aui_bs5;
+
+			    // Maybe fix settings
+			    if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
+				    $db_settings = get_option( 'ayecode-ui-settings' );
+				    if ( ! empty( $db_settings ) ) {
+					    $db_settings['css_backend'] = 'compatibility';
+					    $db_settings['js_backend'] = 'core-popper';
+					    update_option( 'ayecode-ui-settings', $db_settings );
+					    wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
+				    }
+			    }
+
+			    $this->constants();
+			    $this->settings = $this->get_settings();
+			    $this->url = $this->get_url();
+
+                // define the version
+			    $aui_bs5 = $this->settings['bs_ver'] === '5';
+
+			    if ( $aui_bs5 ) {
+				    include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
+				    add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
+				    add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
+			    }
+
+			    /**
 			 * Maybe load CSS
 			 *
 			 * We load super early in case there is a theme version that might change the colors
 			 */
-			if ( $this->settings['css'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-                $priority = $aui_bs5 ? 10 : $priority;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
-			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-
-			// maybe load JS
-			if ( $this->settings['js'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
-			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
-			}
-
-			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
-			}
-
-			// Maybe show backend style error
-			if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
-				add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
-			}
-
-		}
-
-		/**
+			    if ( $this->settings['css'] ) {
+				    $priority = $this->is_bs3_compat() ? 100 : 1;
+                    $priority = $aui_bs5 ? 10 : $priority;
+				    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
+			    }
+			    if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
+				    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+			    }
+
+			    // maybe load JS
+			    if ( $this->settings['js'] ) {
+				    $priority = $this->is_bs3_compat() ? 100 : 1;
+				    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+			    }
+			    if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
+				    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+			    }
+
+			    // Maybe set the HTML font size
+			    if ( $this->settings['html_font_size'] ) {
+				    add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+			    }
+
+			    // Maybe show backend style error
+			    if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
+				    add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
+			    }
+
+		    }
+
+		    /**
 		 * Show admin notice if backend scripts not loaded.
 		 */
-		public function show_admin_style_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
+		    public function show_admin_style_notice(){
+			    $fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
+			    $button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
+			    $message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
+			    echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+		    }
 
-		/**
+		    /**
 		 * Check if we should load the admin scripts or not.
 		 *
 		 * @return bool
 		 */
-		public function load_admin_scripts(){
-			$result = true;
+		    public function load_admin_scripts(){
+			    $result = true;
 
-			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
-						return false; // return early, no point checking further
-					}
-				}
-			}
+			    // check if specifically disabled
+			    if(!empty($this->settings['disable_admin'])){
+				    $url_parts = explode("\n",$this->settings['disable_admin']);
+				    foreach($url_parts as $part){
+					    if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+						    return false; // return early, no point checking further
+					    }
+				    }
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Add a html font size to the footer.
 		 */
-		public function html_font_size(){
-			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
-		}
+		    public function html_font_size(){
+			    $this->settings = $this->get_settings();
+			    echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+		    }
 
-		/**
+		    /**
 		 * Check if the current admin screen should load scripts.
 		 *
 		 * @return bool
 		 */
-		public function is_aui_screen(){
-//			echo '###';exit;
-			$load = false;
-			// check if we should load or not
-			if ( is_admin() ) {
-				// Only enable on set pages
-				$aui_screens = array(
-					'page',
-                    //'docs',
-					'post',
-					'settings_page_ayecode-ui-settings',
-					'appearance_page_gutenberg-widgets',
-					'widgets',
-					'ayecode-ui-settings',
-					'site-editor'
-				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
-
-				$screen = get_current_screen();
-
-//				echo '###'.$screen->id;
-
-				// check if we are on a AUI screen
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
-					$load = true;
-				}
-
-				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
-					$load = true;
-				}
-			}
-
-
-
-			return apply_filters( 'aui_load_on_admin' , $load );
-		}
-
-		/**
+		    public function is_aui_screen(){
+    //			echo '###';exit;
+			    $load = false;
+			    // check if we should load or not
+			    if ( is_admin() ) {
+				    // Only enable on set pages
+				    $aui_screens = array(
+					    'page',
+                        //'docs',
+					    'post',
+					    'settings_page_ayecode-ui-settings',
+					    'appearance_page_gutenberg-widgets',
+					    'widgets',
+					    'ayecode-ui-settings',
+					    'site-editor'
+				    );
+				    $screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+
+				    $screen = get_current_screen();
+
+    //				echo '###'.$screen->id;
+
+				    // check if we are on a AUI screen
+				    if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+					    $load = true;
+				    }
+
+				    //load for widget previews in WP 5.8
+				    if( !empty($_REQUEST['legacy-widget-preview'])){
+					    $load = true;
+				    }
+			    }
+
+
+
+			    return apply_filters( 'aui_load_on_admin' , $load );
+		    }
+
+		    /**
 		 * Check if the current theme is a block theme.
 		 *
 		 * @return bool
 		 */
-		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
-				return true;
-			}
+		    public static function is_block_theme() {
+			    if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+				    return true;
+			    }
 
-			return false;
-		}
+			    return false;
+		    }
 
-		/**
+		    /**
 		 * Adds the styles.
 		 */
-		public function enqueue_style() {
-            global $aui_bs5;
+		    public function enqueue_style() {
+                global $aui_bs5;
 
-            $load_fse = false;
+                $load_fse = false;
 
-			if ( is_admin() && ! $this->is_aui_screen() ) {
-				// Don't add wp-admin scripts if not requested to.
-			} else {
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
-                $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
+			    if ( is_admin() && ! $this->is_aui_screen() ) {
+				    // Don't add wp-admin scripts if not requested to.
+			    } else {
+				    $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+				    $rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+                    $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if ( $this->settings[ $css_setting ] ) {
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+				    if ( $this->settings[ $css_setting ] ) {
+					    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+					    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+					    wp_register_style( 'ayecode-ui', $url, array(), $this->version );
+					    wp_enqueue_style( 'ayecode-ui' );
 
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
-						$load_fse = true;
-					}
+					    if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+						    $url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
+						    wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
+						    wp_enqueue_style( 'ayecode-ui-fse' );
+						    $load_fse = true;
+					    }
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+					    // flatpickr
+					    wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+					    // fix some wp-admin issues
+					    if(is_admin()){
+						    $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -526,84 +526,84 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+						    // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+						    $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
-
-					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
-					}
-				}
-			}
-		}
-
-		/**
+						    wp_add_inline_style( 'ayecode-ui', $custom_css );
+					    }
+
+					    // custom changes
+					    if ( $load_fse ) {
+						    wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
+					    }else{
+						    wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+					    }
+				    }
+			    }
+		    }
+
+		    /**
 		 * Get inline script used if bootstrap enqueued
 		 *
 		 * If this remains small then its best to use this than to add another JS file.
 		 */
-		public function inline_script() {
-            global $aui_bs5;
-			// Flatpickr calendar locale
-			$flatpickr_locale = self::flatpickr_locale();
+		    public function inline_script() {
+                global $aui_bs5;
+			    // Flatpickr calendar locale
+			    $flatpickr_locale = self::flatpickr_locale();
 
-			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
-            }
+			    ob_start();
+			    if ( $aui_bs5 ) {
+				    include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
+			    }else{
+				    include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+                }
 
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', self::minify_js($output) );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', self::minify_js($output) );
+		    }
 
 
-		/**
+		    /**
 		 * JS to help with conflict issues with other plugins and themes using bootstrap v3.
 		 *
 		 * @TODO we may need this when other conflicts arrise.
 		 * @return mixed
 		 */
-		public static function bs3_compat_js() {
-			ob_start();
-			?>
-            <script>
+		    public static function bs3_compat_js() {
+			    ob_start();
+			    ?>
+                <script>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
-                /* With Avada builder */
+                    /* With Avada builder */
 
 				<?php } ?>
-            </script>
+                </script>
 			<?php
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', ob_get_clean());
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', ob_get_clean());
+		    }
 
-		/**
+		    /**
 		 * Get inline script used if bootstrap file browser enqueued.
 		 *
 		 * If this remains small then its best to use this than to add another JS file.
 		 */
-		public function inline_script_file_browser(){
-			ob_start();
-			?>
+		    public function inline_script_file_browser(){
+			    ob_start();
+			    ?>
             <script>
                 // run on doc ready
                 jQuery(document).ready(function () {
@@ -611,129 +611,129 @@ 
                 });
             </script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
-		/**
+		    /**
 		 * Adds the Font Awesome JS.
 		 */
-		public function enqueue_scripts() {
-			if( is_admin() && !$this->is_aui_screen()){
-				// Don't add wp-admin scripts if not requested to.
-			} else {
-				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
-
-				$bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
-
-				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
-
-				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
-
-				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
-				}
-
-				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
-
-				$load_inline = false;
-
-				// Load select2 only when required.
-				if ( $this->force_load_select2() ) {
-					$dependency = array( 'select2', 'jquery' );
-				} else {
-					$dependency = array( 'jquery' );
-				}
-
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
-
-					// If in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
-
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', $dependency );
-					wp_enqueue_script( 'bootstrap-dummy' );
-
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-		}
-
-		/**
+		    public function enqueue_scripts() {
+			    if( is_admin() && !$this->is_aui_screen()){
+				    // Don't add wp-admin scripts if not requested to.
+			    } else {
+				    $js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
+
+				    $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
+
+				    // select2
+				    wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+
+				    // flatpickr
+				    wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
+
+				    // iconpicker
+				    if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+					    wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
+				    }else{
+					    wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+				    }
+
+				    // Bootstrap file browser
+				    wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+				    wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+
+				    $load_inline = false;
+
+				    // Load select2 only when required.
+				    if ( $this->force_load_select2() ) {
+					    $dependency = array( 'select2', 'jquery' );
+				    } else {
+					    $dependency = array( 'jquery' );
+				    }
+
+				    if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+					    // Bootstrap bundle
+					    $url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
+					    wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
+
+					    // If in admin then add to footer for compatibility.
+					    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+
+					    $script = $this->inline_script();
+					    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+				    } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+					    $url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
+					    wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
+					    wp_enqueue_script( 'bootstrap-js-popper' );
+					    $load_inline = true;
+				    } else {
+					    $load_inline = true;
+				    }
+
+				    // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+				    if ( $load_inline ) {
+					    wp_register_script( 'bootstrap-dummy', '', $dependency );
+					    wp_enqueue_script( 'bootstrap-dummy' );
+
+					    $script = $this->inline_script();
+					    wp_add_inline_script( 'bootstrap-dummy', $script );
+				    }
+			    }
+		    }
+
+		    /**
 		 * Enqueue select2 if called.
 		 *
 		 * @since 0.2.29
 		 */
-		public function force_load_select2() {
-			global $aui_select2_enqueued;
+		    public function force_load_select2() {
+			    global $aui_select2_enqueued;
 
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+			    $conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
 
-			if ( $conditional_select2 !== true ) {
-				return true;
-			}
+			    if ( $conditional_select2 !== true ) {
+				    return true;
+			    }
 
-			$load = is_admin() && ! $aui_select2_enqueued;
+			    $load = is_admin() && ! $aui_select2_enqueued;
 
-			return apply_filters( 'aui_force_load_select2', $load );
-		}
+			    return apply_filters( 'aui_force_load_select2', $load );
+		    }
 
-		/**
+		    /**
 		 * Enqueue select2 if called.
 		 *
 		 * @since 0.2.29
 		 */
-		public function enqueue_select2() {
-			wp_enqueue_script( 'select2' );
-		}
+		    public function enqueue_select2() {
+			    wp_enqueue_script( 'select2' );
+		    }
 
-		/**
+		    /**
 		 * Enqueue flatpickr if called.
 		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
-		}
+		    public function enqueue_flatpickr(){
+			    wp_enqueue_style( 'flatpickr' );
+			    wp_enqueue_script( 'flatpickr' );
+		    }
 
-		/**
+		    /**
 		 * Enqueue iconpicker if called.
 		 */
-		public function enqueue_iconpicker(){
-			wp_enqueue_style( 'iconpicker' );
-			wp_enqueue_script( 'iconpicker' );
-		}
+		    public function enqueue_iconpicker(){
+			    wp_enqueue_style( 'iconpicker' );
+			    wp_enqueue_script( 'iconpicker' );
+		    }
 
-        /**
+            /**
          * Get the url path to the current folder.
          *
          * This can be called very early, hence the need for the dynamic way of getting the URL.
@@ -741,198 +741,198 @@ 
          * @since 0.2.31 changed to support edge cases like bitnami containers.
          * @return string
          */
-        public function get_url() {
-            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-            $content_url = untrailingslashit( WP_CONTENT_URL );
+            public function get_url() {
+                $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+                $content_url = untrailingslashit( WP_CONTENT_URL );
 
-            // maybe Replace http:// to https://.
-            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-                $content_url = str_replace( 'http://', 'https://', $content_url );
-            }
+                // maybe Replace http:// to https://.
+                if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                    $content_url = str_replace( 'http://', 'https://', $content_url );
+                }
 
-            // First find where in the path our content directory starts
-            $content_basename = basename($content_dir);
-            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+                // First find where in the path our content directory starts
+                $content_basename = basename($content_dir);
+                $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
 
-            // Find the relative path by matching from content directory name
-            $after_content = substr($file_dir, strpos($file_dir, '/' . $content_basename . '/') + strlen('/' . $content_basename . '/'));
+                // Find the relative path by matching from content directory name
+                $after_content = substr($file_dir, strpos($file_dir, '/' . $content_basename . '/') + strlen('/' . $content_basename . '/'));
 
-            // Build URL using WP_CONTENT_URL and the relative path
-            $url = trailingslashit($content_url) . $after_content;
+                // Build URL using WP_CONTENT_URL and the relative path
+                $url = trailingslashit($content_url) . $after_content;
 
-            // some hosts end up with /wp-content/wp-content/
-            $url = str_replace( '/wp-content/wp-content/', '/wp-content/', $url );
+                // some hosts end up with /wp-content/wp-content/
+                $url = str_replace( '/wp-content/wp-content/', '/wp-content/', $url );
 
-            return trailingslashit($url);
-        }
+                return trailingslashit($url);
+            }
 
-		/**
+		    /**
 		 * Get the url path to the current folder.
 		 * @todo remove
 		 * @return string
 		 */
-		public function get_url_old() {
+		    public function get_url_old() {
 
-			$url = '';
-			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+			    $url = '';
+			    // check if we are inside a plugin
+			    $file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
 
-			// add check in-case user has changed wp-content dir name.
-			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
+			    // add check in-case user has changed wp-content dir name.
+			    $wp_content_folder_name = basename(WP_CONTENT_DIR);
+			    $dir_parts = explode("/$wp_content_folder_name/",$file_dir);
+			    $url_parts = explode("/$wp_content_folder_name/",plugins_url());
 
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
+			    if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+				    $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+			    }
 
-			return $url;
-		}
+			    return $url;
+		    }
 
-		/**
+		    /**
 		 * Register the database settings with WordPress.
 		 */
-		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
-		}
+		    public function register_settings() {
+			    register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+		    }
 
-		/**
+		    /**
 		 * Add the WordPress settings menu item.
 		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
 		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
+		    public function menu_item() {
+			    $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+			    call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+				    $this,
+				    'settings_page'
+			    ) );
+		    }
 
-		/**
+		    /**
 		 * Get a list of themes and their default JS settings.
 		 *
 		 * @return array
 		 */
-		public function theme_js_settings(){
-			return array(
-				'ayetheme' => 'popper',
-				'listimia' => 'required',
-				'listimia_backend' => 'core-popper',
-				//'avada'    => 'required', // removed as we now add compatibility
-			);
-		}
+		    public function theme_js_settings(){
+			    return array(
+				    'ayetheme' => 'popper',
+				    'listimia' => 'required',
+				    'listimia_backend' => 'core-popper',
+				    //'avada'    => 'required', // removed as we now add compatibility
+			    );
+		    }
 
-		/**
+		    /**
          * Get the date the site was installed.
          *
 		 * @return false|string
 		 */
-        public function get_site_install_date() {
-	        global $wpdb; // This gives you access to the WordPress database object
+            public function get_site_install_date() {
+	            global $wpdb; // This gives you access to the WordPress database object
 
-	        // Prepare the SQL query to get the oldest registration date
-	        $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
+	            // Prepare the SQL query to get the oldest registration date
+	            $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
 
-	        // Execute the query
-	        $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+	            // Execute the query
+	            $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 
-	        return $date ? $date : false;
-        }
+	            return $date ? $date : false;
+            }
 
-		/**
+		    /**
 		 * Show admin notice if backend scripts not loaded.
 		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
+		    public function show_admin_version_notice(){
+			    $fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
+			    $button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
+			    $message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
+			    echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+		    }
 
-		/**
+		    /**
 		 * Get the current Font Awesome output settings.
 		 *
 		 * @return array The array of settings.
 		 */
-		public function get_settings() {
-			$db_settings = get_option( 'ayecode-ui-settings' );
-
-			// Maybe show default version notice
-			if ( empty( $db_settings ) ) {
-				$site_install_date = new DateTime( self::get_site_install_date() );
-				$switch_over_date = new DateTime( "2024-02-01" );
-
-				if ( $site_install_date < $switch_over_date ) {
-					add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
-				}
-			}
-
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
-
-			/**
+		    public function get_settings() {
+			    $db_settings = get_option( 'ayecode-ui-settings' );
+
+			    // Maybe show default version notice
+			    if ( empty( $db_settings ) ) {
+				    $site_install_date = new DateTime( self::get_site_install_date() );
+				    $switch_over_date = new DateTime( "2024-02-01" );
+
+				    if ( $site_install_date < $switch_over_date ) {
+					    add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+				    }
+			    }
+
+			    $js_default = 'core-popper';
+			    $js_default_backend = $js_default;
+
+			    // maybe set defaults (if no settings set)
+			    if(empty($db_settings)){
+				    $active_theme = strtolower( get_template() ); // active parent theme.
+				    $theme_js_settings = self::theme_js_settings();
+				    if(isset($theme_js_settings[$active_theme])){
+					    $js_default = $theme_js_settings[$active_theme];
+					    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+				    }
+			    }
+
+			    /**
 			 * Filter the default settings.
 			 */
-			$defaults = apply_filters( 'ayecode-ui-default-settings', array(
-				'css'            => 'compatibility', // core, compatibility
-				'js'             => $js_default, // js to load, core-popper, popper
-				'html_font_size' => '16', // js to load, core-popper, popper
-				'css_backend'    => 'compatibility', // core, compatibility
-				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
-				'disable_admin'  => '', // URL snippets to disable loading on admin
-                'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
+			    $defaults = apply_filters( 'ayecode-ui-default-settings', array(
+				    'css'            => 'compatibility', // core, compatibility
+				    'js'             => $js_default, // js to load, core-popper, popper
+				    'html_font_size' => '16', // js to load, core-popper, popper
+				    'css_backend'    => 'compatibility', // core, compatibility
+				    'js_backend'     => $js_default_backend, // js to load, core-popper, popper
+				    'disable_admin'  => '', // URL snippets to disable loading on admin
+                    'bs_ver'         => '5', // The default bootstrap version to sue by default
+			    ), $db_settings );
+
+			    $settings = wp_parse_args( $db_settings, $defaults );
+
+			    /**
 			 * Filter the Bootstrap settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
+			    return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+		    }
 
 
-		/**
+		    /**
 		 * The settings page html output.
 		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
-            $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
+		    public function settings_page() {
+			    if ( ! current_user_can( 'manage_options' ) ) {
+				    wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			    }
+                $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
 
-			?>
+			    ?>
             <div class="wrap">
                 <h1><?php echo esc_attr( $this->name ); ?></h1>
                 <p><?php echo esc_html( apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) ) );?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+					    settings_fields( 'ayecode-ui-settings' );
+					    do_settings_sections( 'ayecode-ui-settings' );
+					    ?>
 
                     <h2><?php esc_html_e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
                     <p><?php echo esc_html( apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) ) );?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
-		                echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			                'type'=> 'info',
-			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
-		                ));
-	                }
-	                ?>
+	                    if ( ! empty( $overrides ) ) {
+		                    echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			                    'type'=> 'info',
+			                    'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+		                    ));
+	                    }
+	                    ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
@@ -1016,77 +1016,77 @@ 
                     </table>
 
 					<?php
-					submit_button();
-					?>
+					    submit_button();
+					    ?>
                 </form>
                 <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo esc_html( $this->version ); ?></div>
             </div>
 			<?php
-		}
-
-        public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-	        // Find source plugin/theme of SD
-	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-		        }
-	        }
-
-            return isset($source[0]) ? esc_attr($source[0]) : '';
-        }
-
-		public function customizer_settings($wp_customize){
-			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
-				'priority' => 120,
-			));
-
-			//  =============================
-			//  = Color Picker              =
-			//  =============================
-			$wp_customize->add_setting('aui_options[color_primary]', array(
-				'default'           => AUI_PRIMARY_COLOR,
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_primary]',
-			)));
-
-			$wp_customize->add_setting('aui_options[color_secondary]', array(
-				'default'           => '#6c757d',
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_secondary]',
-			)));
-		}
-
-		/**
+		    }
+
+            public function get_load_source(){
+	            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+	            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+	            // Find source plugin/theme of SD
+	            $source = array();
+	            if ( strpos( $file, $plugins_dir ) !== false ) {
+		            $source = explode( "/", plugin_basename( $file ) );
+	            } else if ( function_exists( 'get_theme_root' ) ) {
+		            $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+		            if ( strpos( $file, $themes_dir ) !== false ) {
+			            $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+		            }
+	            }
+
+                return isset($source[0]) ? esc_attr($source[0]) : '';
+            }
+
+		    public function customizer_settings($wp_customize){
+			    $wp_customize->add_section('aui_settings', array(
+				    'title'    => __('AyeCode UI', 'ayecode-connect' ),
+				    'priority' => 120,
+			    ));
+
+			    //  =============================
+			    //  = Color Picker              =
+			    //  =============================
+			    $wp_customize->add_setting('aui_options[color_primary]', array(
+				    'default'           => AUI_PRIMARY_COLOR,
+				    'sanitize_callback' => 'sanitize_hex_color',
+				    'capability'        => 'edit_theme_options',
+				    'type'              => 'option',
+				    'transport'         => 'refresh',
+			    ));
+			    $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+				    'label'    => __('Primary Color', 'ayecode-connect' ),
+				    'section'  => 'aui_settings',
+				    'settings' => 'aui_options[color_primary]',
+			    )));
+
+			    $wp_customize->add_setting('aui_options[color_secondary]', array(
+				    'default'           => '#6c757d',
+				    'sanitize_callback' => 'sanitize_hex_color',
+				    'capability'        => 'edit_theme_options',
+				    'type'              => 'option',
+				    'transport'         => 'refresh',
+			    ));
+			    $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+				    'label'    => __('Secondary Color', 'ayecode-connect' ),
+				    'section'  => 'aui_settings',
+				    'settings' => 'aui_options[color_secondary]',
+			    )));
+		    }
+
+		    /**
 		 * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
 		 *
 		 * @return mixed
 		 */
-		public static function bs3_compat_css() {
-			ob_start();
-			?>
+		    public static function bs3_compat_css() {
+			    ob_start();
+			    ?>
             <style>
                 /* Bootstrap 3 compatibility */
                 body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1103,7 +1103,7 @@ 
                 /* KLEO theme specific */
                 .kleo-main-header .navbar-collapse.collapse.show:not(.in){display: block !important;}
                 <?php } ?>
-
+    
                 <?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
                 /* With Avada builder */
                 body.modal-open .modal.in  {opacity:1;z-index: 99999}
@@ -1113,254 +1113,254 @@ 
                 .bsui .collapse.in.row:not(.show){display: none;}
 
                 <?php } ?>
-            </style>
+                </style>
 			<?php
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
-
-		public static function custom_css( $compatibility = true, $is_fse = false ) {
-			global $aui_bs5;
-
-			$colors = array();
-
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-				$setting = wp_get_global_settings();
-
-				if ( ! empty( $setting['color']['palette']['theme'] ) ) {
-					foreach ( $setting['color']['palette']['theme'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
-
-				if ( ! empty( $setting['color']['palette']['custom'] ) ) {
-					foreach ( $setting['color']['palette']['custom'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
-			} else {
-				$settings = get_option( 'aui_options' );
-
-				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
-				);
-			}
-
-			ob_start();
-			?><style><?php
-			// BS v3 compat
-			if( self::is_bs3_compat() ){
-				echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			//$is_fse = false;
-			//if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-				//$is_fse = true;
-			//}
-
-			$custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
-			$custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
-            $bs_custom_css = apply_filters( 'ayecode_ui_bs_custom_css', $custom_admin || $custom_front );
-			//$bs_custom_css = true; // Force true to fix any color issue.
-
-			$colors_css = '';
-			if ( ! empty( $colors ) && $bs_custom_css ) {
-				$d_colors = self::get_colors(true);
-
-				foreach ( $colors as $key => $color ) {
-					if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
-						$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
-						$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
-
-						$colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
-					}
-				}
-			}
-
-			if ( $colors_css ) {
-				echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			// Set admin bar z-index lower when modal is open.
-			echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
-
-			if ( is_admin() ) {
-				echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
-			}
-
-			$custom_css = '';
-
-			if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
-				$css = '';
-				$theme_settings = wp_get_global_styles();
-
-				// Font face
-				if( !empty( $theme_settings['typography']['fontFamily'] ) ){
-					$t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
-					$css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
-				}
-
-				// font size
-				if( !empty( $theme_settings['typography']['fontSize'] ) ){
-					$css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
-				}
-
-				// line height
-				 if( !empty( $theme_settings['typography']['lineHeight'] ) ){
-					$css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
-				}
-
-
-				   // font weight
-				 if( !empty( $theme_settings['typography']['fontWeight'] ) ){
-					$css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
-				}
-
-				// Background
-				 if( !empty( $theme_settings['color']['background'] ) ){
-					$css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
-				}
-
-				 // Background Gradient
-				 if( !empty( $theme_settings['color']['gradient'] ) ){
-					$css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
-				}
-
-				   // Background Gradient
-				 if( !empty( $theme_settings['color']['gradient'] ) ){
-					$css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
-				}
-
-				// text color
-				if( !empty( $theme_settings['color']['text'] ) ){
-					$css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
-				}
-
-
-				// link colors
-				if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
-					$css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
-				}
-				if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
-					$css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
-				}
-
-				if($css){
-					$custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
-				}
-
-				$bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
-
-				// Headings
-				$headings_css = '';
-				if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
-					$headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
-				}
-
-				// heading background
-				if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
-					$headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
-				}
-
-				 // heading font family
-				if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
-					$headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
-				}
-
-				if( $headings_css ){
-					$custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
-				}
-
-				$hs = array('h1','h2','h3','h4','h5','h6');
-
-				foreach($hs as $hn){
-					$h_css = '';
-					 if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
-						$h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
-					 }
-
-					  if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
-						$h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
-					 }
-
-					  if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
-						$h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
-					 }
-
-					 if($h_css){
-						$custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
-					 }
-				}
-			}
+			    return str_replace( array(
+				    '<style>',
+				    '</style>'
+			    ), '', self::minify_css( ob_get_clean() ) );
+		    }
+
+		    public static function custom_css( $compatibility = true, $is_fse = false ) {
+			    global $aui_bs5;
+
+			    $colors = array();
+
+			    if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+				    $setting = wp_get_global_settings();
+
+				    if ( ! empty( $setting['color']['palette']['theme'] ) ) {
+					    foreach ( $setting['color']['palette']['theme'] as $color ) {
+						    $colors[$color['slug']] = esc_attr( $color['color'] );
+					    }
+				    }
+
+				    if ( ! empty( $setting['color']['palette']['custom'] ) ) {
+					    foreach ( $setting['color']['palette']['custom'] as $color ) {
+						    $colors[$color['slug']] = esc_attr( $color['color'] );
+					    }
+				    }
+			    } else {
+				    $settings = get_option( 'aui_options' );
+
+				    $colors = array(
+					    'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+					    'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+				    );
+			    }
+
+			    ob_start();
+			    ?><style><?php
+			    // BS v3 compat
+			    if( self::is_bs3_compat() ){
+				    echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    }
+
+			    //$is_fse = false;
+			    //if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+				    //$is_fse = true;
+			    //}
+
+			    $custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
+			    $custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
+                $bs_custom_css = apply_filters( 'ayecode_ui_bs_custom_css', $custom_admin || $custom_front );
+			    //$bs_custom_css = true; // Force true to fix any color issue.
+
+			    $colors_css = '';
+			    if ( ! empty( $colors ) && $bs_custom_css ) {
+				    $d_colors = self::get_colors(true);
+
+				    foreach ( $colors as $key => $color ) {
+					    if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
+						    $var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
+						    $compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
+
+						    $colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
+					    }
+				    }
+			    }
+
+			    if ( $colors_css ) {
+				    echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    }
+
+			    // Set admin bar z-index lower when modal is open.
+			    echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
+
+			    if ( is_admin() ) {
+				    echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
+			    }
+
+			    $custom_css = '';
+
+			    if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
+				    $css = '';
+				    $theme_settings = wp_get_global_styles();
+
+				    // Font face
+				    if( !empty( $theme_settings['typography']['fontFamily'] ) ){
+					    $t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
+					    $css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
+				    }
+
+				    // font size
+				    if( !empty( $theme_settings['typography']['fontSize'] ) ){
+					    $css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
+				    }
+
+				    // line height
+				     if( !empty( $theme_settings['typography']['lineHeight'] ) ){
+					    $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
+				    }
+
+
+				       // font weight
+				     if( !empty( $theme_settings['typography']['fontWeight'] ) ){
+					    $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
+				    }
+
+				    // Background
+				     if( !empty( $theme_settings['color']['background'] ) ){
+					    $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
+				    }
+
+				     // Background Gradient
+				     if( !empty( $theme_settings['color']['gradient'] ) ){
+					    $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+				    }
+
+				       // Background Gradient
+				     if( !empty( $theme_settings['color']['gradient'] ) ){
+					    $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+				    }
+
+				    // text color
+				    if( !empty( $theme_settings['color']['text'] ) ){
+					    $css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
+				    }
+
+
+				    // link colors
+				    if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
+					    $css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
+				    }
+				    if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
+					    $css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
+				    }
+
+				    if($css){
+					    $custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
+				    }
+
+				    $bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
+
+				    // Headings
+				    $headings_css = '';
+				    if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
+					    $headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
+				    }
+
+				    // heading background
+				    if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
+					    $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
+				    }
+
+				     // heading font family
+				    if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
+					    $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
+				    }
+
+				    if( $headings_css ){
+					    $custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
+				    }
+
+				    $hs = array('h1','h2','h3','h4','h5','h6');
+
+				    foreach($hs as $hn){
+					    $h_css = '';
+					     if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
+						    $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
+					     }
+
+					      if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
+						    $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
+					     }
+
+					      if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
+						    $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
+					     }
+
+					     if($h_css){
+						    $custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
+					     }
+				    }
+			    }
 			
-			if ( $custom_css ) {
-				echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			// Pagination on Hello Elementor theme.
-			if ( function_exists( 'hello_elementor_setup' ) ) {
-				echo '.aui-nav-links .pagination{justify-content:inherit}';
-			}
-
-            // Astra theme - when woocommerce active they add compatibility CSS which breaks select2 in modals
-            if( defined('ASTRA_THEME_VERSION')){
-                echo '.woocommerce-js.modal-open .select2-container .select2-dropdown, .woocommerce-js.modal-open .select2-container .select2-search__field, .woocommerce-page.modal-open .select2-container .select2-dropdown, .woocommerce-page.modal-open .select2-container .select2-search__field{z-index: 1056;}';
-            }
+			    if ( $custom_css ) {
+				    echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    }
+
+			    // Pagination on Hello Elementor theme.
+			    if ( function_exists( 'hello_elementor_setup' ) ) {
+				    echo '.aui-nav-links .pagination{justify-content:inherit}';
+			    }
+
+                // Astra theme - when woocommerce active they add compatibility CSS which breaks select2 in modals
+                if( defined('ASTRA_THEME_VERSION')){
+                    echo '.woocommerce-js.modal-open .select2-container .select2-dropdown, .woocommerce-js.modal-open .select2-container .select2-search__field, .woocommerce-page.modal-open .select2-container .select2-dropdown, .woocommerce-page.modal-open .select2-container .select2-search__field{z-index: 1056;}';
+                }
 
-			?></style><?php
-			$custom_css = ob_get_clean();
+			    ?></style><?php
+			    $custom_css = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( $custom_css ) );
-		}
+			    return str_replace( array(
+				    '<style>',
+				    '</style>'
+			    ), '', self::minify_css( $custom_css ) );
+		    }
 
-		/**
+		    /**
 		 * Check if we should add booststrap 3 compatibility changes.
 		 *
 		 * @return bool
 		 */
-		public static function is_bs3_compat(){
-			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
-		}
+		    public static function is_bs3_compat(){
+			    return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+		    }
 
-		public static function hex_to_rgb( $hex ) {
-			// Remove '#' if present
-			$hex = str_replace( '#', '', $hex );
+		    public static function hex_to_rgb( $hex ) {
+			    // Remove '#' if present
+			    $hex = str_replace( '#', '', $hex );
 
-			// Check if input is RGB
-			if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
-				$_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
+			    // Check if input is RGB
+			    if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
+				    $_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
 
-				$rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
+				    $rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
+				    $rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
+				    $rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
 
-				return $rgb;
-			}
+				    return $rgb;
+			    }
 
-			// Convert 3-digit hex to 6-digit hex
-			if ( strlen( $hex ) == 3 ) {
-				$hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
-			}
+			    // Convert 3-digit hex to 6-digit hex
+			    if ( strlen( $hex ) == 3 ) {
+				    $hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
+			    }
 
-			// Convert hex to RGB
-			$r = hexdec( substr( $hex, 0, 2 ) );
-			$g = hexdec( substr( $hex, 2, 2 ) );
-			$b = hexdec( substr( $hex, 4, 2 ) );
+			    // Convert hex to RGB
+			    $r = hexdec( substr( $hex, 0, 2 ) );
+			    $g = hexdec( substr( $hex, 2, 2 ) );
+			    $b = hexdec( substr( $hex, 4, 2 ) );
 
-			// Return RGB values as an array
-			return $r . ',' . $g . ',' . $b;
-		}
+			    // Return RGB values as an array
+			    return $r . ',' . $g . ',' . $b;
+		    }
 
-		/**
+		    /**
 		 * Build the CSS to overwrite a bootstrap color variable.
 		 *
 		 * @param $type
@@ -1369,120 +1369,120 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
-			global $aui_bs5;
+		    public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+			    global $aui_bs5;
 
-			$is_var = false;
-			$is_custom = strpos($type, 'custom-') !== false ? true : false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
-//				$color_code = "rgba($color_code, 0.5)";
-//                echo '###1'.$color_code.'###';//exit;
-			}
+			    $is_var = false;
+			    $is_custom = strpos($type, 'custom-') !== false ? true : false;
+			    if(!$color_code){return '';}
+			    if(strpos($color_code, 'var') !== false){
+				    //if(!sanitize_hex_color($color_code)){
+				    $color_code = esc_attr($color_code);
+				    $is_var = true;
+    //				$color_code = "rgba($color_code, 0.5)";
+    //                echo '###1'.$color_code.'###';//exit;
+			    }
 
-//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+    //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			    if(!$color_code){return '';}
 
-			$rgb = self::hex_to_rgb($hex);
+			    $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+			    if($compatibility===true || $compatibility===1){
+				    $compatibility = '.bsui';
+			    }elseif(!$compatibility){
+				    $compatibility = '';
+			    }else{
+				    $compatibility = esc_attr($compatibility);
+			    }
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+			    $prefix = $compatibility ? $compatibility . " " : "";
 
 
-            $output = '';
+                $output = '';
 
-//            echo '####'.$color_code;exit;
+    //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
+			    $type = sanitize_html_class($type);
 
-			/**
+			    /**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-					);
-			}
-
-
-
-            // link
-			if ( $type === 'primary' ) {
-				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
-				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
-				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
-
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
-
-                // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
-
-                // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
-
-			}
-
-			$output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
-
-			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
-			$output .= ' 
+			    $selectors = array(
+				    ".btn-{$type}"                                              => array( 'b', 'o' ),
+				    ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+				    ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+				    ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+				    ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+				    ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+				    ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+				    ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+				    ".badge-{$type}"                                            => array( 'b' ),
+				    ".alert-{$type}"                                            => array( 'b', 'o' ),
+				    ".bg-{$type}"                                               => array( 'b', 'f' ),
+				    ".btn-link.btn-{$type}"                                     => array( 'c' ),
+				    ".text-{$type}"                                     => array( 'c' ),
+			    );
+
+			    if ( $aui_bs5 ) {
+				    unset($selectors[".alert-{$type}" ]);
+			    }
+
+			    if ( $type == 'primary' ) {
+				    $selectors = $selectors + array(
+						    'a'                                                                                                    => array( 'c' ),
+						    '.btn-link'                                                                                            => array( 'c' ),
+						    '.dropdown-item.active'                                                                                => array( 'b' ),
+						    '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+							    'b',
+							    'o'
+						    ),
+						    '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+							    'b',
+							    'o'
+						    ),
+						    '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+						    '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+						    '.page-link'                                                                                           => array( 'c' ),
+						    '.page-item.active .page-link'                                                                         => array(
+							    'b',
+							    'o'
+						    ),
+						    '.progress-bar'                                                                                        => array( 'b' ),
+						    '.list-group-item.active'                                                                              => array(
+							    'b',
+							    'o'
+						    ),
+						    '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+					    );
+			    }
+
+
+
+                // link
+			    if ( $type === 'primary' ) {
+				    $output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
+				    $output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
+				    $output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
+
+				    $output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
+				    $output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+
+                    // dropdown
+				    $output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+
+                    // pagination
+				    $output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+
+			    }
+
+			    $output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
+			    $output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+
+			    //  buttons
+			    $output .= $prefix . ' .btn-'.esc_attr($type).'{';
+			    $output .= ' 
             --bs-btn-bg: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1494,17 +1494,17 @@ 
             --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
             --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
             ';
-//			$output .= '
-//		    --bs-btn-color: #fff;
-//			--bs-btn-hover-color: #fff;
-//			--bs-btn-active-color: #fff;
-//			--bs-btn-disabled-color: #fff;
-//            ';
-			$output .= '}';
-
-			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
-			$output .= ' 
+    //			$output .= '
+    //		    --bs-btn-color: #fff;
+    //			--bs-btn-hover-color: #fff;
+    //			--bs-btn-active-color: #fff;
+    //			--bs-btn-disabled-color: #fff;
+    //            ';
+			    $output .= '}';
+
+			    //  buttons outline
+			    $output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+			    $output .= ' 
 			--bs-btn-color: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1516,140 +1516,140 @@ 
             --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
             --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
             ';
-//			$output .= '
-//		    --bs-btn-color: #fff;
-//			--bs-btn-hover-color: #fff;
-//			--bs-btn-active-color: #fff;
-//			--bs-btn-disabled-color: #fff;
-//            ';
-			$output .= '}';
-
-
-            // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
-			$output .= ' 
+    //			$output .= '
+    //		    --bs-btn-color: #fff;
+    //			--bs-btn-hover-color: #fff;
+    //			--bs-btn-active-color: #fff;
+    //			--bs-btn-disabled-color: #fff;
+    //            ';
+			    $output .= '}';
+
+
+                // button hover
+			    $output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
+			    $output .= ' 
             box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
             }
             ';
 
 
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
-
-
-			if ( $is_custom ) {
-
-//				echo '###'.$type;exit;
-
-				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
-				}
-
-//				// build rules into each type
-//				foreach($important_selectors as $selector => $types){
-//					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-//					$types = array_combine($types,$types);
-//					if(isset($types['c'])){$color_i[] = $selector;}
-//					if(isset($types['b'])){$background_i[] = $selector;}
-//					if(isset($types['o'])){$border_i[] = $selector;}
-//					if(isset($types['f'])){$fill_i[] = $selector;}
-//				}
-
-				// add any color rules
-				if(!empty($color)){
-					$output .= implode(",",$color) . "{color: $color_code;} ";
-				}
-				if(!empty($color_i)){
-					$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-				}
-
-				// add any background color rules
-				if(!empty($background)){
-					$output .= implode(",",$background) . "{background-color: $color_code;} ";
-				}
-				if(!empty($background_i)){
-					$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
-//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-				}
-
-				// add any border color rules
-				if(!empty($border)){
-					$output .= implode(",",$border) . "{border-color: $color_code;} ";
-				}
-				if(!empty($border_i)){
-					$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-				}
-
-				// add any fill color rules
-				if(!empty($fill)){
-					$output .= implode(",",$fill) . "{fill: $color_code;} ";
-				}
-				if(!empty($fill_i)){
-					$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-				}
-
-			}
-
-
-
-
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
-
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled):focus {box-shadow: 0 0.25rem 0.25rem 0.125rem rgba(var(--bs-{$type}-rgb), 0.1), 0 0.375rem 0.75rem -0.125rem rgba(var(--bs-{$type}-rgb), 0.4);} ";
-
-			// text
-//			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
-
-
-//			if ( $type == 'primary' ) {
-//				// dropdown's
-//				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-//
-//				// input states
-//				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
-//
-//				// page link
-//				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-//			}
-
-			// alerts
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
+			    if ( $aui_bs5 ) {
+    //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
+				    $output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
+				    $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+			    }
+
+
+			    if ( $is_custom ) {
+
+    //				echo '###'.$type;exit;
+
+				    // build rules into each type
+				    foreach($selectors as $selector => $types){
+					    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+					    $types = array_combine($types,$types);
+					    if(isset($types['c'])){$color[] = $selector;}
+					    if(isset($types['b'])){$background[] = $selector;}
+					    if(isset($types['o'])){$border[] = $selector;}
+					    if(isset($types['f'])){$fill[] = $selector;}
+				    }
+
+    //				// build rules into each type
+    //				foreach($important_selectors as $selector => $types){
+    //					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
+    //					$types = array_combine($types,$types);
+    //					if(isset($types['c'])){$color_i[] = $selector;}
+    //					if(isset($types['b'])){$background_i[] = $selector;}
+    //					if(isset($types['o'])){$border_i[] = $selector;}
+    //					if(isset($types['f'])){$fill_i[] = $selector;}
+    //				}
+
+				    // add any color rules
+				    if(!empty($color)){
+					    $output .= implode(",",$color) . "{color: $color_code;} ";
+				    }
+				    if(!empty($color_i)){
+					    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+				    }
+
+				    // add any background color rules
+				    if(!empty($background)){
+					    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+				    }
+				    if(!empty($background_i)){
+					    $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+    //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
+				    }
+
+				    // add any border color rules
+				    if(!empty($border)){
+					    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+				    }
+				    if(!empty($border_i)){
+					    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+				    }
+
+				    // add any fill color rules
+				    if(!empty($fill)){
+					    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+				    }
+				    if(!empty($fill_i)){
+					    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+				    }
+
+			    }
+
+
+
+
+			    $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+			    // darken
+			    $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+			    $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+			    $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+			    $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+
+			    // lighten
+			    $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+
+			    // opacity see https://css-tricks.com/8-digit-hex-codes/
+			    $op_25 = $color_code."40"; // 25% opacity
+
+
+			    // button states
+			    $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+			    $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+    //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
+			    $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			    $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+                $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+                $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled):focus {box-shadow: 0 0.25rem 0.25rem 0.125rem rgba(var(--bs-{$type}-rgb), 0.1), 0 0.375rem 0.75rem -0.125rem rgba(var(--bs-{$type}-rgb), 0.4);} ";
+
+			    // text
+    //			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
+
+
+    //			if ( $type == 'primary' ) {
+    //				// dropdown's
+    //				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+    //
+    //				// input states
+    //				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+    //
+    //				// page link
+    //				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+    //			}
+
+			    // alerts
+			    if ( $aui_bs5 ) {
+    //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
+				    $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+			    }
+
+			    return $output;
+		    }
+
+		    /**
 		 * Build the CSS to overwrite a bootstrap color variable.
 		 *
 		 * @param $type
@@ -1658,214 +1658,214 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
-            global $aui_bs5;
+		    public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+                global $aui_bs5;
 
-			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
-//				$color_code = "rgba($color_code, 0.5)";
-//                echo '###1'.$color_code.'###';//exit;
-			}
+			    $is_var = false;
+			    if(!$color_code){return '';}
+			    if(strpos($color_code, 'var') !== false){
+				    //if(!sanitize_hex_color($color_code)){
+				    $color_code = esc_attr($color_code);
+				    $is_var = true;
+    //				$color_code = "rgba($color_code, 0.5)";
+    //                echo '###1'.$color_code.'###';//exit;
+			    }
 
-//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+    //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			    if(!$color_code){return '';}
 
-            $rgb = self::hex_to_rgb($hex);
+                $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+			    if($compatibility===true || $compatibility===1){
+				    $compatibility = '.bsui';
+			    }elseif(!$compatibility){
+				    $compatibility = '';
+			    }else{
+				    $compatibility = esc_attr($compatibility);
+			    }
 
 
 
-//            echo '####'.$color_code;exit;
+    //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
+			    $type = sanitize_html_class($type);
 
-			/**
+			    /**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-                unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-//				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
-//				    '.custom-range::-moz-range-thumb' => array('b'),
-//				    '.custom-range::-ms-thumb' => array('b'),
-					);
-			}
-
-			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
-				".border-{$type}" => array('o'),
-				".text-{$type}" => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
-//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? $compatibility . " " : "";
-
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
-
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			if ( $type == 'primary' ) {
-				// dropdown's
-				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-				// input states
-				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-				// page link
-				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			}
-
-            // alerts
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
+			    $selectors = array(
+				    ".btn-{$type}"                                              => array( 'b', 'o' ),
+				    ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+				    ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+				    ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+				    ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+				    ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+				    ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+				    ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+				    ".badge-{$type}"                                            => array( 'b' ),
+				    ".alert-{$type}"                                            => array( 'b', 'o' ),
+				    ".bg-{$type}"                                               => array( 'b', 'f' ),
+				    ".btn-link.btn-{$type}"                                     => array( 'c' ),
+			    );
+
+			    if ( $aui_bs5 ) {
+                    unset($selectors[".alert-{$type}" ]);
+			    }
+
+			    if ( $type == 'primary' ) {
+				    $selectors = $selectors + array(
+						    'a'                                                                                                    => array( 'c' ),
+						    '.btn-link'                                                                                            => array( 'c' ),
+						    '.dropdown-item.active'                                                                                => array( 'b' ),
+						    '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+							    'b',
+							    'o'
+						    ),
+						    '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+							    'b',
+							    'o'
+						    ),
+						    '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+						    '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+						    '.page-link'                                                                                           => array( 'c' ),
+						    '.page-item.active .page-link'                                                                         => array(
+							    'b',
+							    'o'
+						    ),
+						    '.progress-bar'                                                                                        => array( 'b' ),
+						    '.list-group-item.active'                                                                              => array(
+							    'b',
+							    'o'
+						    ),
+						    '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+    //				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
+    //				    '.custom-range::-moz-range-thumb' => array('b'),
+    //				    '.custom-range::-ms-thumb' => array('b'),
+					    );
+			    }
+
+			    $important_selectors = array(
+				    ".bg-{$type}" => array('b','f'),
+				    ".border-{$type}" => array('o'),
+				    ".text-{$type}" => array('c'),
+			    );
+
+			    $color = array();
+			    $color_i = array();
+			    $background = array();
+			    $background_i = array();
+			    $border = array();
+			    $border_i = array();
+			    $fill = array();
+			    $fill_i = array();
+
+			    $output = '';
+
+			    if ( $aui_bs5 ) {
+    //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
+				    $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+			    }
+
+			    // build rules into each type
+			    foreach($selectors as $selector => $types){
+				    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color[] = $selector;}
+				    if(isset($types['b'])){$background[] = $selector;}
+				    if(isset($types['o'])){$border[] = $selector;}
+				    if(isset($types['f'])){$fill[] = $selector;}
+			    }
+
+			    // build rules into each type
+			    foreach($important_selectors as $selector => $types){
+				    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color_i[] = $selector;}
+				    if(isset($types['b'])){$background_i[] = $selector;}
+				    if(isset($types['o'])){$border_i[] = $selector;}
+				    if(isset($types['f'])){$fill_i[] = $selector;}
+			    }
+
+			    // add any color rules
+			    if(!empty($color)){
+				    $output .= implode(",",$color) . "{color: $color_code;} ";
+			    }
+			    if(!empty($color_i)){
+				    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			    }
+
+			    // add any background color rules
+			    if(!empty($background)){
+				    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+			    }
+			    if(!empty($background_i)){
+				    $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+    //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
+			    }
+
+			    // add any border color rules
+			    if(!empty($border)){
+				    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+			    }
+			    if(!empty($border_i)){
+				    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			    }
+
+			    // add any fill color rules
+			    if(!empty($fill)){
+				    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+			    }
+			    if(!empty($fill_i)){
+				    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			    }
+
+
+			    $prefix = $compatibility ? $compatibility . " " : "";
+
+			    $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+			    // darken
+			    $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+			    $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+			    $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+			    $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+
+			    // lighten
+			    $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+
+			    // opacity see https://css-tricks.com/8-digit-hex-codes/
+			    $op_25 = $color_code."40"; // 25% opacity
+
+
+			    // button states
+			    $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+			    $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+    //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
+			    $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			    $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+			    $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+			    if ( $type == 'primary' ) {
+				    // dropdown's
+				    $output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+
+				    // input states
+				    $output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+				    // page link
+				    $output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			    }
+
+                // alerts
+			    if ( $aui_bs5 ) {
+    //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
+				    $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+			    }
+
+			    return $output;
+		    }
+
+		    /**
 		 *
 		 * @deprecated 0.1.76 Use css_overwrite()
 		 *
@@ -1875,151 +1875,151 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_primary($color_code,$compatibility, $use_variable = false){
+		    public static function css_primary($color_code,$compatibility, $use_variable = false){
 
-			if(!$use_variable){
-				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
-			}
+			    if(!$use_variable){
+				    $color_code = sanitize_hex_color($color_code);
+				    if(!$color_code){return '';}
+			    }
 
-			/**
+			    /**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
-			$selectors = array(
-				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
-				'.btn-link' => array('c'),
-				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
-//				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
-//				'.custom-range::-moz-range-thumb' => array('b'),
-//				'.custom-range::-ms-thumb' => array('b'),
-				'.nav-pills .nav-link.active' => array('b'),
-				'.nav-pills .show>.nav-link' => array('b'),
-				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
-				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
-				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
-				'.btn-link.btn-primary' => array('c'),
-				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
-			);
-
-			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
-				'.border-primary' => array('o'),
-				'.text-primary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-
-			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			return $output;
-		}
-
-		/**
+			    $selectors = array(
+				    'a' => array('c'),
+				    '.btn-primary' => array('b','o'),
+				    '.btn-primary.disabled' => array('b','o'),
+				    '.btn-primary:disabled' => array('b','o'),
+				    '.btn-outline-primary' => array('c','o'),
+				    '.btn-outline-primary:hover' => array('b','o'),
+				    '.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
+				    '.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
+				    '.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+				    '.btn-link' => array('c'),
+				    '.dropdown-item.active' => array('b'),
+				    '.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
+				    '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+    //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
+    //				'.custom-range::-moz-range-thumb' => array('b'),
+    //				'.custom-range::-ms-thumb' => array('b'),
+				    '.nav-pills .nav-link.active' => array('b'),
+				    '.nav-pills .show>.nav-link' => array('b'),
+				    '.page-link' => array('c'),
+				    '.page-item.active .page-link' => array('b','o'),
+				    '.badge-primary' => array('b'),
+				    '.alert-primary' => array('b','o'),
+				    '.progress-bar' => array('b'),
+				    '.list-group-item.active' => array('b','o'),
+				    '.bg-primary' => array('b','f'),
+				    '.btn-link.btn-primary' => array('c'),
+				    '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
+			    );
+
+			    $important_selectors = array(
+				    '.bg-primary' => array('b','f'),
+				    '.border-primary' => array('o'),
+				    '.text-primary' => array('c'),
+			    );
+
+			    $color = array();
+			    $color_i = array();
+			    $background = array();
+			    $background_i = array();
+			    $border = array();
+			    $border_i = array();
+			    $fill = array();
+			    $fill_i = array();
+
+			    $output = '';
+
+			    // build rules into each type
+			    foreach($selectors as $selector => $types){
+				    $selector = $compatibility ? ".bsui ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color[] = $selector;}
+				    if(isset($types['b'])){$background[] = $selector;}
+				    if(isset($types['o'])){$border[] = $selector;}
+				    if(isset($types['f'])){$fill[] = $selector;}
+			    }
+
+			    // build rules into each type
+			    foreach($important_selectors as $selector => $types){
+				    $selector = $compatibility ? ".bsui ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color_i[] = $selector;}
+				    if(isset($types['b'])){$background_i[] = $selector;}
+				    if(isset($types['o'])){$border_i[] = $selector;}
+				    if(isset($types['f'])){$fill_i[] = $selector;}
+			    }
+
+			    // add any color rules
+			    if(!empty($color)){
+				    $output .= implode(",",$color) . "{color: $color_code;} ";
+			    }
+			    if(!empty($color_i)){
+				    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			    }
+
+			    // add any background color rules
+			    if(!empty($background)){
+				    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+			    }
+			    if(!empty($background_i)){
+				    $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			    }
+
+			    // add any border color rules
+			    if(!empty($border)){
+				    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+			    }
+			    if(!empty($border_i)){
+				    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			    }
+
+			    // add any fill color rules
+			    if(!empty($fill)){
+				    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+			    }
+			    if(!empty($fill_i)){
+				    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			    }
+
+
+			    $prefix = $compatibility ? ".bsui " : "";
+
+			    // darken
+			    $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+			    $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+			    $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+			    // lighten
+			    $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+			    // opacity see https://css-tricks.com/8-digit-hex-codes/
+			    $op_25 = $color_code."40"; // 25% opacity
+
+
+			    // button states
+			    $output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+			    $output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			    $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+			    $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+			    // dropdown's
+			    $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+
+
+			    // input states
+			    $output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+			    // page link
+			    $output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+			    return $output;
+		    }
+
+		    /**
 		 *
 		 * @deprecated 0.1.76 Use css_overwrite()
 		 *
@@ -2028,123 +2028,123 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_secondary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
+		    public static function css_secondary($color_code,$compatibility){;
+			    $color_code = sanitize_hex_color($color_code);
+			    if(!$color_code){return '';}
+			    /**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
-			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
-				'.btn-outline-secondary.disabled' => array('c'),
-				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
-				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
-				'.btn-link.btn-secondary' => array('c'),
-			);
-
-			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
-				'.border-secondary' => array('o'),
-				'.text-secondary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			return $output;
-		}
-
-		/**
+			    $selectors = array(
+				    '.btn-secondary' => array('b','o'),
+				    '.btn-secondary.disabled' => array('b','o'),
+				    '.btn-secondary:disabled' => array('b','o'),
+				    '.btn-outline-secondary' => array('c','o'),
+				    '.btn-outline-secondary:hover' => array('b','o'),
+				    '.btn-outline-secondary.disabled' => array('c'),
+				    '.btn-outline-secondary:disabled' => array('c'),
+				    '.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
+				    '.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
+				    '.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+				    '.badge-secondary' => array('b'),
+				    '.alert-secondary' => array('b','o'),
+				    '.btn-link.btn-secondary' => array('c'),
+			    );
+
+			    $important_selectors = array(
+				    '.bg-secondary' => array('b','f'),
+				    '.border-secondary' => array('o'),
+				    '.text-secondary' => array('c'),
+			    );
+
+			    $color = array();
+			    $color_i = array();
+			    $background = array();
+			    $background_i = array();
+			    $border = array();
+			    $border_i = array();
+			    $fill = array();
+			    $fill_i = array();
+
+			    $output = '';
+
+			    // build rules into each type
+			    foreach($selectors as $selector => $types){
+				    $selector = $compatibility ? ".bsui ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color[] = $selector;}
+				    if(isset($types['b'])){$background[] = $selector;}
+				    if(isset($types['o'])){$border[] = $selector;}
+				    if(isset($types['f'])){$fill[] = $selector;}
+			    }
+
+			    // build rules into each type
+			    foreach($important_selectors as $selector => $types){
+				    $selector = $compatibility ? ".bsui ".$selector : $selector;
+				    $types = array_combine($types,$types);
+				    if(isset($types['c'])){$color_i[] = $selector;}
+				    if(isset($types['b'])){$background_i[] = $selector;}
+				    if(isset($types['o'])){$border_i[] = $selector;}
+				    if(isset($types['f'])){$fill_i[] = $selector;}
+			    }
+
+			    // add any color rules
+			    if(!empty($color)){
+				    $output .= implode(",",$color) . "{color: $color_code;} ";
+			    }
+			    if(!empty($color_i)){
+				    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			    }
+
+			    // add any background color rules
+			    if(!empty($background)){
+				    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+			    }
+			    if(!empty($background_i)){
+				    $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			    }
+
+			    // add any border color rules
+			    if(!empty($border)){
+				    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+			    }
+			    if(!empty($border_i)){
+				    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			    }
+
+			    // add any fill color rules
+			    if(!empty($fill)){
+				    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+			    }
+			    if(!empty($fill_i)){
+				    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			    }
+
+
+			    $prefix = $compatibility ? ".bsui " : "";
+
+			    // darken
+			    $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+			    $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+			    $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+			    // lighten
+			    $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+			    // opacity see https://css-tricks.com/8-digit-hex-codes/
+			    $op_25 = $color_code."40"; // 25% opacity
+
+
+			    // button states
+			    $output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+			    $output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			    $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+			    $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+			    return $output;
+		    }
+
+		    /**
 		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
 		 *
 		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
@@ -2152,265 +2152,265 @@ 
 		 *
 		 * @return  string
 		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($hexCode, '#');
+		    public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+			    $hexCode = ltrim($hexCode, '#');
 
-			if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
-				return $hexCode;
-			}
+			    if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
+				    return $hexCode;
+			    }
 
-			if (strlen($hexCode) == 3) {
-				$hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-			}
+			    if (strlen($hexCode) == 3) {
+				    $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+			    }
 
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
+			    $hexCode = array_map('hexdec', str_split($hexCode, 2));
 
-			foreach ($hexCode as & $color) {
-				$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-				$adjustAmount = ceil($adjustableLimit * $adjustPercent);
+			    foreach ($hexCode as & $color) {
+				    $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+				    $adjustAmount = ceil($adjustableLimit * $adjustPercent);
 
-				$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-			}
+				    $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+			    }
 
-			return '#' . implode($hexCode);
-		}
+			    return '#' . implode($hexCode);
+		    }
 
-		/**
+		    /**
 		 * Check if we should display examples.
 		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
-				echo "<head>";
-				wp_head();
-				echo "</head>";
-				echo "<body>";
-				echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				echo "</body>";
-				exit;
-			}
-		}
-
-		/**
+		    public function maybe_show_examples(){
+			    if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+				    echo "<head>";
+				    wp_head();
+				    echo "</head>";
+				    echo "<body>";
+				    echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				    echo "</body>";
+				    exit;
+			    }
+		    }
+
+		    /**
 		 * Get developer examples.
 		 *
 		 * @return string
 		 */
-		public function get_examples(){
-			$output = '';
-
-
-			// open form
-			$output .= "<form class='p-5 m-5 border rounded'>";
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			));
-
-			// close form
-			$output .= "</form>";
-
-			return $output;
-		}
-
-		/**
+		    public function get_examples(){
+			    $output = '';
+
+
+			    // open form
+			    $output .= "<form class='p-5 m-5 border rounded'>";
+
+			    // input example
+			    $output .= aui()->input(array(
+				    'type'  =>  'text',
+				    'id'    =>  'text-example',
+				    'name'    =>  'text-example',
+				    'placeholder'   => 'text placeholder',
+				    'title'   => 'Text input example',
+				    'value' =>  '',
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Text input example label'
+			    ));
+
+			    // input example
+			    $output .= aui()->input(array(
+				    'type'  =>  'url',
+				    'id'    =>  'text-example2',
+				    'name'    =>  'text-example',
+				    'placeholder'   => 'url placeholder',
+				    'title'   => 'Text input example',
+				    'value' =>  '',
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Text input example label'
+			    ));
+
+			    // checkbox example
+			    $output .= aui()->input(array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'checkbox-example',
+				    'name'    =>  'checkbox-example',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Checkbox example',
+				    'value' =>  '1',
+				    'checked'   => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Checkbox checked'
+			    ));
+
+			    // checkbox example
+			    $output .= aui()->input(array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'checkbox-example2',
+				    'name'    =>  'checkbox-example2',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Checkbox example',
+				    'value' =>  '1',
+				    'checked'   => false,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Checkbox un-checked'
+			    ));
+
+			    // switch example
+			    $output .= aui()->input(array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'switch-example',
+				    'name'    =>  'switch-example',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Switch example',
+				    'value' =>  '1',
+				    'checked'   => true,
+				    'switch'    => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Switch on'
+			    ));
+
+			    // switch example
+			    $output .= aui()->input(array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'switch-example2',
+				    'name'    =>  'switch-example2',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Switch example',
+				    'value' =>  '1',
+				    'checked'   => false,
+				    'switch'    => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Switch off'
+			    ));
+
+			    // close form
+			    $output .= "</form>";
+
+			    return $output;
+		    }
+
+		    /**
 		 * Calendar params.
 		 *
 		 * @since 0.1.44
 		 *
 		 * @return array Calendar params.
 		 */
-		public static function calendar_params() {
-			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
-				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
-		}
-
-		/**
+		    public static function calendar_params() {
+			    $params = array(
+				    'month_long_1' => __( 'January', 'ayecode-connect' ),
+				    'month_long_2' => __( 'February', 'ayecode-connect' ),
+				    'month_long_3' => __( 'March', 'ayecode-connect' ),
+				    'month_long_4' => __( 'April', 'ayecode-connect' ),
+				    'month_long_5' => __( 'May', 'ayecode-connect' ),
+				    'month_long_6' => __( 'June', 'ayecode-connect' ),
+				    'month_long_7' => __( 'July', 'ayecode-connect' ),
+				    'month_long_8' => __( 'August', 'ayecode-connect' ),
+				    'month_long_9' => __( 'September', 'ayecode-connect' ),
+				    'month_long_10' => __( 'October', 'ayecode-connect' ),
+				    'month_long_11' => __( 'November', 'ayecode-connect' ),
+				    'month_long_12' => __( 'December', 'ayecode-connect' ),
+				    'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
+				    'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
+				    'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
+				    'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
+				    'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
+				    'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
+				    'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
+				    'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
+				    'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
+				    'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
+				    'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
+				    'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
+				    'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
+				    'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
+				    'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
+				    'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
+				    'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
+				    'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
+				    'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
+				    'day_s2_1' => __( 'Su', 'ayecode-connect' ),
+				    'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
+				    'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
+				    'day_s2_4' => __( 'We', 'ayecode-connect' ),
+				    'day_s2_5' => __( 'Th', 'ayecode-connect' ),
+				    'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
+				    'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
+				    'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
+				    'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
+				    'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
+				    'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
+				    'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
+				    'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
+				    'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
+				    'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
+				    'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
+				    'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
+				    'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
+				    'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
+				    'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
+				    'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
+				    'am_lower' => __( 'am', 'ayecode-connect' ),
+				    'pm_lower' => __( 'pm', 'ayecode-connect' ),
+				    'am_upper' => __( 'AM', 'ayecode-connect' ),
+				    'pm_upper' => __( 'PM', 'ayecode-connect' ),
+				    'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+				    'time_24hr' => false,
+				    'year' => __( 'Year', 'ayecode-connect' ),
+				    'hour' => __( 'Hour', 'ayecode-connect' ),
+				    'minute' => __( 'Minute', 'ayecode-connect' ),
+				    'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
+				    'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
+				    'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
+				    'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+			    );
+
+			    return apply_filters( 'ayecode_ui_calendar_params', $params );
+		    }
+
+		    /**
 		 * Flatpickr calendar localize.
 		 *
 		 * @since 0.1.44
 		 *
 		 * @return string Calendar locale.
 		 */
-		public static function flatpickr_locale() {
-			$params = self::calendar_params();
+		    public static function flatpickr_locale() {
+			    $params = self::calendar_params();
 
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
-			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
-						continue;
-					}
+			    if ( is_string( $params ) ) {
+				    $params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+			    } else {
+				    foreach ( (array) $params as $key => $value ) {
+					    if ( ! is_scalar( $value ) ) {
+						    continue;
+					    }
 
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-				}
-			}
+					    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+				    }
+			    }
 
-			$day_s3 = array();
-			$day_s5 = array();
+			    $day_s3 = array();
+			    $day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+			    for ( $i = 1; $i <= 7; $i ++ ) {
+				    $day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				    $day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    }
 
-			$month_s = array();
-			$month_long = array();
+			    $month_s = array();
+			    $month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+			    for ( $i = 1; $i <= 12; $i ++ ) {
+				    $month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				    $month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    }
 
-			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+			    ob_start();
+		    if ( 0 ) { ?><script><?php } ?>
                 {
                     weekdays: {
                         shorthand: ['<?php echo implode( "','", $day_s3 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
@@ -2446,192 +2446,192 @@ 
                     hourAriaLabel: '<?php echo esc_attr( $params[ 'hour' ] ); ?>',
                     minuteAriaLabel: '<?php echo esc_attr( $params[ 'minute' ] ); ?>',
                     time_24hr: <?php echo ( $params[ 'time_24hr' ] ? 'true' : 'false' ) ; ?>
-                }
+                    }
 				<?php if ( 0 ) { ?></script><?php } ?>
-			<?php
-			$locale = ob_get_clean();
+    			<?php
+			    $locale = ob_get_clean();
 
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
-		}
+			    return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+		    }
 
-		/**
+		    /**
 		 * Select2 JS params.
 		 *
 		 * @since 0.1.44
 		 *
 		 * @return array Select2 JS params.
 		 */
-		public static function select2_params() {
-			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_select2_params', $params );
-		}
-
-		/**
+		    public static function select2_params() {
+			    $params = array(
+				    'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
+				    'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
+				    'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+			    );
+
+			    return apply_filters( 'ayecode_ui_select2_params', $params );
+		    }
+
+		    /**
 		 * Select2 JS localize.
 		 *
 		 * @since 0.1.44
 		 *
 		 * @return string Select2 JS locale.
 		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
+		    public static function select2_locale() {
+			    $params = self::select2_params();
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+			    foreach ( (array) $params as $key => $value ) {
+				    if ( ! is_scalar( $value ) ) {
+					    continue;
+				    }
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
+				    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+			    }
 
-			$locale = json_encode( $params );
+			    $locale = json_encode( $params );
 
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
-		}
+			    return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+		    }
 
-		/**
+		    /**
 		 * Time ago JS localize.
 		 *
 		 * @since 0.1.47
 		 *
 		 * @return string Time ago JS locale.
 		 */
-		public static function timeago_locale() {
-			$params = array(
-				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
-				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
-			);
-
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
-
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
-		}
-
-		/**
+		    public static function timeago_locale() {
+			    $params = array(
+				    'prefix_ago' => '',
+				    'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
+				    'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+				    'suffix_after' => '',
+				    'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
+				    'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
+				    'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
+				    'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
+				    'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
+				    'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
+				    'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
+				    'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
+				    'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
+				    'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
+				    'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+			    );
+
+			    $params = apply_filters( 'ayecode_ui_timeago_params', $params );
+
+			    foreach ( (array) $params as $key => $value ) {
+				    if ( ! is_scalar( $value ) ) {
+					    continue;
+				    }
+
+				    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+			    }
+
+			    $locale = json_encode( $params );
+
+			    return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+		    }
+
+		    /**
 		 * JavaScript Minifier
 		 *
 		 * @param $input
 		 *
 		 * @return mixed
 		 */
-		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
-					// Remove white-space(s) outside the string and regex
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
-					// Remove the last semicolon
-					'#;+\}#',
-					// Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
-					'#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
-					// --ibid. From `foo['bar']` to `foo.bar`
-					'#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
-				),
-				array(
-					'$1',
-					'$1$2',
-					'}',
-					'$1$3',
-					'$1.$3'
-				),
-				$input);
-		}
-
-		/**
+		    public static function minify_js($input) {
+			    if(trim($input) === "") return $input;
+			    return preg_replace(
+				    array(
+					    // Remove comment(s)
+					    '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
+					    // Remove white-space(s) outside the string and regex
+					    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
+					    // Remove the last semicolon
+					    '#;+\}#',
+					    // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
+					    '#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
+					    // --ibid. From `foo['bar']` to `foo.bar`
+					    '#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
+				    ),
+				    array(
+					    '$1',
+					    '$1$2',
+					    '}',
+					    '$1$3',
+					    '$1.$3'
+				    ),
+				    $input);
+		    }
+
+		    /**
 		 * Minify CSS
 		 *
 		 * @param $input
 		 *
 		 * @return mixed
 		 */
-		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
-					// Remove unused white-space(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
-					// Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
-					'#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
-					// Replace `:0 0 0 0` with `:0`
-					'#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
-					// Replace `background-position:0` with `background-position:0 0`
-					'#(background-position):0(?=[;\}])#si',
-					// Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
-					'#(?<=[\s:,\-])0+\.(\d+)#s',
-					// Minify string value
-					'#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
-					'#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
-					// Minify HEX color code
-					'#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
-					// Replace `(border|outline):none` with `(border|outline):0`
-					'#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
-					// Remove empty selector(s)
-					'#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
-				),
-				array(
-					'$1',
-					'$1$2$3$4$5$6$7',
-					'$1',
-					':0',
-					'$1:0 0',
-					'.$1',
-					'$1$3',
-					'$1$2$4$5',
-					'$1$2$3',
-					'$1:0',
-					'$1$2'
-				),
-				$input);
-		}
-
-		/**
+		    public static function minify_css($input) {
+			    if(trim($input) === "") return $input;
+			    return preg_replace(
+				    array(
+					    // Remove comment(s)
+					    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
+					    // Remove unused white-space(s)
+					    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
+					    // Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
+					    '#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
+					    // Replace `:0 0 0 0` with `:0`
+					    '#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
+					    // Replace `background-position:0` with `background-position:0 0`
+					    '#(background-position):0(?=[;\}])#si',
+					    // Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
+					    '#(?<=[\s:,\-])0+\.(\d+)#s',
+					    // Minify string value
+					    '#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
+					    '#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
+					    // Minify HEX color code
+					    '#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
+					    // Replace `(border|outline):none` with `(border|outline):0`
+					    '#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
+					    // Remove empty selector(s)
+					    '#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
+				    ),
+				    array(
+					    '$1',
+					    '$1$2$3$4$5$6$7',
+					    '$1',
+					    ':0',
+					    '$1:0 0',
+					    '.$1',
+					    '$1$3',
+					    '$1$2$4$5',
+					    '$1$2$3',
+					    '$1:0',
+					    '$1$2'
+				    ),
+				    $input);
+		    }
+
+		    /**
 		 * Get the conditional fields JavaScript.
 		 *
 		 * @return mixed
 		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+		    public function conditional_fields_js() {
+			    ob_start();
+			    ?>
             <script>
                 /**
                  * Conditional Fields
@@ -3164,33 +3164,33 @@ 
                     }
                 }
 				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
-            </script>
+                </script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
-		}
+			    return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+		    }
 
-		/**
+		    /**
 		 * Check if block editor page.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_block_editor() {
-			if ( is_admin() ) {
-				$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
+		    public static function is_block_editor() {
+			    if ( is_admin() ) {
+				    $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
 
-				if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
-					return true;
-				}
-			}
+				    if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
+					    return true;
+				    }
+			    }
 
-			return false;
-		}
+			    return false;
+		    }
 
-		/**
+		    /**
 		 * Checks if the current call is a ajax call to get the block content.
 		 *
 		 * This can be used in your widget to return different content as the block content.
@@ -3199,32 +3199,32 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
+		    public static function is_block_content_call() {
+			    $result = false;
+			    if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Divi preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
+		    public static function is_divi_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a elementor preview.
 		 *
 		 *
@@ -3232,171 +3232,171 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
+		    public static function is_elementor_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Beaver builder preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
+		    public static function is_beaver_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['fl_builder'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a siteorigin builder preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
+		    public static function is_siteorigin_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a cornerstone builder preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
+		    public static function is_cornerstone_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a fusion builder preview.
 		 *
 		 * @return bool
 		 *@since 1.1.0
 		 */
-		public static function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
+		    public static function is_fusion_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Oxygen builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.18
 		 */
-		public static function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
+		    public static function is_oxygen_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Kallyas theme Zion builder preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_kallyas_zion_preview() {
-			$result = false;
+		    public static function is_kallyas_zion_preview() {
+			    $result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Bricks theme builder preview.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_bricks_preview() {
-			$result = false;
+		    public static function is_bricks_preview() {
+			    $result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * General function to check if we are in a preview situation.
 		 *
 		 * @since 0.2.27
 		 *
 		 * @return bool
 		 */
-		public static function is_preview() {
-			$preview = false;
-
-			if ( self::is_block_editor() ) {
-				return true;
-			}
-
-			if( self::is_block_content_call() ) {
-				$preview = true;
-			} elseif ( self::is_divi_preview() ) {
-				$preview = true;
-			} elseif ( self::is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( self::is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( self::is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( self::is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( self::is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( self::is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( self::is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( self::is_bricks_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-	}
-
-	global $ayecode_ui_settings;
-
-	/**
+		    public static function is_preview() {
+			    $preview = false;
+
+			    if ( self::is_block_editor() ) {
+				    return true;
+			    }
+
+			    if( self::is_block_content_call() ) {
+				    $preview = true;
+			    } elseif ( self::is_divi_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_elementor_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_beaver_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_siteorigin_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_cornerstone_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_fusion_preview() ) {
+				    $preview = true;
+			    } elseif ( self::is_oxygen_preview() ) {
+				    $preview = true;
+			    } elseif( self::is_kallyas_zion_preview() ) {
+				    $preview = true;
+			    } elseif( self::is_bricks_preview() ) {
+				    $preview = true;
+			    }
+
+			    return $preview;
+		    }
+	    }
+
+	    global $ayecode_ui_settings;
+
+	    /**
 	 * Run the class if found.
 	 */
-	$ayecode_ui_settings = AyeCode_UI_Settings::instance();
+	    $ayecode_ui_settings = AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

vendor/ayecode/wp-ayecode-ui/includes/inc/bs-conversion.php

Switch Indentation +80 added lines, -80 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * Functionality to convert BS4 to BS5.
  */
@@ -13,87 +13,87 @@ 
  *
  * @return array|mixed|string|string[]
  */
-function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
-	global $aui_bs5;
+    function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
+	    global $aui_bs5;
 
-	if ( $aui_bs5 ) {
-		$convert = array(
-			'"ml-' => '"ms-',
-			'"mr-' => '"me-',
-			'"pl-' => '"ps-',
-			'"pr-' => '"pe-',
-			"'ml-" => "'ms-",
-			"'mr-" => "'me-",
-			"'pl-" => "'ps-",
-			"'pr-" => "'pe-",
-			' ml-' => ' ms-',
-			' mr-' => ' me-',
-			' pl-' => ' ps-',
-			' pr-' => ' pe-',
-			'.ml-' => '.ms-',
-			'.mr-' => '.me-',
-			'.pl-' => '.ps-',
-			'.pr-' => '.pe-',
-			' form-row' => ' row',
-			' embed-responsive-item' => '',
-			' embed-responsive' => ' ratio',
-			'-1by1'    => '-1x1',
-			'-4by3'    => '-4x3',
-			'-16by9'    => '-16x9',
-			'-21by9'    => '-21x9',
-			'geodir-lightbox-image' => 'aui-lightbox-image',
-			'geodir-lightbox-iframe' => 'aui-lightbox-iframe',
-			' badge-'   => ' text-bg-',
-			'form-group'   => 'mb-3',
-			'custom-select'   => 'form-select',
-			'float-left'   => 'float-start',
-			'float-right'   => 'float-end',
-			'text-left'    => 'text-start',
-			'text-sm-left'    => 'text-sm-start',
-			'text-md-left'    => 'text-md-start',
-			'text-lg-left'    => 'text-lg-start',
-			'text-right'    => 'text-end',
-			'text-sm-right'    => 'text-sm-end',
-			'text-md-right'    => 'text-md-end',
-			'text-lg-right'    => 'text-lg-end',
-			'border-right'    => 'border-end',
-			'border-left'    => 'border-start',
-			'font-weight-'  => 'fw-',
-			'btn-block'     => 'w-100',
-			'rounded-left'  => 'rounded-start',
-			'rounded-right'  => 'rounded-end',
-			'font-italic' => 'fst-italic',
-			'"sr-only visually-hidden' => '"visually-hidden',
-			"'sr-only visually-hidden" => "'visually-hidden",
-			' sr-only visually-hidden' => ' visually-hidden',
-			'"sr-only' => '"visually-hidden',
-			"'sr-only" => "'visually-hidden",
-			' sr-only' => ' visually-hidden',
-			'"fa-fw' => '"fa-fw fa-width-fixed', // FA7 compatibility
-			"'fa-fw" => "'fa-fw fa-width-fixed",
-			' fa-fw' => ' fa-fw fa-width-fixed',
-			'fa-width-fixed fa-width-fixed' => 'fa-width-fixed',
+	    if ( $aui_bs5 ) {
+		    $convert = array(
+			    '"ml-' => '"ms-',
+			    '"mr-' => '"me-',
+			    '"pl-' => '"ps-',
+			    '"pr-' => '"pe-',
+			    "'ml-" => "'ms-",
+			    "'mr-" => "'me-",
+			    "'pl-" => "'ps-",
+			    "'pr-" => "'pe-",
+			    ' ml-' => ' ms-',
+			    ' mr-' => ' me-',
+			    ' pl-' => ' ps-',
+			    ' pr-' => ' pe-',
+			    '.ml-' => '.ms-',
+			    '.mr-' => '.me-',
+			    '.pl-' => '.ps-',
+			    '.pr-' => '.pe-',
+			    ' form-row' => ' row',
+			    ' embed-responsive-item' => '',
+			    ' embed-responsive' => ' ratio',
+			    '-1by1'    => '-1x1',
+			    '-4by3'    => '-4x3',
+			    '-16by9'    => '-16x9',
+			    '-21by9'    => '-21x9',
+			    'geodir-lightbox-image' => 'aui-lightbox-image',
+			    'geodir-lightbox-iframe' => 'aui-lightbox-iframe',
+			    ' badge-'   => ' text-bg-',
+			    'form-group'   => 'mb-3',
+			    'custom-select'   => 'form-select',
+			    'float-left'   => 'float-start',
+			    'float-right'   => 'float-end',
+			    'text-left'    => 'text-start',
+			    'text-sm-left'    => 'text-sm-start',
+			    'text-md-left'    => 'text-md-start',
+			    'text-lg-left'    => 'text-lg-start',
+			    'text-right'    => 'text-end',
+			    'text-sm-right'    => 'text-sm-end',
+			    'text-md-right'    => 'text-md-end',
+			    'text-lg-right'    => 'text-lg-end',
+			    'border-right'    => 'border-end',
+			    'border-left'    => 'border-start',
+			    'font-weight-'  => 'fw-',
+			    'btn-block'     => 'w-100',
+			    'rounded-left'  => 'rounded-start',
+			    'rounded-right'  => 'rounded-end',
+			    'font-italic' => 'fst-italic',
+			    '"sr-only visually-hidden' => '"visually-hidden',
+			    "'sr-only visually-hidden" => "'visually-hidden",
+			    ' sr-only visually-hidden' => ' visually-hidden',
+			    '"sr-only' => '"visually-hidden',
+			    "'sr-only" => "'visually-hidden",
+			    ' sr-only' => ' visually-hidden',
+			    '"fa-fw' => '"fa-fw fa-width-fixed', // FA7 compatibility
+			    "'fa-fw" => "'fa-fw fa-width-fixed",
+			    ' fa-fw' => ' fa-fw fa-width-fixed',
+			    'fa-width-fixed fa-width-fixed' => 'fa-width-fixed',
 
-//			'custom-control custom-checkbox'    => 'form-check',
-			// data
-			' data-toggle=' => ' data-bs-toggle=',
-			'data-ride=' => 'data-bs-ride=',
-			'data-controlnav=' => 'data-bs-controlnav=',
-			'data-slide='   => 'data-bs-slide=',
-			'data-slide-to=' => 'data-bs-slide-to=',
-			'data-target='  => 'data-bs-target=',
-			'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
-			'class="close"' => 'class="btn-close"',
-			'<span aria-hidden="true">&times;</span>' => '',
-		);
-		$output  = str_replace(
-			array_keys( $convert ),
-			array_values( $convert ),
-			$output
-		);
-	}
+    //			'custom-control custom-checkbox'    => 'form-check',
+			    // data
+			    ' data-toggle=' => ' data-bs-toggle=',
+			    'data-ride=' => 'data-bs-ride=',
+			    'data-controlnav=' => 'data-bs-controlnav=',
+			    'data-slide='   => 'data-bs-slide=',
+			    'data-slide-to=' => 'data-bs-slide-to=',
+			    'data-target='  => 'data-bs-target=',
+			    'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
+			    'class="close"' => 'class="btn-close"',
+			    '<span aria-hidden="true">&times;</span>' => '',
+		    );
+		    $output  = str_replace(
+			    array_keys( $convert ),
+			    array_values( $convert ),
+			    $output
+		    );
+	    }
 
-	return $output;
+	    return $output;
 }
 
-add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this
+    add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-pagination.php

Switch Indentation +103 added lines, -103 removed lines

@@ -1,7 +1,7 @@ 
-<?php
+    <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit; // Exit if accessed directly
 }
 
 /**
@@ -9,114 +9,114 @@ 
  *
  * @since 1.0.0
  */
-class AUI_Component_Pagination {
+    class AUI_Component_Pagination {
 
-	/**
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get( $args = array() ) {
-		global $wp_query, $aui_bs5;
-
-		$defaults = array(
-			'class'              => '',
-			'mid_size'           => 2,
-			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
-			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
-			'before_paging'      => '',
-			'after_paging'       => '',
-			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
-			'links'              => array(), // an array of links if using custom links, this includes the a tag.
-			'rounded_style'      => false,
-			'custom_next_text'   => '', // Custom next page text
-			'custom_prev_text'   => '', // Custom prev page text
-		);
-
-		/**
+	    public static function get( $args = array() ) {
+		    global $wp_query, $aui_bs5;
+
+		    $defaults = array(
+			    'class'              => '',
+			    'mid_size'           => 2,
+			    'prev_text'          => '<i class="fas fa-chevron-left"></i>',
+			    'next_text'          => '<i class="fas fa-chevron-right"></i>',
+			    'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
+			    'before_paging'      => '',
+			    'after_paging'       => '',
+			    'type'               => 'array',
+			    'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+			    'links'              => array(), // an array of links if using custom links, this includes the a tag.
+			    'rounded_style'      => false,
+			    'custom_next_text'   => '', // Custom next page text
+			    'custom_prev_text'   => '', // Custom prev page text
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
-			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
-
-			$class = !empty($args['class']) ? $args['class'] : '';
-
-			$custom_prev_link = '';
-			$custom_next_link = '';
-
-			// make the output bootstrap ready
-			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
-					$_link = $link;
-
-					if ( $aui_bs5 ) {
-						$link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
-						$link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
-						$links_html .= "<li class='page-item mx-0'>";
-						$link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-						$links_html .=  $link;
-						$links_html .= "</li>";
-					} else {
-						$active = strpos( $link, 'current' ) !== false ? 'active' : '';
-						$links_html .= "<li class='page-item $active'>";
-						$links_html .= str_replace( "page-numbers", "page-link", $link );
-						$links_html .= "</li>";
-					}
-
-					if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
-						$link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-
-						if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
-							$custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
-						} else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
-							$custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
-						}
-					}
-				}
-			}
-			$links_html .= "</ul>";
-
-			if ( $links ) {
-				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
-				$output .= '</section>';
-			}
-
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only" . ( $aui_bs5 ? ' visually-hidden' : '' ), $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
-		}
-
-		if ( $output ) {
-			if ( $custom_next_link || $custom_prev_link ) {
-				$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-				$current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
-
-				$output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
-			}
-
-			if ( ! empty( $args['before_paging'] ) ) {
-				$output = $args['before_paging'] . $output;
-			}
-
-			if ( ! empty( $args['after_paging'] ) ) {
-				$output = $output . $args['after_paging'];
-			}
-		}
-
-		return $output;
-	}
+		    $args = wp_parse_args( $args, $defaults );
+
+		    $output = '';
+
+		    // Don't print empty markup if there's only one page.
+		    if ( $args['total'] > 1 ) {
+			    // Set up paginated links.
+			    $links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+
+			    $class = !empty($args['class']) ? $args['class'] : '';
+
+			    $custom_prev_link = '';
+			    $custom_next_link = '';
+
+			    // make the output bootstrap ready
+			    $links_html = "<ul class='pagination m-0 p-0 $class'>";
+			    if ( ! empty( $links ) ) {
+				    foreach ( $links as $link ) {
+					    $_link = $link;
+
+					    if ( $aui_bs5 ) {
+						    $link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
+						    $link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
+						    $links_html .= "<li class='page-item mx-0'>";
+						    $link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
+						    $link = str_replace( 'text-dark link-primary current', 'current', $link );
+						    $links_html .=  $link;
+						    $links_html .= "</li>";
+					    } else {
+						    $active = strpos( $link, 'current' ) !== false ? 'active' : '';
+						    $links_html .= "<li class='page-item $active'>";
+						    $links_html .= str_replace( "page-numbers", "page-link", $link );
+						    $links_html .= "</li>";
+					    }
+
+					    if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
+						    $link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
+						    $link = str_replace( 'text-dark link-primary current', 'current', $link );
+
+						    if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
+							    $custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
+						    } else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
+							    $custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
+						    }
+					    }
+				    }
+			    }
+			    $links_html .= "</ul>";
+
+			    if ( $links ) {
+				    $output .= '<section class="px-0 py-2 w-100">';
+				    $output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+				    $output .= '</section>';
+			    }
+
+			    $output = str_replace( "screen-reader-text", "screen-reader-text sr-only" . ( $aui_bs5 ? ' visually-hidden' : '' ), $output );
+			    $output = str_replace( "nav-links", "aui-nav-links", $output );
+		    }
+
+		    if ( $output ) {
+			    if ( $custom_next_link || $custom_prev_link ) {
+				    $total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
+				    $current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
+
+				    $output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
+			    }
+
+			    if ( ! empty( $args['before_paging'] ) ) {
+				    $output = $args['before_paging'] . $output;
+			    }
+
+			    if ( ! empty( $args['after_paging'] ) ) {
+				    $output = $output . $args['after_paging'];
+			    }
+		    }
+
+		    return $output;
+	    }
 
 }
\ No newline at end of file

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-input.php

Switch Indentation +1230 added lines, -1230 removed lines

@@ -1,7 +1,7 @@ 
-<?php
+    <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit; // Exit if accessed directly
 }
 
 /**
@@ -9,1305 +9,1305 @@ 
  *
  * @since 1.0.0
  */
-class AUI_Component_Input {
+    class AUI_Component_Input {
 
-	/**
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'type'                     => 'text',
-			'name'                     => '',
-			'class'                    => '',
-			'wrap_class'               => '',
-			'id'                       => '',
-			'placeholder'              => '',
-			'title'                    => '',
-			'value'                    => '',
-			'required'                 => false,
-			'size'                     => '', // sm, lg, small, large
-			'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
-			'with_hidden'              => false, // Append hidden field for single checkbox.
-			'label'                    => '',
-			'label_after'              => false,
-			'label_class'              => '',
-			'label_col'                => '2',
-			'label_type'               => '', // top, horizontal, empty = hidden
-			'label_force_left'         => false, // used to force checkbox label left when using horizontal
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'                => '',
-			'validation_text'          => '',
-			'validation_pattern'       => '',
-			'no_wrap'                  => false,
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			// forces the input group inside the input
-			'input_group_left_inside'  => false,
-			// forces the input group inside the input
-			'form_group_class'         => '',
-			'step'                     => '',
-			'switch'                   => false,
-			// to show checkbox as a switch
-			'checked'                  => false,
-			// set a checkbox or radio as selected
-			'password_toggle'          => true,
-			// toggle view/hide password
-			'element_require'          => '',
-			// [%element_id%] == "1"
-			'extra_attributes'         => array(),
-			// an array of extra attributes
-			'wrap_attributes'          => array()
-		);
-
-		/**
+	    public static function input( $args = array() ) {
+		    global $aui_bs5;
+
+		    $defaults = array(
+			    'type'                     => 'text',
+			    'name'                     => '',
+			    'class'                    => '',
+			    'wrap_class'               => '',
+			    'id'                       => '',
+			    'placeholder'              => '',
+			    'title'                    => '',
+			    'value'                    => '',
+			    'required'                 => false,
+			    'size'                     => '', // sm, lg, small, large
+			    'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
+			    'with_hidden'              => false, // Append hidden field for single checkbox.
+			    'label'                    => '',
+			    'label_after'              => false,
+			    'label_class'              => '',
+			    'label_col'                => '2',
+			    'label_type'               => '', // top, horizontal, empty = hidden
+			    'label_force_left'         => false, // used to force checkbox label left when using horizontal
+			    // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+			    'help_text'                => '',
+			    'validation_text'          => '',
+			    'validation_pattern'       => '',
+			    'no_wrap'                  => false,
+			    'input_group_right'        => '',
+			    'input_group_left'         => '',
+			    'input_group_right_inside' => false,
+			    // forces the input group inside the input
+			    'input_group_left_inside'  => false,
+			    // forces the input group inside the input
+			    'form_group_class'         => '',
+			    'step'                     => '',
+			    'switch'                   => false,
+			    // to show checkbox as a switch
+			    'checked'                  => false,
+			    // set a checkbox or radio as selected
+			    'password_toggle'          => true,
+			    // toggle view/hide password
+			    'element_require'          => '',
+			    // [%element_id%] == "1"
+			    'extra_attributes'         => array(),
+			    // an array of extra attributes
+			    'wrap_attributes'          => array()
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			// hidden label option needs to be empty
-			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-			$type = sanitize_html_class( $args['type'] );
-
-			$help_text   = '';
-			$label       = '';
-			$label_after = $args['label_after'];
-			$label_args  = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-
-			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
-				$label_after         = true;
-				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-			}
-
-			// size
-			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
-				$size = 'lg';
-				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
-				$size = 'sm';
-				$args['class'] .= ' form-control-sm';
-			}
-
-			// clear function
-			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
-
-			// Some special sauce for files
-			if ( $type == 'file' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
-				$orig_type = $type;
-				$type = 'text';
-				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
-				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-
-				// Disable native datetime inputs.
-				$disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
-				$disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
-
-				$args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
-
-				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
-					$args['input_group_right_inside'] = true;
-					$args['clear_icon'] = true;
-				}
-
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			} else if ( $type == 'iconpicker' ) {
-				$type = 'text';
-
-				// Validate FA icon.
-				$args['value'] = AUI_Component_Helper::sanitize_fa_icon( $args['value'], $args );
-
-				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
-				$args['extra_attributes']['data-placement'] = 'bottomRight';
-
-				$args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
-
-				// Enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_iconpicker();
-			}
-
-			if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-			}
-
-			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
-				$args['input_group_right_inside'] = true;
-				$align_class = $aui_bs5 ? ' h-100 py-0' : '';
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
-			}
-
-			// open/type
-			$output .= '<input type="' . $type . '" ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
-			}
-
-			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
-				$output .= ' checked ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
-				$output .= ' step="' . $args['step'] . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
-
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close
-			$output .= '>';
-
-			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-			}
-
-			// label
-			if ( ! empty( $args['label'] ) ) {
-				$label_base_class = '';
-				if ( $type == 'file' ) {
-					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
-						$help_text = '';
-						//$label_args['class'] .= ' d-inline ';
-						$args['wrap_class'] .= ' align-items-center ';
-					}else{
-
-					}
-
-					$label_base_class = $aui_bs5 ? ' form-check-label' : ' custom-control-label';
-				}
-				$label_args['class'] .= $label_base_class;
-				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
-			}
-
-
-
-
-			// set help text in the correct position
-			if ( $label_after ) {
-				$output .= $label . $help_text;
-			}
-
-			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
-
-				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				if ( $aui_bs5 ) {
-					$wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
-				}else{
-					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
-				}
-				if ( ! empty( $args['label_force_left'] ) ) {
-					$wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
-					$label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
-				}
-				$output     = self::wrap( array(
-					'content' => $output,
-					'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
-				) );
-
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
-				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
-
-
-				// allow password field to toggle view
-				$args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+		    if ( ! empty( $args['type'] ) ) {
+			    // hidden label option needs to be empty
+			    $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+			    $type = sanitize_html_class( $args['type'] );
+
+			    $help_text   = '';
+			    $label       = '';
+			    $label_after = $args['label_after'];
+			    $label_args  = array(
+				    'title'      => $args['label'],
+				    'for'        => $args['id'],
+				    'class'      => $args['label_class'] . " ",
+				    'label_type' => $args['label_type'],
+				    'label_col'  => $args['label_col']
+			    );
+
+			    // floating labels need label after
+			    if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+				    $label_after         = true;
+				    $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+			    }
+
+			    // size
+			    $size = '';
+			    if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+				    $size = 'lg';
+				    $args['class'] .= ' form-control-lg';
+			    }elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+				    $size = 'sm';
+				    $args['class'] .= ' form-control-sm';
+			    }
+
+			    // clear function
+			    $clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
+
+			    // Some special sauce for files
+			    if ( $type == 'file' ) {
+				    $label_after = true; // if type file we need the label after
+				    $args['class'] .= ' custom-file-input ';
+			    } elseif ( $type == 'checkbox' ) {
+				    $label_after = true; // if type file we need the label after
+				    $args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
+			    } elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+				    $orig_type = $type;
+				    $type = 'text';
+				    $args['class'] .= ' bg-initial '; // @todo not sure why we have this?
+				    $clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
+
+				    $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+
+				    // Disable native datetime inputs.
+				    $disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
+				    $disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
+
+				    $args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
+
+				    // set a way to clear field if empty
+				    if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+					    $args['input_group_right_inside'] = true;
+					    $args['clear_icon'] = true;
+				    }
+
+				    // enqueue the script
+				    $aui_settings = AyeCode_UI_Settings::instance();
+				    $aui_settings->enqueue_flatpickr();
+			    } else if ( $type == 'iconpicker' ) {
+				    $type = 'text';
+
+				    // Validate FA icon.
+				    $args['value'] = AUI_Component_Helper::sanitize_fa_icon( $args['value'], $args );
+
+				    $args['extra_attributes']['data-aui-init'] = 'iconpicker';
+				    $args['extra_attributes']['data-placement'] = 'bottomRight';
+
+				    $args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
+
+				    // Enqueue the script
+				    $aui_settings = AyeCode_UI_Settings::instance();
+				    $aui_settings->enqueue_iconpicker();
+			    }
+
+			    if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
+				    $output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+			    }
+
+			    // allow clear icon
+			    if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
+				    $font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+				    $args['input_group_right_inside'] = true;
+				    $align_class = $aui_bs5 ? ' h-100 py-0' : '';
+				    $args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
+			    }
+
+			    // open/type
+			    $output .= '<input type="' . $type . '" ';
+
+			    // name
+			    if ( ! empty( $args['name'] ) ) {
+				    $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			    }
+
+			    // id
+			    if ( ! empty( $args['id'] ) ) {
+				    $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			    }
+
+			    // placeholder
+			    if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+				    $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			    }
+
+			    // title
+			    if ( ! empty( $args['title'] ) ) {
+				    $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			    }
+
+			    // value
+			    if ( ! empty( $args['value'] ) ) {
+				    $output .= AUI_Component_Helper::value( $args['value'] );
+			    }
+
+			    // checked, for radio and checkboxes
+			    if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+				    $output .= ' checked ';
+			    }
+
+			    // validation text
+			    if ( ! empty( $args['validation_text'] ) ) {
+				    $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+				    $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+			    }
+
+			    // validation_pattern
+			    if ( ! empty( $args['validation_pattern'] ) ) {
+				    $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			    }
+
+			    // step (for numbers)
+			    if ( ! empty( $args['step'] ) ) {
+				    $output .= ' step="' . $args['step'] . '" ';
+			    }
+
+			    // required
+			    if ( ! empty( $args['required'] ) ) {
+				    $output .= ' required ';
+			    }
+
+			    // class
+			    $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			    $output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
+
+			    // data-attributes
+			    $output .= AUI_Component_Helper::data_attributes( $args );
+
+			    // extra attributes
+			    if ( ! empty( $args['extra_attributes'] ) ) {
+				    $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			    }
+
+			    // close
+			    $output .= '>';
+
+			    // help text
+			    if ( ! empty( $args['help_text'] ) ) {
+				    $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+			    }
+
+			    // label
+			    if ( ! empty( $args['label'] ) ) {
+				    $label_base_class = '';
+				    if ( $type == 'file' ) {
+					    $label_base_class = ' custom-file-label';
+				    } elseif ( $type == 'checkbox' ) {
+					    if ( ! empty( $args['label_force_left'] ) ) {
+						    $label_args['title'] = wp_kses_post( $args['help_text'] );
+						    $help_text = '';
+						    //$label_args['class'] .= ' d-inline ';
+						    $args['wrap_class'] .= ' align-items-center ';
+					    }else{
+
+					    }
+
+					    $label_base_class = $aui_bs5 ? ' form-check-label' : ' custom-control-label';
+				    }
+				    $label_args['class'] .= $label_base_class;
+				    $temp_label_args = $label_args;
+				    if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
+				    $label = self::label( $temp_label_args, $type );
+			    }
+
+
+
+
+			    // set help text in the correct position
+			    if ( $label_after ) {
+				    $output .= $label . $help_text;
+			    }
+
+			    // some input types need a separate wrap
+			    if ( $type == 'file' ) {
+				    $output = self::wrap( array(
+					    'content' => $output,
+					    'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
+				    ) );
+			    } elseif ( $type == 'checkbox' ) {
+
+				    $label_args['title'] = $args['label'];
+				    $label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
+				    $label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
+				    $switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
+				    if ( $aui_bs5 ) {
+					    $wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
+				    }else{
+					    $wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
+				    }
+				    if ( ! empty( $args['label_force_left'] ) ) {
+					    $wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
+					    $label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
+				    }
+				    $output     = self::wrap( array(
+					    'content' => $output,
+					    'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
+				    ) );
+
+				    if ( $args['label_type'] == 'horizontal' ) {
+					    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+					    $output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
+				    }
+			    } elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+
+
+				    // allow password field to toggle view
+				    $args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
 onclick="var $el = jQuery(this).find(\'i\');$el.toggleClass(\'fa-eye fa-eye-slash\');
 var $eli = jQuery(this).parent().parent().find(\'input\');
 if($el.hasClass(\'fa-eye\'))
 {$eli.attr(\'type\',\'text\');}
 else{$eli.attr(\'type\',\'password\');}"
 ><i class="far fa-fw fa-eye-slash"></i></span>';
-			}
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				$group_size = $size == 'lg' ? ' input-group-lg' : '';
-				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
-
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-			if ( ! $label_after ) {
-				$output .= $help_text;
-			}
-
-
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
-			}
-
-			if ( ! $label_after ) {
-				$output = $label . $output;
-			}
-
-			// wrap
-			if ( ! $args['no_wrap'] ) {
-				if ( ! empty( $args['form_group_class'] ) ) {
-					$fg_class = esc_attr( $args['form_group_class'] );
-				}else{
-					$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-				}
-				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
-				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
-					'content'         => $output,
-					'class'           => $wrap_class,
-					'element_require' => $args['element_require'],
-					'argument_id'     => $args['id'],
-					'wrap_attributes' => $args['wrap_attributes'],
-				) );
-			}
-		}
-
-		return $output;
-	}
-
-	public static function label( $args = array(), $type = '' ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'title'      => 'div',
-			'for'        => '',
-			'class'      => '',
-			'label_type' => '', // empty = hidden, top, horizontal
-			'label_col'  => '',
-		);
-
-		/**
+			    }
+
+			    // input group wraps
+			    if ( $args['input_group_left'] || $args['input_group_right'] ) {
+				    $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+				    $group_size = $size == 'lg' ? ' input-group-lg' : '';
+				    $group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
+
+				    if ( $args['input_group_left'] ) {
+					    $output = self::wrap( array(
+						    'content'                 => $output,
+						    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+						    'input_group_left'        => $args['input_group_left'],
+						    'input_group_left_inside' => $args['input_group_left_inside']
+					    ) );
+				    }
+				    if ( $args['input_group_right'] ) {
+					    $output = self::wrap( array(
+						    'content'                  => $output,
+						    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+						    'input_group_right'        => $args['input_group_right'],
+						    'input_group_right_inside' => $args['input_group_right_inside']
+					    ) );
+				    }
+
+			    }
+
+			    if ( ! $label_after ) {
+				    $output .= $help_text;
+			    }
+
+
+			    if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+				    $output = self::wrap( array(
+					    'content' => $output,
+					    'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+				    ) );
+			    }
+
+			    if ( ! $label_after ) {
+				    $output = $label . $output;
+			    }
+
+			    // wrap
+			    if ( ! $args['no_wrap'] ) {
+				    if ( ! empty( $args['form_group_class'] ) ) {
+					    $fg_class = esc_attr( $args['form_group_class'] );
+				    }else{
+					    $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+				    }
+				    $form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
+				    $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+				    $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+				    $output           = self::wrap( array(
+					    'content'         => $output,
+					    'class'           => $wrap_class,
+					    'element_require' => $args['element_require'],
+					    'argument_id'     => $args['id'],
+					    'wrap_attributes' => $args['wrap_attributes'],
+				    ) );
+			    }
+		    }
+
+		    return $output;
+	    }
+
+	    public static function label( $args = array(), $type = '' ) {
+		    global $aui_bs5;
+
+		    $defaults = array(
+			    'title'      => 'div',
+			    'for'        => '',
+			    'class'      => '',
+			    'label_type' => '', // empty = hidden, top, horizontal
+			    'label_col'  => '',
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		if ( $args['title'] ) {
-			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
-				$class = $args['class'];
-			} else {
-				$class = 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' ) . $args['class'];
-			}
-
-			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label ' . $type;
-			}
-
-			if ( $aui_bs5 ) {
-				$class .= ' form-label';
-			}
-
-			// open
-			$output .= '<label';
-
-			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '"';
-			}
-
-			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= $class != "" ? ' class="' . $class . '"' : '';
-
-			// close
-			$output .= '>';
-
-			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
-			}
-
-			// close wrap
-			$output .= '</label>';
-		}
-
-		return $output;
-	}
-
-	/**
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+
+		    if ( $args['title'] ) {
+			    // maybe hide labels //@todo set a global option for visibility class
+			    if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+				    $class = $args['class'];
+			    } else {
+				    $class = 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' ) . $args['class'];
+			    }
+
+			    // maybe horizontal
+			    if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+				    $class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label ' . $type;
+			    }
+
+			    if ( $aui_bs5 ) {
+				    $class .= ' form-label';
+			    }
+
+			    // open
+			    $output .= '<label';
+
+			    // for
+			    if ( ! empty( $args['for'] ) ) {
+				    $output .= ' for="' . esc_attr( $args['for'] ) . '"';
+			    }
+
+			    // class
+			    $class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+			    $output .= $class != "" ? ' class="' . $class . '"' : '';
+
+			    // close
+			    $output .= '>';
+
+			    // title, don't escape fully as can contain html
+			    if ( ! empty( $args['title'] ) ) {
+				    $output .= wp_kses_post( $args['title'] );
+			    }
+
+			    // close wrap
+			    $output .= '</label>';
+		    }
+
+		    return $output;
+	    }
+
+	    /**
 	 * Wrap some content in a HTML wrapper.
 	 *
 	 * @param array $args
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
-		global $aui_bs5;
-		$defaults = array(
-			'type'                     => 'div',
-			'class'                    => $aui_bs5 ? 'mb-3' : 'form-group',
-			'content'                  => '',
-			'input_group_left'         => '',
-			'input_group_right'        => '',
-			'input_group_left_inside'  => false,
-			'input_group_right_inside' => false,
-			'element_require'          => '',
-			'argument_id'              => '',
-			'wrap_attributes'          => array()
-		);
-
-		/**
+	    public static function wrap( $args = array() ) {
+		    global $aui_bs5;
+		    $defaults = array(
+			    'type'                     => 'div',
+			    'class'                    => $aui_bs5 ? 'mb-3' : 'form-group',
+			    'content'                  => '',
+			    'input_group_left'         => '',
+			    'input_group_right'        => '',
+			    'input_group_left_inside'  => false,
+			    'input_group_right_inside' => false,
+			    'element_require'          => '',
+			    'argument_id'              => '',
+			    'wrap_attributes'          => array()
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( $args['type'] ) {
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+		    if ( $args['type'] ) {
 
-			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
+			    // open
+			    $output .= '<' . sanitize_html_class( $args['type'] );
 
-			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-				$args['class'] .= " aui-conditional-field";
-			}
+			    // element require
+			    if ( ! empty( $args['element_require'] ) ) {
+				    $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+				    $args['class'] .= " aui-conditional-field";
+			    }
 
-			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
-			}
+			    // argument_id
+			    if ( ! empty( $args['argument_id'] ) ) {
+				    $output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+			    }
 
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="' . $class . '" ';
+			    // class
+			    $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			    $output .= ' class="' . $class . '" ';
 
-			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
-			}
+			    // Attributes
+			    if ( ! empty( $args['wrap_attributes'] ) ) {
+				    $output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+			    }
 
-			// close wrap
-			$output .= '>';
+			    // close wrap
+			    $output .= '>';
 
 
-			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
-				$output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
-//				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
-			}
+			    // Input group left
+			    if ( ! empty( $args['input_group_left'] ) ) {
+				    $position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
+				    $input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+				    $output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
+    //				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
+			    }
 
-			// content
-			$output .= $args['content'];
+			    // content
+			    $output .= $args['content'];
 
-			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
-//				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
-			}
+			    // Input group right
+			    if ( ! empty( $args['input_group_right'] ) ) {
+				    $position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
+				    $input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+				    $output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+    //				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+			    }
 
 
-			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+			    // close wrap
+			    $output .= '</' . sanitize_html_class( $args['type'] ) . '>';
 
 
-		} else {
-			$output = $args['content'];
-		}
+		    } else {
+			    $output = $args['content'];
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'name'               => '',
-			'class'              => '',
-			'wrap_class'         => '',
-			'id'                 => '',
-			'placeholder'        => '',
-			'title'              => '',
-			'value'              => '',
-			'required'           => false,
-			'label'              => '',
-			'label_after'        => false,
-			'label_class'        => '',
-			'label_type'         => '',
-			'label_col'          => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			'form_group_class'      => '',
-			'help_text'          => '',
-			'validation_text'    => '',
-			'validation_pattern' => '',
-			'no_wrap'            => false,
-			'rows'               => '',
-			'wysiwyg'            => false,
-			'allow_tags'         => false,
-			// Allow HTML tags
-			'element_require'    => '',
-			// [%element_id%] == "1"
-			'extra_attributes'   => array(),
-			// an array of extra attributes
-			'wrap_attributes'    => array(),
-		);
-
-		/**
+	    public static function textarea( $args = array() ) {
+		    global $aui_bs5;
+
+		    $defaults = array(
+			    'name'               => '',
+			    'class'              => '',
+			    'wrap_class'         => '',
+			    'id'                 => '',
+			    'placeholder'        => '',
+			    'title'              => '',
+			    'value'              => '',
+			    'required'           => false,
+			    'label'              => '',
+			    'label_after'        => false,
+			    'label_class'        => '',
+			    'label_type'         => '',
+			    'label_col'          => '',
+			    // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+			    'input_group_right'        => '',
+			    'input_group_left'         => '',
+			    'input_group_right_inside' => false,
+			    'form_group_class'      => '',
+			    'help_text'          => '',
+			    'validation_text'    => '',
+			    'validation_pattern' => '',
+			    'no_wrap'            => false,
+			    'rows'               => '',
+			    'wysiwyg'            => false,
+			    'allow_tags'         => false,
+			    // Allow HTML tags
+			    'element_require'    => '',
+			    // [%element_id%] == "1"
+			    'extra_attributes'   => array(),
+			    // an array of extra attributes
+			    'wrap_attributes'    => array(),
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		$label = '';
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
-			$args['label_type'] = 'top';
-		}
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$label .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['wysiwyg'] ) ) {
-			ob_start();
-			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
-			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
-				'quicktags'     => false,
-				'media_buttons' => false,
-				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
-				'teeny'         => true,
-			);
-
-			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
-			}
-
-			wp_editor( $content, $editor_id, $settings );
-			$output .= ob_get_clean();
-		} else {
-
-			// open
-			$output .= '<textarea ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
-			}
-
-
-			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close tag
-			$output .= '>';
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
-				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
-				}
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-
-		}
-
-		if ( ! empty( $args['label'] ) && $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
-				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-			}
-			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
-			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+		    $label = '';
+
+		    // hidden label option needs to be empty
+		    $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+		    // floating labels don't work with wysiwyg so set it as top
+		    if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+			    $args['label_type'] = 'top';
+		    }
+
+		    $label_after = $args['label_after'];
+
+		    // floating labels need label after
+		    if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+			    $label_after         = true;
+			    $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+		    }
+
+		    // label
+		    if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+		    } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+			    $label_args = array(
+				    'title'      => $args['label'],
+				    'for'        => $args['id'],
+				    'class'      => $args['label_class'] . " ",
+				    'label_type' => $args['label_type'],
+				    'label_col'  => $args['label_col']
+			    );
+			    $label .= self::label( $label_args );
+		    }
+
+		    // maybe horizontal label
+		    if ( $args['label_type'] == 'horizontal' ) {
+			    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+			    $label .= '<div class="' . $input_col . '">';
+		    }
+
+		    if ( ! empty( $args['wysiwyg'] ) ) {
+			    ob_start();
+			    $content   = $args['value'];
+			    $editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+			    $settings  = array(
+				    'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+				    'quicktags'     => false,
+				    'media_buttons' => false,
+				    'editor_class'  => 'form-control',
+				    'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+				    'teeny'         => true,
+			    );
+
+			    // maybe set settings if array
+			    if ( is_array( $args['wysiwyg'] ) ) {
+				    $settings = wp_parse_args( $args['wysiwyg'], $settings );
+			    }
+
+			    wp_editor( $content, $editor_id, $settings );
+			    $output .= ob_get_clean();
+		    } else {
+
+			    // open
+			    $output .= '<textarea ';
+
+			    // name
+			    if ( ! empty( $args['name'] ) ) {
+				    $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			    }
+
+			    // id
+			    if ( ! empty( $args['id'] ) ) {
+				    $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			    }
+
+			    // placeholder
+			    if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+				    $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			    }
+
+			    // title
+			    if ( ! empty( $args['title'] ) ) {
+				    $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			    }
+
+			    // validation text
+			    if ( ! empty( $args['validation_text'] ) ) {
+				    $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+				    $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+			    }
+
+			    // validation_pattern
+			    if ( ! empty( $args['validation_pattern'] ) ) {
+				    $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			    }
+
+			    // required
+			    if ( ! empty( $args['required'] ) ) {
+				    $output .= ' required ';
+			    }
+
+			    // rows
+			    if ( ! empty( $args['rows'] ) ) {
+				    $output .= ' rows="' . absint( $args['rows'] ) . '" ';
+			    }
+
+
+			    // class
+			    $class = ! empty( $args['class'] ) ? $args['class'] : '';
+			    $output .= ' class="form-control ' . $class . '" ';
+
+			    // extra attributes
+			    if ( ! empty( $args['extra_attributes'] ) ) {
+				    $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			    }
+
+			    // close tag
+			    $output .= '>';
+
+			    // value
+			    if ( ! empty( $args['value'] ) ) {
+				    if ( ! empty( $args['allow_tags'] ) ) {
+					    $output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+				    } else {
+					    $output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+				    }
+			    }
+
+			    // closing tag
+			    $output .= '</textarea>';
+
+
+			    // input group wraps
+			    if ( $args['input_group_left'] || $args['input_group_right'] ) {
+				    $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+				    if ( $args['input_group_left'] ) {
+					    $output = self::wrap( array(
+						    'content'                 => $output,
+						    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+						    'input_group_left'        => $args['input_group_left'],
+						    'input_group_left_inside' => $args['input_group_left_inside']
+					    ) );
+				    }
+				    if ( $args['input_group_right'] ) {
+					    $output = self::wrap( array(
+						    'content'                  => $output,
+						    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+						    'input_group_right'        => $args['input_group_right'],
+						    'input_group_right_inside' => $args['input_group_right_inside']
+					    ) );
+				    }
+
+			    }
+
+
+		    }
+
+		    if ( ! empty( $args['label'] ) && $label_after ) {
+			    $label_args = array(
+				    'title'      => $args['label'],
+				    'for'        => $args['id'],
+				    'class'      => $args['label_class'] . " ",
+				    'label_type' => $args['label_type'],
+				    'label_col'  => $args['label_col']
+			    );
+			    $output .= self::label( $label_args );
+		    }
+
+		    // help text
+		    if ( ! empty( $args['help_text'] ) ) {
+			    $output .= AUI_Component_Helper::help_text( $args['help_text'] );
+		    }
+
+		    if ( ! $label_after ) {
+			    $output = $label . $output;
+		    }
+
+		    // maybe horizontal label
+		    if ( $args['label_type'] == 'horizontal' ) {
+			    $output .= '</div>';
+		    }
+
+
+		    // wrap
+		    if ( ! $args['no_wrap'] ) {
+			    if ( ! empty( $args['form_group_class'] ) ) {
+				    $fg_class = esc_attr( $args['form_group_class'] );
+			    }else{
+				    $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+			    }
+			    $form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
+			    $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+			    $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			    $output           = self::wrap( array(
+				    'content'         => $output,
+				    'class'           => $wrap_class,
+				    'element_require' => $args['element_require'],
+				    'argument_id'     => $args['id'],
+				    'wrap_attributes' => $args['wrap_attributes'],
+			    ) );
+		    }
+
+
+		    return $output;
+	    }
+
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
-		global $aui_bs5, $aui_has_select2, $aui_select2_enqueued;
-
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			// can be an array or a string
-			'required'         => false,
-			'label'            => '',
-			'label_after'      => false,
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'label_class'      => '',
-			'help_text'        => '',
-			'placeholder'      => '',
-			'options'          => array(),
-			// array or string
-			'icon'             => '',
-			'multiple'         => false,
-			'select2'          => false,
-			'no_wrap'          => false,
-			'input_group_right' => '',
-			'input_group_left' => '',
-			'input_group_right_inside' => false, // forces the input group inside the input
-			'input_group_left_inside' => false, // forces the input group inside the input
-			'form_group_class'  => '',
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array(),
-		);
-
-		/**
+	    public static function select( $args = array() ) {
+		    global $aui_bs5, $aui_has_select2, $aui_select2_enqueued;
+
+		    $defaults = array(
+			    'class'            => '',
+			    'wrap_class'       => '',
+			    'id'               => '',
+			    'title'            => '',
+			    'value'            => '',
+			    // can be an array or a string
+			    'required'         => false,
+			    'label'            => '',
+			    'label_after'      => false,
+			    'label_type'       => '',
+			    'label_col'        => '',
+			    // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+			    'label_class'      => '',
+			    'help_text'        => '',
+			    'placeholder'      => '',
+			    'options'          => array(),
+			    // array or string
+			    'icon'             => '',
+			    'multiple'         => false,
+			    'select2'          => false,
+			    'no_wrap'          => false,
+			    'input_group_right' => '',
+			    'input_group_left' => '',
+			    'input_group_right_inside' => false, // forces the input group inside the input
+			    'input_group_left_inside' => false, // forces the input group inside the input
+			    'form_group_class'  => '',
+			    'element_require'  => '',
+			    // [%element_id%] == "1"
+			    'extra_attributes' => array(),
+			    // an array of extra attributes
+			    'wrap_attributes'  => array(),
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'hidden';
-		}
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// Maybe setup select2
-		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
-			$args['class'] .= ' aui-select2';
-			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
-			$is_select2 = true;
-		}
-
-		if ( $is_select2 && ! $aui_has_select2 ) {
-			$aui_has_select2 = true;
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
-
-			// Enqueue the script,
-			if ( empty( $aui_select2_enqueued ) && $conditional_select2 === true ) {
-				$aui_select2_enqueued = true;
-
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_select2();
-			}
-		}
-
-		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
-			$args['data-tags']             = 'true';
-			$args['data-token-separators'] = "[',']";
-			$args['multiple']              = true;
-		}
-
-		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
-		}
-
-		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
-			$output .= " style='width:100%;' ";
-		}
-
-		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-			$args['class'] .= " aui-conditional-field";
-		}
-
-		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
-		$output .= AUI_Component_Helper::class_attr( $select_class . $class );
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required';
-		}
-
-		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
-			$output .= ' multiple';
-		}
-
-		// close opening tag
-		$output .= '>';
-
-		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
-			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
-		}
-
-		// Options
-		if ( ! empty( $args['options'] ) ) {
-
-			if ( ! is_array( $args['options'] ) ) {
-				$output .= $args['options']; // not the preferred way but an option
-			} else {
-				foreach ( $args['options'] as $val => $name ) {
-					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
-						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
-							}
-
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
-						}
-					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
-							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
-						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		$label = '';
-		$help_text = '';
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label = self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
-					'content'                 => $output,
-					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_left'        => $args['input_group_left'],
-					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
-			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
-					'content'                  => $output,
-					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_right'        => $args['input_group_right'],
-					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
-			}
-
-		}
-
-		if ( ! $label_after ) {
-			$output .= $help_text;
-		}
-
-
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
-//		if ( $args['label_type'] == 'horizontal' ) {
-//			$output .= '</div>';
-//		}
-
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
-				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-			}
-			$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+
+		    // for now lets hide floating labels
+		    if ( $args['label_type'] == 'floating' ) {
+			    $args['label_type'] = 'hidden';
+		    }
+
+		    // hidden label option needs to be empty
+		    $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+
+		    $label_after = $args['label_after'];
+
+		    // floating labels need label after
+		    if ( $args['label_type'] == 'floating' ) {
+			    $label_after         = true;
+			    $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+		    }
+
+		    // Maybe setup select2
+		    $is_select2 = false;
+		    if ( ! empty( $args['select2'] ) ) {
+			    $args['class'] .= ' aui-select2';
+			    $is_select2 = true;
+		    } elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+			    $is_select2 = true;
+		    }
+
+		    if ( $is_select2 && ! $aui_has_select2 ) {
+			    $aui_has_select2 = true;
+			    $conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+
+			    // Enqueue the script,
+			    if ( empty( $aui_select2_enqueued ) && $conditional_select2 === true ) {
+				    $aui_select2_enqueued = true;
+
+				    $aui_settings = AyeCode_UI_Settings::instance();
+				    $aui_settings->enqueue_select2();
+			    }
+		    }
+
+		    // select2 tags
+		    if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+			    $args['data-tags']             = 'true';
+			    $args['data-token-separators'] = "[',']";
+			    $args['multiple']              = true;
+		    }
+
+		    // select2 placeholder
+		    if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
+			    $args['data-placeholder'] = esc_attr( $args['placeholder'] );
+			    $args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+		    }
+
+		    // Set hidden input to save empty value for multiselect.
+		    if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
+			    $output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
+		    }
+
+		    // open/type
+		    $output .= '<select ';
+
+		    // style
+		    if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+			    $output .= " style='width:100%;' ";
+		    }
+
+		    // element require
+		    if ( ! empty( $args['element_require'] ) ) {
+			    $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+			    $args['class'] .= " aui-conditional-field";
+		    }
+
+		    // class
+		    $class = ! empty( $args['class'] ) ? $args['class'] : '';
+		    $select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
+		    $output .= AUI_Component_Helper::class_attr( $select_class . $class );
+
+		    // name
+		    if ( ! empty( $args['name'] ) ) {
+			    $output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+		    }
+
+		    // id
+		    if ( ! empty( $args['id'] ) ) {
+			    $output .= AUI_Component_Helper::id( $args['id'] );
+		    }
+
+		    // title
+		    if ( ! empty( $args['title'] ) ) {
+			    $output .= AUI_Component_Helper::title( $args['title'] );
+		    }
+
+		    // data-attributes
+		    $output .= AUI_Component_Helper::data_attributes( $args );
+
+		    // aria-attributes
+		    $output .= AUI_Component_Helper::aria_attributes( $args );
+
+		    // extra attributes
+		    if ( ! empty( $args['extra_attributes'] ) ) {
+			    $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		    }
+
+		    // required
+		    if ( ! empty( $args['required'] ) ) {
+			    $output .= ' required';
+		    }
+
+		    // multiple
+		    if ( ! empty( $args['multiple'] ) ) {
+			    $output .= ' multiple';
+		    }
+
+		    // close opening tag
+		    $output .= '>';
+
+		    // placeholder
+		    if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
+			    $output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
+		    } elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+			    $output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
+		    }
+
+		    // Options
+		    if ( ! empty( $args['options'] ) ) {
+
+			    if ( ! is_array( $args['options'] ) ) {
+				    $output .= $args['options']; // not the preferred way but an option
+			    } else {
+				    foreach ( $args['options'] as $val => $name ) {
+					    $selected = '';
+					    if ( is_array( $name ) ) {
+						    if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
+							    $option_label = isset( $name['label'] ) ? $name['label'] : '';
+
+							    $output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+						    } else {
+							    $option_label = isset( $name['label'] ) ? $name['label'] : '';
+							    $option_value = isset( $name['value'] ) ? $name['value'] : '';
+							    $extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
+							    if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
+								    $selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
+							    } elseif ( ! empty( $args['value'] ) ) {
+								    $selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
+							    } elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
+								    $selected = selected( $option_value, $args['value'], false );
+							    }
+
+							    $output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+						    }
+					    } else {
+						    if ( ! empty( $args['value'] ) ) {
+							    if ( is_array( $args['value'] ) ) {
+								    $selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
+							    } elseif ( ! empty( $args['value'] ) ) {
+								    $selected = selected( $args['value'], $val, false );
+							    }
+						    } elseif ( $args['value'] === $val ) {
+							    $selected = selected( $args['value'], $val, false );
+						    }
+						    $output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+					    }
+				    }
+			    }
+
+		    }
+
+		    // closing tag
+		    $output .= '</select>';
+
+		    $label = '';
+		    $help_text = '';
+		    // label
+		    if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+		    } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+			    $label_args = array(
+				    'title'      => $args['label'],
+				    'for'        => $args['id'],
+				    'class'      => $args['label_class'] . " ",
+				    'label_type' => $args['label_type'],
+				    'label_col'  => $args['label_col']
+			    );
+			    $label = self::label( $label_args );
+		    }
+
+		    // help text
+		    if ( ! empty( $args['help_text'] ) ) {
+			    $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+		    }
+
+		    // input group wraps
+		    if ( $args['input_group_left'] || $args['input_group_right'] ) {
+			    $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+			    if ( $args['input_group_left'] ) {
+				    $output = self::wrap( array(
+					    'content'                 => $output,
+					    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+					    'input_group_left'        => $args['input_group_left'],
+					    'input_group_left_inside' => $args['input_group_left_inside']
+				    ) );
+			    }
+			    if ( $args['input_group_right'] ) {
+				    $output = self::wrap( array(
+					    'content'                  => $output,
+					    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+					    'input_group_right'        => $args['input_group_right'],
+					    'input_group_right_inside' => $args['input_group_right_inside']
+				    ) );
+			    }
+
+		    }
+
+		    if ( ! $label_after ) {
+			    $output .= $help_text;
+		    }
+
+
+		    if ( $args['label_type'] == 'horizontal' ) {
+			    $output = self::wrap( array(
+				    'content' => $output,
+				    'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+			    ) );
+		    }
+
+		    if ( ! $label_after ) {
+			    $output = $label . $output;
+		    }
+
+		    // maybe horizontal label
+    //		if ( $args['label_type'] == 'horizontal' ) {
+    //			$output .= '</div>';
+    //		}
+
+
+		    // wrap
+		    if ( ! $args['no_wrap'] ) {
+			    if ( ! empty( $args['form_group_class'] ) ) {
+				    $fg_class = esc_attr( $args['form_group_class'] );
+			    }else{
+				    $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+			    }
+			    $wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
+			    $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			    $output     = self::wrap( array(
+				    'content'         => $output,
+				    'class'           => $wrap_class,
+				    'element_require' => $args['element_require'],
+				    'argument_id'     => $args['id'],
+				    'wrap_attributes' => $args['wrap_attributes'],
+			    ) );
+		    }
+
+
+		    return $output;
+	    }
+
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'horizontal'       => false,
-			// sets the lable horizontal
-			'value'            => '',
-			'label'            => '',
-			'label_class'      => '',
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'        => '',
-			'inline'           => true,
-			'required'         => false,
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array()
-		);
-
-		/**
+	    public static function radio( $args = array() ) {
+		    global $aui_bs5;
+
+		    $defaults = array(
+			    'class'            => '',
+			    'wrap_class'       => '',
+			    'id'               => '',
+			    'title'            => '',
+			    'horizontal'       => false,
+			    // sets the lable horizontal
+			    'value'            => '',
+			    'label'            => '',
+			    'label_class'      => '',
+			    'label_type'       => '',
+			    'label_col'        => '',
+			    // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+			    'help_text'        => '',
+			    'inline'           => true,
+			    'required'         => false,
+			    'options'          => array(),
+			    'icon'             => '',
+			    'no_wrap'          => false,
+			    'element_require'  => '',
+			    // [%element_id%] == "1"
+			    'extra_attributes' => array(),
+			    // an array of extra attributes
+			    'wrap_attributes'  => array()
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'horizontal';
-		}
-
-		$label_args = array(
-			'title'      => $args['label'],
-			'class'      => $args['label_class'] . " pt-0 ",
-			'label_type' => $args['label_type'],
-			'label_col'  => $args['label_col']
-		);
-
-		if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
-			$label_args['class'] .= 'd-block ';
-
-			if ( $args['label_type'] == 'hidden' ) {
-				$label_args['class'] .= 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' );
-			}
-		}
-
-		$output = '';
-
-		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['options'] ) ) {
-			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
-				$option_args            = $args;
-				$option_args['value']   = $value;
-				$option_args['label']   = $label;
-				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
-			}
-		}
-
-		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
-		$output .= $help_text;
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-		// wrap
-		$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-		$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
-			'content'         => $output,
-			'class'           => $wrap_class,
-			'element_require' => $args['element_require'],
-			'argument_id'     => $args['id'],
-			'wrap_attributes' => $args['wrap_attributes'],
-		) );
-
-
-		return $output;
-	}
-
-	/**
+		    $args = wp_parse_args( $args, $defaults );
+
+		    // for now lets use horizontal for floating
+		    if ( $args['label_type'] == 'floating' ) {
+			    $args['label_type'] = 'horizontal';
+		    }
+
+		    $label_args = array(
+			    'title'      => $args['label'],
+			    'class'      => $args['label_class'] . " pt-0 ",
+			    'label_type' => $args['label_type'],
+			    'label_col'  => $args['label_col']
+		    );
+
+		    if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
+			    $label_args['class'] .= 'd-block ';
+
+			    if ( $args['label_type'] == 'hidden' ) {
+				    $label_args['class'] .= 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' );
+			    }
+		    }
+
+		    $output = '';
+
+		    // label before
+		    if ( ! empty( $args['label'] ) ) {
+			    $output .= self::label( $label_args, 'radio' );
+		    }
+
+		    // maybe horizontal label
+		    if ( $args['label_type'] == 'horizontal' ) {
+			    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+			    $output .= '<div class="' . $input_col . '">';
+		    }
+
+		    if ( ! empty( $args['options'] ) ) {
+			    $count = 0;
+			    foreach ( $args['options'] as $value => $label ) {
+				    $option_args            = $args;
+				    $option_args['value']   = $value;
+				    $option_args['label']   = $label;
+				    $option_args['checked'] = $value == $args['value'] ? true : false;
+				    $output .= self::radio_option( $option_args, $count );
+				    $count ++;
+			    }
+		    }
+
+		    // help text
+		    $help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+		    $output .= $help_text;
+
+		    // maybe horizontal label
+		    if ( $args['label_type'] == 'horizontal' ) {
+			    $output .= '</div>';
+		    }
+
+		    // wrap
+		    $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+		    $wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
+		    $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+		    $output     = self::wrap( array(
+			    'content'         => $output,
+			    'class'           => $wrap_class,
+			    'element_require' => $args['element_require'],
+			    'argument_id'     => $args['id'],
+			    'wrap_attributes' => $args['wrap_attributes'],
+		    ) );
+
+
+		    return $output;
+	    }
+
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option( $args = array(), $count = '' ) {
-		$defaults = array(
-			'class'            => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			'required'         => false,
-			'inline'           => true,
-			'label'            => '',
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'extra_attributes' => array() // an array of extra attributes
-		);
-
-		/**
+	    public static function radio_option( $args = array(), $count = '' ) {
+		    $defaults = array(
+			    'class'            => '',
+			    'id'               => '',
+			    'title'            => '',
+			    'value'            => '',
+			    'required'         => false,
+			    'inline'           => true,
+			    'label'            => '',
+			    'options'          => array(),
+			    'icon'             => '',
+			    'no_wrap'          => false,
+			    'extra_attributes' => array() // an array of extra attributes
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// open/type
-		$output .= '<input type="radio"';
-
-		// class
-		$output .= ' class="form-check-input" ';
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
-		}
-
-		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
-			$output .= ' checked ';
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required';
-		}
-
-		// close opening tag
-		$output .= '>';
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
-				'title' => $args['label'],
-				'for'   => $args['id'] . $count,
-				'class' => 'form-check-label'
-			), 'radio' );
-		}
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
-
-			// Unique wrap class
-			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
-				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
-				$uniq_class .= '-' . $args['id'];
-			}
-
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
-				$uniq_class .= '-' . $args['value'];
-			} else {
-				$uniq_class .= '-' . $count;
-			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
-
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => $wrap_class
-			) );
-		}
-
-		return $output;
-	}
+		    $args = wp_parse_args( $args, $defaults );
+
+		    $output = '';
+
+		    // open/type
+		    $output .= '<input type="radio"';
+
+		    // class
+		    $output .= ' class="form-check-input" ';
+
+		    // name
+		    if ( ! empty( $args['name'] ) ) {
+			    $output .= AUI_Component_Helper::name( $args['name'] );
+		    }
+
+		    // id
+		    if ( ! empty( $args['id'] ) ) {
+			    $output .= AUI_Component_Helper::id( $args['id'] . $count );
+		    }
+
+		    // title
+		    if ( ! empty( $args['title'] ) ) {
+			    $output .= AUI_Component_Helper::title( $args['title'] );
+		    }
+
+		    // value
+		    if ( isset( $args['value'] ) ) {
+			    $output .= AUI_Component_Helper::value( $args['value'] );
+		    }
+
+		    // checked, for radio and checkboxes
+		    if ( $args['checked'] ) {
+			    $output .= ' checked ';
+		    }
+
+		    // data-attributes
+		    $output .= AUI_Component_Helper::data_attributes( $args );
+
+		    // aria-attributes
+		    $output .= AUI_Component_Helper::aria_attributes( $args );
+
+		    // extra attributes
+		    if ( ! empty( $args['extra_attributes'] ) ) {
+			    $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		    }
+
+		    // required
+		    if ( ! empty( $args['required'] ) ) {
+			    $output .= ' required';
+		    }
+
+		    // close opening tag
+		    $output .= '>';
+
+		    // label
+		    if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+		    } elseif ( ! empty( $args['label'] ) ) {
+			    $output .= self::label( array(
+				    'title' => $args['label'],
+				    'for'   => $args['id'] . $count,
+				    'class' => 'form-check-label'
+			    ), 'radio' );
+		    }
+
+		    // wrap
+		    if ( ! $args['no_wrap'] ) {
+			    $wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
+
+			    // Unique wrap class
+			    $uniq_class = 'fwrap';
+			    if ( ! empty( $args['name'] ) ) {
+				    $uniq_class .= '-' . $args['name'];
+			    } else if ( ! empty( $args['id'] ) ) {
+				    $uniq_class .= '-' . $args['id'];
+			    }
+
+			    if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+				    $uniq_class .= '-' . $args['value'];
+			    } else {
+				    $uniq_class .= '-' . $count;
+			    }
+			    $wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+
+			    $output = self::wrap( array(
+				    'content' => $output,
+				    'class'   => $wrap_class
+			    ) );
+		    }
+
+		    return $output;
+	    }
 
 }
\ No newline at end of file

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-helper.php

Switch Indentation +276 added lines, -276 removed lines

@@ -1,7 +1,7 @@ 
-<?php
+    <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit; // Exit if accessed directly
 }
 
 /**
@@ -9,9 +9,9 @@ 
  *
  * @since 1.0.0
  */
-class AUI_Component_Helper {
+    class AUI_Component_Helper {
 
-	/**
+	    /**
 	 * A component helper for generating a input name.
 	 *
 	 * @param $text
@@ -19,152 +19,152 @@ 
 	 *
 	 * @return string
 	 */
-	public static function name( $text, $multiple = false ) {
-		$output = '';
+	    public static function name( $text, $multiple = false ) {
+		    $output = '';
 
-		if ( $text ) {
-			$is_multiple = strpos( $text, '[' ) === false && $multiple ? '[]' : '';
-			$output      = ' name="' . esc_attr( $text ) . $is_multiple . '" ';
-		}
+		    if ( $text ) {
+			    $is_multiple = strpos( $text, '[' ) === false && $multiple ? '[]' : '';
+			    $output      = ' name="' . esc_attr( $text ) . $is_multiple . '" ';
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * A component helper for generating a item id.
 	 *
 	 * @param $text string The text to be used as the value.
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function id( $text ) {
-		$output = '';
+	    public static function id( $text ) {
+		    $output = '';
 
-		if ( $text ) {
-			$output = ' id="' . sanitize_html_class( $text ) . '" ';
-		}
+		    if ( $text ) {
+			    $output = ' id="' . sanitize_html_class( $text ) . '" ';
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * A component helper for generating a item title.
 	 *
 	 * @param $text string The text to be used as the value.
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function title( $text ) {
-		$output = '';
+	    public static function title( $text ) {
+		    $output = '';
 
-		if ( $text ) {
-			$output = ' title="' . esc_attr( $text ) . '" ';
-		}
+		    if ( $text ) {
+			    $output = ' title="' . esc_attr( $text ) . '" ';
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * A component helper for generating a item value.
 	 *
 	 * @param $text string The text to be used as the value.
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function value( $text ) {
-		$output = '';
+	    public static function value( $text ) {
+		    $output = '';
 
-		if ( $text !== null && $text !== false ) {
-			$output = ' value="' . esc_attr( wp_unslash( $text ) ) . '" ';
-		}
+		    if ( $text !== null && $text !== false ) {
+			    $output = ' value="' . esc_attr( wp_unslash( $text ) ) . '" ';
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * A component helper for generating a item class attribute.
 	 *
 	 * @param $text string The text to be used as the value.
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function class_attr( $text ) {
-		$output = '';
+	    public static function class_attr( $text ) {
+		    $output = '';
 
-		if ( $text ) {
-			$classes = self::esc_classes( $text );
-			if ( ! empty( $classes ) ) {
-				$output = ' class="' . $classes . '" ';
-			}
-		}
+		    if ( $text ) {
+			    $classes = self::esc_classes( $text );
+			    if ( ! empty( $classes ) ) {
+				    $output = ' class="' . $classes . '" ';
+			    }
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * Escape a string of classes.
 	 *
 	 * @param $text
 	 *
 	 * @return string
 	 */
-	public static function esc_classes( $text ) {
-		$output = '';
+	    public static function esc_classes( $text ) {
+		    $output = '';
 
-		if ( $text ) {
-			$classes = explode( " ", $text );
-			$classes = array_map( "trim", $classes );
-			$classes = array_map( "sanitize_html_class", $classes );
-			if ( ! empty( $classes ) ) {
-				$output = implode( " ", array_filter( $classes ) );
-			}
-		}
+		    if ( $text ) {
+			    $classes = explode( " ", $text );
+			    $classes = array_map( "trim", $classes );
+			    $classes = array_map( "sanitize_html_class", $classes );
+			    if ( ! empty( $classes ) ) {
+				    $output = implode( " ", array_filter( $classes ) );
+			    }
+		    }
 
-		return $output;
+		    return $output;
 
-	}
+	    }
 
-	/**
+	    /**
 	 * @param $args
 	 *
 	 * @return string
 	 */
-	public static function data_attributes( $args ) {
-		$output = '';
+	    public static function data_attributes( $args ) {
+		    $output = '';
 
-		if ( ! empty( $args ) ) {
+		    if ( ! empty( $args ) ) {
 
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "data-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-		}
+			    foreach ( $args as $key => $val ) {
+				    if ( substr( $key, 0, 5 ) === "data-" ) {
+					    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+				    }
+			    }
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * @param $args
 	 *
 	 * @return string
 	 */
-	public static function aria_attributes( $args ) {
-		$output = '';
+	    public static function aria_attributes( $args ) {
+		    $output = '';
 
-		if ( ! empty( $args ) ) {
+		    if ( ! empty( $args ) ) {
 
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "aria-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-		}
+			    foreach ( $args as $key => $val ) {
+				    if ( substr( $key, 0, 5 ) === "aria-" ) {
+					    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+				    }
+			    }
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * Build a font awesome icon from a class.
 	 *
 	 * @param $class
@@ -173,91 +173,91 @@ 
 	 *
 	 * @return string
 	 */
-	public static function icon( $class, $space_after = false, $extra_attributes = array() ) {
-		$output = '';
-
-		if ( $class ) {
-			$classes = self::esc_classes( $class );
-			if ( ! empty( $classes ) ) {
-				$output = '<i class="' . $classes . '" ';
-				// extra attributes
-				if ( ! empty( $extra_attributes ) ) {
-					$output .= AUI_Component_Helper::extra_attributes( $extra_attributes );
-				}
-				$output .= '></i>';
-				if ( $space_after ) {
-					$output .= " ";
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
+	    public static function icon( $class, $space_after = false, $extra_attributes = array() ) {
+		    $output = '';
+
+		    if ( $class ) {
+			    $classes = self::esc_classes( $class );
+			    if ( ! empty( $classes ) ) {
+				    $output = '<i class="' . $classes . '" ';
+				    // extra attributes
+				    if ( ! empty( $extra_attributes ) ) {
+					    $output .= AUI_Component_Helper::extra_attributes( $extra_attributes );
+				    }
+				    $output .= '></i>';
+				    if ( $space_after ) {
+					    $output .= " ";
+				    }
+			    }
+		    }
+
+		    return $output;
+	    }
+
+	    /**
 	 * @param $args
 	 *
 	 * @return string
 	 */
-	public static function extra_attributes( $args ) {
-		$output = '';
+	    public static function extra_attributes( $args ) {
+		    $output = '';
 
-		if ( ! empty( $args ) ) {
+		    if ( ! empty( $args ) ) {
 
-			if ( is_array( $args ) ) {
-				foreach ( $args as $key => $val ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			} else {
-				$output .= ' ' . $args . ' ';
-			}
+			    if ( is_array( $args ) ) {
+				    foreach ( $args as $key => $val ) {
+					    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+				    }
+			    } else {
+				    $output .= ' ' . $args . ' ';
+			    }
 
-		}
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * @param $args
 	 *
 	 * @return string
 	 */
-	public static function help_text( $text ) {
-		$output = '';
+	    public static function help_text( $text ) {
+		    $output = '';
 
-		if ( $text ) {
-			$output .= '<small class="form-text text-muted d-block">' . wp_kses_post( $text ) . '</small>';
-		}
+		    if ( $text ) {
+			    $output .= '<small class="form-text text-muted d-block">' . wp_kses_post( $text ) . '</small>';
+		    }
 
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * Replace element require context with JS.
 	 *
 	 * @param $input
 	 *
 	 * @return string|void
 	 */
-	public static function element_require( $input ) {
+	    public static function element_require( $input ) {
 
-		$input = str_replace( "'", '"', $input );// we only want double quotes
+		    $input = str_replace( "'", '"', $input );// we only want double quotes
 
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-			"jQuery(form).find('[data-argument=\"",
-			"\"]').find('input,select,textarea').val()",
-			"\"]').find('input:checked').val()",
-		), $input ) );
+		    $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+			    "jQuery(form).find('[data-argument=\"",
+			    "\"]').find('input,select,textarea').val()",
+			    "\"]').find('input:checked').val()",
+		    ), $input ) );
 
-		if ( $output ) {
-			$output = ' data-element-require="' . $output . '" ';
-		}
+		    if ( $output ) {
+			    $output = ' data-element-require="' . $output . '" ';
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
-	/**
+	    /**
 	 * Navigates through an array, object, or scalar, and removes slashes from the values.
 	 *
 	 * @since 0.1.41
@@ -267,24 +267,24 @@ 
 	 *
 	 * @return mixed Stripped value.
 	 */
-	public static function sanitize_html_field( $value, $input = array() ) {
-		$original = $value;
-
-		if ( is_array( $value ) ) {
-			foreach ( $value as $index => $item ) {
-				$value[ $index ] = self::_sanitize_html_field( $value, $input );
-			}
-		} elseif ( is_object( $value ) ) {
-			$object_vars = get_object_vars( $value );
-
-			foreach ( $object_vars as $property_name => $property_value ) {
-				$value->$property_name = self::_sanitize_html_field( $property_value, $input );
-			}
-		} else {
-			$value = self::_sanitize_html_field( $value, $input );
-		}
-
-		/**
+	    public static function sanitize_html_field( $value, $input = array() ) {
+		    $original = $value;
+
+		    if ( is_array( $value ) ) {
+			    foreach ( $value as $index => $item ) {
+				    $value[ $index ] = self::_sanitize_html_field( $value, $input );
+			    }
+		    } elseif ( is_object( $value ) ) {
+			    $object_vars = get_object_vars( $value );
+
+			    foreach ( $object_vars as $property_name => $property_value ) {
+				    $value->$property_name = self::_sanitize_html_field( $property_value, $input );
+			    }
+		    } else {
+			    $value = self::_sanitize_html_field( $value, $input );
+		    }
+
+		    /**
 		 * Filters content and keeps only allowable HTML elements.
 		 *
 		 * @since 0.1.41
@@ -293,10 +293,10 @@ 
 		 * @param string|array $value Original content without filter.
 		 * @param array $input Input Field.
 		 */
-		return apply_filters( 'ayecode_ui_sanitize_html_field', $value, $original, $input );
-	}
+		    return apply_filters( 'ayecode_ui_sanitize_html_field', $value, $original, $input );
+	    }
 
-	/**
+	    /**
 	 * Filters content and keeps only allowable HTML elements.
 	 *
 	 * This function makes sure that only the allowed HTML element names, attribute
@@ -316,25 +316,25 @@ 
 	 *
 	 * @return string Filtered content with only allowed HTML elements.
 	 */
-	public static function _sanitize_html_field( $value, $input = array() ) {
-		if ( $value === '' ) {
-			return $value;
-		}
+	    public static function _sanitize_html_field( $value, $input = array() ) {
+		    if ( $value === '' ) {
+			    return $value;
+		    }
 
-		$allowed_html = self::kses_allowed_html( 'post', $input );
+		    $allowed_html = self::kses_allowed_html( 'post', $input );
 
-		if ( ! is_array( $allowed_html ) ) {
-			$allowed_html = wp_kses_allowed_html( 'post' );
-		}
+		    if ( ! is_array( $allowed_html ) ) {
+			    $allowed_html = wp_kses_allowed_html( 'post' );
+		    }
 
-		$filtered = trim( wp_unslash( $value ) );
-		$filtered = wp_kses( $filtered, $allowed_html );
-		$filtered = balanceTags( $filtered ); // Balances tags
+		    $filtered = trim( wp_unslash( $value ) );
+		    $filtered = wp_kses( $filtered, $allowed_html );
+		    $filtered = balanceTags( $filtered ); // Balances tags
 
-		return $filtered;
-	}
+		    return $filtered;
+	    }
 
-	/**
+	    /**
 	 * Returns an array of allowed HTML tags and attributes for a given context.
 	 *
 	 * @since 0.1.41
@@ -346,32 +346,32 @@ 
 	 *
 	 * @return array Array of allowed HTML tags and their allowed attributes.
 	 */
-	public static function kses_allowed_html( $context = 'post', $input = array() ) {
-		$allowed_html = wp_kses_allowed_html( $context );
-
-		if ( is_array( $allowed_html ) ) {
-			// <iframe>
-			if ( ! isset( $allowed_html['iframe'] ) && $context == 'post' ) {
-				$allowed_html['iframe'] = array(
-					'class'           => true,
-					'id'              => true,
-					'src'             => true,
-					'width'           => true,
-					'height'          => true,
-					'frameborder'     => true,
-					'marginwidth'     => true,
-					'marginheight'    => true,
-					'scrolling'       => true,
-					'style'           => true,
-					'title'           => true,
-					'allow'           => true,
-					'allowfullscreen' => true,
-					'data-*'          => true,
-				);
-			}
-		}
-
-		/**
+	    public static function kses_allowed_html( $context = 'post', $input = array() ) {
+		    $allowed_html = wp_kses_allowed_html( $context );
+
+		    if ( is_array( $allowed_html ) ) {
+			    // <iframe>
+			    if ( ! isset( $allowed_html['iframe'] ) && $context == 'post' ) {
+				    $allowed_html['iframe'] = array(
+					    'class'           => true,
+					    'id'              => true,
+					    'src'             => true,
+					    'width'           => true,
+					    'height'          => true,
+					    'frameborder'     => true,
+					    'marginwidth'     => true,
+					    'marginheight'    => true,
+					    'scrolling'       => true,
+					    'style'           => true,
+					    'title'           => true,
+					    'allow'           => true,
+					    'allowfullscreen' => true,
+					    'data-*'          => true,
+				    );
+			    }
+		    }
+
+		    /**
 		 * Filters the allowed html tags.
 		 *
 		 * @since 0.1.41
@@ -380,30 +380,30 @@ 
 		 * @param @param string|array $context The context for which to retrieve tags.
 		 * @param array $input Input field.
 		 */
-		return apply_filters( 'ayecode_ui_kses_allowed_html', $allowed_html, $context, $input );
-	}
+		    return apply_filters( 'ayecode_ui_kses_allowed_html', $allowed_html, $context, $input );
+	    }
 
-	public static function get_column_class( $label_number = 2, $type = 'label' ) {
+	    public static function get_column_class( $label_number = 2, $type = 'label' ) {
 
-		$class = '';
+		    $class = '';
 
-		// set default if empty
-		if( $label_number === '' ){
-			$label_number = 2;
-		}
+		    // set default if empty
+		    if( $label_number === '' ){
+			    $label_number = 2;
+		    }
 
-		if ( $label_number && $label_number < 12 && $label_number > 0 ) {
-			if ( $type == 'label' ) {
-				$class = 'col-sm-' . absint( $label_number );
-			} elseif ( $type == 'input' ) {
-				$class = 'col-sm-' . ( 12 - absint( $label_number ) );
-			}
-		}
+		    if ( $label_number && $label_number < 12 && $label_number > 0 ) {
+			    if ( $type == 'label' ) {
+				    $class = 'col-sm-' . absint( $label_number );
+			    } elseif ( $type == 'input' ) {
+				    $class = 'col-sm-' . ( 12 - absint( $label_number ) );
+			    }
+		    }
 
-		return $class;
-	}
+		    return $class;
+	    }
 
-	/**
+	    /**
 	 * Sanitizes a multiline string from user input or from the database.
 	 *
 	 * Emulate the WP native sanitize_textarea_field function in a %%variable%% safe way.
@@ -415,10 +415,10 @@ 
 	 * @param string $str String to sanitize.
 	 * @return string Sanitized string.
 	 */
-	public static function sanitize_textarea_field( $str ) {
-		$filtered = self::_sanitize_text_fields( $str, true );
+	    public static function sanitize_textarea_field( $str ) {
+		    $filtered = self::_sanitize_text_fields( $str, true );
 
-		/**
+		    /**
 		 * Filters a sanitized textarea field string.
 		 *
 		 * @see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php
@@ -426,10 +426,10 @@ 
 		 * @param string $filtered The sanitized string.
 		 * @param string $str      The string prior to being sanitized.
 		 */
-		return apply_filters( 'sanitize_textarea_field', $filtered, $str );
-	}
+		    return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+	    }
 
-	/**
+	    /**
 	 * Internal helper function to sanitize a string from user input or from the db.
 	 *
 	 * @since 0.1.66
@@ -439,61 +439,61 @@ 
 	 * @param bool   $keep_newlines Optional. Whether to keep newlines. Default: false.
 	 * @return string Sanitized string.
 	 */
-	public static function _sanitize_text_fields( $str, $keep_newlines = false ) {
-		if ( is_object( $str ) || is_array( $str ) ) {
-			return '';
-		}
-
-		$str = (string) $str;
-
-		$filtered = wp_check_invalid_utf8( $str );
-
-		if ( strpos( $filtered, '<' ) !== false ) {
-			$filtered = wp_pre_kses_less_than( $filtered );
-			// This will strip extra whitespace for us.
-			$filtered = wp_strip_all_tags( $filtered, false );
-
-			// Use HTML entities in a special case to make sure no later
-			// newline stripping stage could lead to a functional tag.
-			$filtered = str_replace( "<\n", "&lt;\n", $filtered );
-		}
-
-		if ( ! $keep_newlines ) {
-			$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
-		}
-		$filtered = trim( $filtered );
-
-		$found = false;
-		while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) {
-			$filtered = str_replace( $match[1], '', $filtered );
-			$found = true;
-		}
-		unset( $match );
-
-		if ( $found ) {
-			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace( '` +`', ' ', $filtered ) );
-		}
-
-		return $filtered;
-	}
-
-	/**
+	    public static function _sanitize_text_fields( $str, $keep_newlines = false ) {
+		    if ( is_object( $str ) || is_array( $str ) ) {
+			    return '';
+		    }
+
+		    $str = (string) $str;
+
+		    $filtered = wp_check_invalid_utf8( $str );
+
+		    if ( strpos( $filtered, '<' ) !== false ) {
+			    $filtered = wp_pre_kses_less_than( $filtered );
+			    // This will strip extra whitespace for us.
+			    $filtered = wp_strip_all_tags( $filtered, false );
+
+			    // Use HTML entities in a special case to make sure no later
+			    // newline stripping stage could lead to a functional tag.
+			    $filtered = str_replace( "<\n", "&lt;\n", $filtered );
+		    }
+
+		    if ( ! $keep_newlines ) {
+			    $filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+		    }
+		    $filtered = trim( $filtered );
+
+		    $found = false;
+		    while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) {
+			    $filtered = str_replace( $match[1], '', $filtered );
+			    $found = true;
+		    }
+		    unset( $match );
+
+		    if ( $found ) {
+			    // Strip out the whitespace that may now exist after removing the octets.
+			    $filtered = trim( preg_replace( '` +`', ' ', $filtered ) );
+		    }
+
+		    return $filtered;
+	    }
+
+	    /**
 	 * Sanitize FontAwesome icon.
 	 *
 	 * @param string $icon Icon string.
 	 * @param array $args Extra args.
 	 * @return string Sanitized icon.
 	 */
-	public static function sanitize_fa_icon( $icon, $args = array() ) {
-		if ( ! is_scalar( $icon ) ) {
-			return "";
-		}
+	    public static function sanitize_fa_icon( $icon, $args = array() ) {
+		    if ( ! is_scalar( $icon ) ) {
+			    return "";
+		    }
 
-		$pattern = '/[^0-9a-zA-Z\-_ ]/';
+		    $pattern = '/[^0-9a-zA-Z\-_ ]/';
 
-		$sanitized_icon = preg_replace( $pattern, '', trim( $icon ) );
+		    $sanitized_icon = preg_replace( $pattern, '', trim( $icon ) );
 
-		return apply_filters( 'ayecode_ui_sanitize_fa_icon', $sanitized_icon, $icon, $args );
-	}
+		    return apply_filters( 'ayecode_ui_sanitize_fa_icon', $sanitized_icon, $icon, $args );
+	    }
 }
\ No newline at end of file