AyeCode / invoicing

vendor/composer/autoload_static.php

Spacing +9 added lines, -9 removed lines

@@ -6,35 +6,35 @@ 
 
 class ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5
 {
-    public static $files = array (
+    public static $files = array(
         'e8d544c98e79f913e13eae1306ab635e' => __DIR__ . '/..' . '/ayecode/wp-ayecode-ui/ayecode-ui-loader.php',
         '24583d3588ebda5228dd453cfaa070da' => __DIR__ . '/..' . '/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php',
         '42671a413efb740d7040437ff2a982cd' => __DIR__ . '/..' . '/ayecode/wp-super-duper/sd-functions.php',
     );
 
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'M' => 
-        array (
+        array(
             'MaxMind\\Db\\' => 11,
         ),
         'C' => 
-        array (
+        array(
             'Composer\\Installers\\' => 20,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'MaxMind\\Db\\' => 
-        array (
+        array(
             0 => __DIR__ . '/..' . '/maxmind-db/reader/src/MaxMind/Db',
         ),
         'Composer\\Installers\\' => 
-        array (
+        array(
             0 => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers',
         ),
     );
 
-    public static $classMap = array (
+    public static $classMap = array(
         'AyeCode_Connect_Helper' => __DIR__ . '/..' . '/ayecode/ayecode-connect-helper/ayecode-connect-helper.php',
         'AyeCode_Deactivation_Survey' => __DIR__ . '/..' . '/ayecode/wp-deactivation-survey/wp-deactivation-survey.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -43,7 +43,7 @@ 
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$classMap;

vendor/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     if (!headers_sent()) {
         header('HTTP/1.1 500 Internal Server Error');
     }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running ' . PHP_VERSION . ', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.' . PHP_EOL;
     if (!ini_get('display_errors')) {
         if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
             fwrite(STDERR, $err);

vendor/composer/InstalledVersions.php

Spacing +3 added lines, -3 removed lines

@@ -327,11 +327,11 @@
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                } elseif (is_file($vendorDir . '/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                    $required = require $vendorDir.'/composer/installed.php';
+                    $required = require $vendorDir . '/composer/installed.php';
                     $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                    if (null === self::$installed && strtr($vendorDir . '/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
                 }

vendor/composer/autoload_real.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         $loader->register(true);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$files;
-        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+        $requireFile = \Closure::bind(static function($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 

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

Spacing +310 added lines, -310 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input( $args = array() ) {
+	public static function input($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -69,13 +69,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text   = '';
 			$label       = '';
@@ -89,17 +89,17 @@ 
 			);
 
 			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after         = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// size
 			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+			if ($args['size'] == 'lg' || $args['size'] == 'large') {
 				$size = 'lg';
 				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+			}elseif ($args['size'] == 'sm' || $args['size'] == 'small') {
 				$size = 'sm';
 				$args['class'] .= ' form-control-sm';
 			}
@@ -108,28 +108,28 @@ 
 			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
 
 			// Some special sauce for files
-			if ( $type == 'file' ) {
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
+			} elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+			} elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$orig_type = $type;
 				$type = 'text';
 				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
-				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
+				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr($args['name']) . "\']').trigger('change');";
 
 				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
 
 				// Disable native datetime inputs.
-				$disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
-				$disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
+				$disable_mobile_attr = isset($args['extra_attributes']['data-disable-mobile']) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
+				$disable_mobile_attr = apply_filters('aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args);
 
 				$args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
 
 				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+				if ($args['input_group_right'] === '' && $args['clear_icon'] !== false) {
 					$args['input_group_right_inside'] = true;
 					$args['clear_icon'] = true;
 				}
@@ -137,7 +137,7 @@ 
 				// enqueue the script
 				$aui_settings = AyeCode_UI_Settings::instance();
 				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
+			} elseif ($type == 'iconpicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
@@ -152,104 +152,104 @@ 
 				$aui_settings->enqueue_iconpicker();
 			}
 
-			if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+			if ($type == 'checkbox' && ((!empty($args['name']) && strpos($args['name'], '[') === false) || !empty($args['with_hidden']))) {
+				$output .= '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 			}
 
 			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+			if ($args['input_group_right'] === '' && $args['clear_icon']) {
+				$font_size = $size == 'sm' ? '1.3' : ($size == 'lg' ? '1.65' : '1.5');
 				$args['input_group_right_inside'] = true;
 				$align_class = $aui_bs5 ? ' h-100 py-0' : '';
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
+				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ($aui_bs5 ? 'btn-close' : 'close') . '">' . ($aui_bs5 ? '' : '&times;') . '</span></span>';
 			}
 
 			// open/type
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
+			if (!empty($args['value'])) {
+				$output .= AUI_Component_Helper::value($args['value']);
 			}
 
 			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr(addslashes($args['validation_text'])) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
+			if (!empty($args['step'])) {
 				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
+			$output .= $aui_bs5 && $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
 
 			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
+			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close
 			$output .= ' >';
 
 			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+			if (!empty($args['help_text'])) {
+				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 			// label
-			if ( ! empty( $args['label'] ) ) {
+			if (!empty($args['label'])) {
 				$label_base_class = '';
-				if ( $type == 'file' ) {
+				if ($type == 'file') {
 					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
+				} elseif ($type == 'checkbox') {
+					if (!empty($args['label_force_left'])) {
+						$label_args['title'] = wp_kses_post($args['help_text']);
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else {
 
 					}
 
@@ -257,49 +257,49 @@ 
 				}
 				$label_args['class'] .= $label_base_class;
 				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
+				if (!empty($args['label_force_left'])) {$temp_label_args['class'] = $label_base_class . " text-muted"; }
+				$label = self::label($temp_label_args, $type);
 			}
 
 
 
 
 			// set help text in the correct position
-			if ( $label_after ) {
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
+				));
+			} elseif ($type == 'checkbox') {
 
 				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				if ( $aui_bs5 ) {
+				$label_col = AUI_Component_Helper::get_column_class($args['label_col'], 'label');
+				$label = !empty($args['label_force_left']) ? self::label($label_args, 'cb') : '<div class="' . $label_col . ' col-form-label"></div>';
+				$switch_size_class = $args['switch'] && !is_bool($args['switch']) ? ' custom-switch-' . esc_attr($args['switch']) : '';
+				if ($aui_bs5) {
 					$wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
-				}else{
-					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
+				} else {
+					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class : 'custom-checkbox';
 				}
-				if ( ! empty( $args['label_force_left'] ) ) {
+				if (!empty($args['label_force_left'])) {
 					$wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
-					$label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
+					$label = str_replace(array("form-check-label", "custom-control-label"), "", self::label($label_args, 'cb'));
 				}
-				$output     = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
-				) );
+				));
 
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+				if ($args['label_type'] == 'horizontal') {
+					$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
 				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+			} elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -313,70 +313,70 @@ 
 			}
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
 				$group_size = $size == 'lg' ? ' input-group-lg' : '';
 				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
 
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
+					'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+				));
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if ( ! $args['no_wrap'] ) {
-				if ( ! empty( $args['form_group_class'] ) ) {
-					$fg_class = esc_attr( $args['form_group_class'] );
-				}else{
+			if (!$args['no_wrap']) {
+				if (!empty($args['form_group_class'])) {
+					$fg_class = esc_attr($args['form_group_class']);
+				} else {
 					$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 				}
 				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
 				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
+				$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+				$output           = self::wrap(array(
 					'content'         => $output,
 					'class'           => $wrap_class,
 					'element_require' => $args['element_require'],
 					'argument_id'     => $args['id'],
 					'wrap_attributes' => $args['wrap_attributes'],
-				) );
+				));
 			}
 		}
 
 		return $output;
 	}
 
-	public static function label( $args = array(), $type = '' ) {
+	public static function label($args = array(), $type = '') {
 		global $aui_bs5;
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
@@ -390,35 +390,35 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if ( $args['title'] ) {
+		if ($args['title']) {
 
 			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
 			} else {
 				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label '.$type;
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$class .= ' ' . AUI_Component_Helper::get_column_class($args['label_col'], 'label') . ' col-form-label ' . $type;
 			}
 
-			if( $aui_bs5 ){ $class .= ' form-label'; }
+			if ($aui_bs5) { $class .= ' form-label'; }
 
 			// open
 			$output .= '<label ';
 
 			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . esc_attr($args['for']) . '" ';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+			$class = $class ? AUI_Component_Helper::esc_classes($class) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// close
@@ -426,8 +426,8 @@ 
 
 
 			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
+			if (!empty($args['title'])) {
+				$output .= wp_kses_post($args['title']);
 			}
 
 			// close wrap
@@ -447,7 +447,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
+	public static function wrap($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'type'                     => 'div',
@@ -465,31 +465,31 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( $args['type'] ) {
+		if ($args['type']) {
 
 			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+			if (!empty($args['element_require'])) {
+				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+			if (!empty($args['wrap_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['wrap_attributes']);
 			}
 
 			// close wrap
@@ -497,9 +497,9 @@ 
 
 
 			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+			if (!empty($args['input_group_left'])) {
+				$position_class   = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
 				$output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 //				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
@@ -508,16 +508,16 @@ 
 			$output .= $args['content'];
 
 			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+			if (!empty($args['input_group_right'])) {
+				$position_class    = !empty($args['input_group_right_inside']) ? 'position-absolute h-100' : '';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+				$output .= $aui_bs5 ? str_replace('input-group-text', 'input-group-text top-0 end-0', $input_group_right) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 //				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
 		} else {
@@ -534,7 +534,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
+	public static function textarea($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -574,7 +574,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 		$label = '';
 
@@ -582,21 +582,21 @@ 
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -604,34 +604,34 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label .= self::label( $label_args );
+			$label .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$label .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['wysiwyg'] ) ) {
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
 			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+				'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
 				'quicktags'     => false,
 				'media_buttons' => false,
 				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+				'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
 				'teeny'         => true,
 			);
 
 			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
 		} else {
 
@@ -639,65 +639,65 @@ 
 			$output .= '<textarea ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr(addslashes($args['validation_text'])) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
+			$class = !empty($args['class']) ? $args['class'] : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+			if (!empty($args['value'])) {
+				if (!empty($args['allow_tags'])) {
+					$output .= AUI_Component_Helper::sanitize_html_field($args['value'], $args); // Sanitize HTML.
 				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+					$output .= AUI_Component_Helper::sanitize_textarea_field($args['value']);
 				}
 			}
 
@@ -706,23 +706,23 @@ 
 
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
@@ -730,7 +730,7 @@ 
 
 		}
 
-		if ( ! empty( $args['label'] ) && $label_after ) {
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -738,41 +738,41 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+		if (!$args['no_wrap']) {
+			if (!empty($args['form_group_class'])) {
+				$fg_class = esc_attr($args['form_group_class']);
+			} else {
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
 			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
+			$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output           = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -786,7 +786,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'class'            => '',
@@ -825,11 +825,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'hidden';
 		}
 
@@ -840,90 +840,90 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+		} elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
 		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags']             = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple']              = true;
 		}
 
 		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+		if ($is_select2 && isset($args['placeholder']) && '' != $args['placeholder'] && empty($args['data-placeholder'])) {
+			$args['data-placeholder'] = esc_attr($args['placeholder']);
+			$args['data-allow-clear'] = isset($args['data-allow-clear']) ? (bool) $args['data-allow-clear'] : true;
 		}
 
 		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
+		if (!empty($args['multiple']) && !empty($args['name'])) {
+			$output .= '<input type="hidden" ' . AUI_Component_Helper::name($args['name']) . ' value="" data-ignore-rule/>';
 		}
 
 		// open/type
 		$output .= '<select ';
 
 		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+		if ($is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+		if (!empty($args['element_require'])) {
+			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
+		$class = !empty($args['class']) ? $args['class'] : '';
 		$select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
-		$output .= AUI_Component_Helper::class_attr( $select_class . $class );
+		$output .= AUI_Component_Helper::class_attr($select_class . $class);
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
 		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple ';
 		}
 
@@ -931,50 +931,50 @@ 
 		$output .= ' >';
 
 		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+		if (isset($args['placeholder']) && '' != $args['placeholder'] && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		} elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 
-			if ( ! is_array( $args['options'] ) ) {
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
 			} else {
-				foreach ( $args['options'] as $val => $name ) {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
+					if (is_array($name)) {
+						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
+							$option_label = isset($name['label']) ? $name['label'] : '';
 
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
 						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
+							$option_label = isset($name['label']) ? $name['label'] : '';
+							$option_value = isset($name['value']) ? $name['value'] : '';
+							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes($name['extra_attributes']) : '';
+							if (!empty($args['multiple']) && !empty($args['value']) && is_array($args['value'])) {
+								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
+							} elseif (empty($args['value']) && $args['value'] === $option_value) {
+								$selected = selected($option_value, $args['value'], false);
 							}
 
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . ' ' . $extra_attributes . '>' . $option_label . '</option>';
 						}
 					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
+						} elseif ($args['value'] === $val) {
+							$selected = selected($args['value'], $val, false);
 						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -987,8 +987,8 @@ 
 		$label = '';
 		$help_text = '';
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -996,49 +996,49 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label = self::label( $label_args );
+			$label = self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$help_text = AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
+		if ($args['input_group_left'] || $args['input_group_right']) {
+			$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+			if ($args['input_group_left']) {
+				$output = self::wrap(array(
 					'content'                 => $output,
 					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_left'        => $args['input_group_left'],
 					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
+				));
 			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
+			if ($args['input_group_right']) {
+				$output = self::wrap(array(
 					'content'                  => $output,
 					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_right'        => $args['input_group_right'],
 					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
+				));
 			}
 
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output .= $help_text;
 		}
 
 
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
+		if ($args['label_type'] == 'horizontal') {
+			$output = self::wrap(array(
 				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
+				'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+			));
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
@@ -1049,21 +1049,21 @@ 
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+		if (!$args['no_wrap']) {
+			if (!empty($args['form_group_class'])) {
+				$fg_class = esc_attr($args['form_group_class']);
+			} else {
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output     = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
+	public static function radio($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -1109,10 +1109,10 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'horizontal';
 		}
 
@@ -1123,10 +1123,10 @@ 
 			'label_col'  => $args['label_col']
 		);
 
-		if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
+		if ($args['label_type'] == 'top' || $args['label_type'] == 'hidden') {
 			$label_args['class'] .= 'd-block ';
 
-			if ( $args['label_type'] == 'hidden' ) {
+			if ($args['label_type'] == 'hidden') {
 				$label_args['class'] .= 'sr-only ';
 			}
 		}
@@ -1134,48 +1134,48 @@ 
 		$output = '';
 
 		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
+			foreach ($args['options'] as $value => $label) {
 				$option_args            = $args;
 				$option_args['value']   = $value;
 				$option_args['label']   = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
+				$output .= self::radio_option($option_args, $count);
+				$count++;
 			}
 		}
 
 		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+		$help_text = !empty($args['help_text']) ? AUI_Component_Helper::help_text($args['help_text']) : '';
 		$output .= $help_text;
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 		// wrap
 		$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 		$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
+		$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+		$output     = self::wrap(array(
 			'content'         => $output,
 			'class'           => $wrap_class,
 			'element_require' => $args['element_require'],
 			'argument_id'     => $args['id'],
 			'wrap_attributes' => $args['wrap_attributes'],
-		) );
+		));
 
 
 		return $output;
@@ -1188,7 +1188,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option( $args = array(), $count = '' ) {
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'            => '',
 			'id'               => '',
@@ -1206,7 +1206,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -1217,43 +1217,43 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
+		if (isset($args['value'])) {
+			$output .= AUI_Component_Helper::value($args['value']);
 		}
 
 		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
@@ -1261,38 +1261,38 @@ 
 		$output .= ' >';
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label'])) {
+			$output .= self::label(array(
 				'title' => $args['label'],
 				'for'   => $args['id'] . $count,
 				'class' => 'form-check-label'
-			), 'radio' );
+			), 'radio');
 		}
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 
 			// Unique wrap class
 			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
+			if (!empty($args['name'])) {
 				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
+			} else if (!empty($args['id'])) {
 				$uniq_class .= '-' . $args['id'];
 			}
 
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+			if (isset($args['value']) || $args['value'] !== "") {
 				$uniq_class .= '-' . $args['value'];
 			} else {
 				$uniq_class .= '-' . $count;
 			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+			$wrap_class .= ' ' . sanitize_html_class($uniq_class);
 
-			$output = self::wrap( array(
+			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class
-			) );
+			));
 		}
 
 		return $output;

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

Spacing +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@ 
  *
  * @return array|mixed|string|string[]
  */
-function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
+function aui_bs_convert_sd_output($output, $instance = '', $args = '', $sd = '') {
 	global $aui_bs5;
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$convert = array(
 			'"ml-' => '"ms-',
 			'"mr-' => '"me-',
@@ -75,9 +75,9 @@ 
 			'class="close"' => 'class="btn-close"',
 			'<span aria-hidden="true">&times;</span>' => '',
 		);
-		$output  = str_replace(
-			array_keys( $convert ),
-			array_values( $convert ),
+		$output = str_replace(
+			array_keys($convert),
+			array_values($convert),
 			$output
 		);
 	}
@@ -85,4 +85,4 @@ 
 	return $output;
 }
 
-add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this
+add_filter('wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4); //$output, $instance, $args, $this

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

Spacing +761 added lines, -761 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>'. wp_kses_post( $message ).'</p></div>';
+		public function show_admin_style_notice() {
+			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=" . wp_create_nonce('aui-fix-admin'));
+			$button = '<a href="' . esc_url($fix_url) . '" class="button-primary">Fix Now</a>';
+			$message = __('<b>Style Issue:</b> AyeCode UI is disable or set wrong.') . " " . $button;
+			echo '<div class="notice notice-error aui-settings-error-notice"><p>' . wp_kses_post($message) . '</p></div>';
 		}
 
 		/**
@@ -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',
@@ -417,26 +417,26 @@ 
 					'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);
 		}
 
 		/**
@@ -445,7 +445,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;
 			}
 
@@ -460,40 +460,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;
@@ -541,14 +541,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));
 
 					}
 
@@ -569,10 +569,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();
@@ -580,10 +580,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));
 		}
 
 
@@ -597,13 +597,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());
@@ -614,7 +614,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>
@@ -629,10 +629,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);
 		}
 
 		/**
@@ -640,59 +640,59 @@ 
 		 */
 		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);
 
 				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+				if (defined('FAS_ICONPICKER_JS_URL')) {
+					wp_register_script('iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version);
+				} else {
+					wp_register_script('iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version);
 				}
 
 				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+				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);
 				}
 			}
 
@@ -701,17 +701,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');
 		}
 
 		/**
@@ -720,19 +720,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);
 		}
 
 		/**
@@ -744,15 +744,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;
@@ -762,7 +762,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');
 		}
 
 		/**
@@ -771,10 +771,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'
-			) );
+			));
 		}
 
 		/**
@@ -782,7 +782,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function theme_js_settings(){
+		public function theme_js_settings() {
 			return array(
 				'ayetheme' => 'popper',
 				'listimia' => 'required',
@@ -803,7 +803,7 @@ 
 	        $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
 
 	        // Execute the query
-	        $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+	        $date = $wpdb->get_var($query); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 
 	        return $date ? $date : false;
         }
@@ -811,11 +811,11 @@ 
 		/**
 		 * Show admin notice if backend scripts not loaded.
 		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+		public function show_admin_version_notice() {
+			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings");
+			$button = '<a href="' . esc_url($fix_url) . '" class="button-primary">View Settings</a>';
+			$message = __('<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)') . " " . $button;
+			echo '<div class="notice notice-error aui-settings-error-notice"><p>' . wp_kses_post($message) . '</p></div>';
 		}
 
 		/**
@@ -825,32 +825,32 @@ 
 		 */
 		public function get_settings() {
 
-			$db_settings = get_option( 'ayecode-ui-settings' );
+			$db_settings = get_option('ayecode-ui-settings');
 
             // Maybe show default version notice
-			$site_install_date = new DateTime( self::get_site_install_date() );
+			$site_install_date = new DateTime(self::get_site_install_date());
 			$switch_over_date = new DateTime("2024-02-01");
-			if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
-				add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+			if (empty($db_settings) && $site_install_date < $switch_over_date) {
+				add_action('admin_notices', array($this, 'show_admin_version_notice'));
 			}
 
 			$js_default = 'core-popper';
 			$js_default_backend = $js_default;
 
 			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
+			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
@@ -858,16 +858,16 @@ 
 				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
 				'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
+			), $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 defeats the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('ayecode-ui-settings', $settings, $db_settings, $defaults);
 		}
 
 
@@ -875,109 +875,109 @@ 
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(esc_attr__('You do not have sufficient permissions to access this page.', 'ayecode-connect'));
 			}
-            $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
+            $overrides = apply_filters('ayecode-ui-settings', array(), array(), array());
 
 			?>
             <div class="wrap">
-                <h1><?php echo esc_attr( $this->name ); ?></h1>
-                <p><?php echo esc_html( apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) ) );?></p>
+                <h1><?php echo esc_attr($this->name); ?></h1>
+                <p><?php echo esc_html(apply_filters('ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect'))); ?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
+					settings_fields('ayecode-ui-settings');
+					do_settings_sections('ayecode-ui-settings');
 					?>
 
-                    <h2><?php esc_html_e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
-                    <p><?php echo esc_html( apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) ) );?></p>
+                    <h2><?php esc_html_e('BootStrap Version', 'ayecode-connect'); ?></h2>
+                    <p><?php echo esc_html(apply_filters('ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect'))); ?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
+	                if (!empty($overrides)) {
 		                echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			                'type'=> 'info',
-			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect')
 		                ));
 	                }
 	                ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css"><?php esc_html_e( 'Version', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css"><?php esc_html_e('Version', 'ayecode-connect'); ?></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 esc_html_e( 'v5 (recommended)', 'ayecode-connect' ); ?></option>
-                                    <option value="4" <?php selected( $this->settings['bs_ver'], '4' ); ?>><?php esc_html_e( 'v4 (legacy)', 'ayecode-connect' ); ?></option>
+                                    <option	value="5" <?php selected($this->settings['bs_ver'], '5'); ?>><?php esc_html_e('v5 (recommended)', 'ayecode-connect'); ?></option>
+                                    <option value="4" <?php selected($this->settings['bs_ver'], '4'); ?>><?php esc_html_e('v4 (legacy)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
                     </table>
 
-                    <h2><?php esc_html_e( 'Frontend', 'ayecode-connect' ); ?></h2>
+                    <h2><?php esc_html_e('Frontend', 'ayecode-connect'); ?></h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css"><?php esc_html_e( 'Load CSS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css"><?php esc_html_e('Load CSS', 'ayecode-connect'); ?></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 esc_html_e( 'Compatibility Mode (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css'], 'core' ); ?>><?php esc_html_e( 'Full Mode', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css'], '' ); ?>><?php esc_html_e( 'Disabled', 'ayecode-connect' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css'], 'compatibility'); ?>><?php esc_html_e('Compatibility Mode (default)', 'ayecode-connect'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css'], 'core'); ?>><?php esc_html_e('Full Mode', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css'], ''); ?>><?php esc_html_e('Disabled', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-js"><?php esc_html_e( 'Load JS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-js"><?php esc_html_e('Load JS', 'ayecode-connect'); ?></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 esc_html_e( 'Core + Popper (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js'], 'popper' ); ?>><?php esc_html_e( 'Popper', 'ayecode-connect' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js'], 'required' ); ?>><?php esc_html_e( 'Required functions only', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js'], '' ); ?>><?php esc_html_e( 'Disabled (not recommended)', 'ayecode-connect' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js'], 'core-popper'); ?>><?php esc_html_e('Core + Popper (default)', 'ayecode-connect'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js'], 'popper'); ?>><?php esc_html_e('Popper', 'ayecode-connect'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js'], 'required'); ?>><?php esc_html_e('Required functions only', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js'], ''); ?>><?php esc_html_e('Disabled (not recommended)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-font_size"><?php esc_html_e( 'HTML Font Size (px)', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-font_size"><?php esc_html_e('HTML Font Size (px)', 'ayecode-connect'); ?></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 esc_html_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.", 'ayecode-connect' );?></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 esc_html_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.", 'ayecode-connect'); ?></p>
                             </td>
                         </tr>
 
                     </table>
 
-                    <h2><?php esc_html_e( 'Backend', 'ayecode-connect' ); ?> (wp-admin)</h2>
+                    <h2><?php esc_html_e('Backend', 'ayecode-connect'); ?> (wp-admin)</h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css-admin"><?php esc_html_e( 'Load CSS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css-admin"><?php esc_html_e('Load CSS', 'ayecode-connect'); ?></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 esc_html_e( 'Compatibility Mode (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css_backend'], 'core' ); ?>><?php esc_html_e( 'Full Mode (will cause style issues)', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css_backend'], '' ); ?>><?php esc_html_e( 'Disabled', 'ayecode-connect' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css_backend'], 'compatibility'); ?>><?php esc_html_e('Compatibility Mode (default)', 'ayecode-connect'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css_backend'], 'core'); ?>><?php esc_html_e('Full Mode (will cause style issues)', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css_backend'], ''); ?>><?php esc_html_e('Disabled', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-js-admin"><?php esc_html_e( 'Load JS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-js-admin"><?php esc_html_e('Load JS', 'ayecode-connect'); ?></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 esc_html_e( 'Core + Popper (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js_backend'], 'popper' ); ?>><?php esc_html_e( 'Popper', 'ayecode-connect' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js_backend'], 'required' ); ?>><?php esc_html_e( 'Required functions only', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js_backend'], '' ); ?>><?php esc_html_e( 'Disabled (not recommended)', 'ayecode-connect' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js_backend'], 'core-popper'); ?>><?php esc_html_e('Core + Popper (default)', 'ayecode-connect'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js_backend'], 'popper'); ?>><?php esc_html_e('Popper', 'ayecode-connect'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js_backend'], 'required'); ?>><?php esc_html_e('Required functions only', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js_backend'], ''); ?>><?php esc_html_e('Disabled (not recommended)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-disable-admin"><?php esc_html_e( 'Disable load on URL', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-disable-admin"><?php esc_html_e('Disable load on URL', 'ayecode-connect'); ?></label></th>
                             <td>
-                                <p><?php esc_html_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.', 'ayecode-connect' ); ?></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 esc_textarea( $this->settings['disable_admin'] );?></textarea>
+                                <p><?php esc_html_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.', 'ayecode-connect'); ?></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 esc_textarea($this->settings['disable_admin']); ?></textarea>
                             </td>
                         </tr>
                     </table>
@@ -986,33 +986,33 @@ 
 					submit_button();
 					?>
                 </form>
-                <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo esc_html( $this->version ); ?></div>
+                <div id="wpbs-version" data-aui-source="<?php echo esc_attr($this->get_load_source()); ?>"><?php echo esc_html($this->version); ?></div>
             </div>
 			<?php
 		}
 
-        public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+        public function get_load_source() {
+	        $file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+	        $plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 	        // Find source plugin/theme of SD
 	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+	        if (strpos($file, $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), "/"));
 		        }
 	        }
 
             return isset($source[0]) ? esc_attr($source[0]) : '';
         }
 
-		public function customizer_settings($wp_customize){
+		public function customizer_settings($wp_customize) {
 			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
+				'title'    => __('AyeCode UI', 'ayecode-connect'),
 				'priority' => 120,
 			));
 
@@ -1026,8 +1026,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+				'label'    => __('Primary Color', 'ayecode-connect'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_primary]',
 			)));
@@ -1039,8 +1039,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+				'label'    => __('Secondary Color', 'ayecode-connect'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_secondary]',
 			)));
@@ -1066,12 +1066,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;}
@@ -1082,10 +1082,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()));
 		}
 
 
@@ -1093,7 +1093,7 @@ 
             global $aui_bs5;
 
 			$colors = array();
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+			if (defined('BLOCKSTRAP_VERSION')) {
 
 
 				$setting = wp_get_global_settings();
@@ -1102,22 +1102,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
 				);
 			}
 
@@ -1128,25 +1128,25 @@ 
                 <?php
 
 					// BS v3 compat
-					if( self::is_bs3_compat() ){
+					if (self::is_bs3_compat()) {
 						echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					}
 
-                    $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;
                     }
 
-					if(!empty($colors)){
+					if (!empty($colors)) {
 						$d_colors = self::get_colors(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); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+								echo $aui_bs5 ? self::css_overwrite_bs5($key, $var, $compat, $color) : self::css_overwrite($key, $var, $compat, $color); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 							}
 						}
 					   // exit;
@@ -1155,71 +1155,71 @@ 
 					// 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();
 
 //                        print_r( $theme_settings);exit;
 
                         // 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) . ';';
                         }
 
                         // font size
-                        if( !empty( $theme_settings['typography']['fontSize'] ) ){
-                            $css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
+                        if (!empty($theme_settings['typography']['fontSize'])) {
+                            $css .= '--bs-body-font-size: ' . esc_attr($theme_settings['typography']['fontSize']) . ' ;';
                         }
 
                         // line height
-                         if( !empty( $theme_settings['typography']['lineHeight'] ) ){
-                            $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
+                         if (!empty($theme_settings['typography']['lineHeight'])) {
+                            $css .= '--bs-body-line-height: ' . esc_attr($theme_settings['typography']['lineHeight']) . ';';
                         }
 
 
                            // font weight
-                         if( !empty( $theme_settings['typography']['fontWeight'] ) ){
-                            $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
+                         if (!empty($theme_settings['typography']['fontWeight'])) {
+                            $css .= '--bs-body-font-weight: ' . esc_attr($theme_settings['typography']['fontWeight']) . ';';
                         }
 
                         // Background
-                         if( !empty( $theme_settings['color']['background'] ) ){
-                            $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
+                         if (!empty($theme_settings['color']['background'])) {
+                            $css .= '--bs-body-bg: ' . esc_attr($theme_settings['color']['background']) . ';';
                         }
 
                          // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
-                            $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                         if (!empty($theme_settings['color']['gradient'])) {
+                            $css .= 'background: ' . esc_attr($theme_settings['color']['gradient']) . ';';
                         }
 
                            // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
-                            $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                         if (!empty($theme_settings['color']['gradient'])) {
+                            $css .= 'background: ' . esc_attr($theme_settings['color']['gradient']) . ';';
                         }
 
                         // text color
-                        if( !empty( $theme_settings['color']['text'] ) ){
-                            $css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
+                        if (!empty($theme_settings['color']['text'])) {
+                            $css .= '--bs-body-color: ' . esc_attr($theme_settings['color']['text']) . ';';
                         }
 
 
                         // link colors
-                        if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
-                            $css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
+                        if (!empty($theme_settings['elements']['link']['color']['text'])) {
+                            $css .= '--bs-link-color: ' . esc_attr($theme_settings['elements']['link']['color']['text']) . ';';
                         }
-                        if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
-                            $css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
+                        if (!empty($theme_settings['elements']['link'][':hover']['color']['text'])) {
+                            $css .= '--bs-link-hover-color: ' . esc_attr($theme_settings['elements']['link'][':hover']['color']['text']) . ';';
                         }
 
 
 
-                        if($css){
-                            echo  $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
+                        if ($css) {
+                            echo  $is_fse ? 'body.editor-styles-wrapper{' . esc_attr($css) . '}' : 'body{' . esc_attr($css) . '}';
                         }
 
                         $bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
@@ -1227,42 +1227,42 @@ 
 
                         // Headings
                         $headings_css = '';
-                        if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
-                            $headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
+                        if (!empty($theme_settings['elements']['heading']['color']['text'])) {
+                            $headings_css .= "color: " . esc_attr($theme_settings['elements']['heading']['color']['text']) . ";";
                         }
 
                         // heading background
-                        if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
-                            $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
+                        if (!empty($theme_settings['elements']['heading']['color']['background'])) {
+                            $headings_css .= 'background: ' . esc_attr($theme_settings['elements']['heading']['color']['background']) . ';';
                         }
 
                          // heading font family
-                        if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
-                            $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
+                        if (!empty($theme_settings['elements']['heading']['typography']['fontFamily'])) {
+                            $headings_css .= 'font-family: ' . esc_attr($theme_settings['elements']['heading']['typography']['fontFamily']) . ';';
                         }
 
-                        if( $headings_css ){
-                            echo "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                        if ($headings_css) {
+                            echo "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr($headings_css) . "}"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
                         }
 
-                        $hs = array('h1','h2','h3','h4','h5','h6');
+                        $hs = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
 
-                        foreach($hs as $hn){
+                        foreach ($hs as $hn) {
                             $h_css = '';
-                             if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
-                                $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
+                             if (!empty($theme_settings['elements'][$hn]['color']['text'])) {
+                                $h_css .= 'color: ' . esc_attr($theme_settings['elements'][$hn]['color']['text']) . ';';
                              }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
-                                $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
+                              if (!empty($theme_settings['elements'][$hn]['typography']['fontSize'])) {
+                                $h_css .= 'font-size: ' . esc_attr($theme_settings['elements'][$hn]['typography']['fontSize']) . ';';
                              }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
-                                $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
+                              if (!empty($theme_settings['elements'][$hn]['typography']['fontFamily'])) {
+                                $h_css .= 'font-family: ' . esc_attr($theme_settings['elements'][$hn]['typography']['fontFamily']) . ';';
                              }
 
-                             if($h_css){
-                                echo esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
+                             if ($h_css) {
+                                echo esc_attr($bep . $hn) . '{' . esc_attr($h_css) . '}';
                              }
                         }
 
@@ -1275,10 +1275,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()));
 		}
 
 
@@ -1288,34 +1288,34 @@ 
 		 *
 		 * @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');
 		}
 
-		public static function hex_to_rgb( $hex ) {
+		public static function hex_to_rgb($hex) {
 			// Remove '#' if present
-			$hex = str_replace( '#', '', $hex );
+			$hex = str_replace('#', '', $hex);
 
 			// Check if input is RGB
-			if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
-				$_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
+			if (strpos($hex, 'rgba(') === 0 || strpos($hex, 'rgb(') === 0) {
+				$_rgb = explode(',', str_replace(array('rgba(', 'rgb(', ')'), '', $hex));
 
-				$rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
+				$rgb = (isset($_rgb[0]) ? (int) trim($_rgb[0]) : '0') . ',';
+				$rgb .= (isset($_rgb[1]) ? (int) trim($_rgb[1]) : '0') . ',';
+				$rgb .= (isset($_rgb[2]) ? (int) trim($_rgb[2]) : '0');
 
 				return $rgb;
 			}
 
 			// Convert 3-digit hex to 6-digit hex
-			if ( strlen( $hex ) == 3 ) {
-				$hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
+			if (strlen($hex) == 3) {
+				$hex = str_repeat(substr($hex, 0, 1), 2) . str_repeat(substr($hex, 1, 1), 2) . str_repeat(substr($hex, 2, 1), 2);
 			}
 
 			// Convert hex to RGB
-			$r = hexdec( substr( $hex, 0, 2 ) );
-			$g = hexdec( substr( $hex, 2, 2 ) );
-			$b = hexdec( substr( $hex, 4, 2 ) );
+			$r = hexdec(substr($hex, 0, 2));
+			$g = hexdec(substr($hex, 2, 2));
+			$b = hexdec(substr($hex, 4, 2));
 
 			// Return RGB values as an array
 			return $r . ',' . $g . ',' . $b;
@@ -1330,13 +1330,13 @@ 
 		 *
 		 * @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;
 			$is_custom = strpos($type, 'custom-') !== false ? true : 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;
@@ -1346,15 +1346,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);
 			}
 
@@ -1371,30 +1371,30 @@ 
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
+				".btn-{$type}"                                              => array('b', 'o'),
+				".btn-{$type}.disabled"                                     => array('b', 'o'),
+				".btn-{$type}:disabled"                                     => array('b', 'o'),
+				".btn-outline-{$type}"                                      => array('c', 'o'),
+				".btn-outline-{$type}:hover"                                => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array('b', 'o'),
+				".show>.btn-outline-{$type}.dropdown-toggle"                => array('b', 'o'),
+				".badge-{$type}"                                            => array('b'),
+				".alert-{$type}"                                            => array('b', 'o'),
+				".bg-{$type}"                                               => array('b', 'f'),
+				".btn-link.btn-{$type}"                                     => array('c'),
+				".text-{$type}"                                     => array('c'),
 			);
 
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
+			if ($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'
@@ -1403,57 +1403,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).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+			$output .= $prefix . ' .link-' . esc_attr($type) . ' {color: var(--bs-' . esc_attr($type) . '-rgb) !important;}';
+			$output .= $prefix . ' .link-' . esc_attr($type) . ':hover {color: rgba(var(--bs-' . esc_attr($type) . '-rgb), .8) !important;}';
 
 			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
+			$output .= $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;
@@ -1464,18 +1464,18 @@ 
 			$output .= '}';
 
 			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+			$output .= $prefix . ' .btn-outline-' . esc_attr($type) . '{';
 			$output .= ' 
-			--bs-btn-color: '.esc_attr($color_code).';
-            --bs-btn-border-color: '.esc_attr($color_code).';
-            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --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-color: '.esc_attr($color_code) . ';
+            --bs-btn-border-color: '.esc_attr($color_code) . ';
+            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --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;
@@ -1487,32 +1487,32 @@ 
 
 
             // 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 . '; }';
 			}
 
 
-			if ( $is_custom ) {
+			if ($is_custom) {
 
 //				echo '###'.$type;exit;
 
 				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
+				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
@@ -1526,36 +1526,36 @@ 
 //				}
 
 				// 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;} ";
 				}
 
 			}
@@ -1565,25 +1565,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;} ";
 
 			// text
 //			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
@@ -1601,9 +1601,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;
@@ -1618,12 +1618,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;
@@ -1633,15 +1633,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);
 			}
 
@@ -1655,29 +1655,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'
@@ -1686,19 +1686,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'),
@@ -1706,7 +1706,7 @@ 
 			}
 
 			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
+				".bg-{$type}" => array('b', 'f'),
 				".border-{$type}" => array('o'),
 				".text-{$type}" => array('c'),
 			);
@@ -1722,62 +1722,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;} ";
 			}
 
 
@@ -1785,27 +1785,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;} ";
 
@@ -1817,9 +1817,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;
@@ -1835,11 +1835,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 ''; }
 			}
 
 			/**
@@ -1847,36 +1847,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'),
 			);
@@ -1893,88 +1893,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;
 		}
@@ -1988,30 +1988,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'),
 			);
@@ -2028,77 +2028,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;
@@ -2115,7 +2115,7 @@ 
 		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
 			$hexCode = ltrim($hexCode, '#');
 
-			if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
+			if (strpos($hexCode, 'rgba(') !== false || strpos($hexCode, 'rgb(') !== false) {
 				return $hexCode;
 			}
 
@@ -2138,8 +2138,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>";
@@ -2155,7 +2155,7 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_examples(){
+		public function get_examples() {
 			$output = '';
 
 
@@ -2261,74 +2261,74 @@ 
 		 */
 		public static function calendar_params() {
 			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+				'month_long_1' => __('January', 'ayecode-connect'),
+				'month_long_2' => __('February', 'ayecode-connect'),
+				'month_long_3' => __('March', 'ayecode-connect'),
+				'month_long_4' => __('April', 'ayecode-connect'),
+				'month_long_5' => __('May', 'ayecode-connect'),
+				'month_long_6' => __('June', 'ayecode-connect'),
+				'month_long_7' => __('July', 'ayecode-connect'),
+				'month_long_8' => __('August', 'ayecode-connect'),
+				'month_long_9' => __('September', 'ayecode-connect'),
+				'month_long_10' => __('October', 'ayecode-connect'),
+				'month_long_11' => __('November', 'ayecode-connect'),
+				'month_long_12' => __('December', 'ayecode-connect'),
+				'month_s_1' => _x('Jan', 'January abbreviation', 'ayecode-connect'),
+				'month_s_2' => _x('Feb', 'February abbreviation', 'ayecode-connect'),
+				'month_s_3' => _x('Mar', 'March abbreviation', 'ayecode-connect'),
+				'month_s_4' => _x('Apr', 'April abbreviation', 'ayecode-connect'),
+				'month_s_5' => _x('May', 'May abbreviation', 'ayecode-connect'),
+				'month_s_6' => _x('Jun', 'June abbreviation', 'ayecode-connect'),
+				'month_s_7' => _x('Jul', 'July abbreviation', 'ayecode-connect'),
+				'month_s_8' => _x('Aug', 'August abbreviation', 'ayecode-connect'),
+				'month_s_9' => _x('Sep', 'September abbreviation', 'ayecode-connect'),
+				'month_s_10' => _x('Oct', 'October abbreviation', 'ayecode-connect'),
+				'month_s_11' => _x('Nov', 'November abbreviation', 'ayecode-connect'),
+				'month_s_12' => _x('Dec', 'December abbreviation', 'ayecode-connect'),
+				'day_s1_1' => _x('S', 'Sunday initial', 'ayecode-connect'),
+				'day_s1_2' => _x('M', 'Monday initial', 'ayecode-connect'),
+				'day_s1_3' => _x('T', 'Tuesday initial', 'ayecode-connect'),
+				'day_s1_4' => _x('W', 'Wednesday initial', 'ayecode-connect'),
+				'day_s1_5' => _x('T', 'Friday initial', 'ayecode-connect'),
+				'day_s1_6' => _x('F', 'Thursday initial', 'ayecode-connect'),
+				'day_s1_7' => _x('S', 'Saturday initial', 'ayecode-connect'),
+				'day_s2_1' => __('Su', 'ayecode-connect'),
+				'day_s2_2' => __('Mo', 'ayecode-connect'),
+				'day_s2_3' => __('Tu', 'ayecode-connect'),
+				'day_s2_4' => __('We', 'ayecode-connect'),
+				'day_s2_5' => __('Th', 'ayecode-connect'),
+				'day_s2_6' => __('Fr', 'ayecode-connect'),
+				'day_s2_7' => __('Sa', 'ayecode-connect'),
+				'day_s3_1' => __('Sun', 'ayecode-connect'),
+				'day_s3_2' => __('Mon', 'ayecode-connect'),
+				'day_s3_3' => __('Tue', 'ayecode-connect'),
+				'day_s3_4' => __('Wed', 'ayecode-connect'),
+				'day_s3_5' => __('Thu', 'ayecode-connect'),
+				'day_s3_6' => __('Fri', 'ayecode-connect'),
+				'day_s3_7' => __('Sat', 'ayecode-connect'),
+				'day_s5_1' => __('Sunday', 'ayecode-connect'),
+				'day_s5_2' => __('Monday', 'ayecode-connect'),
+				'day_s5_3' => __('Tuesday', 'ayecode-connect'),
+				'day_s5_4' => __('Wednesday', 'ayecode-connect'),
+				'day_s5_5' => __('Thursday', 'ayecode-connect'),
+				'day_s5_6' => __('Friday', 'ayecode-connect'),
+				'day_s5_7' => __('Saturday', 'ayecode-connect'),
+				'am_lower' => __('am', 'ayecode-connect'),
+				'pm_lower' => __('pm', 'ayecode-connect'),
+				'am_upper' => __('AM', 'ayecode-connect'),
+				'pm_upper' => __('PM', 'ayecode-connect'),
+				'firstDayOfWeek' => (int) get_option('start_of_week'),
 				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+				'year' => __('Year', 'ayecode-connect'),
+				'hour' => __('Hour', 'ayecode-connect'),
+				'minute' => __('Minute', 'ayecode-connect'),
+				'weekAbbreviation' => __('Wk', 'ayecode-connect'),
+				'rangeSeparator' => __(' to ', 'ayecode-connect'),
+				'scrollTitle' => __('Scroll to increment', 'ayecode-connect'),
+				'toggleTitle' => __('Click to toggle', 'ayecode-connect')
 			);
 
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
+			return apply_filters('ayecode_ui_calendar_params', $params);
 		}
 
 		/**
@@ -2341,47 +2341,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 ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			for ($i = 1; $i <= 7; $i++) {
+				$day_s3[] = addslashes($params['day_s3_' . $i]); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				$day_s5[] = addslashes($params['day_s3_' . $i]); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 
 			$month_s = array();
 			$month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			for ($i = 1; $i <= 12; $i++) {
+				$month_s[] = addslashes($params['month_s_' . $i]); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				$month_long[] = addslashes($params['month_long_' . $i]); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 
 			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+		if (0) { ?><script><?php } ?>
                 {
                     weekdays: {
-                        shorthand: ['<?php echo implode( "','", $day_s3 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
-                            longhand: ['<?php echo implode( "','", $day_s5 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
+                        shorthand: ['<?php echo implode("','", $day_s3); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
+                            longhand: ['<?php echo implode("','", $day_s5); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
                     },
                     months: {
-                        shorthand: ['<?php echo implode( "','", $month_s ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
-                            longhand: ['<?php echo implode( "','", $month_long ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
+                        shorthand: ['<?php echo implode("','", $month_s); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
+                            longhand: ['<?php echo implode("','", $month_long); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
                     },
                     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)
@@ -2397,21 +2397,21 @@ 
                                 return "th";
                         }
                     },
-                    rangeSeparator: '<?php echo esc_attr( $params[ 'rangeSeparator' ] ); ?>',
-                        weekAbbreviation: '<?php echo esc_attr( $params[ 'weekAbbreviation' ] ); ?>',
-                    scrollTitle: '<?php echo esc_attr( $params[ 'scrollTitle' ] ); ?>',
-                    toggleTitle: '<?php echo esc_attr( $params[ 'toggleTitle' ] ); ?>',
-                    amPM: ['<?php echo esc_attr( $params[ 'am_upper' ] ); ?>','<?php echo esc_attr( $params[ 'pm_upper' ] ); ?>'],
-                    yearAriaLabel: '<?php echo esc_attr( $params[ 'year' ] ); ?>',
-                    hourAriaLabel: '<?php echo esc_attr( $params[ 'hour' ] ); ?>',
-                    minuteAriaLabel: '<?php echo esc_attr( $params[ 'minute' ] ); ?>',
-                    time_24hr: <?php echo ( $params[ 'time_24hr' ] ? 'true' : 'false' ) ; ?>
+                    rangeSeparator: '<?php echo esc_attr($params['rangeSeparator']); ?>',
+                        weekAbbreviation: '<?php echo esc_attr($params['weekAbbreviation']); ?>',
+                    scrollTitle: '<?php echo esc_attr($params['scrollTitle']); ?>',
+                    toggleTitle: '<?php echo esc_attr($params['toggleTitle']); ?>',
+                    amPM: ['<?php echo esc_attr($params['am_upper']); ?>','<?php echo esc_attr($params['pm_upper']); ?>'],
+                    yearAriaLabel: '<?php echo esc_attr($params['year']); ?>',
+                    hourAriaLabel: '<?php echo esc_attr($params['hour']); ?>',
+                    minuteAriaLabel: '<?php echo esc_attr($params['minute']); ?>',
+                    time_24hr: <?php echo ($params['time_24hr'] ? 'true' : 'false'); ?>
                 }
-				<?php if ( 0 ) { ?></script><?php } ?>
+				<?php 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));
 		}
 
 		/**
@@ -2423,20 +2423,20 @@ 
 		 */
 		public static function select2_params() {
 			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+				'i18n_select_state_text'    => esc_attr__('Select an option&hellip;', 'ayecode-connect'),
+				'i18n_no_matches'           => _x('No matches found', 'enhanced select', 'ayecode-connect'),
+				'i18n_ajax_error'           => _x('Loading failed', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_short_1'    => _x('Please enter 1 or more characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_short_n'    => _x('Please enter %item% or more characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_long_1'     => _x('Please delete 1 character', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_long_n'     => _x('Please delete %item% characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_selection_too_long_1' => _x('You can only select 1 item', 'enhanced select', 'ayecode-connect'),
+				'i18n_selection_too_long_n' => _x('You can only select %item% items', 'enhanced select', 'ayecode-connect'),
+				'i18n_load_more'            => _x('Loading more results&hellip;', 'enhanced select', 'ayecode-connect'),
+				'i18n_searching'            => _x('Searching&hellip;', 'enhanced select', 'ayecode-connect')
 			);
 
-			return apply_filters( 'ayecode_ui_select2_params', $params );
+			return apply_filters('ayecode_ui_select2_params', $params);
 		}
 
 		/**
@@ -2449,17 +2449,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));
 		}
 
 		/**
@@ -2472,35 +2472,35 @@ 
 		public static function timeago_locale() {
 			$params = array(
 				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+				'suffix_ago' => ' ' . _x('ago', 'time ago', 'ayecode-connect'),
+				'prefix_after' => _x('after', 'time ago', 'ayecode-connect') . ' ',
 				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+				'seconds' => _x('less than a minute', 'time ago', 'ayecode-connect'),
+				'minute' => _x('about a minute', 'time ago', 'ayecode-connect'),
+				'minutes' => _x('%d minutes', 'time ago', 'ayecode-connect'),
+				'hour' => _x('about an hour', 'time ago', 'ayecode-connect'),
+				'hours' => _x('about %d hours', 'time ago', 'ayecode-connect'),
+				'day' => _x('a day', 'time ago', 'ayecode-connect'),
+				'days' => _x('%d days', 'time ago', 'ayecode-connect'),
+				'month' => _x('about a month', 'time ago', 'ayecode-connect'),
+				'months' => _x('%d months', 'time ago', 'ayecode-connect'),
+				'year' => _x('about a year', 'time ago', 'ayecode-connect'),
+				'years' => _x('%d years', 'time ago', 'ayecode-connect'),
 			);
 
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
+			$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));
 		}
 
 		/**
@@ -2511,7 +2511,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)
@@ -2543,7 +2543,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)
@@ -3109,12 +3109,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-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.2.15";
-	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-super-duper/wp-super-duper.php

Spacing +799 added lines, -799 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.43' );
+    define('SUPER_DUPER_VER', '1.1.43');
 
     /**
      * 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' ), 99 );
-                add_action( 'wp_head', array( $this, 'generator' ), 99 );
+                add_action('admin_head', array($this, 'generator'), 99);
+                add_action('wp_head', array($this, 'generator'), 99);
             }
 
-            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,38 +205,38 @@ 
                         $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;
                     }
 
                     // heading
-                    $param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+                    $param['heading'] = isset($val['title']) ? $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( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                        $param['value'] = array('0' => __("No", 'ayecode-connect'), '1' => __("Yes", 'ayecode-connect'));
+                    } 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', 'ayecode-connect' ) . "</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', 'ayecode-connect') . "</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', 'ayecode-connect' ); ?></button>
+                                } ?>)"><?php _e('Insert shortcode', 'ayecode-connect'); ?></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' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+            echo '<meta name="generator" content="WP Super Duper v' . esc_attr($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', 'ayecode-connect' );?>" 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', 'ayecode-connect'); ?>" 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;
                 }
@@ -1106,10 +1106,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);
         }
 
         /**
@@ -1176,7 +1176,7 @@ 
                         jQuery($this).data('sd-widget-enabled', true);
                     }
 
-                    var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" 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', 'ayecode-connect'); ?>" 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) {
@@ -1267,7 +1267,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();
@@ -1276,10 +1276,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);
         }
 
 
@@ -1290,14 +1290,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;
                 }
             }
 
@@ -1310,8 +1310,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'));
         }
 
         /**
@@ -1320,50 +1320,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 .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+                        $attributes .= " " . esc_attr(sanitize_title_with_dashes($key)) . "='" . esc_attr($value) . "' ";
                     }
                 }
 
-                $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+                $shortcode = "[" . esc_attr($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;
@@ -1379,21 +1379,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.
                  *
@@ -1404,40 +1404,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;
@@ -1445,20 +1445,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);
         }
 
         /**
@@ -1468,8 +1468,8 @@ 
          *
          * @return string
          */
-        public function preview_placeholder_text( $name = '' ) {
-            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+        public function preview_placeholder_text($name = '') {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf(__('Placeholder for: %s', 'ayecode-connect'), $name) . "</div>";
         }
 
         /**
@@ -1479,13 +1479,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;
                 }
             }
 
@@ -1501,26 +1501,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'];
                     }
                 }
             }
@@ -1547,12 +1547,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;
         }
@@ -1564,7 +1564,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 = '') {
 
         }
 
@@ -1572,9 +1572,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());
             }
         }
 
@@ -1588,9 +1588,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
                     }
@@ -1608,19 +1608,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;
             }
 
@@ -1636,15 +1636,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;
                 }
             }
@@ -1665,45 +1665,45 @@ 
          * @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 ) {
-            if ( ! empty( $arguments ) ) {
+        public function group_arguments($arguments) {
+            if (!empty($arguments)) {
                 $temp_arguments = array();
-                $general        = __( "General", 'ayecode-connect' );
+                $general        = __("General", 'ayecode-connect');
                 $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;
                     }
                 }
 
@@ -1774,7 +1774,7 @@ 
             ?>
             <script>
             <?php
-            if ( ! $sd_is_js_functions_loaded ) {
+            if (!$sd_is_js_functions_loaded) {
                 $sd_is_js_functions_loaded = true;
             ?>
 function sd_show_view_options($this){
@@ -2040,7 +2040,7 @@ 
     }
 }
 
-<?php if( !isset( $_REQUEST['sd-block-recover-debug'] ) ){ ?>
+<?php if (!isset($_REQUEST['sd-block-recover-debug'])) { ?>
 // Wait will window is loaded before calling.
 window.onload = function() {
     sd_auto_recover_blocks();
@@ -2219,7 +2219,7 @@ 
                 $classes = [];
 
                 <?php
-                if($aui_bs5){
+                if ($aui_bs5) {
                     ?>
                 $aui_bs5 = true;
                 $p_ml = 'ms-';
@@ -2228,7 +2228,7 @@ 
                 $p_pl = 'ps-';
                 $p_pr = 'pe-';
                     <?php
-                }else{
+                } else {
                         ?>
                 $aui_bs5 = false;
                 $p_ml = 'ml-';
@@ -2413,7 +2413,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
@@ -2421,7 +2421,7 @@ 
 
             }
 
-            if(method_exists($this,'block_global_js')){
+            if (method_exists($this, 'block_global_js')) {
                     echo $this->block_global_js();
             }
             ?>
@@ -2450,9 +2450,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;
 
                     /**
@@ -2467,87 +2467,87 @@ 
                      * @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']['renaming'])){
+                            if (!isset($this->options['block-supports']['renaming'])) {
                                 $this->options['block-supports']['renaming'] = false;
                             }
-                            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']);
                             }
                             ?>
                         },
                         __experimentalLabel( attributes, { context } ) {
                             var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
                             var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '';
-                            var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr( addslashes( $this->options['name'] ) ) . "'"; ?>;
+                            var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr(addslashes($this->options['name'])) . "'"; ?>;
                             return metadata_name ? metadata_name + visibility_html  : label_name + visibility_html;
                         },
-                        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.
                         $example_args = array();
-                        if(!empty($this->arguments)){
-                            foreach($this->arguments as $key => $a_args){
-                                if(isset($a_args['example'])){
+                        if (!empty($this->arguments)) {
+                            foreach ($this->arguments as $key => $a_args) {
+                                if (isset($a_args['example'])) {
                                     $example_args[$key] = $a_args['example'];
                                 }
                             }
                         }
-                        $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+                        $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: ' . absint($this->options['example']['viewportWidth']) : '';
                         $example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-                        if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+                        if (isset($this->options['example']) && $this->options['example'] === false) {
                             // no preview if set to false
-                        }elseif( !empty( $example_args ) ){
-                            echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-                        }elseif( !empty( $this->options['example'] ) ){
+                        }elseif (!empty($example_args)) {
+                            echo "example : {attributes:{" . $this->array_to_attributes($example_args) . "},$viewport_width},";
+                        }elseif (!empty($this->options['example'])) {
                             unset($this->options['example']['viewportWidth']);
                             unset($this->options['example']['innerBlocks']);
-                            $example_atts = $this->array_to_attributes( $this->options['example'] );
+                            $example_atts = $this->array_to_attributes($this->options['example']);
                             $example_parts = array();
-                            if($example_atts){
-                                $example_parts[] = rtrim($example_atts,",");
+                            if ($example_atts) {
+                                $example_parts[] = rtrim($example_atts, ",");
                             }
-                            if($viewport_width){
+                            if ($viewport_width) {
                                 $example_parts[] = $viewport_width;
                             }
-                            if($example_inner_blocks){
+                            if ($example_inner_blocks) {
                                 $example_parts[] = $example_inner_blocks;
                             }
-                            if(!empty($example_parts)){
-                                echo "example : {".implode(',', $example_parts)."},";
+                            if (!empty($example_parts)) {
+                                echo "example : {" . implode(',', $example_parts) . "},";
                             }
-                        }else{
+                        } else {
                             echo 'example : {viewportWidth: 500},';
                         }
 
 
 
                         // limit to parent
-                        if( !empty( $this->options['parent'] ) ){
-                            echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+                        if (!empty($this->options['parent'])) {
+                            echo "parent : " . wp_json_encode($this->options['parent']) . ",";
                         }
 
                         // limit allowed blocks
-                        if( !empty( $this->options['allowed-blocks'] ) ){
-                            echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+                        if (!empty($this->options['allowed-blocks'])) {
+                            echo "allowedBlocks : " . wp_json_encode($this->options['allowed-blocks']) . ",";
                         }
 
                         // 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'] = '';
                         }
 
@@ -2561,10 +2561,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,";
@@ -2572,56 +2572,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 : {";
@@ -2633,7 +2633,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 . " : {";
@@ -2657,7 +2657,7 @@ 
 
 <?php
 // only include the drag/drop functions if required.
-if( $img_drag_drop ){
+if ($img_drag_drop) {
 
 ?>
 
@@ -2723,9 +2723,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) {
@@ -2749,7 +2749,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;
@@ -2764,9 +2764,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 */
@@ -2774,15 +2774,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. */
@@ -2792,12 +2792,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. */
@@ -2805,7 +2805,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); ?>;
                 });
             }
         }
@@ -2817,12 +2817,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.
@@ -2837,12 +2837,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.
@@ -2850,7 +2850,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); ?>;
                 });
             }
         }
@@ -2858,9 +2858,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 => {
@@ -2889,13 +2889,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) {
@@ -2904,17 +2904,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:', 'ayecode-connect' );?> " + props.name + "</div>";
+                                            env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for:', 'ayecode-connect'); ?> " + 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;
@@ -2939,8 +2939,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
                             }
 
 
@@ -2952,7 +2952,7 @@ 
 
                                 el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-                                    <?php if($show_alignment){?>
+                                    <?php if ($show_alignment) {?>
                                     el(
                                         wp.blockEditor.AlignmentToolbar,
                                         {
@@ -2970,9 +2970,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'}
@@ -2992,42 +2992,42 @@ 
                                     <?php
                                     }
 
-                                    $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;
                                                         }
                                                     }
@@ -3036,27 +3036,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,
@@ -3064,24 +3064,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", 'ayecode-connect' ); ?>',
+                                            title: '<?php esc_attr_e("Settings", 'ayecode-connect'); ?>',
                                             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);
                                         }
                                         ?>
                                     ),
@@ -3095,11 +3095,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';
                                 ?>
@@ -3126,27 +3126,27 @@ 
                             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;}
 
                                // don't add metadata arguments
-                               if (substr($key, 0, 9 ) === 'metadata_') {
+                               if (substr($key, 0, 9) === 'metadata_') {
                                    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
@@ -3165,7 +3165,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?
@@ -3195,7 +3195,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 ";";
@@ -3205,30 +3205,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")) {
@@ -3257,48 +3257,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
                                 }
                                 ?>
@@ -3306,17 +3306,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',
@@ -3325,36 +3325,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 "))";
                 }
 
@@ -3362,14 +3362,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'},
 
@@ -3378,52 +3378,52 @@ 
                                     {
                                         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           = '';
@@ -3431,28 +3431,28 @@ 
             $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.
@@ -3460,27 +3460,27 @@ 
             }
 
             // 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) : '' } )";
                 }
 
-                if (substr($key, 0, 9 ) === 'metadata_') {
-                    $real_key = str_replace('metadata_','', $key );
+                if (substr($key, 0, 9) === 'metadata_') {
+                    $real_key = str_replace('metadata_', '', $key);
                     $onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-                    $value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+                    $value = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
                 }
             }
 //			else if ( $args['type'] == 'popup' ) {
@@ -3500,12 +3500,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';
@@ -3567,11 +3567,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) {
@@ -3580,7 +3580,7 @@ 
                             $key: value
                         });
                     },";
-            }elseif ( $args['type'] == 'gradient' ) {
+            }elseif ($args['type'] == 'gradient') {
                 $type = 'GradientPicker';
                 $extra .= "gradients: [{
             name: 'Vivid cyan blue to vivid purple',
@@ -3619,7 +3619,7 @@ 
             slug: 'cool-to-warm-spectrum',
         }],";
 
-            }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,{
@@ -3681,7 +3681,7 @@ 
                 $onchange = "";
 
                 //$inside_elements = ",el('div',{},'file upload')";
-            } else if ( $args['type'] == 'images' ) {
+            } else if ($args['type'] == 'images') {
                 $img_preview = "props.attributes.$key && (function() {
     let uploads = JSON.parse('['+props.attributes.$key+']');
     let images = [];
@@ -3694,7 +3694,7 @@ 
             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);
@@ -3757,36 +3757,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: '" . esc_js( addslashes( $option_label ) ) . "' },";
+                        foreach ($args['options'] as $option_val => $option_label) {
+                            $options .= "{ value: '" . esc_attr($option_val) . "', label: '" . esc_js(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(){
@@ -3798,7 +3798,7 @@ 
                                     'Clear'
                             ),";
                 }
-            } elseif ( $args['type'] == 'tagselect' ) {
+            } elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3833,19 +3833,19 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-            } else if ( $args['type'] == 'alignment' ) {
+            } else if ($args['type'] == 'alignment') {
                 $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-            } else if ( $args['type'] == 'margins' ) {
+            } else if ($args['type'] == 'margins') {
 
-            } else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+            } else if ($args['type'] == 'visibility_conditions' && (function_exists('wp_is_block_theme') && wp_is_block_theme())) {
                 $type = 'TextControl';
                 $value = "(props.attributes.$key ? props.attributes.$key : '')";
                 $args['type'] = 'text';
                 $options .= 'disabled:true,';
-                $bsvc_title = esc_attr( addslashes( $args['title'] ) );
-                $bsvc_body = $this->block_visibility_fields( $args );
+                $bsvc_title = esc_attr(addslashes($args['title']));
+                $bsvc_body = $this->block_visibility_fields($args);
                 // @TODO reset button
-                $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+                $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __('Reset', 'ayecode-connect') . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __('Close', 'ayecode-connect') . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __('Save Rules', 'ayecode-connect') . '</button>';
                 $after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
                         className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
                         onClick: function() {
@@ -3864,25 +3864,25 @@ 
                                     jQuery('.bs-vc-modal-form').trigger('change');
                                 }
                             });
-                            aui_modal('" . $bsvc_title . "', '" . addslashes( $bsvc_body ) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
+                            aui_modal('" . $bsvc_title . "', '" . addslashes($bsvc_body) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
                             jQuery(document).off('change', '#bsvc_raw_value').on('change', '#bsvc_raw_value', function(e) {
                                 props.setAttributes({" . $key . ": e.target.value});
                             });
                         }
                     },
-                    '" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
+                    '" . addslashes(!empty($args['button_title']) ? $args['button_title'] : $args['title']) . "'
                 ) ),";
             } 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
@@ -3894,22 +3894,22 @@ 
             // icon
             echo $icon;
             ?>
-            el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
-            label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( 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)"}})<?php } ?>)<?php
-            } else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
-            help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
+            el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type : "wp.components." . $type; ?>, {
+            label: <?php if (empty($args['title'])) { echo "''"; } else if (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)"}})<?php } ?>)<?php
+            } else { ?>'<?php echo addslashes(trim(esc_html($args['title']))); ?>'<?php } ?>,
+            help: <?php echo (isset($args['desc']) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim(wp_kses_post(addslashes($args['desc']))) . "'}})" : "''"); ?>,
             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: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+            <?php if (!empty($args['placeholder'])) {
+                echo "placeholder: '" . esc_js(addslashes(trim(esc_html($args['placeholder'])))) . "',";
             } ?>
             <?php echo $options; ?>
             <?php echo $extra; ?>
             <?php echo $custom_attributes; ?>
             <?php echo $onchangecomplete; ?>
-            <?php if ( $onchange ) { ?>
+            <?php if ($onchange) { ?>
             onChange: function ( <?php echo $key; ?> ) {
                 <?php echo $onchange; ?>
             }
@@ -3928,15 +3928,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',";
                     }
                 }
 
@@ -3954,112 +3954,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
                             }
 
 
@@ -4068,26 +4068,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) . "',";
                         }
 
                     }
@@ -4102,11 +4102,11 @@ 
          *
          * @return mixed
          */
-        public function block_props_replace( $string, $no_wrap = false ) {
-            if ( $no_wrap ) {
-                $string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+        public function block_props_replace($string, $no_wrap = false) {
+            if ($no_wrap) {
+                $string = str_replace(array("[%", "%]", "%:checked]"), array("props.attributes.", "", ""), $string);
             } else {
-                $string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+                $string = str_replace(array("![%", "[%", "%]", "%:checked]"), array("'+!props.attributes.", "'+props.attributes.", "+'", "+'"), $string);
             }
 
             return $string;
@@ -4118,65 +4118,65 @@ 
          * @param array $args
          * @param array $instance
          */
-        public function widget( $args, $instance ) {
-            if ( ! is_array( $args ) ) {
+        public function widget($args, $instance) {
+            if (!is_array($args)) {
                 $args = array();
             }
 
             // 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;
         }
@@ -4189,7 +4189,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;
             }
 
@@ -4204,7 +4204,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;
             }
 
@@ -4219,7 +4219,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;
             }
 
@@ -4234,7 +4234,7 @@ 
          */
         public function is_beaver_preview() {
             $result = false;
-            if ( isset( $_REQUEST['fl_builder'] ) ) {
+            if (isset($_REQUEST['fl_builder'])) {
                 $result = true;
             }
 
@@ -4249,7 +4249,7 @@ 
          */
         public function is_siteorigin_preview() {
             $result = false;
-            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+            if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
                 $result = true;
             }
 
@@ -4264,7 +4264,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;
             }
 
@@ -4279,7 +4279,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;
             }
 
@@ -4294,7 +4294,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;
             }
 
@@ -4311,7 +4311,7 @@ 
         public function is_kallyas_zion_preview() {
             $result = false;
 
-            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+            if (function_exists('znhg_kallyas_theme_config') && !empty($_REQUEST['zn_pb_edit'])) {
                 $result = true;
             }
 
@@ -4328,7 +4328,7 @@ 
         public function is_bricks_preview() {
             $result = false;
 
-            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+            if (function_exists('bricks_is_builder') && (bricks_is_builder() || bricks_is_builder_call())) {
                 $result = true;
             }
 
@@ -4343,25 +4343,25 @@ 
          */
         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_kallyas_zion_preview() ) {
+            } elseif ($this->is_kallyas_zion_preview()) {
                 $preview = true;
-            } elseif( $this->is_block_content_call() ) {
+            } elseif ($this->is_block_content_call()) {
                 $preview = true;
-            } elseif( $this->is_bricks_preview() ) {
+            } elseif ($this->is_bricks_preview()) {
                 $preview = true;
             }
 
@@ -4376,34 +4376,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>";
                 }
 
@@ -4417,7 +4417,7 @@ 
          *
          * @param array $instance The widget options.
          */
-        public function form( $instance ) {
+        public function form($instance) {
 
             // set widget instance
             $this->instance = $instance;
@@ -4425,20 +4425,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>
@@ -4448,26 +4448,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);
                     }
                 }
@@ -4475,28 +4475,28 @@ 
             }
         }
 
-        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 echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
-                    <?php if ( ! empty( $args['row']['title'] ) ) { ?>
+                    <div class='bsui sd-argument' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php echo (!empty($args['row']['element_require']) ? $this->convert_element_require($args['row']['element_require']) : ''); ?>'>
+                    <?php if (!empty($args['row']['title'])) { ?>
                     <?php
-                        if ( isset( $args['row']['icon'] ) ) {
+                        if (isset($args['row']['icon'])) {
                             $args['row']['icon'] = '';
                         }
 
-                        if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+                        if (!isset($args['row']['device_type']) && isset($args['device_type'])) {
                             $args['row']['device_type'] = $args['device_type'];
                         }
                     ?>
-                    <label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+                    <label class="mb-0"><?php echo $this->widget_field_title($args['row']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
                     <?php } ?>
-                    <div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
+                    <div class='row<?php echo (!empty($args['row']['class']) ? ' ' . esc_attr($args['row']['class']) : ''); ?>'>
                     <div class='col pr-2'>
                     <?php
-                } else if ( ! empty( $args['row']['close'] ) ) {
+                } else if (!empty($args['row']['close'])) {
                     echo "<div class='col pl-0 ps-0'>";
                 } else {
                     echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
@@ -4504,10 +4504,10 @@ 
             }
         }
 
-        public function widget_inputs_row_end( $key, $args ) {
-            if ( ! empty( $args['row'] ) ) {
+        public function widget_inputs_row_end($key, $args) {
+            if (!empty($args['row'])) {
                 // Maybe close
-                if ( ! empty( $args['row']['close'] ) ) {
+                if (!empty($args['row']['close'])) {
                     echo "</div></div>";
                 }
                 echo "</div>";
@@ -4522,7 +4522,7 @@ 
         public function widget_advanced_toggle() {
 
             $output = '';
-            if ( $this->block_show_advanced() ) {
+            if ($this->block_show_advanced()) {
                 $val = 1;
             } else {
                 $val = 0;
@@ -4542,14 +4542,14 @@ 
          *@since 1.0.0
          *
          */
-        public function convert_element_require( $input ) {
-            $input = str_replace( "'", '"', $input );// we only want double quotes
+        public function convert_element_require($input) {
+            $input = str_replace("'", '"', $input); // we only want double quotes
 
-            $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+            $output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
                 "jQuery(form).find('[data-argument=\"",
                 "\"]').find('input,select,textarea').val()",
                 "\"]').find('input:checked').val()"
-            ), $input ) );
+            ), $input));
 
             return $output;
         }
@@ -4560,48 +4560,48 @@ 
          * @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":
@@ -4611,33 +4611,33 @@ 
                 case "url":
                 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>
-                    <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 ); ?>">
+                    <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); ?>">
                     <?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>
-                    <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 ) { echo "[]"; } ?>"
-                        <?php if ( $multiple ) {
+                    <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) { echo "[]"; } ?>"
+                        <?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>";
                             }
@@ -4648,20 +4648,20 @@ 
                     break;
                 case "checkbox":
                     ?>
-                    <input <?php echo $placeholder; ?> <?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" 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>
+                    <input <?php echo $placeholder; ?> <?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" 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>
                     <?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>
-                    <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>
+                    <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>
                     <?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:
@@ -4671,15 +4671,15 @@ 
             ?></p><?php
         }
 
-        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>';
             }
         }
 
@@ -4691,14 +4691,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>';
                 }
             }
 
@@ -4712,18 +4712,18 @@ 
          *
          * @return string
          */
-        public function widget_field_title( $args ) {
+        public function widget_field_title($args) {
             $title = '';
 
-            if ( isset( $args['title'] ) && $args['title'] ) {
-                if ( ! empty( $args['device_type'] ) ) {
+            if (isset($args['title']) && $args['title']) {
+                if (!empty($args['device_type'])) {
                     $args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
                 }
 
-                if ( isset( $args['icon'] ) && $args['icon'] ) {
-                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                if (isset($args['icon']) && $args['icon']) {
+                    $title = self::get_widget_icon($args['icon'], $args['title']);
                 } else {
-                    $title = esc_attr( $args['title'] );
+                    $title = esc_attr($args['title']);
                 }
             }
 
@@ -4738,11 +4738,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>';
@@ -4755,8 +4755,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(),
@@ -4766,7 +4766,7 @@ 
                 'li'     => array(),
                 'ol'     => array(),
                 'p'      => array(),
-            ) ) );
+            )));
         }
 
         /**
@@ -4778,23 +4778,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';
                     }
                 }
             }
@@ -4812,7 +4812,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;
             }
 
@@ -4825,9 +4825,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);
         }
 
         /**
@@ -4838,14 +4838,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>";
@@ -4863,9 +4863,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;',
@@ -4876,7 +4876,7 @@ 
                 '&amp;gt;' => '&0gt;',
             );
 
-            $content = strtr( $content, $trans );
+            $content = strtr($content, $trans);
 
             $trans   = array(
                 '[' => '&#91;',
@@ -4887,7 +4887,7 @@ 
                 "'" => '&#39;',
             );
 
-            $content = strtr( $content, $trans );
+            $content = strtr($content, $trans);
 
             return $content;
         }
@@ -4901,8 +4901,8 @@ 
          *@since 1.0.28
          *
          */
-        public function decode_shortcodes( $content ) {
-            $trans   = array(
+        public function decode_shortcodes($content) {
+            $trans = array(
                 '&#91;' => '[',
                 '&#93;' => ']',
                 '&amp;#91;' => '[',
@@ -4915,7 +4915,7 @@ 
                 '&apos;' => "'",
             );
 
-            $content = strtr( $content, $trans );
+            $content = strtr($content, $trans);
 
             $trans   = array(
                 '&#091;' => '&#91;',
@@ -4928,31 +4928,31 @@ 
                 '&amp;0gt;' => '&gt;',
             );
 
-            $content = strtr( $content, $trans );
+            $content = strtr($content, $trans);
 
             return $content;
         }
 
-        public function block_visibility_fields( $args ) {
-            $value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+        public function block_visibility_fields($args) {
+            $value = !empty($args['value']) ? esc_attr($args['value']) : '';
             $content = '<div class="bs-vc-rule-template d-none">';
                 $content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
                     $content .= '<div class="row">';
                         $content .= '<div class="col-sm-12">';
-                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__('Remove Rule', 'ayecode-connect') . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
                             $content .= aui()->select(
                                 array(
                                     'id'          => 'bsvc_rule_BSVCINDEX',
                                     'name'        => 'bsvc_rule_BSVCINDEX',
-                                    'label'       => __( 'Rule', 'ayecode-connect' ),
-                                    'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+                                    'label'       => __('Rule', 'ayecode-connect'),
+                                    'placeholder' => __('Select Rule...', 'ayecode-connect'),
                                     'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
                                     'options'     => sd_visibility_rules_options(),
                                     'default'     => '',
                                     'value'       => '',
                                     'label_type'  => '',
                                     'select2'     => false,
-                                    'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+                                    'input_group_left' => __('Rule:', 'ayecode-connect'),
                                     'extra_attributes' => array(
                                         'data-minimum-results-for-search' => '-1'
                                     )
@@ -4961,15 +4961,15 @@ 
 
                         $content .= '</div>';
 
-                        if ( class_exists( 'GeoDirectory' ) ) {
+                        if (class_exists('GeoDirectory')) {
                             $content .= '<div class="col-md-7 col-sm-12">';
 
                                 $content .= aui()->select(
                                     array(
                                         'id'          => 'bsvc_gd_field_BSVCINDEX',
                                         'name'        => 'bsvc_gd_field_BSVCINDEX',
-                                        'label'       => __( 'FIELD', 'ayecode-connect' ),
-                                        'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+                                        'label'       => __('FIELD', 'ayecode-connect'),
+                                        'placeholder' => __('FIELD', 'ayecode-connect'),
                                         'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
                                         'options'     => sd_visibility_gd_field_options(),
                                         'default'     => '',
@@ -4990,8 +4990,8 @@ 
                                     array(
                                         'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
                                         'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-                                        'label'       => __( 'CONDITION', 'ayecode-connect' ),
-                                        'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+                                        'label'       => __('CONDITION', 'ayecode-connect'),
+                                        'placeholder' => __('CONDITION', 'ayecode-connect'),
                                         'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
                                         'options'     => sd_visibility_field_condition_options(),
                                         'default'     => '',
@@ -5013,9 +5013,9 @@ 
                                         'type'            => 'text',
                                         'id'              => 'bsvc_gd_field_search_BSVCINDEX',
                                         'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-                                        'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'label'           => __('VALUE TO MATCH', 'ayecode-connect'),
                                         'class'           => 'bsvc_gd_field_search form-control-sm',
-                                        'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'placeholder'     => __('VALUE TO MATCH', 'ayecode-connect'),
                                         'label_type'      => '',
                                         'value'           => '',
                                         'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
@@ -5027,11 +5027,11 @@ 
 
                     $content .= '</div>';
 
-                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __('Select User Roles:', 'ayecode-connect') . '</label>';
                         $role_options = sd_user_roles_options();
 
                         $role_option_i = 0;
-                        foreach ( $role_options as $role_option_key => $role_option_name ) {
+                        foreach ($role_options as $role_option_key => $role_option_name) {
                             $role_option_i++;
 
                             $content .= '<div class="col-sm-6">';
@@ -5055,14 +5055,14 @@ 
             $content .= '</div>';
             $content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
             $content .= '<div class="bs-vc-rule-sets"></div>';
-            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __('Add Rule', 'ayecode-connect') . '</button></div></div>';
             $content .= '<div class="row"><div class="col-md-6 col-sm-12">';
             $content .= aui()->select(
                 array(
                     'id'          => 'bsvc_output',
                     'name'        => 'bsvc_output',
-                    'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-                    'placeholder' => __( 'Default Output', 'ayecode-connect' ),
+                    'label'       => __('What should happen if rules met.', 'ayecode-connect'),
+                    'placeholder' => __('Default Output', 'ayecode-connect'),
                     'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
                     'options'     => sd_visibility_output_options(),
                     'default'     => '',
@@ -5081,8 +5081,8 @@ 
                 array(
                     'id'              => 'bsvc_page',
                     'name'            => 'bsvc_page',
-                    'label'           => __( 'Page Content', 'ayecode-connect' ),
-                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'label'           => __('Page Content', 'ayecode-connect'),
+                    'placeholder'     => __('Select Page ID...', 'ayecode-connect'),
                     'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
                     'options'         => sd_template_page_options(),
                     'default'         => '',
@@ -5097,8 +5097,8 @@ 
                 array(
                     'id'          => 'bsvc_tmpl_part',
                     'name'        => 'bsvc_tmpl_part',
-                    'label'       => __( 'Template Part', 'ayecode-connect' ),
-                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'label'       => __('Template Part', 'ayecode-connect'),
+                    'placeholder' => __('Select Template Part...', 'ayecode-connect'),
                     'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
                     'options'     => sd_template_part_options(),
                     'default'     => '',
@@ -5116,8 +5116,8 @@ 
                 array(
                     'id'               => 'bsvc_message_type',
                     'name'             => 'bsvc_message_type',
-                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'label'            => __('Custom Message Type', 'ayecode-connect'),
+                    'placeholder'      => __('Default (none)', 'ayecode-connect'),
                     'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
                     'options'          => sd_aui_colors(),
                     'default'          => '',
@@ -5140,7 +5140,7 @@ 
                     'name'            => 'bsvc_message',
                     'label'           => '',
                     'class'           => 'bsvc_message form-control-sm',
-                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
                     'label_type'      => '',
                     'value'           => '',
                     'form_group_class' => ' ',