AyeCode / invoicing

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

Switch Indentation +78 added lines, -78 removed lines

@@ -1,7 +1,7 @@ 
-<?php
+    <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit; // Exit if accessed directly
 }
 
 /**
@@ -9,89 +9,89 @@ 
  *
  * @since 1.0.0
  */
-class AUI_Component_Alert {
+    class AUI_Component_Alert {
 
-	/**
+	    /**
 	 * Build the component.
 	 * 
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get($args = array()){
-		global $aui_bs5;
-		$defaults = array(
-			'type'       => 'info',
-			'class'      => '',
-			'icon' => '',
-			'heading'    => '',
-			'content'    => '',
-			'footer'     => '',
-			'dismissible'=> false,
-			'data'       => '',
-		);
-
-		/**
+	    public static function get($args = array()){
+		    global $aui_bs5;
+		    $defaults = array(
+			    'type'       => 'info',
+			    'class'      => '',
+			    'icon' => '',
+			    'heading'    => '',
+			    'content'    => '',
+			    'footer'     => '',
+			    'dismissible'=> false,
+			    'data'       => '',
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['content'] ) ) {
-			$type = sanitize_html_class( $args['type'] );
-			if($type=='error'){$type='danger';}
-			$icon = !empty($args['icon']) ? "<i class='".esc_attr($args['icon'])."'></i>" : '';
-
-			// set default icon
-			if(!$icon && $args['icon']!==false && $type){
-				if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
-				elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
-				elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
-				elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
-			}
-
-			$data = '';
-			$class = !empty($args['class']) ? esc_attr($args['class']) : '';
-			if($args['dismissible']){$class .= " alert-dismissible fade show";}
-
-			// open
-			$output .= '<div class="alert alert-' . $type . ' '.$class.'" role="alert" '.$data.'>';
-
-			// heading
-			if ( ! empty( $args['heading'] ) ) {
-				$output .= '<h4 class="alert-heading">' . $args['heading'] . '</h4>';
-			}
-
-			// icon
-			if ( ! empty( $icon) ) {
-				$output .= $icon." ";
-			}
-
-			// content
-			$output .= $args['content'];
-
-			// dismissible
-			if($args['dismissible']){
-
-				if ( $aui_bs5 ) {
-					$output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
-				}else{
-					$output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
-					$output .= '<span aria-hidden="true">&times;</span>';
-					$output .= '</button>';
-				}
-			}
-
-			// footer
-			if ( ! empty( $args['footer'] ) ) {
-				$output .= '<hr>';
-				$output .= '<p class="mb-0">' . $args['footer'] . '</p>';
-			}
-
-			// close
-			$output .= '</div>';
-		}
-
-		return $output;
-	}
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+		    if ( ! empty( $args['content'] ) ) {
+			    $type = sanitize_html_class( $args['type'] );
+			    if($type=='error'){$type='danger';}
+			    $icon = !empty($args['icon']) ? "<i class='".esc_attr($args['icon'])."'></i>" : '';
+
+			    // set default icon
+			    if(!$icon && $args['icon']!==false && $type){
+				    if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
+				    elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
+				    elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
+				    elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
+			    }
+
+			    $data = '';
+			    $class = !empty($args['class']) ? esc_attr($args['class']) : '';
+			    if($args['dismissible']){$class .= " alert-dismissible fade show";}
+
+			    // open
+			    $output .= '<div class="alert alert-' . $type . ' '.$class.'" role="alert" '.$data.'>';
+
+			    // heading
+			    if ( ! empty( $args['heading'] ) ) {
+				    $output .= '<h4 class="alert-heading">' . $args['heading'] . '</h4>';
+			    }
+
+			    // icon
+			    if ( ! empty( $icon) ) {
+				    $output .= $icon." ";
+			    }
+
+			    // content
+			    $output .= $args['content'];
+
+			    // dismissible
+			    if($args['dismissible']){
+
+				    if ( $aui_bs5 ) {
+					    $output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
+				    }else{
+					    $output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
+					    $output .= '<span aria-hidden="true">&times;</span>';
+					    $output .= '</button>';
+				    }
+			    }
+
+			    // footer
+			    if ( ! empty( $args['footer'] ) ) {
+				    $output .= '<hr>';
+				    $output .= '<p class="mb-0">' . $args['footer'] . '</p>';
+			    }
+
+			    // close
+			    $output .= '</div>';
+		    }
+
+		    return $output;
+	    }
 
 }
\ No newline at end of file

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

Switch Indentation +116 added lines, -116 removed lines

@@ -1,7 +1,7 @@ 
-<?php
+    <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit; // Exit if accessed directly
 }
 
 /**
@@ -9,145 +9,145 @@ 
  *
  * @since 1.0.0
  */
-class AUI_Component_Button {
+    class AUI_Component_Button {
 
-	/**
+	    /**
 	 * Build the component.
 	 *
 	 * @param array $args
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get($args = array()){
-		$defaults = array(
-			'type'       => 'a', // a, button, badge
-			'href'       => '#',
-			'new_window' => false,
-			'class'      => 'btn btn-primary',
-			'id'         => '',
-			'title'      => '',
-			'value'      => '',
-			'content'    => '',
-			'icon'       => '',
-			'hover_content' => '',
-			'hover_icon'    => '',
-			'new_line_after' => true,
-			'no_wrap'    => true,
-			'onclick'    => '',
-			'style'  => '',
-			'extra_attributes'  => array(), // an array of extra attributes
-			'icon_extra_attributes'  => array() // an array of icon extra attributes
-		);
-
-		/**
+	    public static function get($args = array()){
+		    $defaults = array(
+			    'type'       => 'a', // a, button, badge
+			    'href'       => '#',
+			    'new_window' => false,
+			    'class'      => 'btn btn-primary',
+			    'id'         => '',
+			    'title'      => '',
+			    'value'      => '',
+			    'content'    => '',
+			    'icon'       => '',
+			    'hover_content' => '',
+			    'hover_icon'    => '',
+			    'new_line_after' => true,
+			    'no_wrap'    => true,
+			    'onclick'    => '',
+			    'style'  => '',
+			    'extra_attributes'  => array(), // an array of extra attributes
+			    'icon_extra_attributes'  => array() // an array of icon extra attributes
+		    );
+
+		    /**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			$type = $args['type'] != 'a' ? esc_attr($args['type']) : 'a';
-
-			// open/type
-			if($type=='a'){
-				$new_window = !empty($args['new_window']) ? ' target="_blank" ' : '';
-				$output .= '<a href="' . $args['href'] . '"'.$new_window;
-			}elseif($type=='badge'){
-				$output .= '<span ';
-			}else{
-				$output .= '<button type="' . $type . '" ';
-			}
-
-			// name
-			if(!empty($args['name'])){
-				$output .= AUI_Component_Helper::name($args['name']);
-			}
-
-			// id
-			if(!empty($args['id'])){
-				$output .= AUI_Component_Helper::id($args['id']);
-			}
-
-			// title
-			if(!empty($args['title'])){
-				$output .= AUI_Component_Helper::title($args['title']);
-			}
-
-			// value
-			if(!empty($args['value'])){
-				$output .= AUI_Component_Helper::value($args['value']);
-			}
-
-			// class
-			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= AUI_Component_Helper::class_attr($class);
+		    $args   = wp_parse_args( $args, $defaults );
+		    $output = '';
+		    if ( ! empty( $args['type'] ) ) {
+			    $type = $args['type'] != 'a' ? esc_attr($args['type']) : 'a';
+
+			    // open/type
+			    if($type=='a'){
+				    $new_window = !empty($args['new_window']) ? ' target="_blank" ' : '';
+				    $output .= '<a href="' . $args['href'] . '"'.$new_window;
+			    }elseif($type=='badge'){
+				    $output .= '<span ';
+			    }else{
+				    $output .= '<button type="' . $type . '" ';
+			    }
+
+			    // name
+			    if(!empty($args['name'])){
+				    $output .= AUI_Component_Helper::name($args['name']);
+			    }
+
+			    // id
+			    if(!empty($args['id'])){
+				    $output .= AUI_Component_Helper::id($args['id']);
+			    }
+
+			    // title
+			    if(!empty($args['title'])){
+				    $output .= AUI_Component_Helper::title($args['title']);
+			    }
+
+			    // value
+			    if(!empty($args['value'])){
+				    $output .= AUI_Component_Helper::value($args['value']);
+			    }
+
+			    // class
+			    $class = !empty($args['class']) ? $args['class'] : '';
+			    $output .= AUI_Component_Helper::class_attr($class);
 			
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes($args);
+			    // data-attributes
+			    $output .= AUI_Component_Helper::data_attributes($args);
 
-			// aria-attributes
-			$output .= AUI_Component_Helper::aria_attributes($args);
+			    // aria-attributes
+			    $output .= AUI_Component_Helper::aria_attributes($args);
 
-			// extra attributes
-			if(!empty($args['extra_attributes'])){
-				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
-			}
+			    // extra attributes
+			    if(!empty($args['extra_attributes'])){
+				    $output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
+			    }
 
-			// onclick, we don't escape this
-			if(!empty($args['onclick'])){
-				$output .= ' onclick="'.$args['onclick'].'" ';
-			}
+			    // onclick, we don't escape this
+			    if(!empty($args['onclick'])){
+				    $output .= ' onclick="'.$args['onclick'].'" ';
+			    }
 
-			// style, we don't escape this
-			if(!empty($args['style'])){
-				$output .= ' style="'.$args['style'].'" ';
-			}
+			    // style, we don't escape this
+			    if(!empty($args['style'])){
+				    $output .= ' style="'.$args['style'].'" ';
+			    }
 
-			// close opening tag
-			$output .= ' >';
+			    // close opening tag
+			    $output .= ' >';
 
 
-			// hover content
-			$hover_content = false;
-			if(!empty($args['hover_content']) || !empty($args['hover_icon'])){
-				$output .= "<span class='hover-content'>".AUI_Component_Helper::icon($args['hover_icon'],$args['hover_content']).$args['hover_content']."</span>";
-				$hover_content = true;
-			}
+			    // hover content
+			    $hover_content = false;
+			    if(!empty($args['hover_content']) || !empty($args['hover_icon'])){
+				    $output .= "<span class='hover-content'>".AUI_Component_Helper::icon($args['hover_icon'],$args['hover_content']).$args['hover_content']."</span>";
+				    $hover_content = true;
+			    }
 			
-			// content
-			if($hover_content){$output .= "<span class='hover-content-original'>";}
-			if(!empty($args['content']) || !empty($args['icon'])){
-				$output .= AUI_Component_Helper::icon($args['icon'],$args['content'],$args['icon_extra_attributes']).$args['content'];
-			}
-			if($hover_content){$output .= "</span>";}
+			    // content
+			    if($hover_content){$output .= "<span class='hover-content-original'>";}
+			    if(!empty($args['content']) || !empty($args['icon'])){
+				    $output .= AUI_Component_Helper::icon($args['icon'],$args['content'],$args['icon_extra_attributes']).$args['content'];
+			    }
+			    if($hover_content){$output .= "</span>";}
 					
 
 
-			// close
-			if($type=='a'){
-				$output .= '</a>';
-			}elseif($type=='badge'){
-				$output .= '</span>';
-			}else{
-				$output .= '</button>';
-			}
+			    // close
+			    if($type=='a'){
+				    $output .= '</a>';
+			    }elseif($type=='badge'){
+				    $output .= '</span>';
+			    }else{
+				    $output .= '</button>';
+			    }
 
-			// maybe new line after?  This adds better spacing between buttons.
-			if(!empty($args['new_line_after'])){
-				$output .= PHP_EOL;
-			}
+			    // maybe new line after?  This adds better spacing between buttons.
+			    if(!empty($args['new_line_after'])){
+				    $output .= PHP_EOL;
+			    }
 
 
-			// wrap
-			if(!$args['no_wrap']){
-				$output = AUI_Component_Input::wrap(array(
-					'content' => $output,
-				));
-			}
+			    // wrap
+			    if(!$args['no_wrap']){
+				    $output = AUI_Component_Input::wrap(array(
+					    'content' => $output,
+				    ));
+			    }
 
 
-		}
+		    }
 
-		return $output;
-	}
+		    return $output;
+	    }
 
 }
\ No newline at end of file

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

Switch Indentation +266 added lines, -266 removed lines

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

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

Switch Indentation +23 added lines, -23 removed lines

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

vendor/ayecode/wp-ayecode-ui/example-plugin.php

Switch Indentation +213 added lines, -213 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /*
 Plugin Name: AyeCode UI
 Plugin URI: https://ayecode.io/
@@ -14,224 +14,224 @@ 
 Tested up to: 6.6
 */
 
-// If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
-	die;
+    // If this file is called directly, abort.
+    if ( ! defined( 'WPINC' ) ) {
+	    die;
 }
 
-class AyeCode_UI_Plugin {
+    class AyeCode_UI_Plugin {
 
-	/**
+	    /**
 	 * AUI Plugin constructor.
 	 *
 	 * @since 1.0.0
 	 */
-	public function __construct() {
-
-		// load AUI
-		require_once( dirname( __FILE__ ) . '/ayecode-ui-loader.php' );
-
-		// Maybe show example page
-		add_action( 'template_redirect', array( $this,'maybe_show_examples' ) );
-	}
-
-	public function maybe_show_examples(){
-		if ( current_user_can( 'manage_options' ) && isset( $_REQUEST['preview-aui'] ) ) {
-			echo "<head>";
-			wp_head();
-			echo "</head>";
-			echo "<body class='bsui'>";
-			echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			wp_footer();
-			echo "</body>";
-			exit;
-		}
-	}
-
-	public function get_examples(){
-		$output = '';
-
-		// open form
-		$output .= "<form class='p-5 m-5 border rounded bg-white'>";
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example_sm',
-				'size'             => 'sm',
-				'name'             => 'date_example_sm',
-				'label'            => 'Date Input Label (small)',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example',
-				//'size'             => 'smx',
-				'name'             => 'date_example',
-				'label'            => 'Date Input Label',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example_lg',
-				'size'             => 'lg',
-				'name'             => 'date_example_lg',
-				'label'            => 'Date Input Label (large)',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					//'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		// input example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'size'             => 'sm',
-				//'clear_icon'    => true,
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label',
-				'label_type' => 'top'
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'  =>  'search',
-				'id'    =>  'text-example',
-				'size'             => 'sm',
-				//'clear_icon'    => true,
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label',
-				'label_type' => 'top'
-			)
-		);
-
-		// input example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			)
-		);
-
-		// checkbox example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			)
-		);
-
-		// checkbox example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			)
-		);
-
-		// switch example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			)
-		);
-
-		// switch example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			)
-		);
-
-		// close form
-		$output .= "</form>";
-
-		return $output;
-	}
+	    public function __construct() {
+
+		    // load AUI
+		    require_once( dirname( __FILE__ ) . '/ayecode-ui-loader.php' );
+
+		    // Maybe show example page
+		    add_action( 'template_redirect', array( $this,'maybe_show_examples' ) );
+	    }
+
+	    public function maybe_show_examples(){
+		    if ( current_user_can( 'manage_options' ) && isset( $_REQUEST['preview-aui'] ) ) {
+			    echo "<head>";
+			    wp_head();
+			    echo "</head>";
+			    echo "<body class='bsui'>";
+			    echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			    wp_footer();
+			    echo "</body>";
+			    exit;
+		    }
+	    }
+
+	    public function get_examples(){
+		    $output = '';
+
+		    // open form
+		    $output .= "<form class='p-5 m-5 border rounded bg-white'>";
+
+		    $output .= aui()->input(
+			    array(
+				    'type'             => 'datepicker',
+				    'id'               => 'date_example_sm',
+				    'size'             => 'sm',
+				    'name'             => 'date_example_sm',
+				    'label'            => 'Date Input Label (small)',
+				    'help_text'        => 'help text',
+				    'label_type'       => 'top',
+				    'placeholder'      => 'YYYY-MM-DD 00:00',
+				    'value'            => '',
+				    'extra_attributes' => array(
+					    'data-enable-time' => 'true',
+					    'data-time_24hr'   => 'true',
+					    'data-allow-input' => 'true',
+				    ),
+			    )
+		    );
+
+		    $output .= aui()->input(
+			    array(
+				    'type'             => 'datepicker',
+				    'id'               => 'date_example',
+				    //'size'             => 'smx',
+				    'name'             => 'date_example',
+				    'label'            => 'Date Input Label',
+				    'help_text'        => 'help text',
+				    'label_type'       => 'top',
+				    'placeholder'      => 'YYYY-MM-DD 00:00',
+				    'value'            => '',
+				    'extra_attributes' => array(
+					    'data-enable-time' => 'true',
+					    'data-time_24hr'   => 'true',
+					    'data-allow-input' => 'true',
+				    ),
+			    )
+		    );
+
+		    $output .= aui()->input(
+			    array(
+				    'type'             => 'datepicker',
+				    'id'               => 'date_example_lg',
+				    'size'             => 'lg',
+				    'name'             => 'date_example_lg',
+				    'label'            => 'Date Input Label (large)',
+				    'help_text'        => 'help text',
+				    'label_type'       => 'top',
+				    'placeholder'      => 'YYYY-MM-DD 00:00',
+				    'value'            => '',
+				    'extra_attributes' => array(
+					    'data-enable-time' => 'true',
+					    'data-time_24hr'   => 'true',
+					    //'data-allow-input' => 'true',
+				    ),
+			    )
+		    );
+
+		    // input example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'text',
+				    'id'    =>  'text-example',
+				    'size'             => 'sm',
+				    //'clear_icon'    => true,
+				    'name'    =>  'text-example',
+				    'placeholder'   => 'text placeholder',
+				    'title'   => 'Text input example',
+				    'value' =>  '',
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Text input example label',
+				    'label_type' => 'top'
+			    )
+		    );
+
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'search',
+				    'id'    =>  'text-example',
+				    'size'             => 'sm',
+				    //'clear_icon'    => true,
+				    'name'    =>  'text-example',
+				    'placeholder'   => 'text placeholder',
+				    'title'   => 'Text input example',
+				    'value' =>  '',
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Text input example label',
+				    'label_type' => 'top'
+			    )
+		    );
+
+		    // input example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'url',
+				    'id'    =>  'text-example2',
+				    'name'    =>  'text-example',
+				    'placeholder'   => 'url placeholder',
+				    'title'   => 'Text input example',
+				    'value' =>  '',
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Text input example label'
+			    )
+		    );
+
+		    // checkbox example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'checkbox-example',
+				    'name'    =>  'checkbox-example',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Checkbox example',
+				    'value' =>  '1',
+				    'checked'   => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Checkbox checked'
+			    )
+		    );
+
+		    // checkbox example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'checkbox-example2',
+				    'name'    =>  'checkbox-example2',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Checkbox example',
+				    'value' =>  '1',
+				    'checked'   => false,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Checkbox un-checked'
+			    )
+		    );
+
+		    // switch example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'switch-example',
+				    'name'    =>  'switch-example',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Switch example',
+				    'value' =>  '1',
+				    'checked'   => true,
+				    'switch'    => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Switch on'
+			    )
+		    );
+
+		    // switch example
+		    $output .= aui()->input(
+			    array(
+				    'type'  =>  'checkbox',
+				    'id'    =>  'switch-example2',
+				    'name'    =>  'switch-example2',
+				    'placeholder'   => 'checkbox-example',
+				    'title'   => 'Switch example',
+				    'value' =>  '1',
+				    'checked'   => false,
+				    'switch'    => true,
+				    'required'  => false,
+				    'help_text' => 'help text',
+				    'label' => 'Switch off'
+			    )
+		    );
+
+		    // close form
+		    $output .= "</form>";
+
+		    return $output;
+	    }
 }
 
-new AyeCode_UI_Plugin();
\ No newline at end of file
+    new AyeCode_UI_Plugin();
\ No newline at end of file

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

Switch Indentation +1917 added lines, -1917 removed lines

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

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

Switch Indentation +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * This is a Hello World test plugin for WP Super Duper Class.
  *
@@ -14,26 +14,26 @@ 
  * Tested up to: 6.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
-	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
+    if ( ! class_exists( 'WP_Super_Duper' ) ) {
+	    // include the class if needed
+	    include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
 }
 
 /*
  * Hello world example.
  */
-include_once( dirname( __FILE__ ) . "/hello-world.php" );
+    include_once( dirname( __FILE__ ) . "/hello-world.php" );
 
 /*
  * Map example.
  */
-include_once( dirname( __FILE__ ) . "/map.php" );
+    include_once( dirname( __FILE__ ) . "/map.php" );
 
 
-if ( ! function_exists( 'sd_get_class_build_keys' ) ) {
-	include_once( dirname( __FILE__ ) . "/sd-functions.php" );
+    if ( ! function_exists( 'sd_get_class_build_keys' ) ) {
+	    include_once( dirname( __FILE__ ) . "/sd-functions.php" );
 }
\ No newline at end of file

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

Switch Indentation +2001 added lines, -2001 removed lines

@@ -1,13 +1,13 @@ 
-<?php
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+	    exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+    if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.9' );
+	    define( 'SUPER_DUPER_VER', '1.2.9' );
 
-	/**
+	    /**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
 	 *
 	 * Should not be called direct but extended instead.
@@ -16,285 +16,285 @@ 
 	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
 	 * @ver 1.1.1
 	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = SUPER_DUPER_VER;
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
+	    class WP_Super_Duper extends WP_Widget {
+
+		    public $version = SUPER_DUPER_VER;
+		    public $font_awesome_icon_version = "5.11.2";
+		    public $block_code;
+		    public $options;
+		    public $base_id;
+		    public $settings_hash;
+		    public $arguments = array();
+		    public $instance = array();
+		    private $class_name;
+
+		    /**
 		 * The relative url to the current folder.
 		 *
 		 * @var string
 		 */
-		public $url = '';
+		    public $url = '';
 
-		/**
+		    /**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$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'];
-			// 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 );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$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');
-				}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 ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode, this needs to be done even for blocks and widgets
-				$this->register_shortcode();
-
-
-				// Fusion Builder (avada) support
-				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' ) );
-				}
-			}
-
-			// 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() );
-
-				// maybe add 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, 'wp_media_buttons' ), 1 );
-				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' ) );
-				}
-				/* Load script on Divi theme builder page */
-				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' ) );
-				}
-
-				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(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				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 generator text to head
-				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 );
-		}
-
-		/**
+		    public function __construct( $options ) {
+			    global $sd_widgets;
+
+			    $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'];
+			    // 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 );
+			    $this->options = $options;
+
+			    $this->base_id   = $options['base_id'];
+			    $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');
+				    }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 ( isset( $options['class_name'] ) ) {
+				    // register widget
+				    $this->class_name = $options['class_name'];
+
+				    // register shortcode, this needs to be done even for blocks and widgets
+				    $this->register_shortcode();
+
+
+				    // Fusion Builder (avada) support
+				    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' ) );
+				    }
+			    }
+
+			    // 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() );
+
+				    // maybe add 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, 'wp_media_buttons' ), 1 );
+				    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' ) );
+				    }
+				    /* Load script on Divi theme builder page */
+				    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' ) );
+				    }
+
+				    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(
+						    $this,
+						    'shortcode_insert_button_script'
+					    ) ); // for elementor
+				    }
+				    // this makes the insert button work for cornerstone
+				    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 generator text to head
+				    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 );
+		    }
+
+		    /**
 		 * The register widget function
 		 * @return void
 		 */
-		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::_register();
-			}
-		}
+		    public function _register() {
+			    if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+				    parent::_register();
+			    }
+		    }
 
-		/**
+		    /**
 		 * Add our widget CSS to elementor editor.
 		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
-
-		}
-
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type'] );
-
-					// multiselect
-					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'] : '';
-
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
-
-					// param_name
-					$param['param_name'] = $key;
-
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
-
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
-
-					// value
-					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();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
-
-					// setup the param
-					$params[] = $param;
-
-				}
-			}
-
-
-			return $params;
-		}
-
-		/**
+		    public function elementor_editor_styles() {
+			    wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+		    }
+
+		    public function register_fusion_element() {
+
+			    $options = $this->options;
+
+			    if ( $this->base_id ) {
+
+				    $params = $this->get_fusion_params();
+
+				    $args = array(
+					    'name'            => $options['name'],
+					    'shortcode'       => $this->base_id,
+					    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+					    'allow_generator' => true,
+				    );
+
+				    if ( ! empty( $params ) ) {
+					    $args['params'] = $params;
+				    }
+
+				    fusion_builder_map( $args );
+			    }
+
+		    }
+
+		    public function get_fusion_params() {
+			    $params    = array();
+			    $arguments = $this->get_arguments();
+
+			    if ( ! empty( $arguments ) ) {
+				    foreach ( $arguments as $key => $val ) {
+					    $param = array();
+					    // type
+					    $param['type'] = str_replace(
+						    array(
+							    "text",
+							    "number",
+							    "email",
+							    "color",
+							    "checkbox"
+						    ),
+						    array(
+							    "textfield",
+							    "textfield",
+							    "textfield",
+							    "colorpicker",
+							    "select",
+
+						    ),
+						    $val['type'] );
+
+					    // multiselect
+					    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'] : '';
+
+					    // description
+					    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+					    // param_name
+					    $param['param_name'] = $key;
+
+					    // Default
+					    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+					    // Group
+					    if ( isset( $val['group'] ) ) {
+						    $param['group'] = $val['group'];
+					    }
+
+					    // value
+					    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();
+					    } else {
+						    $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+					    }
+
+					    // setup the param
+					    $params[] = $param;
+
+				    }
+			    }
+
+
+			    return $params;
+		    }
+
+		    /**
 		 * 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' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
+		    public static function maybe_cornerstone_builder() {
+			    if ( did_action( 'cornerstone_before_boot_app' ) ) {
+				    self::shortcode_insert_button_script();
+			    }
+		    }
 
-		/**
+		    /**
 		 * A function to ge the shortcode builder picker html.
 		 *
 		 * @param string $editor_id
 		 *
 		 * @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'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
+			    ob_start();
+			    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';
+			    }
 
-			global $sd_widgets;
+			    global $sd_widgets;
 
-//			print_r($sd_widgets);exit;
-			?>
+    //			print_r($sd_widgets);exit;
+			    ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				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 "</select>";
-
-				}
-				?>
+				    ksort( $sd_widgets );
+				    //				print_r($sd_widgets);exit;
+				    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 "</select>";
+
+				    }
+				    ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -305,8 +305,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 								onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-									echo "'" . $editor_id . "'";
-								} ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+									    echo "'" . $editor_id . "'";
+								    } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
 					<?php } ?>
 					<button class="button"
 							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -314,94 +314,94 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
+			    $html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
+			    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
-					'avia_request' // enfold
-				);
+				    // some builder get the editor via ajax so we should not die on those occasions
+				    $dont_die = array(
+					    'parent_tag',// WP Bakery
+					    'avia_request' // enfold
+				    );
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
+				    foreach ( $dont_die as $request ) {
+					    if ( isset( $_REQUEST[ $request ] ) ) {
+						    $should_die = false;
+					    }
+				    }
 
-				if ( $should_die ) {
-					wp_die();
-				}
+				    if ( $should_die ) {
+					    wp_die();
+				    }
 
-			} else {
-				return $html;
-			}
+			    } else {
+				    return $html;
+			    }
 
-			return '';
+			    return '';
 
-		}
+		    }
 
-		/**
+		    /**
 		 * Output the version in the header.
 		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-
-		/**
+		    public function generator() {
+			    $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+			    $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+			    // Find source plugin/theme of SD
+			    $source = array();
+			    if ( strpos( $file, $plugins_dir ) !== false ) {
+				    $source = explode( "/", plugin_basename( $file ) );
+			    } else if ( function_exists( 'get_theme_root' ) ) {
+				    $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+				    if ( strpos( $file, $themes_dir ) !== false ) {
+					    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				    }
+			    }
+
+			    echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+		    }
+
+		    /**
 		 * Get widget settings.
 		 *
 		 * @since 1.0.0
 		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$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 ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$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>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
-			<?php
-			wp_die();
-		}
-
-		/**
+		    public static function get_widget_settings() {
+			    global $sd_widgets;
+
+			    $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 ) {
+				    wp_die();
+			    }
+			    $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			    if ( ! $class_name ) {
+				    wp_die();
+			    }
+
+			    // invoke an instance method
+			    $widget = new $class_name;
+
+			    ob_start();
+			    $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>";
+			    echo "<script>" . $widget->widget_js() . "</script>";
+			    ?>
+    			<?php
+			    wp_die();
+		    }
+
+		    /**
 		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
 		 *
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
@@ -410,39 +410,39 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
+		    public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+			    global $sd_widgets, $shortcode_insert_button_once;
+			    if ( $shortcode_insert_button_once ) {
+				    return;
+			    }
+			    add_thickbox();
 
 
-			/**
+			    /**
 			 * 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() ) {
-				echo '<span id="insert-media-button">';
-			}
+			    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() ) {
-				echo '</span>'; // end #insert-media-button
-			}
+			    // see opening note
+			    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' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
+			    // Add separate script for generatepress theme sections
+			    if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			    } else {
+				    self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+			    }
 
-			$shortcode_insert_button_once = true;
-		}
+			    $shortcode_insert_button_once = true;
+		    }
 
-		/**
+		    /**
 		 * Gets the shortcode insert button html.
 		 *
 		 * @param string $id
@@ -450,14 +450,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+		    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 ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+				    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">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 						  class="dashicons dashicons-screenoptions"></span>
@@ -468,21 +468,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
+			    $html = ob_get_clean();
 
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
+			    // remove line breaks so we can use it in js
+			    return preg_replace( "/\r|\n/", "", trim( $html ) );
+		    }
 
-		/**
+		    /**
 		 * Makes SD work with the siteOrigin page builder.
 		 *
 		 * @return mixed
 		 *@since 1.0.6
 		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+		    public static function siteorigin_js() {
+			    ob_start();
+			    ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -558,19 +558,19 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
-		/**
+		    /**
 		 * Output the JS and CSS for the shortcode insert button.
 		 *
 		 * @param string $editor_id
@@ -579,8 +579,8 @@ 
 		 *@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 {
 					float: left;
@@ -703,40 +703,40 @@ 
 					display: inline;
 				}
 				<?php } ?>
-				<?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 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>
+    			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
-			<script>
+			    if ( class_exists( 'SiteOrigin_Panels' ) ) {
+				    echo "<script>" . self::siteorigin_js() . "</script>";
+			    }
+			    ?>
+    			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
+				    if(! empty( $insert_shortcode_function )){
+					    echo $insert_shortcode_function;
+				    }else{
 
-				/**
+				    /**
 				 * Function for super duper insert shortcode.
 				 *
 				 * @since 1.0.0
 				 */
-				?>
+				    ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} 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";';
-							}
-							?>
+							    if ( isset( $_REQUEST['et_fb'] ) ) {
+								    echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+							    } 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";';
+							    }
+							    ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1050,19 +1050,19 @@ 
 				}
 			</script>
 			<?php
-		}
+		    }
 
-		/**
+		    /**
 		 * Gets some CSS for the widgets screen.
 		 *
 		 * @param bool $advanced If we should include advanced CSS.
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
-			<style>
+		    public function widget_css( $advanced = true ) {
+			    ob_start();
+			    ?>
+    			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
 					display: none;
@@ -1101,26 +1101,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</style>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<style>',
+				    '</style>'
+			    ), '', $output );
+		    }
 
-		/**
+		    /**
 		 * Gets some JS for the widgets screen.
 		 *
 		 * @return mixed
 		 */
-		public function widget_js() {
-			ob_start();
-			?>
+		    public function widget_js() {
+			    ob_start();
+			    ?>
 			<script>
 
 				/**
@@ -1269,110 +1269,110 @@ 
 
 				}
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
-			</script>
+    			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
 
-		/**
+		    /**
 		 * Set the name from the argument key.
 		 *
 		 * @param $options
 		 *
 		 * @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;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
+		    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;
+				    }
+			    }
+
+			    return $options;
+		    }
+
+		    /**
 		 * Register the parent shortcode.
 		 *
 		 * @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' ) );
-		}
+		    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' ) );
+		    }
 
-		/**
+		    /**
 		 * Render the shortcode via ajax so we can return it to Gutenberg.
 		 *
 		 * @since 1.0.0
 		 */
-		public function render_shortcode() {
-			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 ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			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();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
-
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
-
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
-
-				$content = do_shortcode( $shortcode );
-
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
-
-				echo $content;
-			}
-			wp_die();
-		}
-
-		/**
+		    public function render_shortcode() {
+			    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 ) ) {
+					    global $post;
+					    $post = $post_obj;
+				    }
+			    }
+
+			    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();
+				    $attributes       = '';
+				    if ( ! empty( $attributes_array ) ) {
+					    foreach ( $attributes_array as $key => $value ) {
+						    if ( is_array( $value ) ) {
+							    $value = implode( ",", $value );
+						    }
+
+						    if ( ! empty( $value ) ) {
+							    $value = wp_unslash( $value );
+
+							    // Encode [ and ].
+							    if ( $is_preview ) {
+								    $value = $this->encode_shortcodes( $value );
+							    }
+						    }
+						    $attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+					    }
+				    }
+
+				    $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+
+				    $content = do_shortcode( $shortcode );
+
+				    // Decode [ and ].
+				    if ( ! empty( $content ) && $is_preview ) {
+					    $content = $this->decode_shortcodes( $content );
+				    }
+
+				    echo $content;
+			    }
+			    wp_die();
+		    }
+
+		    /**
 		 * Output the shortcode.
 		 *
 		 * @param array $args
@@ -1380,22 +1380,22 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
+		    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 );
+			    // add extra argument so we know its a output to gutenberg
+			    //$args
+			    $args = $this->string_to_bool( $args );
 
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
+			    // if we have a enclosed shortcode we add it to the special `html` argument
+			    if ( ! empty( $content ) ) {
+				    $args['html'] = $content;
+			    }
 
-			if ( ! $this->is_preview() ) {
-				/**
+			    if ( ! $this->is_preview() ) {
+				    /**
 				 * Filters the settings for a particular widget args.
 				 *
 				 * @param array          $args      The current widget instance's settings.
@@ -1405,95 +1405,95 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
-
-				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 = 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 );
-
-			$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 = true;
-			}
-			$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 its a shortcode and there is a title try to grab the title wrappers
-					$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'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} 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 . "}}" );
-			}
-
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
-
-		/**
+				    $args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+
+				    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 = 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 );
+
+			    $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 = true;
+			    }
+			    $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 its a shortcode and there is a title try to grab the title wrappers
+					    $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'] ) ) {
+									    $shortcode_args['before_title'] = $sidebar['before_title'];
+									    $shortcode_args['after_title']  = $sidebar['after_title'];
+									    break;
+								    }
+							    }
+						    }
+					    }
+					    $output .= $this->output_title( $shortcode_args, $args );
+				    }
+				    $output .= $main_content;
+				    $output .= '</div>';
+			    } 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 . "}}" );
+			    }
+
+			    return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+		    }
+
+		    /**
 		 * Placeholder text to show if output is empty and we are on a preview/builder page.
 		 *
 		 * @param string $name
 		 *
 		 * @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>";
+		    }
 
-		/**
+		    /**
 		 * Sometimes booleans values can be turned to strings, so we fix that.
 		 *
 		 * @param $options
 		 *
 		 * @return mixed
 		 */
-		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;
-				}
-			}
-
-			return $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;
+				    }
+			    }
+
+			    return $options;
+		    }
+
+		    /**
 		 * Get the argument values that are also filterable.
 		 *
 		 * @param $instance
@@ -1502,159 +1502,159 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			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 ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
+		    public function argument_values( $instance ) {
+			    $argument_values = array();
+
+			    // set widget instance
+			    $this->instance = $instance;
+
+			    if ( empty( $this->arguments ) ) {
+				    $this->arguments = $this->get_arguments();
+			    }
+
+			    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 ] == '' ) {
+						    // don't set default for an empty checkbox
+					    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+						    $argument_values[ $key ] = $args['default'];
+					    }
+				    }
+			    }
+
+			    return $argument_values;
+		    }
+
+		    /**
 		 * Set arguments in super duper.
 		 *
 		 * @return array Set arguments.
 		 *@since 1.0.0
 		 *
 		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
+		    public function set_arguments() {
+			    return $this->arguments;
+		    }
 
-		/**
+		    /**
 		 * Get arguments in super duper.
 		 *
 		 * @return array Get arguments.
 		 *@since 1.0.0
 		 *
 		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
+		    public function get_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;
-		}
+			    return $this->arguments;
+		    }
 
-		/**
+		    /**
 		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
 		 *
 		 * @param array $args
 		 * @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 = '' ) {
 
-		}
+		    }
 
-		/**
+		    /**
 		 * 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() );
-			}
-		}
-
-		/**
+		    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() );
+			    }
+		    }
+
+		    /**
 		 * Check if we need to show advanced options.
 		 *
 		 * @return bool
 		 */
-		public function block_show_advanced() {
+		    public function block_show_advanced() {
 
-			$show      = false;
-			$arguments = $this->get_arguments();
+			    $show      = false;
+			    $arguments = $this->get_arguments();
 
-			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
-					}
-				}
-			}
+			    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
+					    }
+				    }
+			    }
 
-			return $show;
-		}
+			    return $show;
+		    }
 
-		/**
+		    /**
 		 * Get the url path to the current folder.
 		 *
 		 * @return string
 		 */
-		public function get_url() {
-			$url = $this->url;
+		    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 );
-				}
+				    // Replace http:// to https://.
+				    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 );
-				$this->url = $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 );
+				    $this->url = $url;
+			    }
 
-			return $url;
-		}
+			    return $url;
+		    }
 
-		/**
+		    /**
 		 * Get the url path to the current folder.
 		 *
 		 * @return string
 		 */
-		public function get_url_old() {
+		    public function get_url_old() {
 
-			$url = $this->url;
+			    $url = $this->url;
 
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+			    if ( ! $url ) {
+				    // check if we are inside a plugin
+				    $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] );
-					$this->url = $url;
-				}
-			}
+				    if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+					    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+					    $this->url = $url;
+				    }
+			    }
 
 
-			return $url;
-		}
+			    return $url;
+		    }
 
-		/**
+		    /**
 		 * Generate the block icon.
 		 *
 		 * Enables the use of Font Awesome icons.
@@ -1666,99 +1666,99 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} 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 );
-				$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 ) ) {
-				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
-
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
-
-			return $arguments;
-		}
-
-		/**
+		    public function get_block_icon( $icon ) {
+
+			    // check if we have a Font Awesome icon
+			    $fa_type = '';
+			    if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+				    $fa_type = 'solid';
+			    } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+				    $fa_type = 'regular';
+			    } 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 );
+				    $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 ) ) {
+				    $temp_arguments = array();
+				    $general        = __( "General", 'ayecode-connect' );
+				    $add_sections   = false;
+				    foreach ( $arguments as $key => $args ) {
+					    if ( isset( $args['group'] ) ) {
+						    $temp_arguments[ $args['group'] ][ $key ] = $args;
+						    $add_sections                             = true;
+					    } else {
+						    $temp_arguments[ $general ][ $key ] = $args;
+					    }
+				    }
+
+				    // only add sections if more than one
+				    if ( $add_sections ) {
+					    $arguments = $temp_arguments;
+				    }
+			    }
+
+			    return $arguments;
+		    }
+
+		    /**
 		 * Parse used group tabs.
 		 *
 		 * @since 1.1.17
 		 */
-		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'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
+		    public function group_block_tabs( $tabs, $arguments ) {
+			    if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+				    $has_sections = false;
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
+				    foreach ( $this->arguments as $key => $args ) {
+					    if ( isset( $args['group'] ) ) {
+						    $has_sections = true;
+						    break;
+					    }
+				    }
 
-				$new_tabs = array();
+				    if ( ! $has_sections ) {
+					    return $tabs;
+				    }
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+				    $new_tabs = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+				    foreach ( $tabs as $tab_key => $tab ) {
+					    $new_groups = array();
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+					    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+						    foreach ( $tab['groups'] as $group ) {
+							    if ( isset( $arguments[ $group ] ) ) {
+								    $new_groups[] = $group;
+							    }
+						    }
+					    }
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+					    if ( ! empty( $new_groups ) ) {
+						    $tab['groups'] = $new_groups;
 
-				$tabs = $new_tabs;
-			}
+						    $new_tabs[ $tab_key ] = $tab;
+					    }
+				    }
 
-			return $tabs;
-		}
+				    $tabs = $new_tabs;
+			    }
 
-		/**
+			    return $tabs;
+		    }
+
+		    /**
 		 * Output the JS for building the dynamic Guntenberg block.
 		 *
 		 * @return mixed
@@ -1766,18 +1766,18 @@ 
 		 * @since 1.1.0 Font Awesome classes can be used for icons.
 		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
 		 */
-		public function block() {
-			global $sd_is_js_functions_loaded, $aui_bs5;
+		    public function block() {
+			    global $sd_is_js_functions_loaded, $aui_bs5;
 
-			$show_advanced = $this->block_show_advanced();
+			    $show_advanced = $this->block_show_advanced();
 
-			ob_start();
-			?>
-			<script>
+			    ob_start();
+			    ?>
+    			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
+			    if ( ! $sd_is_js_functions_loaded ) {
+				    $sd_is_js_functions_loaded = true;
+			    ?>
 function sd_show_view_options($this){
 	if(jQuery($this).html().length){
 		jQuery($this).html('');
@@ -2223,8 +2223,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+				    if($aui_bs5){
+					    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2232,8 +2232,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+				    }else{
+						    ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2241,8 +2241,8 @@ 
 				$p_pl = 'pl-';
 				$p_pr = 'pr-';
 					<?php
-				}
-				?>
+				    }
+				    ?>
 
 				// margins
 				if ( $args['mt'] !== undefined && $args['mt'] !== '' ) { $classes.push( "mt-" + $args['mt'] );  $mt = $args['mt']; }else{$mt = null;}
@@ -2426,12 +2426,12 @@ 
 			<?php
 
 
-			}
+			    }
 
-			if(method_exists($this,'block_global_js')){
-					echo $this->block_global_js();
-			}
-			?>
+			    if(method_exists($this,'block_global_js')){
+					    echo $this->block_global_js();
+			    }
+			    ?>
 
 jQuery(function() {
 
@@ -2484,13 +2484,13 @@ 
 						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'])){
-								$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']['renaming'])){
+								    $this->options['block-supports']['renaming'] = false;
+							    }
+							    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;' : '';
@@ -2500,184 +2500,184 @@ 
 						},
 						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'])){
-									$example_args[$key] = $a_args['example'];
-								}
-							}
-						}
-						$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 ){
-							// 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'] ) ){
-							unset($this->options['example']['viewportWidth']);
-							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
-							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
-							}
-							if($viewport_width){
-								$example_parts[] = $viewport_width;
-							}
-							if($example_inner_blocks){
-								$example_parts[] = $example_inner_blocks;
-							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
-							}
-						}else{
-							echo 'example : {viewportWidth: 500},';
-						}
-
-
-
-						// limit to 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'] ) . ",";
-						}
-
-						// 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 = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
-
-						// maybe load the drag/drop functions.
-						$img_drag_drop = false;
-
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+						    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'])){
+									    $example_args[$key] = $a_args['example'];
+								    }
+							    }
+						    }
+						    $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 ){
+							    // 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'] ) ){
+							    unset($this->options['example']['viewportWidth']);
+							    unset($this->options['example']['innerBlocks']);
+							    $example_atts = $this->array_to_attributes( $this->options['example'] );
+							    $example_parts = array();
+							    if($example_atts){
+								    $example_parts[] = rtrim($example_atts,",");
+							    }
+							    if($viewport_width){
+								    $example_parts[] = $viewport_width;
+							    }
+							    if($example_inner_blocks){
+								    $example_parts[] = $example_inner_blocks;
+							    }
+							    if(!empty($example_parts)){
+								    echo "example : {".implode(',', $example_parts)."},";
+							    }
+						    }else{
+							    echo 'example : {viewportWidth: 500},';
+						    }
+
+
+
+						    // limit to 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'] ) . ",";
+						    }
+
+						    // 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 = true;
+						    }
+						    if ( $no_wrap ) {
+							    $this->options['block-wrap'] = '';
+						    }
+
+						    // maybe load the drag/drop functions.
+						    $img_drag_drop = false;
+
+						    $show_alignment = false;
+						    // align feature
+						    /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
 
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							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 "},";
-							}
-
-
-							if ( ! empty( $this->arguments ) ) {
-
-								foreach ( $this->arguments as $key => $args ) {
-
-									if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
-										$img_drag_drop = true;
-									}
-
-									// set if we should show alignment
-									if ( $key == 'alignment' ) {
-										$show_alignment = true;
-									}
-
-									$extra = '';
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									}
-									elseif ( $args['type'] == 'checkbox' ) {
-										$type    = 'boolean';
-										$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'] ) ) {
-										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-										} else {
-											$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-										}
-									} elseif ( $args['type'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-
-										// add a field for ID
-	//                                    echo $key . "_id : {";
-	//                                    echo "type : 'number',";
-	//                                    echo "},";
-	//                                    echo $key . "_xy : {";
-	//                                    echo "type : 'object',";
-	//                                    echo "},";
-
-									} else {
-										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-
-									}
-									echo $key . " : {";
-									echo "type : '$type',";
-									echo "default : $default,";
-									echo "},";
-								}
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "sd_shortcode : {type : 'string',default: ''},";
-
-							if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-								echo "sd_shortcode_close : {type : 'string',default: ''},";
-							}
-
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-
-
-						?>
+							    echo "attributes : {";
+
+							    if ( $show_advanced ) {
+								    echo "show_advanced: {";
+								    echo "	type: 'boolean',";
+								    echo "  default: false,";
+								    echo "},";
+							    }
+
+							    // block wrap element
+							    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 "},";
+							    }
+
+
+							    if ( ! empty( $this->arguments ) ) {
+
+								    foreach ( $this->arguments as $key => $args ) {
+
+									    if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+										    $img_drag_drop = true;
+									    }
+
+									    // set if we should show alignment
+									    if ( $key == 'alignment' ) {
+										    $show_alignment = true;
+									    }
+
+									    $extra = '';
+
+									    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+										    continue;
+									    }
+									    elseif ( $args['type'] == 'checkbox' ) {
+										    $type    = 'boolean';
+										    $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'] ) ) {
+										    $type = 'array';
+										    if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+											    $default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+										    } else {
+											    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										    }
+									    } elseif ( $args['type'] == 'tagselect' ) {
+										    $type    = 'array';
+										    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									    } elseif ( $args['type'] == 'multiselect' ) {
+										    $type    = 'array';
+										    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									    } elseif ( $args['type'] == 'image_xy' ) {
+										    $type    = 'object';
+										    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									    } elseif ( $args['type'] == 'image' ) {
+										    $type    = 'string';
+										    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+
+										    // add a field for ID
+	    //                                    echo $key . "_id : {";
+	    //                                    echo "type : 'number',";
+	    //                                    echo "},";
+	    //                                    echo $key . "_xy : {";
+	    //                                    echo "type : 'object',";
+	    //                                    echo "},";
+
+									    } else {
+										    $type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
+										    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+
+									    }
+									    echo $key . " : {";
+									    echo "type : '$type',";
+									    echo "default : $default,";
+									    echo "},";
+								    }
+							    }
+
+							    echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+							    echo "sd_shortcode : {type : 'string',default: ''},";
+
+							    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+								    echo "sd_shortcode_close : {type : 'string',default: ''},";
+							    }
+
+							    echo "className: { type: 'string', default: '' },";
+
+							    echo "},";
+
+
+
+						    ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
 
 
 <?php
-// only include the drag/drop functions if required.
-if( $img_drag_drop ){
+    // only include the drag/drop functions if required.
+    if( $img_drag_drop ){
 
-?>
+    ?>
 
 function enableDragSort(listClass) {
 	setTimeout(function(){
@@ -2741,10 +2741,10 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
-								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
-							?>
+							    if(!empty($this->options['block-edit-raw'])) {
+								    echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
+							    }else{
+							    ?>
 
 function hasSelectedInnerBlock(props) {
 	const select = wp.data.select('core/editor');
@@ -2766,9 +2766,9 @@ 
 
 	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 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(typeof(prev_attributes[props.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2781,12 +2781,12 @@ 
 			term_query_type = $pt;
 		}
 <?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 );
-	}
-?>
+	    $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 */
 		if($value && 'post_type' in prev_attributes[props.clientId] && 'category' in prev_attributes[props.clientId] && run){
 			if (!window.gdCPTCats) {
@@ -2874,12 +2874,12 @@ 
 		}
 	}
 	<?php } ?>
-<?php
-$current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    <?php
+    $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
+    if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+	    echo 'const { deviceType } = "";';
 }else{
-?>
+    ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
 	const { __experimentalGetPreviewDeviceType } = select('core/edit-site') ? select('core/edit-site') : select('core/edit-post') ? select('core/edit-post') : ''; // For sie editor https://github.com/WordPress/gutenberg/issues/39248
@@ -2912,8 +2912,8 @@ 
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+										    echo $post->ID;
+									    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -2927,20 +2927,20 @@ 
 										}
 
 										 <?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;
 										prev_attributes[props.clientId] = props.attributes;
 										<?php
-										}
-										?>
+										    }
+										    ?>
 
 
 										// if AUI is active call the js init function
@@ -2959,32 +2959,32 @@ 
 							}
 
 							<?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
+							    }
 
 
 
 
-							if(empty($this->options['block-save-return'])){
-							?>
+							    if(empty($this->options['block-save-return'])){
+							    ?>
 								///////////////////////////////////////////////////////////////////////
 
 									 // build the shortcode.
 								shortcode = "[<?php echo $this->options['base_id'];?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+								    if(! empty( $this->arguments )){
 
-								foreach($this->arguments as $key => $args){
-								   // if($args['type']=='tabs'){continue;}
+								    foreach($this->arguments as $key => $args){
+								       // if($args['type']=='tabs'){continue;}
 
-								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
-									   continue;
-								   }
-								?>
-								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
+								       // don't add metadata arguments
+								       if (substr($key, 0, 9 ) === 'metadata_') {
+									       continue;
+								       }
+								    ?>
+    								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 									if ('<?php echo esc_attr( $key );?>' == 'html') {
 									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
 										shortcode += props.attributes.<?php echo esc_attr( $key );?>.length && ( props.attributes.<?php echo esc_attr( $key );?>.x.length || props.attributes.<?php echo esc_attr( $key );?>.y.length ) ? " <?php echo esc_attr( $key );?>='{x:" + props.attributes.<?php echo esc_attr( $key );?>.x + ",y:"+props.attributes.<?php echo esc_attr( $key );?>.y +"}' " : "";
@@ -2994,10 +2994,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+								    }
+								    }
 
-								?>
+								    ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3005,17 +3005,17 @@ 
 									props.setAttributes({sd_shortcode: shortcode});
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
-									}
-									?>
+									    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+										    echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+									    }
+									    ?>
 								}
 
 
 							///////////////////////////////////////////////////////////////////////
 							<?php
-							} // end nested block check
-							?>
+							    } // end nested block check
+							    ?>
 
 							return [
 
@@ -3039,10 +3039,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+									    if ( $show_advanced ) {
+									    ?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
 										},
@@ -3059,133 +3059,133 @@ 
 									)
 									,
 									<?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();
-
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
-
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
-
-									$open_tab_groups = array();
-									$used_tabs = array();
-
-									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'] ) ) {
-													$open_tab_groups[] = $key;
-
-													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 );
-														$open_tab = $tab_name;
-														$used_tabs[] = $tab_name;
-													}
-
-													if ( $open_tab_groups == $tab_args['groups'] ) {
-														$close_tab = true;
-														$open_tab_groups = array();
-
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+									    }
+
+									    $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){
+									    $panel_count = 0;
+									    $open_tab = '';
+
+									    $open_tab_groups = array();
+									    $used_tabs = array();
+
+									    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'] ) ) {
+													    $open_tab_groups[] = $key;
+
+													    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 );
+														    $open_tab = $tab_name;
+														    $used_tabs[] = $tab_name;
+													    }
+
+													    if ( $open_tab_groups == $tab_args['groups'] ) {
+														    $close_tab = true;
+														    $open_tab_groups = array();
+
+														    if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+															    $close_tabs = true;
+														    }
+													    }
+												    }
+											    }
+										    }
+										    ?>
 										el(wp.components.PanelBody, {
 												title: '<?php esc_attr_e( $key ); ?>',
 												initialOpen: <?php if ( $panel_count ) {
-												echo "false";
-											} else {
-												echo "true";
-											}?>
-											},
+												    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 ++;
-
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
-
-											);
-											$this->block_tab_end( '', $tab_args );
-//											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
-//
-
-									}
-									}else {
-									?>
+										    $panel_count ++;
+
+										    if($close_tab || $close_tabs){
+											    $tab_args = array(
+												    'tab'	=> array(
+													    'tabs_close' => $close_tabs,
+												    'close' => true,
+												    )
+
+											    );
+											    $this->block_tab_end( '', $tab_args );
+    //											echo '###close'; print_r($tab_args);
+											    $panel_count = 0;
+										    }
+    //
+
+									    }
+									    }else {
+									    ?>
 									el(wp.components.PanelBody, {
 											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 );
+										    }
+										    ?>
+    									),
 									<?php
-									}
+									    }
 
-									}
-									?>
+									    }
+									    ?>
 
 								),
 
 								<?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'])){
-								   echo $this->options['block-edit-return'];
-							}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';
-								?>
-								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
+								    // 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'])){
+								       echo $this->options['block-edit-return'];
+							    }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';
+								    ?>
+    								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									<?php //if(isset($this->arguments['visibility_conditions'])){ echo 'dataVisibilityConditionSD: props.visibility_conditions ? true : false,';} //@todo we need to implement this in the other outputs also ?>
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
-							]; // end return
+								    }
+								    ?>
+    							]; // end return
 
 							<?php
-							} // end block-edit-raw else
-							?>
+							    } // end block-edit-raw else
+							    ?>
 						},
 
 						// The "save" property must be specified and must be a valid function.
@@ -3199,17 +3199,17 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							    if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							   // if($args['type']=='tabs'){continue;}
+							    foreach($this->arguments as $key => $args){
+							       // if($args['type']=='tabs'){continue;}
 
-							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
-								   continue;
-							   }
-							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
+							       // don't add metadata arguments
+							       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') {
@@ -3219,20 +3219,20 @@ 
 								}
 							}
 							<?php
-							}
-							}
+							    }
+							    }
 
-							?>
+							    ?>
 							content += "]";
 							 content = '';
 
 							<?php
-//                            if(!empty($this->options['nested-block'])){
-//                                ?>
+    //                            if(!empty($this->options['nested-block'])){
+    //                                ?>
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
-//                            }
-							?>
+    //                            }
+							    ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3252,38 +3252,38 @@ 
 							}
 
 							<?php
-//							if(!empty($this->options['nested-block'])){
-//                                ?x>
-//                              return el(
-//                                    'div',
-//                                    { className: props.className,
-//                                        style: {'minHeight': '300px','position':'relative','overflow':'hidden','backgroundImage': 'url(https://s.w.org/images/core/5.5/don-quixote-06.jpg)'}
-//                                    },
-//                                    el( InnerBlocks.Content ),
-//                                    el('div', {dangerouslySetInnerHTML: {__html: content}, className: align})
-//                                );
-//                                <x?php
-//							}else
-
-							if(!empty($this->options['block-output'])){
-//                               echo "return";
-//                               $this->block_element( $this->options['block-output'], true );
-//                               echo ";";
-
-							   ?>
+    //							if(!empty($this->options['nested-block'])){
+    //                                ?x>
+    //                              return el(
+    //                                    'div',
+    //                                    { className: props.className,
+    //                                        style: {'minHeight': '300px','position':'relative','overflow':'hidden','backgroundImage': 'url(https://s.w.org/images/core/5.5/don-quixote-06.jpg)'}
+    //                                    },
+    //                                    el( InnerBlocks.Content ),
+    //                                    el('div', {dangerouslySetInnerHTML: {__html: content}, className: align})
+    //                                );
+    //                                <x?php
+    //							}else
+
+							    if(!empty($this->options['block-output'])){
+    //                               echo "return";
+    //                               $this->block_element( $this->options['block-output'], true );
+    //                               echo ";";
+
+							       ?>
 							  return el(
 								   '',
 								   {},
 								  // el('', {dangerouslySetInnerHTML: {__html: content}}),
 								   <?php $this->block_element( $this->options['block-output'], true ); ?>
-								  // 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-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
-								?>
+							    }elseif(!empty($this->options['block-save-return'])){
+								       echo 'return ' . $this->options['block-save-return'];
+							    }elseif(!empty($this->options['nested-block'])){
+								    ?>
 							  return el(
 								   '',
 								   {},
@@ -3292,22 +3292,22 @@ 
 								 //  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'] == ''){
-							?>
-							return content;
+							    }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")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+							    }
+							    ?>
 
 
 						}
@@ -3321,43 +3321,43 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+			    $output = ob_get_clean();
 
-			/*
+			    /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+			    return str_replace( array(
+				    '<script>',
+				    '</script>'
+			    ), '', $output );
+		    }
 
 
 
-		public function block_row_start($key, $args){
+		    public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+			    // check for 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) . "' && " : '';
-				$device_type_icon = '';
-				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'){
-					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}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;
+				    // 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) . "' && " : '';
+				    $device_type_icon = '';
+				    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'){
+					    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+				    }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',
 							},
@@ -3368,15 +3368,15 @@ 
 								},
 								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)"}})
+    									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 }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+    							<?php if(!empty($args['row']['desc'])){ ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
@@ -3395,51 +3395,51 @@ 
 									},
 
 					<?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'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
+			    if(!empty($args['row'])){
+				    // maybe close
+				    if(!empty($args['row']['close'])){
+					    echo "))";
+				    }
 
-				echo "),";
-			}
-		}
+				    echo "),";
+			    }
+		    }
 
-		public function block_tab_start($key, $args){
+		    public function block_tab_start($key, $args){
 
-			// check for row
-			if(!empty($args['tab'])){
+			    // check for row
+			    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'},
 
@@ -3452,12 +3452,12 @@ 
 										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']) ); ?>'}}),
@@ -3466,125 +3466,125 @@ 
 									className: 'components-base-control__help mb-0',
 									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'])){
-				// maybe close
-				if(!empty($args['tab']['close'])){
-					echo ")}, /* tab close */";
-				}
+			    if(!empty($args['tab'])){
+				    // maybe 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 }
-				}
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-			$inside_elements   = '';
-			$after_elements	   = '';
-
-			// `content` is a protected and special argument
-			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_icon = '';
-			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'){
-				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}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'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
-
-			// require 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 ) . " && " : "";
-
-
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$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' ) {
-					$onchange = "props.setAttributes({ $key: $key ? Number($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 : ''";
-				}
-			}
-//			else if ( $args['type'] == 'popup' ) {
-//				$type = 'TextControl';
-//				$args['type'] == 'text';
-//				$after_elements .= "el( wp.components.Button, {
-//                          className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
-//                          onClick: function(){
-//							  aui_modal('','<input id=\'zzz\' value= />');
-//							  const source = document.getElementById('zzz');
-//							  source.value = props.attributes.$key;
-//							  source.addEventListener('input', function(e){props.setAttributes({ $key: e.target.value });});
-//                          }
-//                        },
-//                        'test'
-//                        ),";
-//
-//				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-//			}
-			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' ) {
-
-				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
-				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
-
-				$notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
-				echo $notice_message ? $element_require . $notice : '';
-				return;
-			}
-			/*
+				    }
+			    }
+		    }
+
+		    public function build_block_arguments( $key, $args ) {
+			    $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+			    $options           = '';
+			    $extra             = '';
+			    $require           = '';
+			    $inside_elements   = '';
+			    $after_elements	   = '';
+
+			    // `content` is a protected and special argument
+			    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_icon = '';
+			    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'){
+				    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+			    }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'] ) ){
+				    $icon .= "el('div', {";
+									    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									    $icon .= "className: 'text-center',";
+									    $icon .= "title: '".addslashes( $args['title'] )."',";
+								    $icon .= "}),";
+
+				    // blank title as its added to the icon.
+				    $args['title'] = '';
+			    }
+
+			    // require 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 ) . " && " : "";
+
+
+			    $onchange  = "props.setAttributes({ $key: $key } )";
+			    $onchangecomplete  = "";
+			    $value     = "props.attributes.$key";
+			    $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' ) {
+					    $onchange = "props.setAttributes({ $key: $key ? Number($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 : ''";
+				    }
+			    }
+    //			else if ( $args['type'] == 'popup' ) {
+    //				$type = 'TextControl';
+    //				$args['type'] == 'text';
+    //				$after_elements .= "el( wp.components.Button, {
+    //                          className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
+    //                          onClick: function(){
+    //							  aui_modal('','<input id=\'zzz\' value= />');
+    //							  const source = document.getElementById('zzz');
+    //							  source.value = props.attributes.$key;
+    //							  source.addEventListener('input', function(e){props.setAttributes({ $key: e.target.value });});
+    //                          }
+    //                        },
+    //                        'test'
+    //                        ),";
+    //
+    //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
+    //			}
+			    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' ) {
+
+				    $notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
+				    $notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
+
+				    $notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
+				    echo $notice_message ? $element_require . $notice : '';
+				    return;
+			    }
+			    /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -3637,22 +3637,22 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+			    elseif ( $args['type'] == 'color' ) {
+				    $type = 'ColorPicker';
+				    $onchange = "";
+				    $extra = "color: $value,";
+				    if(!empty($args['disable_alpha'])){
+					    $extra .= "disableAlpha: true,";
+				    }
+				    $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
 						props.setAttributes({
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
-				$type = 'GradientPicker';
-				$extra .= "gradients: [{
+			    }elseif ( $args['type'] == 'gradient' ) {
+				    $type = 'GradientPicker';
+				    $extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
 			gradient:
 				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
@@ -3689,10 +3689,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
-//                print_r($args);
+			    }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,{
+				    $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
 							url:  props.attributes.{$key}_use_featured === true ? 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxzdmcgYmFzZVByb2ZpbGU9InRpbnkiIGhlaWdodD0iNDAwIiB2ZXJzaW9uPSIxLjIiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzIC8+PHJlY3QgZmlsbD0iI2QzZDNkMyIgaGVpZ2h0PSI0MDAiIHdpZHRoPSI0MDAiIHg9IjAiIHk9IjAiIC8+PGxpbmUgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxMCIgeDE9IjAiIHgyPSI0MDAiIHkxPSIwIiB5Mj0iNDAwIiAvPjxsaW5lIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMTAiIHgxPSIwIiB4Mj0iNDAwIiB5MT0iNDAwIiB5Mj0iMCIgLz48cmVjdCBmaWxsPSIjZDNkM2QzIiBoZWlnaHQ9IjUwIiB3aWR0aD0iMjE4LjAiIHg9IjkxLjAiIHk9IjE3NS4wIiAvPjx0ZXh0IGZpbGw9IndoaXRlIiBmb250LXNpemU9IjMwIiBmb250LXdlaWdodD0iYm9sZCIgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMjAwLjAiIHk9IjIwNy41Ij5QTEFDRUhPTERFUjwvdGV4dD48L3N2Zz4='  : props.attributes.$key,
 							value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
@@ -3713,16 +3713,16 @@ 
 						}), ";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+				    $value = '""';
+				    $type = 'MediaUpload';
+				    $extra .= "onSelect: function(media){
 					  return props.setAttributes({
 						  $key: media.url,
 						  {$key}_id: media.id
 						});
 					  },";
-				   $extra .= "type: 'image',";
-				   $extra .= "render: function (obj) {
+				       $extra .= "type: 'image',";
+				       $extra .= "render: function (obj) {
 						return el( 'div',{},
 						( !props.attributes.$key && !props.attributes.{$key}_use_featured ) && el( wp.components.Button, {
 						  className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
@@ -3748,11 +3748,11 @@ 
 
 
 					  }";
-				$onchange = "";
+				    $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+				    //$inside_elements = ",el('div',{},'file upload')";
+			    } else if ( $args['type'] == 'images' ) {
+				    $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3779,9 +3779,9 @@ 
 })(),";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+				    $value = '""';
+				    $type = 'MediaUpload';
+				    $extra .= "onSelect: function(media){
 	let slim_images = props.attributes.$key ? JSON.parse('['+props.attributes.$key+']') : [];
 	if(media.length){
 		for (var i=0; i < media.length; i++) {
@@ -3794,9 +3794,9 @@ 
 	}
 	return props.setAttributes({ $key: slimImagesV});
 },";
-				$extra .= "type: 'image',";
-				$extra .= "multiple: true,";
-				$extra .= "render: function (obj) {
+				    $extra .= "type: 'image',";
+				    $extra .= "multiple: true,";
+				    $extra .= "render: function (obj) {
 	/* Init the sort */
 	enableDragSort('sd-sortable');
 	return el( 'div',{},
@@ -3823,40 +3823,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
-
-				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-
-			} 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 ( ! 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 ) ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				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, {
+				    $onchange = "";
+
+				    //$inside_elements = ",el('div',{},'file upload')";
+			    }
+			    elseif ( $args['type'] == 'checkbox' ) {
+				    $type = 'CheckboxControl';
+				    $extra .= "checked: props.attributes.$key,";
+				    $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+			    } elseif ( $args['type'] == 'textarea' ) {
+				    $type = 'TextareaControl';
+
+			    } 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 ( ! 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 ) ) . "' },";
+						    }
+						    $options .= "],";
+					    }
+				    }
+				    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, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3867,56 +3867,56 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
-//				$type = 'FormTokenField';
-//
-//				if ( ! empty( $args['options'] ) ) {
-//						$options .= "suggestions: [";
-//						foreach ( $args['options'] as $option_val => $option_label ) {
-//							$options .= "{ value: '" . esc_attr( $option_val ) . "', title: '" . addslashes( $option_label ) . "' },";
-////							$options .= "'" . esc_attr( $option_val ) . "':'" . addslashes( $option_label ) . "',";
-//						}
-//						$options .= "],";
-//				}
-//
-//				$onchangex  = "{ ( selectedItems ) => {
-//						// Build array of selected posts.
-//						let selectedPostsArray = [];
-//						selectedPosts.map(
-//							( postName ) => {
-//								const matchingPost = posts.find( ( post ) => {
-//									return post.title.raw === postName;
-//
-//								} );
-//								if ( matchingPost !== undefined ) {
-//									selectedPostsArray.push( matchingPost.id );
-//								}
-//							}
-//						)
-//
-//						setAttributes( { selectedPosts: selectedPostsArray } );
-//					} } ";
-//				$onchange  = '';// "props.setAttributes({ $key: [ props.attributes.$key ] } )";
-//
-////				$options  = "";
-//				$value     = "[]";
-//				$extra .= ' __experimentalExpandOnFocus: true,';
-
-			} 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'] == '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 );
-				// @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>';
-				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
+				    }
+			    } elseif ( $args['type'] == 'tagselect' ) {
+    //				$type = 'FormTokenField';
+    //
+    //				if ( ! empty( $args['options'] ) ) {
+    //						$options .= "suggestions: [";
+    //						foreach ( $args['options'] as $option_val => $option_label ) {
+    //							$options .= "{ value: '" . esc_attr( $option_val ) . "', title: '" . addslashes( $option_label ) . "' },";
+    ////							$options .= "'" . esc_attr( $option_val ) . "':'" . addslashes( $option_label ) . "',";
+    //						}
+    //						$options .= "],";
+    //				}
+    //
+    //				$onchangex  = "{ ( selectedItems ) => {
+    //						// Build array of selected posts.
+    //						let selectedPostsArray = [];
+    //						selectedPosts.map(
+    //							( postName ) => {
+    //								const matchingPost = posts.find( ( post ) => {
+    //									return post.title.raw === postName;
+    //
+    //								} );
+    //								if ( matchingPost !== undefined ) {
+    //									selectedPostsArray.push( matchingPost.id );
+    //								}
+    //							}
+    //						)
+    //
+    //						setAttributes( { selectedPosts: selectedPostsArray } );
+    //					} } ";
+    //				$onchange  = '';// "props.setAttributes({ $key: [ props.attributes.$key ] } )";
+    //
+    ////				$options  = "";
+    //				$value     = "[]";
+    //				$extra .= ' __experimentalExpandOnFocus: true,';
+
+			    } 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'] == '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 );
+				    // @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>';
+				    $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() {
 							var sValue = props.attributes." . $key . ";
@@ -3942,54 +3942,54 @@ 
 					},
 					'" . 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.
-			}
-
-			// color input does not show the labels so we add them
-			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'] )."'),";
-			}
-
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-			echo $device_type_require;
-
-			// icon
-			echo $icon;
-			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
+			    } else {
+				    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'){
+				    // 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'] )."'),";
+			    }
+
+			    // add show only if advanced
+			    echo $require_advanced;
+			    // add setting require if defined
+			    echo $element_require;
+			    echo $device_type_require;
+
+			    // 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 } ?>,
+			    } 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 ( ! 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 ) { ?>
-			onChange: function ( <?php echo $key; ?> ) {
+				    echo "type: '" . addslashes( $args['type'] ) . "',";
+			    } ?>
+    			<?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 ) { ?>
+    			onChange: function ( <?php echo $key; ?> ) {
 				<?php echo $onchange; ?>
-			}
+    			}
 			<?php } ?>
-		} <?php echo $inside_elements; ?> ),
+    		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
+			    echo $after_elements;
+		    }
 
-		/**
+		    /**
 		 * Convert an array of attributes to block string.
 		 *
 		 * @param $custom_attributes
@@ -3998,448 +3998,448 @@ 
 		 *@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 ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+		    public function array_to_attributes( $custom_attributes, $html = false ) {
+			    $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',";
+					    }
+				    }
 
-			}
+			    }
 
-			return $attributes;
-		}
+			    return $attributes;
+		    }
 
 
 
-		/**
+		    /**
 		 * A self looping function to create the output for JS block elements.
 		 *
 		 * This is what is output in the WP Editor visual view.
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
-
-//            print_r($args);echo '###';exit;
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+		    public function block_element( $args, $save = false ) {
+
+    //            print_r($args);echo '###';exit;
+
+			    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_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							if($new_args['element']=='InnerBlocks'){
-								echo "\n el( InnerBlocks, {";
-							}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 "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
-							//    echo '###';
-
-							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
-
-								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'";
-								}
-
-								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 "} ),";
-
-							}else{
-								echo "\n el( '" . $new_args['element'] . "', {";
-							}
+						    if ( isset( $new_args['element'] ) ) {
 
-
-							// get the attributes
-							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 ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
-								}
-							}
-
-							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 ) ) {
-
-									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 ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ),$save );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
-							}
-
-
-							echo ", \n";
-
-						}
-					} else {
-
-						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);
-							}
-							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 ) {
-							echo $element . ": $new_args,";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
+							    if ( isset( $new_args['element_require'] ) ) {
+								    echo str_replace( array(
+										    "'+",
+										    "+'"
+									    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+								    unset( $new_args['element_require'] );
+							    }
+
+							    if($new_args['element']=='InnerBlocks'){
+								    echo "\n el( InnerBlocks, {";
+							    }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 "} ), {";
+								    echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+							    //    echo '###';
+
+							      //  echo '###';
+							    }elseif($new_args['element']=='BlocksProps'){
+
+								    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'";
+								    }
+
+								    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 "} ),";
+
+							    }else{
+								    echo "\n el( '" . $new_args['element'] . "', {";
+							    }
+
+
+							    // get the attributes
+							    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 ) ) {
+									    // do nothing
+								    } else {
+									    echo $this->block_element( array( $new_key => $new_value ),$save );
+								    }
+							    }
+
+							    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 ) ) {
+
+									    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 ( isset( $new_value['element_require'] ) ) {
+											    echo str_replace( array(
+													    "'+",
+													    "+'"
+												    ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+											    unset( $new_value['element_require'] );
+										    }
+
+										    if ( isset( $new_value['element_repeat'] ) ) {
+											    $x = 1;
+											    while ( $x <= absint( $new_value['element_repeat'] ) ) {
+												    $this->block_element( array( '' => $new_value ),$save );
+												    $x ++;
+											    }
+										    } else {
+											    $this->block_element( array( '' => $new_value ),$save );
+										    }
+									    }
+									    $first_item ++;
+								    }
+							    }
+
+							    if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
+								    echo "))";// end content
+							    }else{
+								    echo ")";// end content
+							    }
+
+
+							    echo ", \n";
+
+						    }
+					    } else {
+
+						    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);
+							    }
+							    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 ) {
+							    echo $element . ": $new_args,";
+						    } else {
+							    echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+						    }
+
+					    }
+				    }
+			    }
+		    }
+
+		    /**
 		 * Replace block attributes placeholders with the proper naming.
 		 *
 		 * @param $string
 		 *
 		 * @return mixed
 		 */
-		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 );
-			}
+		    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 );
+			    }
 
-			return $string;
-		}
+			    return $string;
+		    }
 
-		/**
+		    /**
 		 * Outputs the content of the widget
 		 *
 		 * @param array $args
 		 * @param array $instance
 		 */
-		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 );
-
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
-
-			ob_start();
-			if ( $output && ! $no_wrap ) {
-
-				$class_original = $this->options['widget_ops']['classname'];
-				$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 );
-
-				// 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 );
-
-				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() ) {
-					// 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 );
-
-					$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 $this->output_title( $args, $instance );
-				echo $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 . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-			echo $output;
-		}
-
-		/**
+		    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 );
+
+			    $no_wrap = false;
+			    if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+				    $no_wrap = true;
+			    }
+
+			    ob_start();
+			    if ( $output && ! $no_wrap ) {
+
+				    $class_original = $this->options['widget_ops']['classname'];
+				    $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 );
+
+				    // 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 );
+
+				    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() ) {
+					    // 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 );
+
+					    $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 $this->output_title( $args, $instance );
+				    echo $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 . "}}" );
+				    echo $output;
+			    } elseif ( $output && $no_wrap ) {
+				    echo $output;
+			    }
+			    $output = ob_get_clean();
+
+			    $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+			    echo $output;
+		    }
+
+		    /**
 		 * Tests if the current output is inside a elementor container.
 		 *
 		 * @return bool
 		 *@since 1.0.4
 		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
+		    public function is_elementor_widget_output() {
+			    $result = false;
+			    if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a elementor preview.
 		 *
 		 * @return bool
 		 *@since 1.0.4
 		 */
-		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' ) ) {
-				$result = true;
-			}
+		    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' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Divi preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		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' ) ) {
-				$result = true;
-			}
+		    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' ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Beaver builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
+		    public function is_beaver_preview() {
+			    $result = false;
+			    if ( isset( $_REQUEST['fl_builder'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a siteorigin builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
+		    public function is_siteorigin_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a cornerstone builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.8
 		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
+		    public function is_cornerstone_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a fusion builder preview.
 		 *
 		 * @return bool
 		 *@since 1.1.0
 		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
+		    public function is_fusion_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Tests if the current output is inside a Oxygen builder preview.
 		 *
 		 * @return bool
 		 *@since 1.0.18
 		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
+		    public function is_oxygen_preview() {
+			    $result = false;
+			    if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Kallyas theme Zion builder preview.
 		 *
 		 * @since 1.1.22
 		 *
 		 * @return bool True when preview page otherwise false.
 		 */
-		public function is_kallyas_zion_preview() {
-			$result = false;
+		    public function is_kallyas_zion_preview() {
+			    $result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * Check for Bricks theme builder preview.
 		 *
 		 * @since 1.1.31
 		 *
 		 * @return bool True when preview page otherwise false.
 		 */
-		public function is_bricks_preview() {
-			$result = false;
+		    public function is_bricks_preview() {
+			    $result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+			    if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+				    $result = true;
+			    }
 
-			return $result;
-		}
+			    return $result;
+		    }
 
-		/**
+		    /**
 		 * General function to check if we are in a preview situation.
 		 *
 		 * @return bool
 		 *@since 1.0.6
 		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
+		    public function is_preview() {
+			    $preview = false;
+			    if ( $this->is_divi_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_elementor_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_beaver_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_siteorigin_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_cornerstone_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_fusion_preview() ) {
+				    $preview = true;
+			    } elseif ( $this->is_oxygen_preview() ) {
+				    $preview = true;
+			    } elseif( $this->is_kallyas_zion_preview() ) {
+				    $preview = true;
+			    } elseif( $this->is_block_content_call() ) {
+				    $preview = true;
+			    } elseif( $this->is_bricks_preview() ) {
+				    $preview = true;
+			    }
+
+			    return $preview;
+		    }
+
+		    /**
 		 * Output the super title.
 		 *
 		 * @param $args
@@ -4447,172 +4447,172 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			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 );
-
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
-						$args['before_title'] = '';
-					}
-
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
-
-					$output = $args['before_title'] . $title . $args['after_title'];
-				} 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) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
-
-			}
-
-			return $output;
-		}
-
-		/**
+		    public function output_title( $args, $instance = array() ) {
+			    $output = '';
+			    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 );
+
+				    if ( empty( $instance['widget_title_tag'] ) ) {
+					    if ( ! isset( $args['before_title'] ) ) {
+						    $args['before_title'] = '';
+					    }
+
+					    if ( ! isset( $args['after_title'] ) ) {
+						    $args['after_title'] = '';
+					    }
+
+					    $output = $args['before_title'] . $title . $args['after_title'];
+				    } 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) : '';
+					    $output = "<$title_tag class='$class' >$title</$title_tag>";
+				    }
+
+			    }
+
+			    return $output;
+		    }
+
+		    /**
 		 * Outputs the options form inputs for the widget.
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		    public function form( $instance ) {
 
-			// set widget instance
-			$this->instance = $instance;
+			    // set widget instance
+			    $this->instance = $instance;
 
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
+			    // set it as a SD widget
+			    echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
+			    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;
+				    // Do we have sections?
+				    $has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+				    if ( $has_sections ) {
+					    $panel_count = 0;
+					    foreach ( $arguments as $key => $args ) {
 
-						?>
+						    ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$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>";
+						    $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>";
 
-						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_row_end($k, $a);
+							    $this->widget_inputs_row_start($k, $a);
+							    $this->widget_inputs( $a, $instance );
+							    $this->widget_inputs_row_end($k, $a);
 
-						}
+						    }
 
-						echo "</div>";
+						    echo "</div>";
 
-						$panel_count ++;
+						    $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+					    }
+				    } else {
+					    foreach ( $arguments as $key => $args ) {
+						    $this->widget_inputs_row_start($key, $args);
+						    $this->widget_inputs( $args, $instance );
+						    $this->widget_inputs_row_end($key, $args);
+					    }
+				    }
 
-			}
-		}
+			    }
+		    }
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe 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'] ) : '' ); ?>'>
+		    public function widget_inputs_row_start( $key, $args ) {
+			    if ( ! empty( $args['row'] ) ) {
+				    // Maybe 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'] ) ) { ?>
-					<?php
-						if ( isset( $args['row']['icon'] ) ) {
-							$args['row']['icon'] = '';
-						}
-
-						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>
+    					<?php
+						    if ( isset( $args['row']['icon'] ) ) {
+							    $args['row']['icon'] = '';
+						    }
+
+						    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>
 					<?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'] ) ) {
-					echo "<div class='col pl-0 ps-0'>";
-				} else {
-					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
-				}
-			}
-		}
-
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
-					echo "</div></div>";
-				}
-				echo "</div>";
-			}
-		}
-
-		/**
+				    } 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'>";
+				    }
+			    }
+		    }
+
+		    public function widget_inputs_row_end( $key, $args ) {
+			    if ( ! empty( $args['row'] ) ) {
+				    // Maybe close
+				    if ( ! empty( $args['row']['close'] ) ) {
+					    echo "</div></div>";
+				    }
+				    echo "</div>";
+			    }
+		    }
+
+		    /**
 		 * Get the hidden input that when added makes the advanced button show on widget settings.
 		 *
 		 * @return string
 		 */
-		public function widget_advanced_toggle() {
+		    public function widget_advanced_toggle() {
 
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
+			    $output = '';
+			    if ( $this->block_show_advanced() ) {
+				    $val = 1;
+			    } else {
+				    $val = 0;
+			    }
 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+			    $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
 
-			return $output;
-		}
+			    return $output;
+		    }
 
-		/**
+		    /**
 		 * Convert require element.
 		 *
 		 * @param string $input Input element.
@@ -4621,67 +4621,67 @@ 
 		 *@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(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').val()"
-			), $input ) );
+			    $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+				    "jQuery(form).find('[data-argument=\"",
+				    "\"]').find('input,select,textarea').val()",
+				    "\"]').find('input:checked').val()"
+			    ), $input ) );
 
-			return $output;
-		}
+			    return $output;
+		    }
 
-		/**
+		    /**
 		 * Builds the inputs for the widget options.
 		 *
 		 * @param $args
 		 * @param $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'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// 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 );
-			}
-
-			// 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 );} ?>'>
+		    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'] );
+			    } else {
+				    $value = '';
+			    }
+
+			    // get placeholder
+			    if ( ! empty( $args['placeholder'] ) ) {
+				    $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			    } else {
+				    $placeholder = '';
+			    }
+
+			    // get if advanced
+			    if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+				    $class .= " sd-advanced-setting ";
+			    }
+
+			    // 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 );
+			    }
+
+			    // 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 );} ?>'>
 			<?php
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
+			    switch ( $args['type'] ) {
+				    //array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
 				case "number":
@@ -4745,7 +4745,7 @@ 
 					break;
 				default:
 					echo "No input type found!"; // @todo we need to add more input types.
-			}
+			    }
 			// after wrapper
 			?></p><?php
 		}