AyeCode / invoicing

invoicing.php

Spacing +11 added lines, -11 removed lines

@@ -15,20 +15,20 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Define constants.
-if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+	define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.6.26' );
+if (!defined('WPINV_VERSION')) {
+	define('WPINV_VERSION', '2.6.26');
 }
 
 // Include the main Invoicing class.
-if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+if (!class_exists('WPInv_Plugin', false)) {
+	require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function getpaid() {
 
-    if ( empty( $GLOBALS['invoicing'] ) ) {
+    if (empty($GLOBALS['invoicing'])) {
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
@@ -52,9 +52,9 @@ 
  * @since  2.0.8
  */
 function getpaid_deactivation_hook() {
-    update_option( 'wpinv_flush_permalinks', 1 );
+    update_option('wpinv_flush_permalinks', 1);
 }
-register_deactivation_hook( __FILE__, 'getpaid_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'getpaid_deactivation_hook');
 
 /**
  * @deprecated
@@ -64,4 +64,4 @@ 
 }
 
 // Kickstart the plugin.
-add_action( 'plugins_loaded', 'getpaid', -100 );
+add_action('plugins_loaded', 'getpaid', -100);

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

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+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;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.1.91";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	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 () {
+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' );
+	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)){
+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

Spacing +662 added lines, -662 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+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.
@@ -99,27 +99,27 @@ 
 		 * @return AyeCode_UI_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof 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' ) );
+					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;
@@ -134,13 +134,13 @@ 
 		 *
 		 * @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();
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
+			if (!empty($setting['color']['palette']['custom'])) {
+				foreach ($setting['color']['palette']['custom'] as $color) {
 					$theme_colors[$color['slug']] = esc_attr($color['name']);
 				}
 			}
@@ -151,81 +151,81 @@ 
 		/**
 		 * 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' );
+		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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_ORANGE_COLOR')) {
+				define('AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+			if (!defined('AUI_BLACK_COLOR')) {
+				define('AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL);
 			}
 
 		}
 
-		public static function get_colors( $original = false){
+		public static function get_colors($original = false) {
 
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+			if (!defined('AUI_PRIMARY_COLOR')) {
 				return array();
 			}
-			if ( $original ) {
+			if ($original) {
 				return array(
 					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
 					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
@@ -273,7 +273,7 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
+		public function add_bs5_admin_body_class($classes = '') {
 			$classes .= ' aui_bs5';
 
 			return $classes;
@@ -286,7 +286,7 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_body_class( $classes ) {
+		public function add_bs5_body_class($classes) {
 			$classes[] = 'aui_bs5';
 
 			return $classes;
@@ -299,12 +299,12 @@ 
             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 ) ) {
+			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 );
+					update_option('ayecode-ui-settings', $db_settings);
 					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
 				}
 			}
@@ -316,10 +316,10 @@ 
             // 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' ) );
+			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'));
 			}
 
 			/**
@@ -327,32 +327,32 @@ 
 			 *
 			 * We load super early in case there is a theme version that might change the colors
 			 */
-			if ( $this->settings['css'] ) {
+			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 );
+				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 );
+			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'] ) {
+			if ($this->settings['js']) {
 				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+				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 );
+			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 );
+			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_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper') {
+				add_action('admin_notices', array($this, 'show_admin_style_notice'));
 			}
 
 		}
@@ -360,11 +360,11 @@ 
 		/**
 		 * 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>'.$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>' . $message . '</p></div>';
 		}
 
 		/**
@@ -372,14 +372,14 @@ 
 		 *
 		 * @return bool
 		 */
-		public function load_admin_scripts(){
+		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 ){
+			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
 					}
 				}
@@ -391,9 +391,9 @@ 
 		/**
 		 * Add a html font size to the footer.
 		 */
-		public function html_font_size(){
+		public function html_font_size() {
 			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+			echo "<style>html{font-size:" . absint($this->settings['html_font_size']) . "px;}</style>";
 		}
 
 		/**
@@ -401,11 +401,11 @@ 
 		 *
 		 * @return bool
 		 */
-		public function is_aui_screen(){
+		public function is_aui_screen() {
 //			echo '###';exit;
 			$load = false;
 			// check if we should load or not
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// Only enable on set pages
 				$aui_screens = array(
 					'page',
@@ -416,24 +416,24 @@ 
 					'ayecode-ui-settings',
 					'site-editor'
 				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+				$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 ) ) {
+				if ($screen && in_array($screen->id, $screen_ids)) {
 					$load = true;
 				}
 
 				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
+				if (!empty($_REQUEST['legacy-widget-preview'])) {
 					$load = true;
 				}
 			}
 
-			return apply_filters( 'aui_load_on_admin' , $load );
+			return apply_filters('aui_load_on_admin', $load);
 		}
 
 		/**
@@ -442,7 +442,7 @@ 
 		 * @return bool
 		 */
 		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+			if (function_exists('wp_is_block_theme' && wp_is_block_theme())) {
 				return true;
 			}
 
@@ -457,40 +457,40 @@ 
 
             $load_fse = false;
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else{
+			} else {
 				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+				$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');
 
-					$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+					$current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 
 //					if ( is_admin() && !empty($_REQUEST['postType']) ) {
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->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' );
+					if (is_admin() && (!empty($_REQUEST['postType']) || $current_screen->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 );
+					wp_register_style('flatpickr', $this->url . 'assets' . $bs_ver . '/css/flatpickr.min.css', array(), $this->version);
 
 					// fix some wp-admin issues
-					if(is_admin()){
+					if (is_admin()) {
 						$custom_css = "
                 body{
                     background-color: #f1f1f1;
@@ -543,14 +543,14 @@ 
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
+						wp_add_inline_style('ayecode-ui', $custom_css);
 					}
 
 					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+					if ($load_fse) {
+						wp_add_inline_style('ayecode-ui-fse', self::custom_css($compatibility));
+					} else {
+						wp_add_inline_style('ayecode-ui', self::custom_css($compatibility));
 
 					}
 
@@ -571,10 +571,10 @@ 
 			$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' );
+			if ($aui_bs5) {
+				include_once(dirname(__FILE__) . '/inc/bs5-js.php');
+			} else {
+				include_once(dirname(__FILE__) . '/inc/bs4-js.php');
             }
 
 			$output = ob_get_clean();
@@ -582,10 +582,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', self::minify_js($output) );
+			), '', self::minify_js($output));
 		}
 
 
@@ -599,13 +599,13 @@ 
 			ob_start();
 			?>
             <script>
-				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+				<?php if (defined('FUSION_BUILDER_VERSION')) { ?>
                 /* With Avada builder */
 
 				<?php } ?>
             </script>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
 			), '', ob_get_clean());
@@ -616,7 +616,7 @@ 
 		 *
 		 * If this remains small then its best to use this than to add another JS file.
 		 */
-		public function inline_script_file_browser(){
+		public function inline_script_file_browser() {
 			ob_start();
 			?>
             <script>
@@ -631,10 +631,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -642,55 +642,55 @@ 
 		 */
 		public function enqueue_scripts() {
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else {
+			} 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 );
+				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 );
+				wp_register_script('flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version);
 
 				// flatpickr
-				wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+				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() );
+				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;
 
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+				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, array(
+					wp_register_script('bootstrap-js-bundle', $url, array(
 						'select2',
 						'jquery'
-					), $this->version, $this->is_bs3_compat() );
+					), $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' );
+					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' ) {
+					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, array( 'select2', 'jquery' ), $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
+					wp_register_script('bootstrap-js-popper', $url, array('select2', 'jquery'), $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', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
+				if ($load_inline) {
+					wp_register_script('bootstrap-dummy', '', array('select2', 'jquery'));
+					wp_enqueue_script('bootstrap-dummy');
 					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
+					wp_add_inline_script('bootstrap-dummy', $script);
 				}
 			}
 
@@ -699,17 +699,17 @@ 
 		/**
 		 * 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');
 		}
 
 		/**
@@ -718,19 +718,19 @@ 
 		 * @return string
 		 */
 		public function get_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
+			$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+			$content_url = untrailingslashit(WP_CONTENT_URL);
 
 			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
+			if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+				$content_url = str_replace('http://', 'https://', $content_url);
 			}
 
 			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+			$url = str_replace($content_dir, $content_url, $file_dir);
 
-			return trailingslashit( $url );
+			return trailingslashit($url);
 		}
 
 		/**
@@ -742,15 +742,15 @@ 
 
 			$url = '';
 			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+			$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());
+			$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;
@@ -760,7 +760,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+			register_setting('ayecode-ui-settings', 'ayecode-ui-settings');
 		}
 
 		/**
@@ -769,10 +769,10 @@ 
 		 */
 		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(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -780,7 +780,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function theme_js_settings(){
+		public function theme_js_settings() {
 			return array(
 				'ayetheme' => 'popper',
 				'listimia' => 'required',
@@ -796,24 +796,24 @@ 
 		 */
 		public function get_settings() {
 
-			$db_settings = get_option( 'ayecode-ui-settings' );
+			$db_settings = get_option('ayecode-ui-settings');
 			$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.
+			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])){
+				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;
+					$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(
+			$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
@@ -821,16 +821,16 @@ 
 				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
 				'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '4', // The default bootstrap version to sue by default
-			), $db_settings );
+			), $db_settings);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Bootstrap settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates 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);
 		}
 
 
@@ -838,28 +838,28 @@ 
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'aui' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'aui'));
 			}
-            $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
+            $overrides = apply_filters('ayecode-ui-settings', array(), array(), array());
 
 			?>
             <div class="wrap">
                 <h1><?php echo $this->name; ?></h1>
-                <p><?php echo apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.",'aui') );?></p>
+                <p><?php echo apply_filters('ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'aui')); ?></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 _e( 'BootStrap Version', 'aui' ); ?></h2>
-                    <p><?php echo 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.",'aui') );?></p>
+                    <h2><?php _e('BootStrap Version', 'aui'); ?></h2>
+                    <p><?php echo 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.", 'aui')); ?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
+	                if (!empty($overrides)) {
 		                echo aui()->alert(array(
 			                'type'=> 'info',
-			                'content'=> __("Some options are disabled as your current theme is overriding them.",'aui')
+			                'content'=> __("Some options are disabled as your current theme is overriding them.", 'aui')
 		                ));
 	                }
 	                ?>
@@ -867,87 +867,87 @@ 
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-css"><?php _e( 'Version', 'aui' ); ?></label></th>
+                                        for="wpbs-css"><?php _e('Version', 'aui'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[bs_ver]" id="wpbs-css" <?php echo !empty($overrides['bs_ver']) ? 'disabled' : ''; ?>>
-                                    <option	value="5" <?php selected( $this->settings['bs_ver'], '5' ); ?>><?php _e( 'v5 (recommended)', 'aui' ); ?></option>
-                                    <option value="4" <?php selected( $this->settings['bs_ver'], '4' ); ?>><?php _e( 'v4 (legacy)', 'aui' ); ?></option>
+                                    <option	value="5" <?php selected($this->settings['bs_ver'], '5'); ?>><?php _e('v5 (recommended)', 'aui'); ?></option>
+                                    <option value="4" <?php selected($this->settings['bs_ver'], '4'); ?>><?php _e('v4 (legacy)', 'aui'); ?></option>
                                 </select>
                             </td>
                         </tr>
                     </table>
 
-                    <h2><?php _e( 'Frontend', 'aui' ); ?></h2>
+                    <h2><?php _e('Frontend', 'aui'); ?></h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-css"><?php _e( 'Load CSS', 'aui' ); ?></label></th>
+                                        for="wpbs-css"><?php _e('Load CSS', 'aui'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[css]" id="wpbs-css" <?php echo !empty($overrides['css']) ? 'disabled' : ''; ?>>
-                                    <option	value="compatibility" <?php selected( $this->settings['css'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'aui' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css'], 'core' ); ?>><?php _e( 'Full Mode', 'aui' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css'], '' ); ?>><?php _e( 'Disabled', 'aui' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'aui'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css'], 'core'); ?>><?php _e('Full Mode', 'aui'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css'], ''); ?>><?php _e('Disabled', 'aui'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-js"><?php _e( 'Load JS', 'aui' ); ?></label></th>
+                                        for="wpbs-js"><?php _e('Load JS', 'aui'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[js]" id="wpbs-js" <?php echo !empty($overrides['js']) ? 'disabled' : ''; ?>>
-                                    <option	value="core-popper" <?php selected( $this->settings['js'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'aui' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js'], 'popper' ); ?>><?php _e( 'Popper', 'aui' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js'], 'required' ); ?>><?php _e( 'Required functions only', 'aui' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'aui' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'aui'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js'], 'popper'); ?>><?php _e('Popper', 'aui'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js'], 'required'); ?>><?php _e('Required functions only', 'aui'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js'], ''); ?>><?php _e('Disabled (not recommended)', 'aui'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-font_size"><?php _e( 'HTML Font Size (px)', 'aui' ); ?></label></th>
+                                        for="wpbs-font_size"><?php _e('HTML Font Size (px)', 'aui'); ?></label></th>
                             <td>
-                                <input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint( $this->settings['html_font_size']); ?>" placeholder="16" <?php echo !empty($overrides['html_font_size']) ? 'disabled' : ''; ?> />
-                                <p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.",'aui');?></p>
+                                <input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint($this->settings['html_font_size']); ?>" placeholder="16" <?php echo !empty($overrides['html_font_size']) ? 'disabled' : ''; ?> />
+                                <p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.", 'aui'); ?></p>
                             </td>
                         </tr>
 
                     </table>
 
-                    <h2><?php _e( 'Backend', 'aui' ); ?> (wp-admin)</h2>
+                    <h2><?php _e('Backend', 'aui'); ?> (wp-admin)</h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-css-admin"><?php _e( 'Load CSS', 'aui' ); ?></label></th>
+                                        for="wpbs-css-admin"><?php _e('Load CSS', 'aui'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[css_backend]" id="wpbs-css-admin" <?php echo !empty($overrides['css_backend']) ? 'disabled' : ''; ?>>
-                                    <option	value="compatibility" <?php selected( $this->settings['css_backend'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'aui' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css_backend'], 'core' ); ?>><?php _e( 'Full Mode (will cause style issues)', 'aui' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css_backend'], '' ); ?>><?php _e( 'Disabled', 'aui' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css_backend'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'aui'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css_backend'], 'core'); ?>><?php _e('Full Mode (will cause style issues)', 'aui'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css_backend'], ''); ?>><?php _e('Disabled', 'aui'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-js-admin"><?php _e( 'Load JS', 'aui' ); ?></label></th>
+                                        for="wpbs-js-admin"><?php _e('Load JS', 'aui'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[js_backend]" id="wpbs-js-admin" <?php echo !empty($overrides['js_backend']) ? 'disabled' : ''; ?>>
-                                    <option	value="core-popper" <?php selected( $this->settings['js_backend'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'aui' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js_backend'], 'popper' ); ?>><?php _e( 'Popper', 'aui' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js_backend'], 'required' ); ?>><?php _e( 'Required functions only', 'aui' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js_backend'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'aui' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js_backend'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'aui'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js_backend'], 'popper'); ?>><?php _e('Popper', 'aui'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js_backend'], 'required'); ?>><?php _e('Required functions only', 'aui'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js_backend'], ''); ?>><?php _e('Disabled (not recommended)', 'aui'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
                             <th scope="row"><label
-                                        for="wpbs-disable-admin"><?php _e( 'Disable load on URL', 'aui' ); ?></label></th>
+                                        for="wpbs-disable-admin"><?php _e('Disable load on URL', 'aui'); ?></label></th>
                             <td>
-                                <p><?php _e( 'If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'aui' ); ?></p>
-                                <textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin'];?></textarea>
+                                <p><?php _e('If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'aui'); ?></p>
+                                <textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin']; ?></textarea>
 
                             </td>
                         </tr>
@@ -965,9 +965,9 @@ 
 			<?php
 		}
 
-		public function customizer_settings($wp_customize){
+		public function customizer_settings($wp_customize) {
 			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI','aui'),
+				'title'    => __('AyeCode UI', 'aui'),
 				'priority' => 120,
 			));
 
@@ -981,8 +981,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color','aui'),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+				'label'    => __('Primary Color', 'aui'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_primary]',
 			)));
@@ -994,8 +994,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color','aui'),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+				'label'    => __('Secondary Color', 'aui'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_secondary]',
 			)));
@@ -1021,12 +1021,12 @@ 
                 .collapse.show:not(.in){display: inherit;}
                 .fade.show{opacity: 1;}
 
-                <?php if( defined( 'SVQ_THEME_VERSION' ) ){ ?>
+                <?php if (defined('SVQ_THEME_VERSION')) { ?>
                 /* KLEO theme specific */
                 .kleo-main-header .navbar-collapse.collapse.show:not(.in){display: block !important;}
                 <?php } ?>
 
-                <?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+                <?php if (defined('FUSION_BUILDER_VERSION')) { ?>
                 /* With Avada builder */
                 body.modal-open .modal.in  {opacity:1;z-index: 99999}
                 body.modal-open .modal.bsui.in .modal-content  {box-shadow: none;}
@@ -1037,10 +1037,10 @@ 
                 <?php } ?>
             </style>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 
@@ -1048,7 +1048,7 @@ 
             global $aui_bs5;
 
 			$colors = array();
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+			if (defined('BLOCKSTRAP_VERSION')) {
 
 				$setting = wp_get_global_settings();
 
@@ -1056,22 +1056,22 @@ 
 //                print_r(get_default_block_editor_settings());exit;
 
 //                print_r($setting);echo  '###';exit;
-				if(!empty($setting['color']['palette']['theme'])){
-					foreach($setting['color']['palette']['theme'] as $color){
+				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){
+				if (!empty($setting['color']['palette']['custom'])) {
+					foreach ($setting['color']['palette']['custom'] as $color) {
 						$colors[$color['slug']] = esc_attr($color['color']);
 					}
 				}
-			}else{
+			} 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
+					'primary'   => !empty($settings['color_primary']) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+					'secondary' => !empty($settings['color_secondary']) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
 				);
 			}
 
@@ -1082,25 +1082,25 @@ 
                 <?php
 
 					// BS v3 compat
-					if( self::is_bs3_compat() ){
+					if (self::is_bs3_compat()) {
 						echo self::bs3_compat_css();
 					}
 
-					if(!empty($colors)){
+					if (!empty($colors)) {
 						$d_colors = self::get_colors(true);
 
-                        $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+                        $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
                         $is_fse = false;
-                        if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                        if (is_admin() && (!empty($_REQUEST['postType']) || $current_screen->is_block_editor()) && (defined('BLOCKSTRAP_VERSION') || defined('AUI_FSE'))) {
                             $is_fse = true;
                         }
 
 //						$is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template';
-						foreach($colors as $key => $color ){
-							if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
+						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;
-								echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color);
+								echo $aui_bs5 ? self::css_overwrite_bs5($key, $var, $compat, $color) : self::css_overwrite($key, $var, $compat, $color);
 							}
 						}
 					   // exit;
@@ -1109,17 +1109,17 @@ 
 					// 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()){
+					if (is_admin()) {
 						echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
 					}
 
-                    if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) ){
+                    if ($aui_bs5 && defined('BLOCKSTRAP_VERSION')) {
                         $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)
+                        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) . ';';
                         }
 
@@ -1127,7 +1127,7 @@ 
                         $css .= '--bs-body-font-size: var(--wp--preset--font-size--small);';
 
 
-                        if($css){
+                        if ($css) {
                             echo 'body{' . $css . '}';
                         }
                     }
@@ -1139,10 +1139,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 
@@ -1152,7 +1152,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_bs3_compat(){
+		public static function is_bs3_compat() {
 			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
 		}
 
@@ -1161,7 +1161,7 @@ 
 			$hex = str_replace('#', '', $hex);
 
 			// Convert 3-digit hex to 6-digit hex
-			if(strlen($hex) == 3) {
+			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);
 			}
 
@@ -1183,12 +1183,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+		public static function css_overwrite_bs5($type, $color_code, $compatibility, $hex = '') {
 			global $aui_bs5;
 
 			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, '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;
@@ -1198,15 +1198,15 @@ 
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 
 			$rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
+			if ($compatibility === true || $compatibility === 1) {
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			}elseif (!$compatibility) {
 				$compatibility = '';
-			}else{
+			} else {
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -1223,29 +1223,29 @@ 
 			 * 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' ),
+				".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 ($aui_bs5) {
+				unset($selectors[".alert-{$type}"]);
 			}
 
-			if ( $type == 'primary' ) {
+			if ($type == 'primary') {
 				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
+						'a'                                                                                                    => array('c'),
+						'.btn-link'                                                                                            => array('c'),
+						'.dropdown-item.active'                                                                                => array('b'),
 						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
 							'b',
 							'o'
@@ -1254,57 +1254,57 @@ 
 							'b',
 							'o'
 						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
+						'.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' ),
+						'.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' ),
+						'.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).'; }';
+			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;}';
+				$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).');}';
+				$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 . ' .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).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !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 .= $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);
-            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
-            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --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);
+            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type) . '-rgb;
+            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
             --bs-btn-active-shadow: unset;
-            --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);
+            --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;
@@ -1315,17 +1315,17 @@ 
 			$output .= '}';
 
 			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+			$output .= $prefix . ' .btn-outline-' . esc_attr($type) . '{';
 			$output .= ' 
-            --bs-btn-border-color: '.esc_attr($color_code).';
-            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
-            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-border-color: '.esc_attr($color_code) . ';
+            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type) . '-rgb;
+            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
             --bs-btn-active-shadow: unset;
-            --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);
+            --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;
@@ -1337,17 +1337,17 @@ 
 
 
             // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':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);
+            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 ) {
+			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.'; }';
+				$output .= 'html body {--bs-' . esc_attr($type) . ': ' . esc_attr($color_code) . '; }';
+				$output .= 'html body {--bs-' . esc_attr($type) . '-rgb: ' . $rgb . '; }';
 			}
 
 
@@ -1356,25 +1356,25 @@ 
 
 			$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");
+			$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");
+			$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
+			$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 .= $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-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
@@ -1388,9 +1388,9 @@ 
 //			}
 
 			// alerts
-			if ( $aui_bs5 ) {
+			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;} ";
+				$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;
@@ -1405,12 +1405,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+		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 (!$color_code) {return ''; }
+			if (strpos($color_code, 'var') !== false) {
 				//if(!sanitize_hex_color($color_code)){
 				$color_code = esc_attr($color_code);
 				$is_var = true;
@@ -1420,15 +1420,15 @@ 
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 
             $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
+			if ($compatibility === true || $compatibility === 1) {
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			}elseif (!$compatibility) {
 				$compatibility = '';
-			}else{
+			} else {
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -1442,29 +1442,29 @@ 
 			 * 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' ),
+				".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 ($aui_bs5) {
+                unset($selectors[".alert-{$type}"]);
 			}
 
-			if ( $type == 'primary' ) {
+			if ($type == 'primary') {
 				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
+						'a'                                                                                                    => array('c'),
+						'.btn-link'                                                                                            => array('c'),
+						'.dropdown-item.active'                                                                                => array('b'),
 						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
 							'b',
 							'o'
@@ -1473,19 +1473,19 @@ 
 							'b',
 							'o'
 						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
+						'.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' ),
+						'.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' ),
+						'.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'),
@@ -1493,7 +1493,7 @@ 
 			}
 
 			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
+				".bg-{$type}" => array('b', 'f'),
 				".border-{$type}" => array('o'),
 				".text-{$type}" => array('c'),
 			);
@@ -1509,62 +1509,62 @@ 
 
 			$output = '';
 
-			if ( $aui_bs5 ) {
+			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.'; }';
+				$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;}
+			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;}
+			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)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
@@ -1572,27 +1572,27 @@ 
 
 			$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");
+			$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");
+			$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
+			$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 .= $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-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' ) {
+			if ($type == 'primary') {
 				// dropdown's
 				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
@@ -1604,9 +1604,9 @@ 
 			}
 
             // alerts
-			if ( $aui_bs5 ) {
+			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;} ";
+				$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;
@@ -1622,11 +1622,11 @@ 
 		 *
 		 * @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){
+			if (!$use_variable) {
 				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
+				if (!$color_code) {return ''; }
 			}
 
 			/**
@@ -1634,36 +1634,36 @@ 
 			 */
 			$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-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-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'),
+				'.page-item.active .page-link' => array('b', 'o'),
 				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
+				'.alert-primary' => array('b', 'o'),
 				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
+				'.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'),
+				'.bg-primary' => array('b', 'f'),
 				'.border-primary' => array('o'),
 				'.text-primary' => array('c'),
 			);
@@ -1680,88 +1680,88 @@ 
 			$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;}
+			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;}
+			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)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			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");
+			$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");
+			$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
+			$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;} ";
+			$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;} ";
+			$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;} ";
+			$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;} ";
+			$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			return $output;
 		}
@@ -1775,30 +1775,30 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_secondary($color_code,$compatibility){;
+		public static function css_secondary($color_code, $compatibility) {;
 			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
+			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-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'),
+				'.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'),
+				'.alert-secondary' => array('b', 'o'),
 				'.btn-link.btn-secondary' => array('c'),
 			);
 
 			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
+				'.bg-secondary' => array('b', 'f'),
 				'.border-secondary' => array('o'),
 				'.text-secondary' => array('c'),
 			);
@@ -1815,77 +1815,77 @@ 
 			$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;}
+			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;}
+			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)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			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)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			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");
+			$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");
+			$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
+			$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;} ";
+			$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;
@@ -1921,8 +1921,8 @@ 
 		/**
 		 * Check if we should display examples.
 		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+		public function maybe_show_examples() {
+			if (current_user_can('manage_options') && isset($_REQUEST['preview-aui'])) {
 				echo "<head>";
 				wp_head();
 				echo "</head>";
@@ -1938,7 +1938,7 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_examples(){
+		public function get_examples() {
 			$output = '';
 
 
@@ -2044,74 +2044,74 @@ 
 		 */
 		public static function calendar_params() {
 			$params = array(
-				'month_long_1' => __( 'January', 'aui' ),
-				'month_long_2' => __( 'February', 'aui' ),
-				'month_long_3' => __( 'March', 'aui' ),
-				'month_long_4' => __( 'April', 'aui' ),
-				'month_long_5' => __( 'May', 'aui' ),
-				'month_long_6' => __( 'June', 'aui' ),
-				'month_long_7' => __( 'July', 'aui' ),
-				'month_long_8' => __( 'August', 'aui' ),
-				'month_long_9' => __( 'September', 'aui' ),
-				'month_long_10' => __( 'October', 'aui' ),
-				'month_long_11' => __( 'November', 'aui' ),
-				'month_long_12' => __( 'December', 'aui' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'aui' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'aui' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'aui' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'aui' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'aui' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'aui' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'aui' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'aui' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'aui' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'aui' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'aui' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'aui' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'aui' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'aui' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'aui' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'aui' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'aui' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'aui' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'aui' ),
-				'day_s2_1' => __( 'Su', 'aui' ),
-				'day_s2_2' => __( 'Mo', 'aui' ),
-				'day_s2_3' => __( 'Tu', 'aui' ),
-				'day_s2_4' => __( 'We', 'aui' ),
-				'day_s2_5' => __( 'Th', 'aui' ),
-				'day_s2_6' => __( 'Fr', 'aui' ),
-				'day_s2_7' => __( 'Sa', 'aui' ),
-				'day_s3_1' => __( 'Sun', 'aui' ),
-				'day_s3_2' => __( 'Mon', 'aui' ),
-				'day_s3_3' => __( 'Tue', 'aui' ),
-				'day_s3_4' => __( 'Wed', 'aui' ),
-				'day_s3_5' => __( 'Thu', 'aui' ),
-				'day_s3_6' => __( 'Fri', 'aui' ),
-				'day_s3_7' => __( 'Sat', 'aui' ),
-				'day_s5_1' => __( 'Sunday', 'aui' ),
-				'day_s5_2' => __( 'Monday', 'aui' ),
-				'day_s5_3' => __( 'Tuesday', 'aui' ),
-				'day_s5_4' => __( 'Wednesday', 'aui' ),
-				'day_s5_5' => __( 'Thursday', 'aui' ),
-				'day_s5_6' => __( 'Friday', 'aui' ),
-				'day_s5_7' => __( 'Saturday', 'aui' ),
-				'am_lower' => __( 'am', 'aui' ),
-				'pm_lower' => __( 'pm', 'aui' ),
-				'am_upper' => __( 'AM', 'aui' ),
-				'pm_upper' => __( 'PM', 'aui' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+				'month_long_1' => __('January', 'aui'),
+				'month_long_2' => __('February', 'aui'),
+				'month_long_3' => __('March', 'aui'),
+				'month_long_4' => __('April', 'aui'),
+				'month_long_5' => __('May', 'aui'),
+				'month_long_6' => __('June', 'aui'),
+				'month_long_7' => __('July', 'aui'),
+				'month_long_8' => __('August', 'aui'),
+				'month_long_9' => __('September', 'aui'),
+				'month_long_10' => __('October', 'aui'),
+				'month_long_11' => __('November', 'aui'),
+				'month_long_12' => __('December', 'aui'),
+				'month_s_1' => _x('Jan', 'January abbreviation', 'aui'),
+				'month_s_2' => _x('Feb', 'February abbreviation', 'aui'),
+				'month_s_3' => _x('Mar', 'March abbreviation', 'aui'),
+				'month_s_4' => _x('Apr', 'April abbreviation', 'aui'),
+				'month_s_5' => _x('May', 'May abbreviation', 'aui'),
+				'month_s_6' => _x('Jun', 'June abbreviation', 'aui'),
+				'month_s_7' => _x('Jul', 'July abbreviation', 'aui'),
+				'month_s_8' => _x('Aug', 'August abbreviation', 'aui'),
+				'month_s_9' => _x('Sep', 'September abbreviation', 'aui'),
+				'month_s_10' => _x('Oct', 'October abbreviation', 'aui'),
+				'month_s_11' => _x('Nov', 'November abbreviation', 'aui'),
+				'month_s_12' => _x('Dec', 'December abbreviation', 'aui'),
+				'day_s1_1' => _x('S', 'Sunday initial', 'aui'),
+				'day_s1_2' => _x('M', 'Monday initial', 'aui'),
+				'day_s1_3' => _x('T', 'Tuesday initial', 'aui'),
+				'day_s1_4' => _x('W', 'Wednesday initial', 'aui'),
+				'day_s1_5' => _x('T', 'Friday initial', 'aui'),
+				'day_s1_6' => _x('F', 'Thursday initial', 'aui'),
+				'day_s1_7' => _x('S', 'Saturday initial', 'aui'),
+				'day_s2_1' => __('Su', 'aui'),
+				'day_s2_2' => __('Mo', 'aui'),
+				'day_s2_3' => __('Tu', 'aui'),
+				'day_s2_4' => __('We', 'aui'),
+				'day_s2_5' => __('Th', 'aui'),
+				'day_s2_6' => __('Fr', 'aui'),
+				'day_s2_7' => __('Sa', 'aui'),
+				'day_s3_1' => __('Sun', 'aui'),
+				'day_s3_2' => __('Mon', 'aui'),
+				'day_s3_3' => __('Tue', 'aui'),
+				'day_s3_4' => __('Wed', 'aui'),
+				'day_s3_5' => __('Thu', 'aui'),
+				'day_s3_6' => __('Fri', 'aui'),
+				'day_s3_7' => __('Sat', 'aui'),
+				'day_s5_1' => __('Sunday', 'aui'),
+				'day_s5_2' => __('Monday', 'aui'),
+				'day_s5_3' => __('Tuesday', 'aui'),
+				'day_s5_4' => __('Wednesday', 'aui'),
+				'day_s5_5' => __('Thursday', 'aui'),
+				'day_s5_6' => __('Friday', 'aui'),
+				'day_s5_7' => __('Saturday', 'aui'),
+				'am_lower' => __('am', 'aui'),
+				'pm_lower' => __('pm', 'aui'),
+				'am_upper' => __('AM', 'aui'),
+				'pm_upper' => __('PM', 'aui'),
+				'firstDayOfWeek' => (int) get_option('start_of_week'),
 				'time_24hr' => false,
-				'year' => __( 'Year', 'aui' ),
-				'hour' => __( 'Hour', 'aui' ),
-				'minute' => __( 'Minute', 'aui' ),
-				'weekAbbreviation' => __( 'Wk', 'aui' ),
-				'rangeSeparator' => __( ' to ', 'aui' ),
-				'scrollTitle' => __( 'Scroll to increment', 'aui' ),
-				'toggleTitle' => __( 'Click to toggle', 'aui' )
+				'year' => __('Year', 'aui'),
+				'hour' => __('Hour', 'aui'),
+				'minute' => __('Minute', 'aui'),
+				'weekAbbreviation' => __('Wk', 'aui'),
+				'rangeSeparator' => __(' to ', 'aui'),
+				'scrollTitle' => __('Scroll to increment', 'aui'),
+				'toggleTitle' => __('Click to toggle', 'aui')
 			);
 
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
+			return apply_filters('ayecode_ui_calendar_params', $params);
 		}
 
 		/**
@@ -2124,47 +2124,47 @@ 
 		public static function flatpickr_locale() {
 			$params = self::calendar_params();
 
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+			if (is_string($params)) {
+				$params = html_entity_decode($params, ENT_QUOTES, 'UTF-8');
 			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
+				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();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
+			for ($i = 1; $i <= 7; $i++) {
+				$day_s3[] = addslashes($params['day_s3_' . $i]);
+				$day_s5[] = addslashes($params['day_s3_' . $i]);
 			}
 
 			$month_s = array();
 			$month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] );
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] );
+			for ($i = 1; $i <= 12; $i++) {
+				$month_s[] = addslashes($params['month_s_' . $i]);
+				$month_long[] = addslashes($params['month_long_' . $i]);
 			}
 
 			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+		if (0) { ?><script><?php } ?>
                 {
                     weekdays: {
-                        shorthand: ['<?php echo implode( "','", $day_s3 ); ?>'],
-                            longhand: ['<?php echo implode( "','", $day_s5 ); ?>'],
+                        shorthand: ['<?php echo implode("','", $day_s3); ?>'],
+                            longhand: ['<?php echo implode("','", $day_s5); ?>'],
                     },
                     months: {
-                        shorthand: ['<?php echo implode( "','", $month_s ); ?>'],
-                            longhand: ['<?php echo implode( "','", $month_long ); ?>'],
+                        shorthand: ['<?php echo implode("','", $month_s); ?>'],
+                            longhand: ['<?php echo implode("','", $month_long); ?>'],
                     },
                     daysInMonth: [31,28,31,30,31,30,31,31,30,31,30,31],
-                        firstDayOfWeek: <?php echo (int) $params[ 'firstDayOfWeek' ]; ?>,
+                        firstDayOfWeek: <?php echo (int) $params['firstDayOfWeek']; ?>,
                     ordinal: function (nth) {
                         var s = nth % 100;
                         if (s > 3 && s < 21)
@@ -2180,21 +2180,21 @@ 
                                 return "th";
                         }
                     },
-                    rangeSeparator: '<?php echo addslashes( $params[ 'rangeSeparator' ] ); ?>',
-                        weekAbbreviation: '<?php echo addslashes( $params[ 'weekAbbreviation' ] ); ?>',
-                    scrollTitle: '<?php echo addslashes( $params[ 'scrollTitle' ] ); ?>',
-                    toggleTitle: '<?php echo addslashes( $params[ 'toggleTitle' ] ); ?>',
-                    amPM: ['<?php echo addslashes( $params[ 'am_upper' ] ); ?>','<?php echo addslashes( $params[ 'pm_upper' ] ); ?>'],
-                    yearAriaLabel: '<?php echo addslashes( $params[ 'year' ] ); ?>',
-                    hourAriaLabel: '<?php echo addslashes( $params[ 'hour' ] ); ?>',
-                    minuteAriaLabel: '<?php echo addslashes( $params[ 'minute' ] ); ?>',
-                    time_24hr: <?php echo ( $params[ 'time_24hr' ] ? 'true' : 'false' ) ; ?>
+                    rangeSeparator: '<?php echo addslashes($params['rangeSeparator']); ?>',
+                        weekAbbreviation: '<?php echo addslashes($params['weekAbbreviation']); ?>',
+                    scrollTitle: '<?php echo addslashes($params['scrollTitle']); ?>',
+                    toggleTitle: '<?php echo addslashes($params['toggleTitle']); ?>',
+                    amPM: ['<?php echo addslashes($params['am_upper']); ?>','<?php echo addslashes($params['pm_upper']); ?>'],
+                    yearAriaLabel: '<?php echo addslashes($params['year']); ?>',
+                    hourAriaLabel: '<?php echo addslashes($params['hour']); ?>',
+                    minuteAriaLabel: '<?php echo addslashes($params['minute']); ?>',
+                    time_24hr: <?php echo ($params['time_24hr'] ? 'true' : 'false'); ?>
                 }
-				<?php if ( 0 ) { ?></script><?php } ?>
+				<?php if (0) { ?></script><?php } ?>
 			<?php
 			$locale = ob_get_clean();
 
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_flatpickr_locale', trim($locale));
 		}
 
 		/**
@@ -2206,20 +2206,20 @@ 
 		 */
 		public static function select2_params() {
 			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'aui' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'aui' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'aui' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'aui' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'aui' )
+				'i18n_select_state_text'    => esc_attr__('Select an option&hellip;', 'aui'),
+				'i18n_no_matches'           => _x('No matches found', 'enhanced select', 'aui'),
+				'i18n_ajax_error'           => _x('Loading failed', 'enhanced select', 'aui'),
+				'i18n_input_too_short_1'    => _x('Please enter 1 or more characters', 'enhanced select', 'aui'),
+				'i18n_input_too_short_n'    => _x('Please enter %item% or more characters', 'enhanced select', 'aui'),
+				'i18n_input_too_long_1'     => _x('Please delete 1 character', 'enhanced select', 'aui'),
+				'i18n_input_too_long_n'     => _x('Please delete %item% characters', 'enhanced select', 'aui'),
+				'i18n_selection_too_long_1' => _x('You can only select 1 item', 'enhanced select', 'aui'),
+				'i18n_selection_too_long_n' => _x('You can only select %item% items', 'enhanced select', 'aui'),
+				'i18n_load_more'            => _x('Loading more results&hellip;', 'enhanced select', 'aui'),
+				'i18n_searching'            => _x('Searching&hellip;', 'enhanced select', 'aui')
 			);
 
-			return apply_filters( 'ayecode_ui_select2_params', $params );
+			return apply_filters('ayecode_ui_select2_params', $params);
 		}
 
 		/**
@@ -2232,17 +2232,17 @@ 
 		public static function select2_locale() {
 			$params = self::select2_params();
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			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));
 		}
 
 		/**
@@ -2255,35 +2255,35 @@ 
 		public static function timeago_locale() {
 			$params = array(
 				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'aui' ),
-				'prefix_after' => _x( 'after', 'time ago', 'aui' ) . ' ',
+				'suffix_ago' => ' ' . _x('ago', 'time ago', 'aui'),
+				'prefix_after' => _x('after', 'time ago', 'aui') . ' ',
 				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'aui' ),
-				'minute' => _x( 'about a minute', 'time ago', 'aui' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'aui' ),
-				'hour' => _x( 'about an hour', 'time ago', 'aui' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'aui' ),
-				'day' => _x( 'a day', 'time ago', 'aui' ),
-				'days' => _x( '%d days', 'time ago', 'aui' ),
-				'month' => _x( 'about a month', 'time ago', 'aui' ),
-				'months' => _x( '%d months', 'time ago', 'aui' ),
-				'year' => _x( 'about a year', 'time ago', 'aui' ),
-				'years' => _x( '%d years', 'time ago', 'aui' ),
+				'seconds' => _x('less than a minute', 'time ago', 'aui'),
+				'minute' => _x('about a minute', 'time ago', 'aui'),
+				'minutes' => _x('%d minutes', 'time ago', 'aui'),
+				'hour' => _x('about an hour', 'time ago', 'aui'),
+				'hours' => _x('about %d hours', 'time ago', 'aui'),
+				'day' => _x('a day', 'time ago', 'aui'),
+				'days' => _x('%d days', 'time ago', 'aui'),
+				'month' => _x('about a month', 'time ago', 'aui'),
+				'months' => _x('%d months', 'time ago', 'aui'),
+				'year' => _x('about a year', 'time ago', 'aui'),
+				'years' => _x('%d years', 'time ago', 'aui'),
 			);
 
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
+			$params = apply_filters('ayecode_ui_timeago_params', $params);
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			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_timeago_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_timeago_locale', trim($locale));
 		}
 
 		/**
@@ -2294,7 +2294,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2326,7 +2326,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2872,12 +2872,12 @@ 
                         });
                     }
                 }
-				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
+				<?php do_action('aui_conditional_fields_js', $this); ?>
             </script>
 			<?php
 			$output = ob_get_clean();
 
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+			return str_replace(array('<script>', '</script>'), '', self::minify_js($output));
 		}
 	}
 

vendor/ayecode/wp-super-duper/sd-functions.php

Spacing +705 added lines, -705 removed lines

@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+	return apply_filters('sd_widget_exclude', array());
 }
 
 
@@ -49,11 +49,11 @@ 
  *
  * @return array
  */
-function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
+function sd_get_margin_input($type = 'mt', $overwrite = array(), $include_negatives = true) {
 	global $aui_bs5;
 	$options = array(
-		''     => __( 'None', 'super-duper' ),
-		'auto' => __( 'auto', 'super-duper' ),
+		''     => __('None', 'super-duper'),
+		'auto' => __('auto', 'super-duper'),
 		'0'    => '0',
 		'1'    => '1',
 		'2'    => '2',
@@ -69,7 +69,7 @@ 
 		'12'   => '12',
 	);
 
-	if ( $include_negatives ) {
+	if ($include_negatives) {
 		$options['n1']  = '-1';
 		$options['n2']  = '-2';
 		$options['n3']  = '-3';
@@ -86,37 +86,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Margin top', 'super-duper' ),
+		'title'    => __('Margin top', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
 	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'super-duper' );
+	if ($type == 'mt') {
+		$defaults['title'] = __('Margin top', 'super-duper');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Margins', 'super-duper' ),
+			'title' => __('Margins', 'super-duper'),
 			'key'   => 'wrapper-margins',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'super-duper' );
+	} elseif ($type == 'mr') {
+		$defaults['title'] = __('Margin right', 'super-duper');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'super-duper' );
+	} elseif ($type == 'mb') {
+		$defaults['title'] = __('Margin bottom', 'super-duper');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'super-duper' );
+	} elseif ($type == 'ml') {
+		$defaults['title'] = __('Margin left', 'super-duper');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-margins',
@@ -124,7 +124,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -137,9 +137,9 @@ 
  *
  * @return array
  */
-function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
+function sd_get_padding_input($type = 'pt', $overwrite = array()) {
 	$options = array(
-		''   => __( 'None', 'super-duper' ),
+		''   => __('None', 'super-duper'),
 		'0'  => '0',
 		'1'  => '1',
 		'2'  => '2',
@@ -157,37 +157,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Padding top', 'super-duper' ),
+		'title'    => __('Padding top', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
 	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'super-duper' );
+	if ($type == 'pt') {
+		$defaults['title'] = __('Padding top', 'super-duper');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Padding', 'super-duper' ),
+			'title' => __('Padding', 'super-duper'),
 			'key'   => 'wrapper-padding',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'super-duper' );
+	} elseif ($type == 'pr') {
+		$defaults['title'] = __('Padding right', 'super-duper');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'super-duper' );
+	} elseif ($type == 'pb') {
+		$defaults['title'] = __('Padding bottom', 'super-duper');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'super-duper' );
+	} elseif ($type == 'pl') {
+		$defaults['title'] = __('Padding left', 'super-duper');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-padding',
@@ -196,7 +196,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -209,23 +209,23 @@ 
  *
  * @return array
  */
-function sd_get_border_input( $type = 'border', $overwrite = array() ) {
+function sd_get_border_input($type = 'border', $overwrite = array()) {
 	global $aui_bs5;
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Border' ),
+		'title'    => __('Border'),
 		'options'  => array(),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'geodirectory' ),
+		'group'    => __('Wrapper Styles', 'geodirectory'),
 	);
 
 	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'super-duper' );
+	if ('rounded' === $type) {
+		$defaults['title']           = __('Border radius type', 'super-duper');
 		$defaults['options']         = array(
-			''               => __( 'Default', 'super-duper' ),
+			''               => __('Default', 'super-duper'),
 			'rounded'        => 'rounded',
 			'rounded-top'    => 'rounded-top',
 			'rounded-right'  => 'rounded-right',
@@ -233,12 +233,12 @@ 
 			'rounded-left'   => 'rounded-left',
 		);
 		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'super-duper' );
+	} elseif ('rounded_size' === $type) {
+		$defaults['title'] = __('Border radius size', 'super-duper');
 
-		if ( $aui_bs5 ) {
+		if ($aui_bs5) {
 			$defaults['options'] = array(
-				''       => __( 'Default', 'super-duper' ),
+				''       => __('Default', 'super-duper'),
 				'0'      => '0',
 				'1'      => '1',
 				'2'      => '2',
@@ -249,56 +249,56 @@ 
 			);
 		} else {
 			$defaults['options'] = array(
-				''   => __( 'Default', 'super-duper' ),
-				'sm' => __( 'Small', 'super-duper' ),
-				'lg' => __( 'Large', 'super-duper' ),
+				''   => __('Default', 'super-duper'),
+				'sm' => __('Small', 'super-duper'),
+				'lg' => __('Large', 'super-duper'),
 			);
 		}
 		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'super-duper' );
+	} elseif ('width' === $type) { // BS%
+		$defaults['title']           = __('Border width', 'super-duper');
 		$defaults['options']         = array(
-			''         => __( 'Default', 'super-duper' ),
+			''         => __('Default', 'super-duper'),
 			'border-2' => '2',
 			'border-3' => '3',
 			'border-4' => '4',
 			'border-5' => '5',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'super-duper' );
+	} elseif ('opacity' === $type) { // BS%
+		$defaults['title']           = __('Border opacity', 'super-duper');
 		$defaults['options']         = array(
-			''                  => __( 'Default', 'super-duper' ),
+			''                  => __('Default', 'super-duper'),
 			'border-opacity-75' => '75%',
 			'border-opacity-50' => '50%',
 			'border-opacity-25' => '25%',
 			'border-opacity-10' => '10%',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'super-duper' );
+	} elseif ('type' === $type) {
+		$defaults['title']           = __('Border show', 'super-duper');
 		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'super-duper' ),
-			'border-top'      => __( 'Top', 'super-duper' ),
-			'border-bottom'   => __( 'Bottom', 'super-duper' ),
-			'border-left'     => __( 'Left', 'super-duper' ),
-			'border-right'    => __( 'Right', 'super-duper' ),
-			'border-top-0'    => __( '-Top', 'super-duper' ),
-			'border-bottom-0' => __( '-Bottom', 'super-duper' ),
-			'border-left-0'   => __( '-Left', 'super-duper' ),
-			'border-right-0'  => __( '-Right', 'super-duper' ),
+			'border'          => __('Full (set color to show)', 'super-duper'),
+			'border-top'      => __('Top', 'super-duper'),
+			'border-bottom'   => __('Bottom', 'super-duper'),
+			'border-left'     => __('Left', 'super-duper'),
+			'border-right'    => __('Right', 'super-duper'),
+			'border-top-0'    => __('-Top', 'super-duper'),
+			'border-bottom-0' => __('-Bottom', 'super-duper'),
+			'border-left-0'   => __('-Left', 'super-duper'),
+			'border-right-0'  => __('-Right', 'super-duper'),
 		);
 		$defaults['element_require'] = '[%border%]';
 
 	} else {
-		$defaults['title']   = __( 'Border color' );
+		$defaults['title']   = __('Border color');
 		$defaults['options'] = array(
-			                       ''  => __( 'Default', 'super-duper' ),
-			                       '0' => __( 'None', 'super-duper' ),
+			                       ''  => __('Default', 'super-duper'),
+			                       '0' => __('None', 'super-duper'),
 		                       ) + sd_aui_colors();
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -311,24 +311,24 @@ 
  *
  * @return array
  */
-function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
+function sd_get_shadow_input($type = 'shadow', $overwrite = array()) {
 	$options = array(
-		''          => __( 'None', 'super-duper' ),
-		'shadow-sm' => __( 'Small', 'super-duper' ),
-		'shadow'    => __( 'Regular', 'super-duper' ),
-		'shadow-lg' => __( 'Large', 'super-duper' ),
+		''          => __('None', 'super-duper'),
+		'shadow-sm' => __('Small', 'super-duper'),
+		'shadow'    => __('Regular', 'super-duper'),
+		'shadow-lg' => __('Large', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Shadow', 'super-duper' ),
+		'title'    => __('Shadow', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -341,22 +341,22 @@ 
  *
  * @return array
  */
-function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
+function sd_get_background_input($type = 'bg', $overwrite = array()) {
 	$options = array(
-		           ''            => __( 'None', 'super-duper' ),
-		           'transparent' => __( 'Transparent', 'super-duper' ),
+		           ''            => __('None', 'super-duper'),
+		           'transparent' => __('Transparent', 'super-duper'),
 	           ) + sd_aui_colors();
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background color', 'super-duper' ),
+		'title'    => __('Background color', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -369,9 +369,9 @@ 
  *
  * @return array
  */
-function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
+function sd_get_opacity_input($type = 'opacity', $overwrite = array()) {
 	$options = array(
-		''            => __( 'Default', 'super-duper' ),
+		''            => __('Default', 'super-duper'),
 		'opacity-10'  => '10%',
 		'opacity-15'  => '15%',
 		'opacity-25'  => '25%',
@@ -389,14 +389,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Opacity', 'super-duper' ),
+		'title'    => __('Opacity', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -409,102 +409,102 @@ 
  *
  * @return array
  */
-function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
+function sd_get_background_inputs($type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true ) : sd_aui_colors();
+	$color_options = $include_button_colors ? sd_aui_colors(false, true, true, true) : sd_aui_colors();
 
 	$options = array(
-		           ''            => __( 'None', 'super-duper' ),
-		           'transparent' => __( 'Transparent', 'super-duper' ),
+		           ''            => __('None', 'super-duper'),
+		           'transparent' => __('Transparent', 'super-duper'),
 	           ) + $color_options;
 
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'super-duper' );
+	if (false !== $overwrite_color) {
+		$options['custom-color'] = __('Custom Color', 'super-duper');
 	}
 
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'super-duper' );
+	if (false !== $overwrite_gradient) {
+		$options['custom-gradient'] = __('Custom Gradient', 'super-duper');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background Color', 'super-duper' ),
+		'title'    => __('Background Color', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Background', 'super-duper' ),
+		'group'    => __('Background', 'super-duper'),
 	);
 
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	if ($overwrite !== false) {
+		$input[$type] = wp_parse_args($overwrite, $defaults);
 	}
 
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
+	if ($overwrite_color !== false) {
+		$input[$type . '_color'] = wp_parse_args(
 			$overwrite_color,
 			array(
 				'type'            => 'color',
-				'title'           => __( 'Custom color', 'super-duper' ),
+				'title'           => __('Custom color', 'super-duper'),
 				'placeholder'     => '',
 				'default'         => '#0073aa',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'super-duper' ),
+				'group'           => __('Background', 'super-duper'),
 				'element_require' => '[%' . $type . '%]=="custom-color"',
 			)
 		);
 	}
 
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
+	if ($overwrite_gradient !== false) {
+		$input[$type . '_gradient'] = wp_parse_args(
 			$overwrite_gradient,
 			array(
 				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'super-duper' ),
+				'title'           => __('Custom gradient', 'super-duper'),
 				'placeholder'     => '',
 				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'super-duper' ),
+				'group'           => __('Background', 'super-duper'),
 				'element_require' => '[%' . $type . '%]=="custom-gradient"',
 			)
 		);
 	}
 
-	if ( $overwrite_image !== false ) {
+	if ($overwrite_image !== false) {
 
-		$input[ $type . '_image_fixed' ] = array(
+		$input[$type . '_image_fixed'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'super-duper' ),
+			'title'           => __('Fixed background', 'super-duper'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image_use_featured' ] = array(
+		$input[$type . '_image_use_featured'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'super-duper' ),
+			'title'           => __('Use featured image', 'super-duper'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'super-duper' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background', 'super-duper'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image' ] = wp_parse_args(
+		$input[$type . '_image'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image',
-				'title'       => __( 'Custom image', 'super-duper' ),
+				'title'       => __('Custom image', 'super-duper'),
 				'placeholder' => '',
 				'default'     => '',
 				'desc_tip'    => true,
-				'group'       => __( 'Background', 'super-duper' ),
+				'group'       => __('Background', 'super-duper'),
 				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
 			)
 		);
 
-		$input[ $type . '_image_id' ] = wp_parse_args(
+		$input[$type . '_image_id'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'hidden',
@@ -512,18 +512,18 @@ 
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'super-duper' ),
+				'group'       => __('Background', 'super-duper'),
 			)
 		);
 
-		$input[ $type . '_image_xy' ] = wp_parse_args(
+		$input[$type . '_image_xy'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image_xy',
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'super-duper' ),
+				'group'       => __('Background', 'super-duper'),
 			)
 		);
 	}
@@ -539,102 +539,102 @@ 
  *
  * @return array
  */
-function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
+function sd_get_shape_divider_inputs($type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array()) {
 
 	$options = array(
-		''                      => __( 'None', 'super-duper' ),
-		'mountains'             => __( 'Mountains', 'super-duper' ),
-		'drops'                 => __( 'Drops', 'super-duper' ),
-		'clouds'                => __( 'Clouds', 'super-duper' ),
-		'zigzag'                => __( 'Zigzag', 'super-duper' ),
-		'pyramids'              => __( 'Pyramids', 'super-duper' ),
-		'triangle'              => __( 'Triangle', 'super-duper' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'super-duper' ),
-		'tilt'                  => __( 'Tilt', 'super-duper' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'super-duper' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'super-duper' ),
-		'curve'                 => __( 'Curve', 'super-duper' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'super-duper' ),
-		'waves'                 => __( 'Waves', 'super-duper' ),
-		'wave-brush'            => __( 'Wave Brush', 'super-duper' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'super-duper' ),
-		'arrow'                 => __( 'Arrow', 'super-duper' ),
-		'split'                 => __( 'Split', 'super-duper' ),
-		'book'                  => __( 'Book', 'super-duper' ),
+		''                      => __('None', 'super-duper'),
+		'mountains'             => __('Mountains', 'super-duper'),
+		'drops'                 => __('Drops', 'super-duper'),
+		'clouds'                => __('Clouds', 'super-duper'),
+		'zigzag'                => __('Zigzag', 'super-duper'),
+		'pyramids'              => __('Pyramids', 'super-duper'),
+		'triangle'              => __('Triangle', 'super-duper'),
+		'triangle-asymmetrical' => __('Triangle Asymmetrical', 'super-duper'),
+		'tilt'                  => __('Tilt', 'super-duper'),
+		'opacity-tilt'          => __('Opacity Tilt', 'super-duper'),
+		'opacity-fan'           => __('Opacity Fan', 'super-duper'),
+		'curve'                 => __('Curve', 'super-duper'),
+		'curve-asymmetrical'    => __('Curve Asymmetrical', 'super-duper'),
+		'waves'                 => __('Waves', 'super-duper'),
+		'wave-brush'            => __('Wave Brush', 'super-duper'),
+		'waves-pattern'         => __('Waves Pattern', 'super-duper'),
+		'arrow'                 => __('Arrow', 'super-duper'),
+		'split'                 => __('Split', 'super-duper'),
+		'book'                  => __('Book', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'super-duper' ),
+		'title'    => __('Type', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'super-duper' ),
+		'group'    => __('Shape Divider', 'super-duper'),
 	);
 
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	$input[$type] = wp_parse_args($overwrite, $defaults);
 
-	$input[ $type . '_notice' ] = array(
+	$input[$type . '_notice'] = array(
 		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'super-duper' ),
+		'desc'            => __('Parent element must be position `relative`', 'super-duper'),
 		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'super-duper' ),
+		'group'           => __('Shape Divider', 'super-duper'),
 		'element_require' => '[%' . $type . '%]!=""',
 	);
 
-	$input[ $type . '_position' ] = wp_parse_args(
+	$input[$type . '_position'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Position', 'super-duper' ),
+			'title'           => __('Position', 'super-duper'),
 			'options'         => array(
-				'top'    => __( 'Top', 'super-duper' ),
-				'bottom' => __( 'Bottom', 'super-duper' ),
+				'top'    => __('Top', 'super-duper'),
+				'bottom' => __('Bottom', 'super-duper'),
 			),
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'super-duper' ),
+			'group'           => __('Shape Divider', 'super-duper'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
 	$options = array(
-		           ''            => __( 'None', 'super-duper' ),
-		           'transparent' => __( 'Transparent', 'super-duper' ),
+		           ''            => __('None', 'super-duper'),
+		           'transparent' => __('Transparent', 'super-duper'),
 	           ) + sd_aui_colors()
 	           + array(
-		           'custom-color' => __( 'Custom Color', 'super-duper' ),
+		           'custom-color' => __('Custom Color', 'super-duper'),
 	           );
 
-	$input[ $type . '_color' ] = wp_parse_args(
+	$input[$type . '_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Color', 'super-duper' ),
+			'title'           => __('Color', 'super-duper'),
 			'options'         => $options,
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'super-duper' ),
+			'group'           => __('Shape Divider', 'super-duper'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_custom_color' ] = wp_parse_args(
+	$input[$type . '_custom_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'color',
-			'title'           => __( 'Custom color', 'super-duper' ),
+			'title'           => __('Custom color', 'super-duper'),
 			'placeholder'     => '',
 			'default'         => '#0073aa',
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'super-duper' ),
+			'group'           => __('Shape Divider', 'super-duper'),
 			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_width' ] = wp_parse_args(
+	$input[$type . '_width'] = wp_parse_args(
 		$overwrite_gradient,
 		array(
 			'type'              => 'range',
-			'title'             => __( 'Width', 'super-duper' ),
+			'title'             => __('Width', 'super-duper'),
 			'placeholder'       => '',
 			'default'           => '200',
 			'desc_tip'          => true,
@@ -642,69 +642,69 @@ 
 				'min' => 100,
 				'max' => 300,
 			),
-			'group'             => __( 'Shape Divider', 'super-duper' ),
+			'group'             => __('Shape Divider', 'super-duper'),
 			'element_require'   => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_height' ] = array(
+	$input[$type . '_height'] = array(
 		'type'              => 'range',
-		'title'             => __( 'Height', 'super-duper' ),
+		'title'             => __('Height', 'super-duper'),
 		'default'           => '100',
 		'desc_tip'          => true,
 		'custom_attributes' => array(
 			'min' => 0,
 			'max' => 500,
 		),
-		'group'             => __( 'Shape Divider', 'super-duper' ),
+		'group'             => __('Shape Divider', 'super-duper'),
 		'element_require'   => '[%' . $type . '%]!=""',
 	);
 
 	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
+		'mountains'             => array('flip'),
+		'drops'                 => array('flip', 'invert'),
+		'clouds'                => array('flip', 'invert'),
 		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
+		'pyramids'              => array('flip', 'invert'),
+		'triangle'              => array('invert'),
+		'triangle-asymmetrical' => array('flip', 'invert'),
+		'tilt'                  => array('flip'),
+		'opacity-tilt'          => array('flip'),
 		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
+		'curve'                 => array('invert'),
+		'curve-asymmetrical'    => array('flip', 'invert'),
+		'waves'                 => array('flip', 'invert'),
+		'wave-brush'            => array('flip'),
+		'waves-pattern'         => array('flip'),
+		'arrow'                 => array('invert'),
+		'split'                 => array('invert'),
+		'book'                  => array('invert'),
 	);
 
-	$input[ $type . '_flip' ] = array(
+	$input[$type . '_flip'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'super-duper' ),
+		'title'           => __('Flip', 'super-duper'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'super-duper' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+		'group'           => __('Shape Divider', 'super-duper'),
+		'element_require' => sd_get_element_require_string($requires, 'flip', 'sd'),
 	);
 
-	$input[ $type . '_invert' ] = array(
+	$input[$type . '_invert'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'super-duper' ),
+		'title'           => __('Invert', 'super-duper'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'super-duper' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+		'group'           => __('Shape Divider', 'super-duper'),
+		'element_require' => sd_get_element_require_string($requires, 'invert', 'sd'),
 	);
 
-	$input[ $type . '_btf' ] = array(
+	$input[$type . '_btf'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'super-duper' ),
+		'title'           => __('Bring to front', 'super-duper'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'super-duper' ),
+		'group'           => __('Shape Divider', 'super-duper'),
 		'element_require' => '[%' . $type . '%]!=""',
 
 	);
@@ -721,19 +721,19 @@ 
  *
  * @return string
  */
-function sd_get_element_require_string( $args, $key, $type ) {
+function sd_get_element_require_string($args, $key, $type) {
 	$output   = '';
 	$requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
+	if (!empty($args)) {
+		foreach ($args as $t => $k) {
+			if (in_array($key, $k)) {
 				$requires[] = '[%' . $type . '%]=="' . $t . '"';
 			}
 		}
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
+		if (!empty($requires)) {
+			$output = '(' . implode(' || ', $requires) . ')';
 		}
 	}
 
@@ -748,39 +748,39 @@ 
  *
  * @return array
  */
-function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false ) {
+function sd_get_text_color_input($type = 'text_color', $overwrite = array(), $has_custom = false) {
 	$options = array(
-		           '' => __( 'None', 'super-duper' ),
+		           '' => __('None', 'super-duper'),
 	           ) + sd_aui_colors();
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'super-duper' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom color', 'super-duper');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text color', 'super-duper' ),
+		'title'    => __('Text color', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_text_color_input_group($type = 'text_color', $overwrite = array(), $overwrite_custom = array()) {
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_text_color_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_custom_color_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -794,22 +794,22 @@ 
  *
  * @return array
  */
-function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_custom_color_input($type = 'color_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'        => 'color',
-		'title'       => __( 'Custom color', 'super-duper' ),
+		'title'       => __('Custom color', 'super-duper'),
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'super-duper' ),
+		'group'       => __('Typography', 'super-duper'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -822,19 +822,19 @@ 
  *
  * @return array
  */
-function sd_get_col_input( $type = 'col', $overwrite = array() ) {
+function sd_get_col_input($type = 'col', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''     => __( 'Default', 'super-duper' ),
-		'auto' => __( 'auto', 'super-duper' ),
+		''     => __('Default', 'super-duper'),
+		'auto' => __('auto', 'super-duper'),
 		'1'    => '1/12',
 		'2'    => '2/12',
 		'3'    => '3/12',
@@ -851,15 +851,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Column width', 'super-duper' ),
+		'title'           => __('Column width', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'super-duper' ),
+		'group'           => __('Container', 'super-duper'),
 		'element_require' => '[%container%]=="col"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -872,18 +872,18 @@ 
  *
  * @return array
  */
-function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
+function sd_get_row_cols_input($type = 'row_cols', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''  => __( 'auto', 'super-duper' ),
+		''  => __('auto', 'super-duper'),
 		'1' => '1',
 		'2' => '2',
 		'3' => '3',
@@ -894,15 +894,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Row columns', 'super-duper' ),
+		'title'           => __('Row columns', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'super-duper' ),
+		'group'           => __('Container', 'super-duper'),
 		'element_require' => '[%container%]=="row"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -915,33 +915,33 @@ 
  *
  * @return array
  */
-function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
+function sd_get_text_align_input($type = 'text_align', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                => __( 'Default', 'super-duper' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'super-duper' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'super-duper' ),
-		'text' . $device_size . '-center' => __( 'Center', 'super-duper' ),
+		''                                => __('Default', 'super-duper'),
+		'text' . $device_size . '-left'   => __('Left', 'super-duper'),
+		'text' . $device_size . '-right'  => __('Right', 'super-duper'),
+		'text' . $device_size . '-center' => __('Center', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text align', 'super-duper' ),
+		'title'    => __('Text align', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -954,18 +954,18 @@ 
  *
  * @return array
  */
-function sd_get_display_input( $type = 'display', $overwrite = array() ) {
+function sd_get_display_input($type = 'display', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                   => __( 'Default', 'super-duper' ),
+		''                                   => __('Default', 'super-duper'),
 		'd' . $device_size . '-none'         => 'none',
 		'd' . $device_size . '-inline'       => 'inline',
 		'd' . $device_size . '-inline-block' => 'inline-block',
@@ -979,14 +979,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Display', 'super-duper' ),
+		'title'    => __('Display', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -999,17 +999,17 @@ 
  *
  * @return array
  */
-function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
+function sd_get_text_justify_input($type = 'text_justify', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'super-duper' ),
+		'title'    => __('Text justify', 'super-duper'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1023,72 +1023,72 @@ 
  *
  * @return array
  */
-function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false ) {
+function sd_aui_colors($include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false) {
 	$theme_colors = array();
 
-	$theme_colors['primary']   = __( 'Primary', 'super-duper' );
-	$theme_colors['secondary'] = __( 'Secondary', 'super-duper' );
-	$theme_colors['success']   = __( 'Success', 'super-duper' );
-	$theme_colors['danger']    = __( 'Danger', 'super-duper' );
-	$theme_colors['warning']   = __( 'Warning', 'super-duper' );
-	$theme_colors['info']      = __( 'Info', 'super-duper' );
-	$theme_colors['light']     = __( 'Light', 'super-duper' );
-	$theme_colors['dark']      = __( 'Dark', 'super-duper' );
-	$theme_colors['white']     = __( 'White', 'super-duper' );
-	$theme_colors['purple']    = __( 'Purple', 'super-duper' );
-	$theme_colors['salmon']    = __( 'Salmon', 'super-duper' );
-	$theme_colors['cyan']      = __( 'Cyan', 'super-duper' );
-	$theme_colors['gray']      = __( 'Gray', 'super-duper' );
-	$theme_colors['muted']     = __( 'Muted', 'super-duper' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'super-duper' );
-	$theme_colors['indigo']    = __( 'Indigo', 'super-duper' );
-	$theme_colors['orange']    = __( 'Orange', 'super-duper' );
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'super-duper' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'super-duper' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'super-duper' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
+	$theme_colors['primary']   = __('Primary', 'super-duper');
+	$theme_colors['secondary'] = __('Secondary', 'super-duper');
+	$theme_colors['success']   = __('Success', 'super-duper');
+	$theme_colors['danger']    = __('Danger', 'super-duper');
+	$theme_colors['warning']   = __('Warning', 'super-duper');
+	$theme_colors['info']      = __('Info', 'super-duper');
+	$theme_colors['light']     = __('Light', 'super-duper');
+	$theme_colors['dark']      = __('Dark', 'super-duper');
+	$theme_colors['white']     = __('White', 'super-duper');
+	$theme_colors['purple']    = __('Purple', 'super-duper');
+	$theme_colors['salmon']    = __('Salmon', 'super-duper');
+	$theme_colors['cyan']      = __('Cyan', 'super-duper');
+	$theme_colors['gray']      = __('Gray', 'super-duper');
+	$theme_colors['muted']     = __('Muted', 'super-duper');
+	$theme_colors['gray-dark'] = __('Gray dark', 'super-duper');
+	$theme_colors['indigo']    = __('Indigo', 'super-duper');
+	$theme_colors['orange']    = __('Orange', 'super-duper');
+
+	if ($include_outlines) {
+		$button_only                       = $outline_button_only_text ? ' ' . __('(button only)', 'super-duper') : '';
+		$theme_colors['outline-primary']   = __('Primary outline', 'super-duper') . $button_only;
+		$theme_colors['outline-secondary'] = __('Secondary outline', 'super-duper') . $button_only;
+		$theme_colors['outline-success']   = __('Success outline', 'super-duper') . $button_only;
+		$theme_colors['outline-danger']    = __('Danger outline', 'super-duper') . $button_only;
+		$theme_colors['outline-warning']   = __('Warning outline', 'super-duper') . $button_only;
+		$theme_colors['outline-info']      = __('Info outline', 'super-duper') . $button_only;
+		$theme_colors['outline-light']     = __('Light outline', 'super-duper') . $button_only;
+		$theme_colors['outline-dark']      = __('Dark outline', 'super-duper') . $button_only;
+		$theme_colors['outline-white']     = __('White outline', 'super-duper') . $button_only;
+		$theme_colors['outline-purple']    = __('Purple outline', 'super-duper') . $button_only;
+		$theme_colors['outline-salmon']    = __('Salmon outline', 'super-duper') . $button_only;
+		$theme_colors['outline-cyan']      = __('Cyan outline', 'super-duper') . $button_only;
+		$theme_colors['outline-gray']      = __('Gray outline', 'super-duper') . $button_only;
+		$theme_colors['outline-gray-dark'] = __('Gray dark outline', 'super-duper') . $button_only;
+		$theme_colors['outline-indigo']    = __('Indigo outline', 'super-duper') . $button_only;
+		$theme_colors['outline-orange']    = __('Orange outline', 'super-duper') . $button_only;
+	}
+
+	if ($include_branding) {
 		$theme_colors = $theme_colors + sd_aui_branding_colors();
 	}
 
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'super-duper' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'super-duper' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'super-duper' ) . $button_only;
-	}
-
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+	if ($include_translucent) {
+		$button_only                           = $outline_button_only_text ? ' ' . __('(button only)', 'super-duper') : '';
+		$theme_colors['translucent-primary']   = __('Primary translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-secondary'] = __('Secondary translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-success']   = __('Success translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-danger']    = __('Danger translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-warning']   = __('Warning translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-info']      = __('Info translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-light']     = __('Light translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-dark']      = __('Dark translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-white']     = __('White translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-purple']    = __('Purple translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-salmon']    = __('Salmon translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-cyan']      = __('Cyan translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-gray']      = __('Gray translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-gray-dark'] = __('Gray dark translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-indigo']    = __('Indigo translucent', 'super-duper') . $button_only;
+		$theme_colors['translucent-orange']    = __('Orange translucent', 'super-duper') . $button_only;
+	}
+
+	return apply_filters('sd_aui_colors', $theme_colors, $include_outlines, $include_branding);
 }
 
 /**
@@ -1098,17 +1098,17 @@ 
  */
 function sd_aui_branding_colors() {
 	return array(
-		'facebook'  => __( 'Facebook', 'super-duper' ),
-		'twitter'   => __( 'Twitter', 'super-duper' ),
-		'instagram' => __( 'Instagram', 'super-duper' ),
-		'linkedin'  => __( 'Linkedin', 'super-duper' ),
-		'flickr'    => __( 'Flickr', 'super-duper' ),
-		'github'    => __( 'GitHub', 'super-duper' ),
-		'youtube'   => __( 'YouTube', 'super-duper' ),
-		'wordpress' => __( 'WordPress', 'super-duper' ),
-		'google'    => __( 'Google', 'super-duper' ),
-		'yahoo'     => __( 'Yahoo', 'super-duper' ),
-		'vkontakte' => __( 'Vkontakte', 'super-duper' ),
+		'facebook'  => __('Facebook', 'super-duper'),
+		'twitter'   => __('Twitter', 'super-duper'),
+		'instagram' => __('Instagram', 'super-duper'),
+		'linkedin'  => __('Linkedin', 'super-duper'),
+		'flickr'    => __('Flickr', 'super-duper'),
+		'github'    => __('GitHub', 'super-duper'),
+		'youtube'   => __('YouTube', 'super-duper'),
+		'wordpress' => __('WordPress', 'super-duper'),
+		'google'    => __('Google', 'super-duper'),
+		'yahoo'     => __('Yahoo', 'super-duper'),
+		'vkontakte' => __('Vkontakte', 'super-duper'),
 	);
 }
 
@@ -1121,10 +1121,10 @@ 
  *
  * @return array
  */
-function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
+function sd_get_container_class_input($type = 'container', $overwrite = array()) {
 
 	$options = array(
-		'container'       => __( 'container (default)', 'super-duper' ),
+		'container'       => __('container (default)', 'super-duper'),
 		'container-sm'    => 'container-sm',
 		'container-md'    => 'container-md',
 		'container-lg'    => 'container-lg',
@@ -1140,19 +1140,19 @@ 
 		'card-footer'     => 'card-footer',
 		'list-group'      => 'list-group',
 		'list-group-item' => 'list-group-item',
-		''                => __( 'no container class', 'super-duper' ),
+		''                => __('no container class', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'super-duper' ),
+		'title'    => __('Type', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Container', 'super-duper' ),
+		'group'    => __('Container', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1165,10 +1165,10 @@ 
  *
  * @return array
  */
-function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
+function sd_get_position_class_input($type = 'position', $overwrite = array()) {
 
 	$options = array(
-		''                  => __( 'Default', 'super-duper' ),
+		''                  => __('Default', 'super-duper'),
 		'position-static'   => 'static',
 		'position-relative' => 'relative',
 		'position-absolute' => 'absolute',
@@ -1181,14 +1181,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Position', 'super-duper' ),
+		'title'    => __('Position', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1199,10 +1199,10 @@ 
  *
  * @return array
  */
-function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
+function sd_get_absolute_position_input($type = 'absolute_position', $overwrite = array()) {
 
 	$options = array(
-		''              => __( 'Default', 'super-duper' ),
+		''              => __('Default', 'super-duper'),
 		'top-left'      => 'top-left',
 		'top-center'    => 'top-center',
 		'top-right'     => 'top-right',
@@ -1216,15 +1216,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'super-duper' ),
+		'title'           => __('Absolute Position', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => '[%position%]=="position-absolute"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1237,30 +1237,30 @@ 
  *
  * @return array
  */
-function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
+function sd_get_sticky_offset_input($type = 'top', $overwrite = array()) {
 
 	$defaults = array(
 		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'super-duper' ),
+		'title'           => __('Sticky offset', 'super-duper'),
 		//'desc' =>  __('Sticky offset'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
 	);
 
 	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'super-duper' );
+	if ($type == 'top') {
+		$defaults['title'] = __('Top offset', 'super-duper');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'super-duper' ),
+			'title' => __('Sticky offset', 'super-duper'),
 			'key'   => 'sticky-offset',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'super-duper' );
+	} elseif ($type == 'bottom') {
+		$defaults['title'] = __('Bottom offset', 'super-duper');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key'   => 'sticky-offset',
@@ -1268,7 +1268,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1281,11 +1281,11 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
+function sd_get_font_size_input($type = 'font_size', $overwrite = array(), $has_custom = false) {
 	global $aui_bs5;
 
-	$options[] = __( 'Inherit from parent', 'super-duper' );
-	if ( $aui_bs5 ) {
+	$options[] = __('Inherit from parent', 'super-duper');
+	if ($aui_bs5) {
 		// responsive font sizes
 		$options['fs-base'] = 'fs-base (body default)';
 		$options['fs-6']    = 'fs-6';
@@ -1316,25 +1316,25 @@ 
 			'display-4' => 'display-4',
 		);
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$options['display-5'] = 'display-5';
 		$options['display-6'] = 'display-6';
 	}
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'super-duper' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom size', 'super-duper');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font size', 'super-duper' ),
+		'title'    => __('Font size', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1347,11 +1347,11 @@ 
  *
  * @return array
  */
-function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_font_custom_size_input($type = 'font_size_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'super-duper' ),
+		'title'             => __('Font size (rem)', 'super-duper'),
 		'default'           => '',
 		'placeholder'       => '1.25',
 		'custom_attributes' => array(
@@ -1360,14 +1360,14 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'super-duper' ),
+		'group'             => __('Typography', 'super-duper'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1380,11 +1380,11 @@ 
  *
  * @return array
  */
-function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
+function sd_get_font_line_height_input($type = 'font_line_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'super-duper' ),
+		'title'             => __('Font Line Height', 'super-duper'),
 		'default'           => '',
 		'placeholder'       => '1.75',
 		'custom_attributes' => array(
@@ -1393,10 +1393,10 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'super-duper' ),
+		'group'             => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1409,17 +1409,17 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_font_size_input_group($type = 'font_size', $overwrite = array(), $overwrite_custom = array()) {
 
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_font_size_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_font_custom_size_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -1433,10 +1433,10 @@ 
  *
  * @return array
  */
-function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_weight_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                                => __( 'Inherit', 'super-duper' ),
+		''                                => __('Inherit', 'super-duper'),
 		'font-weight-bold'                => 'bold',
 		'font-weight-bolder'              => 'bolder',
 		'font-weight-normal'              => 'normal',
@@ -1452,14 +1452,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Appearance', 'super-duper' ),
+		'title'    => __('Appearance', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1472,25 +1472,25 @@ 
  *
  * @return array
  */
-function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_case_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                => __( 'Default', 'super-duper' ),
-		'text-lowercase'  => __( 'lowercase', 'super-duper' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'super-duper' ),
-		'text-capitalize' => __( 'Capitalize', 'super-duper' ),
+		''                => __('Default', 'super-duper'),
+		'text-lowercase'  => __('lowercase', 'super-duper'),
+		'text-uppercase'  => __('UPPERCASE', 'super-duper'),
+		'text-capitalize' => __('Capitalize', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Letter case', 'super-duper' ),
+		'title'    => __('Letter case', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1504,23 +1504,23 @@ 
  * A helper function for font size
  *
  */
-function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
+function sd_get_font_italic_input($type = 'font_italic', $overwrite = array()) {
 
 	$options = array(
-		''            => __( 'No', 'super-duper' ),
-		'font-italic' => __( 'Yes', 'super-duper' ),
+		''            => __('No', 'super-duper'),
+		'font-italic' => __('Yes', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font italic', 'super-duper' ),
+		'title'    => __('Font italic', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'super-duper' ),
+		'group'    => __('Typography', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1533,18 +1533,18 @@ 
  *
  * @return array
  */
-function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
+function sd_get_anchor_input($type = 'anchor', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'super-duper' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.' ),
+		'title'    => __('HTML anchor', 'super-duper'),
+		'desc'     => __('Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'super-duper' ),
+		'group'    => __('Advanced', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1557,18 +1557,18 @@ 
  *
  * @return array
  */
-function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
+function sd_get_class_input($type = 'css_class', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'super-duper' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'super-duper' ),
+		'title'    => __('Additional CSS class(es)', 'super-duper'),
+		'desc'     => __('Separate multiple classes with spaces.', 'super-duper'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'super-duper' ),
+		'group'    => __('Advanced', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1581,45 +1581,45 @@ 
  *
  * @return array
  */
-function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
+function sd_get_hover_animations_input($type = 'hover_animations', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'none', 'super-duper' ),
-		'hover-zoom'       => __( 'Zoom', 'super-duper' ),
-		'hover-shadow'     => __( 'Shadow', 'super-duper' ),
-		'hover-move-up'    => __( 'Move up', 'super-duper' ),
-		'hover-move-down'  => __( 'Move down', 'super-duper' ),
-		'hover-move-left'  => __( 'Move left', 'super-duper' ),
-		'hover-move-right' => __( 'Move right', 'super-duper' ),
+		''                 => __('none', 'super-duper'),
+		'hover-zoom'       => __('Zoom', 'super-duper'),
+		'hover-shadow'     => __('Shadow', 'super-duper'),
+		'hover-move-up'    => __('Move up', 'super-duper'),
+		'hover-move-down'  => __('Move down', 'super-duper'),
+		'hover-move-left'  => __('Move left', 'super-duper'),
+		'hover-move-right' => __('Move right', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
 		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'super-duper' ),
+		'title'    => __('Hover Animations', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'super-duper' ),
+		'group'    => __('Hover Animations', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
 
-function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
+function sd_get_flex_align_items_input($type = 'align-items', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'super-duper' ),
+		''                                         => __('Default', 'super-duper'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1629,21 +1629,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'super-duper' ),
+		'title'           => __('Vertical Align Items', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
+function sd_get_flex_align_items_input_group($type = 'flex_align_items', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1651,28 +1651,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_items_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input($type = 'flex_justify_content', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                            => __( 'Default', 'super-duper' ),
+		''                                            => __('Default', 'super-duper'),
 		'justify-content' . $device_size . '-start'   => 'justify-content-start',
 		'justify-content' . $device_size . '-end'     => 'justify-content-end',
 		'justify-content' . $device_size . '-center'  => 'justify-content-center',
@@ -1682,21 +1682,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Justify content' ),
+		'title'           => __('Justify content'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input_group($type = 'flex_justify_content', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1704,11 +1704,11 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_justify_content_input($type, $overwrite);
 		}
 	}
 
@@ -1716,17 +1716,17 @@ 
 }
 
 
-function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input($type = 'flex_align_self', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'super-duper' ),
+		''                                         => __('Default', 'super-duper'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1736,21 +1736,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Align Self', 'super-duper' ),
+		'title'           => __('Align Self', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input_group($type = 'flex_align_self', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1758,53 +1758,53 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_self_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input($type = 'flex_order', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		'' => __( 'Default', 'super-duper' ),
+		'' => __('Default', 'super-duper'),
 	);
 
 	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
+	while ($i <= 5) {
+		$options['order' . $device_size . '-' . $i] = $i;
 		$i++;
 	}
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'super-duper' ),
+		'title'           => __('Flex Order', 'super-duper'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'super-duper' ),
+		'group'           => __('Wrapper Styles', 'super-duper'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input_group($type = 'flex_order', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1812,18 +1812,18 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_order_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_group($type = 'flex_wrap', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1831,28 +1831,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_wrap_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_input($type = 'flex_wrap', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                      => __( 'Default', 'super-duper' ),
+		''                                      => __('Default', 'super-duper'),
 		'flex' . $device_size . '-nowrap'       => 'nowrap',
 		'flex' . $device_size . '-wrap'         => 'wrap',
 		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
@@ -1860,14 +1860,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'super-duper' ),
+		'title'    => __('Flex wrap', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1878,10 +1878,10 @@ 
  *
  * @return array
  */
-function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
+function sd_get_zindex_input($type = 'zindex', $overwrite = array()) {
 
 	$options = array(
-		''          => __( 'Default', 'super-duper' ),
+		''          => __('Default', 'super-duper'),
 		'zindex-0'  => '0',
 		'zindex-1'  => '1',
 		'zindex-5'  => '5',
@@ -1890,14 +1890,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Z-index', 'super-duper' ),
+		'title'    => __('Z-index', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1908,26 +1908,26 @@ 
  *
  * @return array
  */
-function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
+function sd_get_overflow_input($type = 'overflow', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'Default', 'super-duper' ),
-		'overflow-auto'    => __( 'Auto', 'super-duper' ),
-		'overflow-hidden'  => __( 'Hidden', 'super-duper' ),
-		'overflow-visible' => __( 'Visible', 'super-duper' ),
-		'overflow-scroll'  => __( 'Scroll', 'super-duper' ),
+		''                 => __('Default', 'super-duper'),
+		'overflow-auto'    => __('Auto', 'super-duper'),
+		'overflow-hidden'  => __('Hidden', 'super-duper'),
+		'overflow-visible' => __('Visible', 'super-duper'),
+		'overflow-scroll'  => __('Scroll', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Overflow', 'super-duper' ),
+		'title'    => __('Overflow', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1938,19 +1938,19 @@ 
  *
  * @return array
  */
-function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
+function sd_get_max_height_input($type = 'max_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'        => 'text',
-		'title'       => __( 'Max height', 'super-duper' ),
+		'title'       => __('Max height', 'super-duper'),
 		'value'       => '',
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'super-duper' ),
+		'group'       => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1961,23 +1961,23 @@ 
  *
  * @return array
  */
-function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
+function sd_get_scrollbars_input($type = 'scrollbars', $overwrite = array()) {
 
 	$options = array(
-		''               => __( 'Default', 'super-duper' ),
-		'scrollbars-ios' => __( 'IOS Style', 'super-duper' ),
+		''               => __('Default', 'super-duper'),
+		'scrollbars-ios' => __('IOS Style', 'super-duper'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'super-duper' ),
+		'title'    => __('Scrollbars', 'super-duper'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'super-duper' ),
+		'group'    => __('Wrapper Styles', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1990,17 +1990,17 @@ 
  *
  * @return array
  */
-function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
+function sd_get_visibility_conditions_input($type = 'visibility_conditions', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'hidden',
-		'title'    => __( '', 'super-duper' ),
+		'title'    => __('', 'super-duper'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( '', 'super-duper' ),
+		'group'    => __('', 'super-duper'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2013,12 +2013,12 @@ 
  * @return string
  * @todo find best way to use px- py- or general p-
  */
-function sd_build_aui_class( $args ) {
+function sd_build_aui_class($args) {
 	global $aui_bs5;
 
 	$classes = array();
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$p_ml = 'ms-';
 		$p_mr = 'me-';
 
@@ -2033,254 +2033,254 @@ 
 	}
 
 	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+	if (isset($args['mt']) && $args['mt'] !== '') {
+		$classes[] = 'mt-' . sanitize_html_class($args['mt']);
 		$mt        = $args['mt'];
 	} else {
 		$mt = null;
 	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+	if (isset($args['mr']) && $args['mr'] !== '') {
+		$classes[] = $p_mr . sanitize_html_class($args['mr']);
 		$mr        = $args['mr'];
 	} else {
 		$mr = null;
 	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+	if (isset($args['mb']) && $args['mb'] !== '') {
+		$classes[] = 'mb-' . sanitize_html_class($args['mb']);
 		$mb        = $args['mb'];
 	} else {
 		$mb = null;
 	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+	if (isset($args['ml']) && $args['ml'] !== '') {
+		$classes[] = $p_ml . sanitize_html_class($args['ml']);
 		$ml        = $args['ml'];
 	} else {
 		$ml = null;
 	}
 
 	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+	if (isset($args['mt_md']) && $args['mt_md'] !== '') {
+		$classes[] = 'mt-md-' . sanitize_html_class($args['mt_md']);
 		$mt_md     = $args['mt_md'];
 	} else {
 		$mt_md = null;
 	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+	if (isset($args['mr_md']) && $args['mr_md'] !== '') {
+		$classes[] = $p_mr . 'md-' . sanitize_html_class($args['mr_md']);
 		$mt_md     = $args['mr_md'];
 	} else {
 		$mr_md = null;
 	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+	if (isset($args['mb_md']) && $args['mb_md'] !== '') {
+		$classes[] = 'mb-md-' . sanitize_html_class($args['mb_md']);
 		$mt_md     = $args['mb_md'];
 	} else {
 		$mb_md = null;
 	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+	if (isset($args['ml_md']) && $args['ml_md'] !== '') {
+		$classes[] = $p_ml . 'md-' . sanitize_html_class($args['ml_md']);
 		$mt_md     = $args['ml_md'];
 	} else {
 		$ml_md = null;
 	}
 
 	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+	if (isset($args['mt_lg']) && $args['mt_lg'] !== '') {
+		if ($mt == null && $mt_md == null) {
+			$classes[] = 'mt-' . sanitize_html_class($args['mt_lg']);
 		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+			$classes[] = 'mt-lg-' . sanitize_html_class($args['mt_lg']);
 		}
 	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+	if (isset($args['mr_lg']) && $args['mr_lg'] !== '') {
+		if ($mr == null && $mr_md == null) {
+			$classes[] = $p_mr . sanitize_html_class($args['mr_lg']);
 		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+			$classes[] = $p_mr . 'lg-' . sanitize_html_class($args['mr_lg']);
 		}
 	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+	if (isset($args['mb_lg']) && $args['mb_lg'] !== '') {
+		if ($mb == null && $mb_md == null) {
+			$classes[] = 'mb-' . sanitize_html_class($args['mb_lg']);
 		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+			$classes[] = 'mb-lg-' . sanitize_html_class($args['mb_lg']);
 		}
 	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+	if (isset($args['ml_lg']) && $args['ml_lg'] !== '') {
+		if ($ml == null && $ml_md == null) {
+			$classes[] = $p_ml . sanitize_html_class($args['ml_lg']);
 		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+			$classes[] = $p_ml . 'lg-' . sanitize_html_class($args['ml_lg']);
 		}
 	}
 
 	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+	if (isset($args['pt']) && $args['pt'] !== '') {
+		$classes[] = 'pt-' . sanitize_html_class($args['pt']);
 		$pt        = $args['pt'];
 	} else {
 		$pt = null;
 	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+	if (isset($args['pr']) && $args['pr'] !== '') {
+		$classes[] = $p_pr . sanitize_html_class($args['pr']);
 		$pr        = $args['pr'];
 	} else {
 		$pr = null;
 	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+	if (isset($args['pb']) && $args['pb'] !== '') {
+		$classes[] = 'pb-' . sanitize_html_class($args['pb']);
 		$pb        = $args['pb'];
 	} else {
 		$pb = null;
 	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+	if (isset($args['pl']) && $args['pl'] !== '') {
+		$classes[] = $p_pl . sanitize_html_class($args['pl']);
 		$pl        = $args['pl'];
 	} else {
 		$pl = null;
 	}
 
 	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+	if (isset($args['pt_md']) && $args['pt_md'] !== '') {
+		$classes[] = 'pt-md-' . sanitize_html_class($args['pt_md']);
 		$pt_md     = $args['pt_md'];
 	} else {
 		$pt_md = null;
 	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+	if (isset($args['pr_md']) && $args['pr_md'] !== '') {
+		$classes[] = $p_pr . 'md-' . sanitize_html_class($args['pr_md']);
 		$pt_md     = $args['pr_md'];
 	} else {
 		$pr_md = null;
 	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+	if (isset($args['pb_md']) && $args['pb_md'] !== '') {
+		$classes[] = 'pb-md-' . sanitize_html_class($args['pb_md']);
 		$pt_md     = $args['pb_md'];
 	} else {
 		$pb_md = null;
 	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+	if (isset($args['pl_md']) && $args['pl_md'] !== '') {
+		$classes[] = $p_pl . 'md-' . sanitize_html_class($args['pl_md']);
 		$pt_md     = $args['pl_md'];
 	} else {
 		$pl_md = null;
 	}
 
 	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+	if (isset($args['pt_lg']) && $args['pt_lg'] !== '') {
+		if ($pt == null && $pt_md == null) {
+			$classes[] = 'pt-' . sanitize_html_class($args['pt_lg']);
 		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+			$classes[] = 'pt-lg-' . sanitize_html_class($args['pt_lg']);
 		}
 	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+	if (isset($args['pr_lg']) && $args['pr_lg'] !== '') {
+		if ($pr == null && $pr_md == null) {
+			$classes[] = $p_pr . sanitize_html_class($args['pr_lg']);
 		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+			$classes[] = $p_pr . 'lg-' . sanitize_html_class($args['pr_lg']);
 		}
 	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+	if (isset($args['pb_lg']) && $args['pb_lg'] !== '') {
+		if ($pb == null && $pb_md == null) {
+			$classes[] = 'pb-' . sanitize_html_class($args['pb_lg']);
 		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+			$classes[] = 'pb-lg-' . sanitize_html_class($args['pb_lg']);
 		}
 	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+	if (isset($args['pl_lg']) && $args['pl_lg'] !== '') {
+		if ($pl == null && $pl_md == null) {
+			$classes[] = $p_pl . sanitize_html_class($args['pl_lg']);
 		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+			$classes[] = $p_pl . 'lg-' . sanitize_html_class($args['pl_lg']);
 		}
 	}
 
 	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+	if (!empty($args['row_cols']) && $args['row_cols'] !== '') {
+		$classes[] = sanitize_html_class('row-cols-' . $args['row_cols']);
 		$row_cols  = $args['row_cols'];
 	} else {
 		$row_cols = null;
 	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+	if (!empty($args['row_cols_md']) && $args['row_cols_md'] !== '') {
+		$classes[]   = sanitize_html_class('row-cols-md-' . $args['row_cols_md']);
 		$row_cols_md = $args['row_cols_md'];
 	} else {
 		$row_cols_md = null;
 	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+	if (!empty($args['row_cols_lg']) && $args['row_cols_lg'] !== '') {
+		if ($row_cols == null && $row_cols_md == null) {
+			$classes[] = sanitize_html_class('row-cols-' . $args['row_cols_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+			$classes[] = sanitize_html_class('row-cols-lg-' . $args['row_cols_lg']);
 		}
 	}
 
 	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
+	if (!empty($args['col']) && $args['col'] !== '') {
+		$classes[] = sanitize_html_class('col-' . $args['col']);
 		$col       = $args['col'];
 	} else {
 		$col = null;
 	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+	if (!empty($args['col_md']) && $args['col_md'] !== '') {
+		$classes[] = sanitize_html_class('col-md-' . $args['col_md']);
 		$col_md    = $args['col_md'];
 	} else {
 		$col_md = null;
 	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+	if (!empty($args['col_lg']) && $args['col_lg'] !== '') {
+		if ($col == null && $col_md == null) {
+			$classes[] = sanitize_html_class('col-' . $args['col_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+			$classes[] = sanitize_html_class('col-lg-' . $args['col_lg']);
 		}
 	}
 
 	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+	if (isset($args['border']) && ($args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0)) {
 		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
+	} elseif (!empty($args['border'])) {
 		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+		if (!empty($args['border_type']) && strpos($args['border_type'], '-0') === false) {
 			$border_class = '';
 		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+		$classes[] = $border_class . ' border-' . sanitize_html_class($args['border']);
 	}
 
 	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
+	if (!empty($args['rounded'])) {
+		$classes[] = sanitize_html_class($args['rounded']);
 	}
 
 	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+	if (isset($args['rounded_size']) && in_array($args['rounded_size'], array('sm', 'lg'))) {
+		$classes[] = 'rounded-' . sanitize_html_class($args['rounded_size']);
 		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
+		if (($key = array_search('rounded', $classes)) !== false) {
+			unset($classes[$key]);
 		}
 	} else {
 
 		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+		if (isset($args['rounded_size']) && $args['rounded_size'] !== '') {
+			$classes[]    = sanitize_html_class('rounded-' . $args['rounded_size']);
 			$rounded_size = $args['rounded_size'];
 		} else {
 			$rounded_size = null;
 		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+		if (isset($args['rounded_size_md']) && $args['rounded_size_md'] !== '') {
+			$classes[]       = sanitize_html_class('rounded-md-' . $args['rounded_size_md']);
 			$rounded_size_md = $args['rounded_size_md'];
 		} else {
 			$rounded_size_md = null;
 		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+		if (isset($args['rounded_size_lg']) && $args['rounded_size_lg'] !== '') {
+			if ($rounded_size == null && $rounded_size_md == null) {
+				$classes[] = sanitize_html_class('rounded-' . $args['rounded_size_lg']);
 			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+				$classes[] = sanitize_html_class('rounded-lg-' . $args['rounded_size_lg']);
 			}
 		}
 	}
@@ -2289,140 +2289,140 @@ 
 	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
 
 	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+	if (!empty($args['bg'])) {
+		$classes[] = 'bg-' . sanitize_html_class($args['bg']);
 	}
 
 	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+	if (!empty($args['text_color'])) {
+		$classes[] = 'text-' . sanitize_html_class($args['text_color']);
 	}
 
 	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
+	if (!empty($args['text_justify'])) {
 		$classes[] = 'text-justify';
 	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
+		if (!empty($args['text_align'])) {
+			$classes[]  = sanitize_html_class($args['text_align']);
 			$text_align = $args['text_align'];
 		} else {
 			$text_align = null;
 		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
+		if (!empty($args['text_align_md']) && $args['text_align_md'] !== '') {
+			$classes[]     = sanitize_html_class($args['text_align_md']);
 			$text_align_md = $args['text_align_md'];
 		} else {
 			$text_align_md = null;
 		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+		if (!empty($args['text_align_lg']) && $args['text_align_lg'] !== '') {
+			if ($text_align == null && $text_align_md == null) {
+				$classes[] = sanitize_html_class(str_replace('-lg', '', $args['text_align_lg']));
 			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
+				$classes[] = sanitize_html_class($args['text_align_lg']);
 			}
 		}
 	}
 
 	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
+	if (!empty($args['display'])) {
+		$classes[] = sanitize_html_class($args['display']);
 		$display   = $args['display'];
 	} else {
 		$display = null;
 	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
+	if (!empty($args['display_md']) && $args['display_md'] !== '') {
+		$classes[]  = sanitize_html_class($args['display_md']);
 		$display_md = $args['display_md'];
 	} else {
 		$display_md = null;
 	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+	if (!empty($args['display_lg']) && $args['display_lg'] !== '') {
+		if ($display == null && $display_md == null) {
+			$classes[] = sanitize_html_class(str_replace('-lg', '', $args['display_lg']));
 		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
+			$classes[] = sanitize_html_class($args['display_lg']);
 		}
 	}
 
 	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+	if (!empty($args['bgtus'])) {
+		$classes[] = sanitize_html_class('bg-transparent-until-scroll');
 	}
 
 	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+	if (!empty($args['bgtus']) && !empty($args['cscos'])) {
+		$classes[] = sanitize_html_class('color-scheme-flip-on-scroll');
 	}
 
 	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+	if (!empty($args['hover_animations'])) {
+		$classes[] = sd_sanitize_html_classes(str_replace(',', ' ', $args['hover_animations']));
 	}
 
 	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
+	if (!empty($args['absolute_position'])) {
+		if ('top-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
+		} elseif ('top-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
+		} elseif ('top-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
+		} elseif ('center-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
+		} elseif ('center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
+		} elseif ('center-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
+		} elseif ('bottom-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
+		} elseif ('bottom-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
+		} elseif ('bottom-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 bottom-0';
 		}
 	}
 
 	// build classes from build keys
 	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
+	if (!empty($build_keys)) {
+		foreach ($build_keys as $key) {
 
-			if ( substr( $key, -4 ) == '-MTD' ) {
+			if (substr($key, -4) == '-MTD') {
 
-				$k = str_replace( '-MTD', '', $key );
+				$k = str_replace('-MTD', '', $key);
 
 				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
+				if (!empty($args[$k]) && $args[$k] !== '') {
+					$classes[] = sanitize_html_class($args[$k]);
+					$v         = $args[$k];
 				} else {
 					$v = null;
 				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
+				if (!empty($args[$k . '_md']) && $args[$k . '_md'] !== '') {
+					$classes[] = sanitize_html_class($args[$k . '_md']);
+					$v_md      = $args[$k . '_md'];
 				} else {
 					$v_md = null;
 				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+				if (!empty($args[$k . '_lg']) && $args[$k . '_lg'] !== '') {
+					if ($v == null && $v_md == null) {
+						$classes[] = sanitize_html_class(str_replace('-lg', '', $args[$k . '_lg']));
 					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+						$classes[] = sanitize_html_class($args[$k . '_lg']);
 					}
 				}
 			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+				if ($key == 'font_size' && !empty($args[$key]) && $args[$key] == 'custom') {
 					continue;
 				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
+				if (!empty($args[$key])) {
+					$classes[] = sd_sanitize_html_classes($args[$key]);
 				}
 			}
 		}
 	}
 
-	return implode( ' ', $classes );
+	return implode(' ', $classes);
 }
 
 /**
@@ -2432,19 +2432,19 @@ 
  *
  * @return array
  */
-function sd_build_aui_styles( $args ) {
+function sd_build_aui_styles($args) {
 
 	$styles = array();
 
 	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
+	if (!empty($args['bg']) && $args['bg'] !== '') {
+		if ($args['bg'] == 'custom-color') {
 			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
+		} elseif ($args['bg'] == 'custom-gradient') {
 			$styles['background-image'] = $args['bg_gradient'];
 
 			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+			if (!empty($args['bg_on_text']) && $args['bg_on_text']) {
 				$styles['background-clip']         = 'text';
 				$styles['-webkit-background-clip'] = 'text';
 				$styles['text-fill-color']         = 'transparent';
@@ -2453,67 +2453,67 @@ 
 		}
 	}
 
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+	if (!empty($args['bg_image']) && $args['bg_image'] !== '') {
 		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+		if (!empty($styles['background-color']) && $args['bg'] == 'custom-color') {
 			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
 			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+		} elseif (!empty($styles['background-image']) && $args['bg'] == 'custom-gradient') {
 			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+		} elseif (!empty($args['bg']) && $args['bg'] != '' && $args['bg'] != 'transparent') {
 			// do nothing as we alreay have a preset
 			$hasImage = false;
 		} else {
 			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
 		}
 
-		if ( $hasImage ) {
+		if ($hasImage) {
 			$styles['background-size'] = 'cover';
 
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+			if (!empty($args['bg_image_fixed']) && $args['bg_image_fixed']) {
 				$styles['background-attachment'] = 'fixed';
 			}
 		}
 
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+		if ($hasImage && !empty($args['bg_image_xy']) && !empty($args['bg_image_xy']['x'])) {
+			$styles['background-position'] = ($args['bg_image_xy']['x'] * 100) . '% ' . ($args['bg_image_xy']['y'] * 100) . '%';
 		}
 	}
 
 	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
+	if (!empty($args['sticky_offset_top']) && $args['sticky_offset_top'] !== '') {
+		$styles['top'] = absint($args['sticky_offset_top']);
 	}
 
 	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+	if (!empty($args['sticky_offset_bottom']) && $args['sticky_offset_bottom'] !== '') {
+		$styles['bottom'] = absint($args['sticky_offset_bottom']);
 	}
 
 	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+	if (!empty($args['font_size_custom']) && $args['font_size_custom'] !== '') {
 		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
 	}
 
 	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
+	if (!empty($args['text_color_custom']) && $args['text_color_custom'] !== '') {
+		$styles['color'] = esc_attr($args['text_color_custom']);
 	}
 
 	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
+	if (!empty($args['font_line_height']) && $args['font_line_height'] !== '') {
+		$styles['line-height'] = esc_attr($args['font_line_height']);
 	}
 
 	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
+	if (!empty($args['max_height']) && $args['max_height'] !== '') {
+		$styles['max-height'] = esc_attr($args['max_height']);
 	}
 
 	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+	if (!empty($styles)) {
+		foreach ($styles as $key => $val) {
+			$style_string .= esc_attr($key) . ':' . esc_attr($val) . ';';
 		}
 	}
 
@@ -2529,28 +2529,28 @@ 
  *
  * @return string
  */
-function sd_build_hover_styles( $args, $is_preview = false ) {
+function sd_build_hover_styles($args, $is_preview = false) {
 	$rules = '';
 	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+	if (!empty($args['styleid'])) {
+		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr($args['styleid']) : 'html .' . esc_attr($args['styleid']);
 
 		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
+		if (!empty($args['text_color_hover'])) {
+			$key    = 'custom' === $args['text_color_hover'] && !empty($args['text_color_hover_custom']) ? 'text_color_hover_custom' : 'text_color_hover';
+			$color  = sd_get_color_from_var($args[$key]);
 			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
 		}
 
 		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
+		if (!empty($args['bg_hover'])) {
+			if ('custom-gradient' === $args['bg_hover']) {
 				$color  = $args['bg_hover_gradient'];
 				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
 			} else {
 				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
+				$color  = sd_get_color_from_var($args[$key]);
 				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
 			}
@@ -2567,11 +2567,11 @@ 
  *
  * @return mixed|string
  */
-function sd_get_color_from_var( $var ) {
+function sd_get_color_from_var($var) {
 
 	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+	if (strpos($var, '#') === false) {
+		$var = defined('BLOCKSTRAP_BLOCKS_VERSION') ? 'var(--wp--preset--color--' . esc_attr($var) . ')' : 'var(--' . esc_attr($var) . ')';
 	}
 
 	return $var;
@@ -2585,16 +2585,16 @@ 
  *
  * @return string
  */
-function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
+function sd_sanitize_html_classes($classes, $sep = ' ') {
 	$return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
+	if (!is_array($classes)) {
+		$classes = explode($sep, $classes);
 	}
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
+	if (!empty($classes)) {
+		foreach ($classes as $class) {
+			$return .= sanitize_html_class($class) . ' ';
 		}
 	}
 
@@ -2638,5 +2638,5 @@ 
 		'scrollbars',
 	);
 
-	return apply_filters( 'sd_class_build_keys', $keys );
+	return apply_filters('sd_class_build_keys', $keys);
 }

vendor/ayecode/wp-super-duper/wp-super-duper.php

Spacing +757 added lines, -757 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
-	define( 'SUPER_DUPER_VER', '1.1.17' );
+	define('SUPER_DUPER_VER', '1.1.17');
 
 	/**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -38,40 +38,40 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name'],
 				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
             // nested blocks can't work as a widget
-            if(!empty($this->options['nested-block'])){
-                if(empty($this->options['output_types'])){
-                    $this->options['output_types'] = array('shortcode','block');
+            if (!empty($this->options['nested-block'])) {
+                if (empty($this->options['output_types'])) {
+                    $this->options['output_types'] = array('shortcode', 'block');
                 }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
                     unset($this->options['output_types'][$key]);
                 }
             }
 
 			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-                parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
+                parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 			}
 
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -80,61 +80,61 @@ 
 
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
 				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-				    add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				if (empty($this->options['output_types']) || in_array('block', $this->options['output_types'])) {
+				    add_action('admin_enqueue_scripts', array($this, 'register_block'));
                 }
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
 				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+				if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) {
 					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+					add_action('admin_footer', array($this, 'shortcode_insert_button_script'));
 				}
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ) );
-				add_action( 'wp_head', array( $this, 'generator' ) );
+				add_action('admin_head', array($this, 'generator'));
+				add_action('wp_head', array($this, 'generator'));
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
         /**
@@ -142,7 +142,7 @@ 
          * @return void
          */
 		public function _register() {
-            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+            if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
                 parent::_register();
 			}
 		}
@@ -151,14 +151,14 @@ 
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -169,11 +169,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -182,8 +182,8 @@ 
 			$params    = array();
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -205,7 +205,7 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
@@ -214,29 +214,29 @@ 
 					$param['heading'] = $val['title'];
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('' => __("No"), '1' => __("Yes"));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -253,7 +253,7 @@ 
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
 		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -265,12 +265,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -281,14 +281,14 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						if (!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])) { continue; }
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -301,37 +301,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -347,22 +347,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$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, $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 ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '"' . (!empty($source[0]) ? ' data-sd-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 
 		/**
@@ -373,16 +373,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -390,7 +390,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -409,9 +409,9 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -421,21 +421,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -449,12 +449,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -470,7 +470,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -528,7 +528,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -563,10 +563,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -578,7 +578,7 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -697,25 +697,25 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+				<?php if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) { ?>
 				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -728,9 +728,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -813,11 +813,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -1016,11 +1016,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -1042,9 +1042,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 			</script>
@@ -1058,11 +1058,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
+		public function widget_css($advanced = true) {
 			ob_start();
 			?>
 			<style>
-				<?php if( $advanced ){ ?>
+				<?php if ($advanced) { ?>
 				.sd-advanced-setting {
 					display: none;
 				}
@@ -1104,10 +1104,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1174,7 +1174,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = $form ? $form : jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1265,7 +1265,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1274,10 +1274,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1288,14 +1288,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1308,8 +1308,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array($this, 'render_shortcode'));
 		}
 
 		/**
@@ -1318,50 +1318,50 @@ 
 		 * @since 1.0.0
 		 */
 		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
 				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						if (is_array($value)) {
+							$value = implode(",", $value);
 						}
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+						if (!empty($value)) {
+							$value = wp_unslash($value);
 
 							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
+							if ($is_preview) {
+								$value = $this->encode_shortcodes($value);
 							}
 						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+				$content = do_shortcode($shortcode);
 
 				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+				if (!empty($content) && $is_preview) {
+					$content = $this->decode_shortcodes($content);
 				}
 
 				echo $content;
@@ -1377,21 +1377,21 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
+		public function shortcode_output($args = array(), $content = '') {
 			$_instance = $args;
 
-			$args = $this->argument_values( $args );
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			if ( ! $this->is_preview() ) {
+			if (!$this->is_preview()) {
 				/**
 				 * Filters the settings for a particular widget args.
 				 *
@@ -1402,40 +1402,40 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+				$args = apply_filters('wp_super_duper_widget_display_callback', $args, $this, $_instance);
 
-				if ( ! is_array( $args ) ) {
+				if (!is_array($args)) {
 					return $args;
 				}
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1443,20 +1443,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1466,8 +1466,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 
 		/**
@@ -1477,13 +1477,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1499,26 +1499,26 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1545,12 +1545,12 @@ 
 		 *
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1562,7 +1562,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1570,9 +1570,9 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 			}
 		}
 
@@ -1586,9 +1586,9 @@ 
 			$show      = false;
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1606,19 +1606,19 @@ 
 		public function get_url() {
 			$url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			if (!$url) {
+				$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+				$content_url = untrailingslashit(WP_CONTENT_URL);
 
 				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
+				if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+					$content_url = str_replace('http://', 'https://', $content_url);
 				}
 
 				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
+				$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+				$url = str_replace($content_dir, $content_url, $file_dir);
+				$url = trailingslashit($url);
 				$this->url = $url;
 			}
 
@@ -1634,15 +1634,15 @@ 
 
 			$url = $this->url;
 
-			if ( ! $url ) {
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url       = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1663,46 +1663,46 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
+		public function group_arguments($arguments) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General" );
+				$general        = __("General");
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1716,38 +1716,38 @@ 
 		 *
 		 * @since 1.1.17
 		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+		public function group_block_tabs($tabs, $arguments) {
+			if (!empty($tabs) && !empty($arguments)) {
 				$has_sections = false;
 
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
+				foreach ($this->arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$has_sections = true;
 						break;
 					}
 				}
 
-				if ( ! $has_sections ) {
+				if (!$has_sections) {
 					return $tabs;
 				}
 
 				$new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
+				foreach ($tabs as $tab_key => $tab) {
 					$new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
+					if (!empty($tab['groups']) && is_array($tab['groups'])) {
+						foreach ($tab['groups'] as $group) {
+							if (isset($arguments[$group])) {
 								$new_groups[] = $group;
 							}
 						}
 					}
 
-					if ( ! empty( $new_groups ) ) {
+					if (!empty($new_groups)) {
 						$tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
+						$new_tabs[$tab_key] = $tab;
 					}
 				}
 
@@ -1777,7 +1777,7 @@ 
 			<script>
 
 			<?php
-			if(!$sd_is_js_functions_loaded){
+			if (!$sd_is_js_functions_loaded) {
                 $sd_is_js_functions_loaded = true;
             ?>
 
@@ -1973,7 +1973,7 @@ 
 
 				// maybe use featured image.
 				if( $args['bg_image_use_featured'] !== undefined && $args['bg_image_use_featured'] ){
-					$bg_image = '<?php echo $this->get_url();?>icons/placeholder.png';
+					$bg_image = '<?php echo $this->get_url(); ?>icons/placeholder.png';
 				}
 
                 if( $bg_image !== undefined && $bg_image !== '' ){
@@ -2048,7 +2048,7 @@ 
                 $classes = [];
 
 				<?php
-				if($aui_bs5){
+				if ($aui_bs5) {
 					?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
@@ -2057,7 +2057,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else {
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2242,7 +2242,7 @@ 
             }
 
 			function sd_get_class_build_keys(){
-				return <?php echo json_encode(sd_get_class_build_keys());?>;
+				return <?php echo json_encode(sd_get_class_build_keys()); ?>;
 			}
 
             <?php
@@ -2250,7 +2250,7 @@ 
 
             }
 
-			if(method_exists($this,'block_global_js')){
+			if (method_exists($this, 'block_global_js')) {
 					echo $this->block_global_js();
 			}
 			?>
@@ -2279,9 +2279,9 @@ 
                     var InnerBlocks = blockEditor.InnerBlocks;
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
                     const MediaUpload = wp.blockEditor.MediaUpload;
 
 					/**
@@ -2296,20 +2296,20 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2 ; ?>,
-                        title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2; ?>,
+                        title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
 						<?php
-						if ( isset( $this->options['block-label'] ) ) {
+						if (isset($this->options['block-label'])) {
 						?>
 						__experimentalLabel( attributes, { context } ) {
                             return <?php echo $this->options['block-label']; ?>;
@@ -2317,8 +2317,8 @@ 
                         <?php
                         }
                         ?>
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 
 //						// block hover preview.
@@ -2345,11 +2345,11 @@ 
                         }
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -2363,10 +2363,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -2374,56 +2374,56 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
 
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
-								if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+								if ($args['type'] == 'image' || $args['type'] == 'images') {
 									$img_drag_drop = true;
 								}
 
 								// set if we should show alignment
-								if ( $key == 'alignment' ) {
+								if ($key == 'alignment') {
 									$show_alignment = true;
 								}
 
 								$extra = '';
 
-								if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+								if ($args['type'] == 'notice' || $args['type'] == 'tab') {
 									continue;
 								}
-								elseif ( $args['type'] == 'checkbox' ) {
+								elseif ($args['type'] == 'checkbox') {
 									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+								} elseif ($args['type'] == 'number') {
 									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 									$type = 'array';
-									if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-										$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+									if (isset($args['default']) && is_array($args['default'])) {
+										$default = !empty($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 									}
-								} elseif ( $args['type'] == 'tagselect' ) {
+								} elseif ($args['type'] == 'tagselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'multiselect' ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'multiselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'image_xy' ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'image_xy') {
 									$type    = 'object';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'image' ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'image') {
 									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
                                     // add a field for ID
 //                                    echo $key . "_id : {";
@@ -2435,7 +2435,7 @@ 
 
 								} else {
 									$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
 								}
 								echo $key . " : {";
@@ -2459,7 +2459,7 @@ 
 
 <?php
 // only include the drag/drop functions if required.
-if( $img_drag_drop ){
+if ($img_drag_drop) {
 
 ?>
 
@@ -2525,9 +2525,9 @@ 
 							}
 
                             <?php
-                            if(!empty($this->options['block-edit-raw'])) {
+                            if (!empty($this->options['block-edit-raw'])) {
                                 echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-                            }else{
+                            } else {
                             ?>
 
 function hasSelectedInnerBlock(props) {
@@ -2551,7 +2551,7 @@ 
 	var $value = '';
 	<?php
 	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+	if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 	?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
@@ -2566,9 +2566,9 @@ 
 		}
 <?php
 	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+	if (!empty($this->arguments['post_type']['onchange_rest']['path'])) {
+		$cat_path = esc_js(strip_tags($this->arguments['post_type']['onchange_rest']['path']));
+		$cat_path = str_replace(array('&quot;', '&#039;'), array('"', "'"), $cat_path);
 	}
 ?>
 		/* taxonomies */
@@ -2576,15 +2576,15 @@ 
 			if (!window.gdCPTCats) {
 				window.gdCPTCats = [];
 			}
-			var gdCatPath = "<?php echo ( ! empty( $cat_path ) ? $cat_path : "/wp/v2/" + $value + "/categories/?per_page=100" ); ?>";
+			var gdCatPath = "<?php echo (!empty($cat_path) ? $cat_path : "/wp/v2/" +$value + "/categories/?per_page=100"); ?>";
 			if (window.gdCPTCats[gdCatPath]) {
 				terms = window.gdCPTCats[gdCatPath];
-				while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
-				taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+				taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 				jQuery.each( terms, function( key, val ) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 				});
 
 				/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2594,12 +2594,12 @@ 
 			} else {
 				wp.apiFetch({path: gdCatPath}).then(terms => {
 					window.gdCPTCats[gdCatPath] = terms;
-					while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 					jQuery.each( terms, function( key, val ) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 					});
 
 					/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2607,7 +2607,7 @@ 
 					props.setAttributes({category: [0] });
 					props.setAttributes({category: $old_cat_value });
 
-					return taxonomies_<?php echo str_replace("-","_", $this->id);?>;
+					return taxonomies_<?php echo str_replace("-", "_", $this->id); ?>;
 				});
 			}
 		}
@@ -2619,12 +2619,12 @@ 
 			}
 			if (window.gdCPTSort[$pt]) {
 				response = window.gdCPTSort[$pt];
-				while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
 
 				jQuery.each( response, function( key, val ) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 				});
 
 				// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2639,12 +2639,12 @@ 
 				jQuery.post(ajaxurl, data, function(response) {
 					response = JSON.parse(response);
 					window.gdCPTSort[$pt] = response;
-					while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
 
 					jQuery.each( response, function( key, val ) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 					});
 
 					// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2652,7 +2652,7 @@ 
 					props.setAttributes({sort_by: [0] });
 					props.setAttributes({sort_by: $old_sort_by_value });
 
-					return sort_by_<?php echo str_replace("-","_", $this->id);?>;
+					return sort_by_<?php echo str_replace("-", "_", $this->id); ?>;
 				});
 			}
 		}
@@ -2660,9 +2660,9 @@ 
 	<?php } ?>
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+if (!empty($current_screen->base) && $current_screen->base === 'widgets') {
 	echo 'const { deviceType } = "";';
-}else{
+} else {
 ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
@@ -2691,13 +2691,13 @@ 
 
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -2706,17 +2706,17 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 										}
 
                                          <?php
-                                        if(!empty($this->options['nested-block'])){
+                                        if (!empty($this->options['nested-block'])) {
                                             ?>
                                             // props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
                                              <?php
-                                        }else{
+                                        } else {
                                         ?>
                                         props.setAttributes({content: env});
 										is_fetching = false;
@@ -2741,8 +2741,8 @@ 
 							}
 
                             <?php
-                            if(!empty($this->options['block-edit-js'])) {
-                                echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+                            if (!empty($this->options['block-edit-js'])) {
+                                echo  $this->options['block-edit-js']; // strings have to be in single quotes, may cause issues
                             }
 
 
@@ -2755,7 +2755,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -2773,9 +2773,9 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									if (!empty($this->arguments)) {
 
-									if ( $show_advanced ) {
+									if ($show_advanced) {
 									?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
@@ -2796,43 +2796,43 @@ 
 
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+									$arguments = $this->group_arguments($this->arguments);
+									$block_group_tabs = !empty($this->options['block_group_tabs']) ? $this->group_block_tabs($this->options['block_group_tabs'], $arguments) : array();
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
 									$open_tab = '';
 
 									$open_tab_groups = array();
 									$used_tabs = array();
 
-									foreach ( $arguments as $key => $args ) {
+									foreach ($arguments as $key => $args) {
 										$close_tab = false;
 										$close_tabs = false;
 
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
+										 if (!empty($block_group_tabs)) {
+											foreach ($block_group_tabs as $tab_name => $tab_args) {
+												if (in_array($key, $tab_args['groups'])) {
 													$open_tab_groups[] = $key;
 
-													if ( $open_tab != $tab_name ) {
+													if ($open_tab != $tab_name) {
 														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
 														$tab_args['tab']['open'] = true;
 
-														$this->block_tab_start( '', $tab_args );
+														$this->block_tab_start('', $tab_args);
 														$open_tab = $tab_name;
 														$used_tabs[] = $tab_name;
 													}
 
-													if ( $open_tab_groups == $tab_args['groups'] ) {
+													if ($open_tab_groups == $tab_args['groups']) {
 														$close_tab = true;
 														$open_tab_groups = array();
 
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+														if ($used_tabs == array_keys($block_group_tabs)) {
 															$close_tabs = true;
 														}
 													}
@@ -2841,27 +2841,27 @@ 
 										}
 										?>
 										el(wp.components.PanelBody, {
-												title: '<?php esc_attr_e( $key ); ?>',
-												initialOpen: <?php if ( $panel_count ) {
+												title: '<?php esc_attr_e($key); ?>',
+												initialOpen: <?php if ($panel_count) {
 												echo "false";
 											} else {
 												echo "true";
 											}?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
+											foreach ($args as $k => $a) {
+												$this->block_tab_start($k, $a);
+												$this->block_row_start($k, $a);
+												$this->build_block_arguments($k, $a);
+												$this->block_row_end($k, $a);
+												$this->block_tab_end($k, $a);
 											}
 											?>
 										),
 										<?php
-										$panel_count ++;
+										$panel_count++;
 
-										if($close_tab || $close_tabs){
+										if ($close_tab || $close_tabs) {
 											$tab_args = array(
 												'tab'	=> array(
 													'tabs_close' => $close_tabs,
@@ -2869,24 +2869,24 @@ 
 												)
 
 											);
-											$this->block_tab_end( '', $tab_args );
+											$this->block_tab_end('', $tab_args);
 //											echo '###close'; print_r($tab_args);
 											$panel_count = 0;
 										}
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings" ); ?>',
+											title: '<?php esc_attr_e("Settings"); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -2900,11 +2900,11 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							}elseif (!empty($this->options['block-edit-return'])) {
                                    echo $this->options['block-edit-return'];
-							}else{
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -2930,22 +2930,22 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
                                // if($args['type']=='tabs'){continue;}
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
-								} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-									content += " <?php echo esc_attr( $key );?>='{x:" + attr.<?php echo esc_attr( $key );?>.x + ",y:"+attr.<?php echo esc_attr( $key );?>.y +"}' ";
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
+								} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+									content += " <?php echo esc_attr($key); ?>='{x:" + attr.<?php echo esc_attr($key); ?>.x + ",y:"+attr.<?php echo esc_attr($key); ?>.y +"}' ";
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 								}
 							}
 							<?php
@@ -2964,7 +2964,7 @@ 
                             ?>
 							// if has html element
 							if ($html) {
-								content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 							// @todo should we add inline style here or just css classes?
@@ -2994,7 +2994,7 @@ 
 //                                <x?php
 //							}else
 
-                            if(!empty($this->options['block-output'])){
+                            if (!empty($this->options['block-output'])) {
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
@@ -3004,30 +3004,30 @@ 
                                    '',
                                    {},
                                    el('', {dangerouslySetInnerHTML: {__html: content}}),
-                                   <?php $this->block_element( $this->options['block-output'], true ); ?>
-                                   el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+                                   <?php $this->block_element($this->options['block-output'], true); ?>
+                                   el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
                                );
                                 <?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							}elseif (!empty($this->options['block-save-return'])) {
                                    echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							}elseif (!empty($this->options['nested-block'])) {
                                 ?>
                               return el(
                                    '',
                                    {},
                                    el('', {dangerouslySetInnerHTML: {__html: content+"\n"}}),
                                    InnerBlocks.Content ? el( InnerBlocks.Content ) : '', // @todo i think we need a comma here
-                                   el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+                                   el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
                                );
                                 <?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-                                echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							}elseif (!empty($this->options['block-save-return'])) {
+                                echo "return " . $this->options['block-edit-return'] . ";";
+							}elseif (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3056,48 +3056,48 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-                $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-                $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
+                $device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+                $device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
                 $device_type_icon = '';
-                if($device_type=='Desktop'){
+                if ($device_type == 'Desktop') {
                     $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-                }elseif($device_type=='Tablet'){
+                }elseif ($device_type == 'Tablet') {
                     $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-                }elseif($device_type=='Mobile'){
+                }elseif ($device_type == 'Mobile') {
                     $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
                 }
 				echo $element_require;
                 echo $device_type_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label position-relative',
 									style: {width:"100%"}
 								},
-								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['row']['title'] ) ?>'}}),
-								<?php if($device_type_icon){ ?>
-                                    deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['row']['title']) ?>'}}),
+								<?php if ($device_type_icon) { ?>
+                                    deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
                                 }
                                 ?>
@@ -3105,17 +3105,17 @@ 
 
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -3124,36 +3124,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -3161,14 +3161,14 @@ 
 			}
 		}
 
-		public function block_tab_start($key, $args){
+		public function block_tab_start($key, $args) {
 
 			// check for row
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 
-				if(!empty($args['tab']['tabs_open'])){
+				if (!empty($args['tab']['tabs_open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3177,81 +3177,81 @@ 
 									{
                                         activeClass: 'is-active',
                                         className: 'btn-groupx',
-                                        initialTabName: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
+                                        initialTabName: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
-				if(!empty($args['tab']['open'])){
+				if (!empty($args['tab']['open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 							{
-												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
-												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
-												className: '<?php echo addslashes( esc_attr( $args['tab']['class']) ); ?>',
-												content: el('div',{}, <?php if(!empty($args['tab']['desc'])){ ?>el('p', {
+												name: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
+												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes(esc_attr($args['tab']['title'])); ?>'}}),
+												className: '<?php echo addslashes(esc_attr($args['tab']['class'])); ?>',
+												content: el('div',{}, <?php if (!empty($args['tab']['desc'])) { ?>el('p', {
 									className: 'components-base-control__help mb-0',
-									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
+									dangerouslySetInnerHTML: {__html:'<?php echo addslashes($args['tab']['desc']); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_tab_end($key, $args){
+		public function block_tab_end($key, $args) {
 
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 				// maybe close
-				if(!empty($args['tab']['close'])){
+				if (!empty($args['tab']['close'])) {
 					echo ")}, /* tab close */";
 				}
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+				if (!empty($args['tab']['tabs_close'])) {
+					if (false) {?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
-					<?php if(false){ ?></script><?php }
+					<?php if (false) { ?></script><?php }
 				}
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
-            $inside_elements   = '';
+            $inside_elements = '';
 			$after_elements	   = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
-            $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-            $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+            $device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+            $device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
             $device_type_icon = '';
-            if($device_type=='Desktop'){
+            if ($device_type == 'Desktop') {
                 $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-            }elseif($device_type=='Tablet'){
+            }elseif ($device_type == 'Tablet') {
                 $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-            }elseif($device_type=='Mobile'){
+            }elseif ($device_type == 'Mobile') {
                 $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
             }
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -3259,20 +3259,20 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx', 'range');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
 				}
 			}
@@ -3293,12 +3293,12 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
+			else if ($args['type'] == 'styleid') {
 				$type = 'TextControl';
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+				$value = "props.attributes.$key ? props.attributes.$key : ''";
+			} else if ($args['type'] == 'notice') {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3360,11 +3360,11 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
+			elseif ($args['type'] == 'color') {
 				$type = 'ColorPicker';
 				$onchange = "";
 				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
+				if (!empty($args['disable_alpha'])) {
 					$extra .= "disableAlpha: true,";
 				}
 				$onchangecomplete = "onChangeComplete: function($key) {
@@ -3373,14 +3373,14 @@ 
                             $key: value
                         });
                     },";
-			}elseif ( $args['type'] == 'gradient' ) {
+			}elseif ($args['type'] == 'gradient') {
 				$type = 'GradientPicker';
 
-			}elseif ( $args['type'] == 'image' ) {
+			}elseif ($args['type'] == 'image') {
 //                print_r($args);
 
                 $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
-                            url:  props.attributes.{$key}_use_featured === true ? '".$this->get_url()."icons/placeholder.png'  : props.attributes.$key,
+                            url:  props.attributes.{$key}_use_featured === true ? '" . $this->get_url() . "icons/placeholder.png'  : props.attributes.$key,
                             value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
                             onChange: function(focalPoint){
@@ -3438,7 +3438,7 @@ 
                 $onchange = "";
 
                 //$inside_elements = ",el('div',{},'file upload')";
-			}elseif ( $args['type'] == 'images' ) {
+			}elseif ($args['type'] == 'images') {
 				//                print_r($args);
 
                 $img_preview = "props.attributes.$key && (function() {
@@ -3450,7 +3450,7 @@ 
 							images.push( el('div',{className: 'col p-2',draggable: 'true','data-index': index}, el('img', { src: upload.sizes.thumbnail.url,style: {maxWidth:'100%',background: '#ccc',pointerEvents:'none'}}),el('i',{
 							className: 'fas fa-times-circle text-danger position-absolute  ml-n2 mt-n1 bg-white rounded-circle c-pointer',
 							onClick: function(){
-							    aui_confirm('".esc_attr__('Are you sure?')."', '".esc_attr__('Delete')."', '".esc_attr__('Cancel')."', true).then(function(confirmed) {
+							    aui_confirm('" . esc_attr__('Are you sure?') . "', '" . esc_attr__('Delete') . "', '" . esc_attr__('Cancel') . "', true).then(function(confirmed) {
 if (confirmed) {
 											let new_uploads = JSON.parse('['+props.attributes.$key+']');
 											new_uploads.splice(index, 1); //remove
@@ -3524,36 +3524,36 @@ 
 
                 //$inside_elements = ",el('div',{},'file upload')";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
 
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . addslashes($option_label) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
 				}
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+				if ($args['type'] == 'multiselect' || (isset($args['multiple']) && $args['multiple'])) {
+					$after_elements .= "props.attributes.$key && el( wp.components.Button, {
                                       className: 'components-button components-circular-option-picker__clear is-secondary is-small',
                                       style: {margin:'-8px 0 8px 0',display: 'block'},
                                       onClick: function(){
@@ -3565,7 +3565,7 @@ 
                                     'Clear'
                             ),";
 				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+			} elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3600,23 +3600,23 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} elseif ( $args['type'] == 'alignment' ) {
+			} elseif ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			}elseif ($args['type'] == 'margins') {
 
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -3628,18 +3628,18 @@ 
 			// icon
 			echo $icon;
 			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
+			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type : "wp.components." . $type; ?>, {
 			label: <?php
-			if(empty($args['title'])){
+			if (empty($args['title'])) {
                 echo "''";
-			}elseif(empty($args['row']) && !empty($args['device_type'])){
+			}elseif (empty($args['row']) && !empty($args['device_type'])) {
                 ?>el('label', {
 									className: 'components-base-control__label',
 									style: {width:"100%"}
 								},
-								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),
-								<?php if($device_type_icon){ ?>
-                                    deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['title']) ?>'}}),
+								<?php if ($device_type_icon) { ?>
+                                    deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
                                 }
                                 ?>
@@ -3647,27 +3647,27 @@ 
 
 							)<?php
 
-			}else{
-                 ?>'<?php echo addslashes( $args['title'] ); ?>'<?php
+			} else {
+                 ?>'<?php echo addslashes($args['title']); ?>'<?php
 
 			}
 
 			?>,
-			help: <?php if ( isset( $args['desc'] ) ) {
-				echo "el('span',{dangerouslySetInnerHTML: {__html: '".wp_kses_post( addslashes($args['desc']) )."'}})";
-			}else{ echo "''"; } ?>,
+			help: <?php if (isset($args['desc'])) {
+				echo "el('span',{dangerouslySetInnerHTML: {__html: '" . wp_kses_post(addslashes($args['desc'])) . "'}})";
+			} else { echo "''"; } ?>,
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . addslashes($args['placeholder']) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
 			<?php echo $onchangecomplete;
-            if($onchange){
+            if ($onchange) {
             ?>
 			onChange: function ( <?php echo $key; ?> ) {
 			<?php echo $onchange; ?>
@@ -3688,15 +3688,15 @@ 
 		 *@todo there is prob a faster way to do this, also we could add some validation here.
 		 *
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+				foreach ($custom_attributes as $key => $val) {
+					if (is_array($val)) {
+						$attributes .= $key . ': {' . $this->array_to_attributes($val, $html) . '},';
+					} else {
+						$attributes .= $html ? " $key='$val' " : "'$key': '$val',";
 					}
 				}
 
@@ -3714,112 +3714,112 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
+		public function block_element($args, $save = false) {
 
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
-                            if($new_args['element']=='InnerBlocks'){
+                            if ($new_args['element'] == 'InnerBlocks') {
                                 echo "\n el( InnerBlocks, {";
-                            }elseif($new_args['element']=='innerBlocksProps'){
+                            }elseif ($new_args['element'] == 'innerBlocksProps') {
                                 $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
                               //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
                                 echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
                                 echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+                                echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
                                 echo "} ), {";
-                                echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+                                echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element($new_args['innerBlocksProps'], $save) : '';
                             //    echo '###';
 
                               //  echo '###';
-                            }elseif($new_args['element']=='BlocksProps'){
+                            }elseif ($new_args['element'] == 'BlocksProps') {
 
-								if ( isset($new_args['if_inner_element']) ) {
+								if (isset($new_args['if_inner_element'])) {
 									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+								} else {
+									$element = isset($new_args['inner_element']) ? "'" . esc_attr($new_args['inner_element']) . "'" : "'div'";
 								}
 
 								unset($new_args['inner_element']);
                                 echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+                                echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 
                                // echo "} ),";
 
-                            }else{
+                            } else {
                                 echo "\n el( '" . $new_args['element'] . "', {";
                             }
 
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
+									echo $this->block_element(array($new_key => $new_value), $save);
 								}
 							}
 
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+							echo $new_args['element'] == 'BlocksProps' ? '} ),' : "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || $new_key === 'if_content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
+									} else if ($new_key === 'if_content') {
+										echo  $this->block_props_replace($new_value);
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value), $save);
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ),$save );
+											$this->block_element(array('' => $new_value), $save);
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-                            if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-                                echo "))";// end content
-                            }else{
-                                echo ")";// end content
+                            if ($new_args['element'] == 'innerBlocksProps' || $new_args['element'] == 'xBlocksProps') {
+                                echo "))"; // end content
+                            } else {
+                                echo ")"; // end content
                             }
 
 
@@ -3828,26 +3828,26 @@ 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
+						if (substr($element, 0, 3) === "if_") {
 							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+							if (strpos($new_args, '[%WrapClass%]') !== false) {
+								$new_args = str_replace('[%WrapClass%]"', '" + sd_build_aui_class(props.attributes)', $new_args);
+								$new_args = str_replace('[%WrapClass%]', '+ sd_build_aui_class(props.attributes)', $new_args);
 							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-                            $new_args = str_replace('[%WrapStyle%]','',$new_args);
-                            echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style' && strpos($new_args, '[%WrapStyle%]') !== false) {
+                            $new_args = str_replace('[%WrapStyle%]', '', $new_args);
+                            echo $element . ": {..." . $this->block_props_replace($new_args) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-                            $new_args = str_replace('[%WrapClass%]','',$new_args);
-                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
+						} elseif (($element == 'class' || $element == 'className') && strpos($new_args, '[%WrapClass%]') !== false) {
+                            $new_args = str_replace('[%WrapClass%]', '', $new_args);
+                            echo $element . ": '" . $this->block_props_replace($new_args) . "' + sd_build_aui_class(props.attributes),";
+						} elseif ($element == 'template' && $new_args) {
 							echo $element . ": $new_args,";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -3862,12 +3862,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
+		public function block_props_replace($string, $no_wrap = false) {
 
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 			}
 
 			return $string;
@@ -3879,62 +3879,62 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
+		public function widget($args, $instance) {
 
 			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = !empty($args['before_widget']) ? $args['before_widget'] : '';
+				$before_widget = $before_widget ? str_replace($class_original, $class, $before_widget) : $before_widget;
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = !empty($args['after_widget']) ? $args['after_widget'] : '';
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+					$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+					$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+					$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+					$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+					echo "<span class='" . esc_attr($class) . "' " . $attrs . ">";
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					echo "</span>";
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif ( $output && $no_wrap ) {
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -3947,7 +3947,7 @@ 
 		 */
 		public function is_elementor_widget_output() {
 			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
 				$result = true;
 			}
 
@@ -3962,7 +3962,7 @@ 
 		 */
 		public 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' ) ) {
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax')) {
 				$result = true;
 			}
 
@@ -3977,7 +3977,7 @@ 
 		 */
 		public function is_divi_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
 				$result = true;
 			}
 
@@ -3992,7 +3992,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -4007,7 +4007,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -4022,7 +4022,7 @@ 
 		 */
 		public function is_cornerstone_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+			if (!empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint') {
 				$result = true;
 			}
 
@@ -4037,7 +4037,7 @@ 
 		 */
 		public function is_fusion_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+			if (!empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce'])) {
 				$result = true;
 			}
 
@@ -4052,7 +4052,7 @@ 
 		 */
 		public 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_" ) ) ) {
+			if (!empty($_REQUEST['ct_builder']) || (!empty($_REQUEST['action']) && (substr($_REQUEST['action'], 0, 11) === "oxy_render_" || substr($_REQUEST['action'], 0, 10) === "ct_render_"))) {
 				$result = true;
 			}
 
@@ -4067,21 +4067,21 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
 			}
 
@@ -4096,34 +4096,34 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if(empty($instance['widget_title_tag'])){
+				if (empty($instance['widget_title_tag'])) {
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+				} else {
+					$title_tag = esc_attr($instance['widget_title_tag']);
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -4137,7 +4137,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -4145,20 +4145,20 @@ 
 			// set it as a SD widget
 			echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
 			$arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			if (is_array($arguments_raw)) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+				$arguments = $this->group_arguments($arguments_raw);
 
 				// Do we have sections?
 				$has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
+				if ($has_sections) {
 					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 
 						?>
 						<script>
@@ -4168,26 +4168,26 @@ 
 
 						$hide       = $panel_count ? ' style="display:none;" ' : '';
 						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes($key) . "'>" . esc_attr($key) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes($key) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+						foreach ($args as $k => $a) {
 
 							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
+							$this->widget_inputs($a, $instance);
 							$this->widget_inputs_row_end($k, $a);
 
 						}
 
 						echo "</div>";
 
-						$panel_count ++;
+						$panel_count++;
 
 					}
 				} else {
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
+						$this->widget_inputs($args, $instance);
 						$this->widget_inputs_row_end($key, $args);
 					}
 				}
@@ -4195,33 +4195,33 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// maybe open
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
+					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php if (!empty($args['row']['element_require'])) {
+						echo $this->convert_element_require($args['row']['element_require']);
 					} ?>'>
-					<?php if(!empty($args['row']['title'])){ ?>
-					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<?php if (!empty($args['row']['title'])) { ?>
+					<label class="mb-0 "><?php echo esc_attr($args['row']['title']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php }?>
-					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
+					<div class='row <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				}elseif (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0 ps-0'>";
-				}else{
+				} else {
 					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
 				}
 			}
 		}
 
-		public function widget_inputs_row_end($key, $args){
+		public function widget_inputs_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 
@@ -4237,7 +4237,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -4257,14 +4257,14 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_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( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -4275,56 +4275,56 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			data-argument='<?php echo esc_attr($args['name']); ?>'
+			data-element_require='<?php if ($element_require) {
+				echo $this->convert_element_require($element_require);
 			} ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -4335,46 +4335,46 @@ 
 				case "color":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-						                               type="<?php echo esc_attr( $args['type'] ); ?>"
-						                               value="<?php echo esc_attr( $value ); ?>">
+						                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+						                               type="<?php echo esc_attr($args['type']); ?>"
+						                               value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
+						                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                name="<?php echo esc_attr($this->get_field_name($args['name']));
+						                                if ($multiple) {
 							                                echo "[]";
 						                                } ?>"
-						<?php if ( $multiple ) {
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -4386,32 +4386,32 @@ 
 				case "checkbox":
 					?>
 					<input <?php echo $placeholder; ?>
-						<?php checked( 1, $value, true ) ?>
+						<?php checked(1, $value, true) ?>
 						<?php echo $custom_attributes; ?>
-						class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+						class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 						value="1">
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                  id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                  name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-					><?php echo esc_attr( $value ); ?></textarea>
+						                                  id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                  name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+					><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-					       value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+					       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+					       value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -4426,15 +4426,15 @@ 
 
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -4446,14 +4446,14 @@ 
 		 * @return string
 		 * @todo, need to make its own tooltip script
 		 */
-		public function widget_field_desc( $args ) {
+		public function widget_field_desc($args) {
 
 			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
+			if (isset($args['desc']) && $args['desc']) {
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
+					$description = $this->desc_tip($args['desc']);
 				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
 				}
 			}
 
@@ -4467,12 +4467,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 
 			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+			if (isset($args['title']) && $args['title']) {
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
 					$title = esc_attr($args['title']);
 				}
@@ -4489,11 +4489,11 @@ 
 		 *
 		 * @return string
 		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		function desc_tip($tip, $allow_html = false) {
+			if ($allow_html) {
+				$tip = $this->sanitize_tooltip($tip);
 			} else {
-				$tip = esc_attr( $tip );
+				$tip = esc_attr($tip);
 			}
 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -4506,8 +4506,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+		public function sanitize_tooltip($var) {
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
 				'br'     => array(),
 				'em'     => array(),
 				'strong' => array(),
@@ -4517,7 +4517,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -4529,23 +4529,23 @@ 
 		 * @return array
 		 * @todo we should add some sanitation here.
 		 */
-		public function update( $new_instance, $old_instance ) {
+		public function update($new_instance, $old_instance) {
 
 			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
+			$instance = array_merge((array) $old_instance, (array) $new_instance);
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->get_arguments();
 			}
 
 			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $argument) {
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+						$instance[$argument['name']] = '0';
 					}
 				}
 			}
@@ -4563,7 +4563,7 @@ 
 		 */
 		public function is_block_content_call() {
 			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
 				$result = true;
 			}
 
@@ -4576,9 +4576,9 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -4589,14 +4589,14 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";
@@ -4614,9 +4614,9 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function encode_shortcodes( $content ) {
+		public function encode_shortcodes($content) {
 			// Avoids existing encoded tags.
-			$trans   = array(
+			$trans = array(
 				'&#91;' => '&#091;',
 				'&#93;' => '&#093;',
 				'&amp;#91;' => '&#091;',
@@ -4627,7 +4627,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -4638,7 +4638,7 @@ 
 				"'" => '&#39;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -4652,8 +4652,8 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -4666,7 +4666,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -4679,7 +4679,7 @@ 
 				'&amp;0gt;' => '&gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}