AyeCode / invoicing

includes/gateways/class-getpaid-bank-transfer-gateway.php

Indentation +363 added lines, -363 removed lines

@@ -13,47 +13,47 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array(
-		'subscription',
-		'addons',
-		'single_subscription_group',
-		'multiple_subscription_groups',
-		'subscription_date_change',
-		'subscription_bill_times_change',
-	);
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array(
+        'subscription',
+        'addons',
+        'single_subscription_group',
+        'multiple_subscription_groups',
+        'subscription_date_change',
+        'subscription_bill_times_change',
+    );
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
+
+    /**
+     * Bank transfer instructions.
+     */
+    public $instructions;
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
-
-	/**
-	 * Bank transfer instructions.
-	 */
-	public $instructions;
-
-	/**
-	 * Locale array.
-	 */
-	public $locale;
+     * Locale array.
+     */
+    public $locale;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -61,43 +61,43 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ), 12, 2 );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
-
-		add_filter( 'wpinv_' . $this->id . '_support_subscription', array( $this, 'supports_subscription' ), 20, 1 );
-		add_filter( 'getpaid_' . $this->id . '_support_subscription', array( $this, 'supports_subscription' ), 20, 1 );
-		add_filter( 'getpaid_' . $this->id . '_supports_subscription', array( $this, 'supports_subscription' ), 20, 1 );
-	}
-
-	/**
-	 * Check gateway supports for subscription.
-	 *
-	 * @since 2.8.24
-	 *
-	 * @param bool $supports True if supports else False.
-	 * @return bool True if supports else False.
-	 */
-	public function supports_subscription( $supports ) {
-		if ( $supports && (int) $this->get_option( 'no_subscription' ) ) {
-			$supports = false;
-		}
-
-		return $supports;
-	}
-
-	/**
-	 * Process Payment.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ), 12, 2 );
+        add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+
+        add_filter( 'wpinv_' . $this->id . '_support_subscription', array( $this, 'supports_subscription' ), 20, 1 );
+        add_filter( 'getpaid_' . $this->id . '_support_subscription', array( $this, 'supports_subscription' ), 20, 1 );
+        add_filter( 'getpaid_' . $this->id . '_supports_subscription', array( $this, 'supports_subscription' ), 20, 1 );
+    }
+
+    /**
+     * Check gateway supports for subscription.
+     *
+     * @since 2.8.24
+     *
+     * @param bool $supports True if supports else False.
+     * @return bool True if supports else False.
+     */
+    public function supports_subscription( $supports ) {
+        if ( $supports && (int) $this->get_option( 'no_subscription' ) ) {
+            $supports = false;
+        }
+
+        return $supports;
+    }
+
+    /**
+     * Process Payment.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
@@ -118,66 +118,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( __( wp_unslash( $this->instructions ), 'invoicing' ) ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
 
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get shortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get shortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'   => __( 'Account Name', 'invoicing' ),
@@ -196,11 +196,11 @@ 
 
             if ( ! empty( $value ) ) {
                 $bank_info[ $field ] = array(
-					'label' => $label,
-					'value' => $value,
-				);
+                    'label' => $label,
+                    'value' => $value,
+                );
             }
-		}
+        }
 
         $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
 
@@ -208,177 +208,177 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+
+        foreach ( $bank_info as $key => $data ) {
+            echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+        }
+
+        echo '</table>';
+
+    }
+
+    /**
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
+
+        }
+
+        return $this->locale;
+
+    }
+
+    /**
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
+        $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
+        $admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+
+        $_settings = array();
+
+        foreach ( $admin_settings as $key => $setting ) {
+            $_settings[ $key ] = $setting;
+
+            if ( $key == 'bank_transfer_active' ) {
+                // Enable/disable subscriptions setting.
+                $_settings['bank_transfer_no_subscription'] = array(
+                    'id' => 'bank_transfer_no_subscription',
+                    'type' => 'checkbox',
+                    'name' => __( 'Disable Subscriptions', 'invoicing' ),
+                    'desc' => __( 'Tick to disable support for recurring items.', 'invoicing' ),
+                    'std' => 0
+                );
+            }
+        }
+
+        $admin_settings = $_settings;
+
+        $locale  = $this->get_country_locale();
+
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+
+        $admin_settings['bank_transfer_ac_name'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_ac_name',
+            'name' => __( 'Account Name', 'invoicing' ),
+        );
+
+        $admin_settings['bank_transfer_ac_no'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_ac_no',
+            'name' => __( 'Account Number', 'invoicing' ),
+        );
+
+        $admin_settings['bank_transfer_bank_name'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_bank_name',
+            'name' => __( 'Bank Name', 'invoicing' ),
+        );
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+        $admin_settings['bank_transfer_ifsc'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_ifsc',
+            'name' => __( 'IFSC Code', 'invoicing' ),
+        );
+
+        $admin_settings['bank_transfer_iban'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_iban',
+            'name' => __( 'IBAN', 'invoicing' ),
+        );
+
+        $admin_settings['bank_transfer_bic'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_bic',
+            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+        );
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
-		}
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		echo '</table>';
+        $admin_settings['bank_transfer_info'] = array(
+            'id'   => 'bank_transfer_info',
+            'name' => __( 'Instructions', 'invoicing' ),
+            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'type' => 'textarea',
+            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'cols' => 50,
+            'rows' => 5,
+        );
 
+        return $admin_settings;
     }
 
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
-		$admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
-
-		$_settings = array();
-
-		foreach ( $admin_settings as $key => $setting ) {
-			$_settings[ $key ] = $setting;
-
-			if ( $key == 'bank_transfer_active' ) {
-				// Enable/disable subscriptions setting.
-				$_settings['bank_transfer_no_subscription'] = array(
-					'id' => 'bank_transfer_no_subscription',
-					'type' => 'checkbox',
-					'name' => __( 'Disable Subscriptions', 'invoicing' ),
-					'desc' => __( 'Tick to disable support for recurring items.', 'invoicing' ),
-					'std' => 0
-				);
-			}
-		}
-
-		$admin_settings = $_settings;
-
-		$locale  = $this->get_country_locale();
-
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
-
-		$admin_settings['bank_transfer_ac_name'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_ac_name',
-			'name' => __( 'Account Name', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_ac_no'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_ac_no',
-			'name' => __( 'Account Number', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_bank_name'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_bank_name',
-			'name' => __( 'Bank Name', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_ifsc'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_ifsc',
-			'name' => __( 'IFSC Code', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_iban'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_iban',
-			'name' => __( 'IBAN', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_bic'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_bic',
-			'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
-
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
-
-		$admin_settings['bank_transfer_info'] = array(
-			'id'   => 'bank_transfer_info',
-			'name' => __( 'Instructions', 'invoicing' ),
-			'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
-			'type' => 'textarea',
-			'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
-			'cols' => 50,
-			'rows' => 5,
-		);
-
-		return $admin_settings;
-	}
-
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -386,98 +386,98 @@ 
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
-
-	/**
-	 * (Maybe) renews a bank transfer subscription profile.
-	 *
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription, $parent_invoice ) {
-		// Ensure its our subscription && it's active.
-		if ( ! empty( $parent_invoice ) && $this->id === $parent_invoice->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			add_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
-
-			$invoice = $subscription->create_payment();
-
-			if ( ! empty( $invoice ) ) {
-				$is_logged_in = is_user_logged_in();
-
-				// Cron run.
-				if ( ! $is_logged_in ) {
-					$note = wp_sprintf( __( 'Renewal %1$s created with the status "%2$s".', 'invoicing' ), $invoice->get_invoice_quote_type(), wpinv_status_nicename( $invoice->get_status(), $invoice ) );
-
-					$invoice->add_note( $note, false, $is_logged_in, ! $is_logged_in );
-				}
-			}
-
-			remove_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
-		}
-	}
-
-	/**
-	 * Process a bank transfer payment.
-	 *
-	 *
+    }
+
+    /**
+     * (Maybe) renews a bank transfer subscription profile.
+     *
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function maybe_renew_subscription( $subscription, $parent_invoice ) {
+        // Ensure its our subscription && it's active.
+        if ( ! empty( $parent_invoice ) && $this->id === $parent_invoice->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+            add_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+
+            $invoice = $subscription->create_payment();
+
+            if ( ! empty( $invoice ) ) {
+                $is_logged_in = is_user_logged_in();
+
+                // Cron run.
+                if ( ! $is_logged_in ) {
+                    $note = wp_sprintf( __( 'Renewal %1$s created with the status "%2$s".', 'invoicing' ), $invoice->get_invoice_quote_type(), wpinv_status_nicename( $invoice->get_status(), $invoice ) );
+
+                    $invoice->add_note( $note, false, $is_logged_in, ! $is_logged_in );
+                }
+            }
+
+            remove_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+        }
+    }
+
+    /**
+     * Process a bank transfer payment.
+     *
+     *
      * @param WPInv_Invoice $invoice
-	 */
-	public function invoice_paid( $invoice ) {
-
-		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
-			return;
-		}
-
-		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
-
-			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
-
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
-
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
-						$subscription->activate();
-					}
-				}
-			}
-		} else {
-
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
-
-			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
-			}
-		}
+     */
+    public function invoice_paid( $invoice ) {
+
+        // Abort if not paid by bank transfer.
+        if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+            return;
+        }
+
+        // Is it a parent payment?
+        if ( 0 == $invoice->get_parent_id() ) {
+
+            // (Maybe) activate subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+
+                foreach ( $subscriptions as $subscription ) {
+                    if ( $subscription->exists() ) {
+                        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+                        $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+
+                        $subscription->set_next_renewal_date( $expiry );
+                        $subscription->set_date_created( current_time( 'mysql' ) );
+                        $subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+                        $subscription->activate();
+                    }
+                }
+            }
+        } else {
+
+            $subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+
+            // Renew the subscription.
+            if ( $subscription && $subscription->exists() ) {
+                $subscription->add_payment( array(), $invoice );
+                $subscription->renew( strtotime( $invoice->get_date_created() ) );
+            }
+        }
 
     }
 
-	/**
-	 * Force created from payment false to allow email for auto renewal generation invoice.
-	 *
-	 * @since 2.8.11
-	 *
-	 * @param bool $is_payment_form_invoice True when invoice created via payment form else false.
-	 * @param int  $invoice Invoice ID.
-	 * @return bool True when invoice created via payment form else false.
-	 */
-	public function force_is_payment_form_invoice( $is_payment_form_invoice, $invoice ) {
-		if ( $is_payment_form_invoice ) {
-			$is_payment_form_invoice = false;
-		}
-
-		return $is_payment_form_invoice;
-	}
+    /**
+     * Force created from payment false to allow email for auto renewal generation invoice.
+     *
+     * @since 2.8.11
+     *
+     * @param bool $is_payment_form_invoice True when invoice created via payment form else false.
+     * @param int  $invoice Invoice ID.
+     * @return bool True when invoice created via payment form else false.
+     */
+    public function force_is_payment_form_invoice( $is_payment_form_invoice, $invoice ) {
+        if ( $is_payment_form_invoice ) {
+            $is_payment_form_invoice = false;
+        }
+
+        return $is_payment_form_invoice;
+    }
 
 }

includes/wpinv-general-functions.php

Indentation +247 added lines, -247 removed lines

@@ -31,16 +31,16 @@ 
 }
 
 function wpinv_can_checkout() {
-	$can_checkout = true; // Always true for now
+    $can_checkout = true; // Always true for now
 
-	return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
+    return (bool) apply_filters( 'wpinv_can_checkout', $can_checkout );
 }
 
 function wpinv_get_success_page_uri() {
-	$page_id = wpinv_get_option( 'success_page', 0 );
-	$page_id = absint( $page_id );
+    $page_id = wpinv_get_option( 'success_page', 0 );
+    $page_id = absint( $page_id );
 
-	return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
+    return apply_filters( 'wpinv_get_success_page_uri', get_permalink( $page_id ) );
 }
 
 /**
@@ -51,22 +51,22 @@ 
  */
 function wpinv_get_history_page_uri( $post_type = 'wpi_invoice' ) {
     $post_type = sanitize_key( str_replace( 'wpi_', '', $post_type ) );
-	$page_id   = wpinv_get_option( "{$post_type}_history_page", 0 );
-	$page_id   = absint( $page_id );
-	return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ), $post_type );
+    $page_id   = wpinv_get_option( "{$post_type}_history_page", 0 );
+    $page_id   = absint( $page_id );
+    return apply_filters( 'wpinv_get_history_page_uri', get_permalink( $page_id ), $post_type );
 }
 
 function wpinv_is_success_page() {
-	$is_success_page = wpinv_get_option( 'success_page', false );
-	$is_success_page = ! empty( $is_success_page ) ? is_page( $is_success_page ) : false;
+    $is_success_page = wpinv_get_option( 'success_page', false );
+    $is_success_page = ! empty( $is_success_page ) ? is_page( $is_success_page ) : false;
 
-	return apply_filters( 'wpinv_is_success_page', $is_success_page );
+    return apply_filters( 'wpinv_is_success_page', $is_success_page );
 }
 
 function wpinv_is_invoice_history_page() {
-	$ret = wpinv_get_option( 'invoice_history_page', false );
-	$ret = $ret ? is_page( $ret ) : false;
-	return apply_filters( 'wpinv_is_invoice_history_page', $ret );
+    $ret = wpinv_get_option( 'invoice_history_page', false );
+    $ret = $ret ? is_page( $ret ) : false;
+    return apply_filters( 'wpinv_is_invoice_history_page', $ret );
 }
 
 function wpinv_is_subscriptions_history_page() {
@@ -105,7 +105,7 @@ 
 }
 
 function wpinv_send_to_failed_page( $args = null ) {
-	$redirect = wpinv_get_failed_transaction_uri();
+    $redirect = wpinv_get_failed_transaction_uri();
 
     if ( ! empty( $args ) ) {
         // Check for backward compatibility
@@ -126,58 +126,58 @@ 
 }
 
 function wpinv_get_checkout_uri( $args = array() ) {
-	$uri = wpinv_get_option( 'checkout_page', false );
-	$uri = isset( $uri ) ? get_permalink( $uri ) : null;
+    $uri = wpinv_get_option( 'checkout_page', false );
+    $uri = isset( $uri ) ? get_permalink( $uri ) : null;
 
-	if ( ! empty( $args ) ) {
-		// Check for backward compatibility
-		if ( is_string( $args ) ) {
-			$args = str_replace( '?', '', $args );
+    if ( ! empty( $args ) ) {
+        // Check for backward compatibility
+        if ( is_string( $args ) ) {
+            $args = str_replace( '?', '', $args );
         }
 
-		$args = wp_parse_args( $args );
+        $args = wp_parse_args( $args );
 
-		$uri = add_query_arg( $args, $uri );
-	}
+        $uri = add_query_arg( $args, $uri );
+    }
 
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+    $scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
-	$ajax_url = admin_url( 'admin-ajax.php', $scheme );
+    $ajax_url = admin_url( 'admin-ajax.php', $scheme );
 
-	if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
-		$uri = preg_replace( '/^http:/', 'https:', $uri );
-	}
+    if ( ( ! preg_match( '/^https/', $uri ) && preg_match( '/^https/', $ajax_url ) ) || wpinv_is_ssl_enforced() ) {
+        $uri = preg_replace( '/^http:/', 'https:', $uri );
+    }
 
-	return apply_filters( 'wpinv_get_checkout_uri', $uri );
+    return apply_filters( 'wpinv_get_checkout_uri', $uri );
 }
 
 function wpinv_get_success_page_url( $query_string = null ) {
-	$success_page = wpinv_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+    $success_page = wpinv_get_option( 'success_page', 0 );
+    $success_page = get_permalink( $success_page );
 
-	if ( $query_string ) {
-		$success_page .= $query_string;
+    if ( $query_string ) {
+        $success_page .= $query_string;
     }
 
-	return apply_filters( 'wpinv_success_page_url', $success_page );
+    return apply_filters( 'wpinv_success_page_url', $success_page );
 }
 
 function wpinv_get_failed_transaction_uri( $extras = false ) {
-	$uri = wpinv_get_option( 'failure_page', '' );
-	$uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
+    $uri = wpinv_get_option( 'failure_page', '' );
+    $uri = ! empty( $uri ) ? trailingslashit( get_permalink( $uri ) ) : home_url();
 
-	if ( $extras ) {
-		$uri .= $extras;
+    if ( $extras ) {
+        $uri .= $extras;
     }
 
-	return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
+    return apply_filters( 'wpinv_get_failed_transaction_uri', $uri );
 }
 
 function wpinv_is_failed_transaction_page() {
-	$ret = wpinv_get_option( 'failure_page', false );
-	$ret = isset( $ret ) ? is_page( $ret ) : false;
+    $ret = wpinv_get_option( 'failure_page', false );
+    $ret = isset( $ret ) ? is_page( $ret ) : false;
 
-	return apply_filters( 'wpinv_is_failure_page', $ret );
+    return apply_filters( 'wpinv_is_failure_page', $ret );
 }
 
 function wpinv_transaction_query( $type = 'start' ) {
@@ -257,36 +257,36 @@ 
     $require_billing_details = apply_filters( 'wpinv_checkout_required_billing_details', wpinv_use_taxes() );
 
     if ( $require_billing_details ) {
-		if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
-			$required_fields['first_name'] = array(
-				'error_id'      => 'invalid_first_name',
-				'error_message' => __( 'Please enter your first name', 'invoicing' ),
-			);
-		}
-		if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
-			$required_fields['address'] = array(
-				'error_id'      => 'invalid_address',
-				'error_message' => __( 'Please enter your address', 'invoicing' ),
-			);
-		}
-		if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
-			$required_fields['city'] = array(
-				'error_id'      => 'invalid_city',
-				'error_message' => __( 'Please enter your billing city', 'invoicing' ),
-			);
-		}
-		if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
-			$required_fields['state'] = array(
-				'error_id'      => 'invalid_state',
-				'error_message' => __( 'Please enter billing state / province', 'invoicing' ),
-			);
-		}
-		if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
-			$required_fields['country'] = array(
-				'error_id'      => 'invalid_country',
-				'error_message' => __( 'Please select your billing country', 'invoicing' ),
-			);
-		}
+        if ( (bool)wpinv_get_option( 'fname_mandatory' ) ) {
+            $required_fields['first_name'] = array(
+                'error_id'      => 'invalid_first_name',
+                'error_message' => __( 'Please enter your first name', 'invoicing' ),
+            );
+        }
+        if ( (bool)wpinv_get_option( 'address_mandatory' ) ) {
+            $required_fields['address'] = array(
+                'error_id'      => 'invalid_address',
+                'error_message' => __( 'Please enter your address', 'invoicing' ),
+            );
+        }
+        if ( (bool)wpinv_get_option( 'city_mandatory' ) ) {
+            $required_fields['city'] = array(
+                'error_id'      => 'invalid_city',
+                'error_message' => __( 'Please enter your billing city', 'invoicing' ),
+            );
+        }
+        if ( (bool)wpinv_get_option( 'state_mandatory' ) ) {
+            $required_fields['state'] = array(
+                'error_id'      => 'invalid_state',
+                'error_message' => __( 'Please enter billing state / province', 'invoicing' ),
+            );
+        }
+        if ( (bool)wpinv_get_option( 'country_mandatory' ) ) {
+            $required_fields['country'] = array(
+                'error_id'      => 'invalid_country',
+                'error_message' => __( 'Please select your billing country', 'invoicing' ),
+            );
+        }
     }
 
     return apply_filters( 'wpinv_checkout_required_fields', $required_fields );
@@ -501,42 +501,42 @@ 
  * @return bool|WP_Filesystem The WP Filesystem object or false on failure.
  */
 function getpaid_wp_filesystem() {
-	if ( ! function_exists( 'get_filesystem_method' ) ) {
-		require_once( ABSPATH . "/wp-admin/includes/file.php" );
-	}
+    if ( ! function_exists( 'get_filesystem_method' ) ) {
+        require_once( ABSPATH . "/wp-admin/includes/file.php" );
+    }
 
-	$access_type = get_filesystem_method();
+    $access_type = get_filesystem_method();
 
-	if ( $access_type === 'direct' ) {
-		/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-		$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+    if ( $access_type === 'direct' ) {
+        /* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
+        $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
 
-		/* Initialize the API */
-		if ( ! WP_Filesystem( $creds ) ) {
-			/* Any problems and we exit */
-			return false;
-		}
+        /* Initialize the API */
+        if ( ! WP_Filesystem( $creds ) ) {
+            /* Any problems and we exit */
+            return false;
+        }
 
-		global $wp_filesystem;
+        global $wp_filesystem;
 
-		return $wp_filesystem;
-		/* Do our file manipulations below */
-	} else if ( defined( 'FTP_USER' ) ) {
-		$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+        return $wp_filesystem;
+        /* Do our file manipulations below */
+    } else if ( defined( 'FTP_USER' ) ) {
+        $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
 
-		/* Initialize the API */
-		if ( ! WP_Filesystem( $creds ) ) {
-			/* Any problems and we exit */
-			return false;
-		}
+        /* Initialize the API */
+        if ( ! WP_Filesystem( $creds ) ) {
+            /* Any problems and we exit */
+            return false;
+        }
 
-		global $wp_filesystem;
+        global $wp_filesystem;
 
-		return $wp_filesystem;
-	} else {
-		/* Don't have direct write access. Prompt user with our notice */
-		return false;
-	}
+        return $wp_filesystem;
+    } else {
+        /* Don't have direct write access. Prompt user with our notice */
+        return false;
+    }
 }
 
 /**
@@ -547,65 +547,65 @@ 
  * @return bool True if file created otherwise false
  */
 function getpaid_sync_db_text_translation() {
-	$wp_filesystem = getpaid_wp_filesystem();
+    $wp_filesystem = getpaid_wp_filesystem();
 
-	$language_file = WPINV_PLUGIN_DIR . 'db-language.php';
+    $language_file = WPINV_PLUGIN_DIR . 'db-language.php';
 
-	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
-		return false;
-	}
+    if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
+        return false;
+    }
 
-	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
-		return false;
-	}
+    if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
+        return false;
+    }
 
-	$head   = array();
-	$head[] = "<?php";
-	$head[] = "/**";
-	$head[] = " * Contains strings for translation that stored in the database. Ex: Payment forms custom fields texts.";
-	$head[] = " *";
-	$head[] = " * @package GetPaid";
-	$head[] = " * @since 2.8.32";
-	$head[] = " */";
-	$head[] = "";
-	$head[] = "__( 'My String', 'invoicing' );";
+    $head   = array();
+    $head[] = "<?php";
+    $head[] = "/**";
+    $head[] = " * Contains strings for translation that stored in the database. Ex: Payment forms custom fields texts.";
+    $head[] = " *";
+    $head[] = " * @package GetPaid";
+    $head[] = " * @since 2.8.32";
+    $head[] = " */";
+    $head[] = "";
+    $head[] = "__( 'My String', 'invoicing' );";
 
-	$footer   = array();
-	$footer[] = "";
-	$footer[] = "";
-	$footer[] = "/*** GetPaid " . WPINV_VERSION . " @ " . gmdate( 'Y-m-d H:i:s' ) . " ***/";
-	$footer[] = "";
+    $footer   = array();
+    $footer[] = "";
+    $footer[] = "";
+    $footer[] = "/*** GetPaid " . WPINV_VERSION . " @ " . gmdate( 'Y-m-d H:i:s' ) . " ***/";
+    $footer[] = "";
 
-	$contents = implode( PHP_EOL, $head );
+    $contents = implode( PHP_EOL, $head );
 
-	$strings = getpaid_get_db_language_strings();
+    $strings = getpaid_get_db_language_strings();
 
-	if ( ! empty( $strings ) ) {
-		$is_wpml = getpaid_is_wpml();
+    if ( ! empty( $strings ) ) {
+        $is_wpml = getpaid_is_wpml();
 
-		foreach ( $strings as $string ) {
-			if ( is_scalar( $string ) && $string != '' ) {
-				do_action( 'getpaid_db_language_add_string', $string );
+        foreach ( $strings as $string ) {
+            if ( is_scalar( $string ) && $string != '' ) {
+                do_action( 'getpaid_db_language_add_string', $string );
 
-				if ( $is_wpml ) {
-					// Registers a individual text string for WPML translation.
-					do_action( 'wpml_register_single_string', 'invoicing', '', $string );
-				}
+                if ( $is_wpml ) {
+                    // Registers a individual text string for WPML translation.
+                    do_action( 'wpml_register_single_string', 'invoicing', '', $string );
+                }
 
-				$string = str_replace( "'", "\'", $string );
+                $string = str_replace( "'", "\'", $string );
 
-				$contents .= PHP_EOL . "__( '" . $string . "', 'invoicing' );";
-			}
-		}
-	}
+                $contents .= PHP_EOL . "__( '" . $string . "', 'invoicing' );";
+            }
+        }
+    }
 
-	$contents .= implode( PHP_EOL, $footer );
+    $contents .= implode( PHP_EOL, $footer );
 
-	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
-		return true;
-	} else {
-		return false;
-	}
+    if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -617,103 +617,103 @@ 
  * @return array Filtered strings.
  */
 function getpaid_get_db_language_strings() {
-	global $wpdb;
-
-	$strings = array();
-
-	// Options
-	$settings = wpinv_get_options();
-
-	$setting_keys = array(
-		'bank_transfer_info',
-		'vat_invoice_notice_label',
-		'vat_invoice_notice'
-	);
-
-	/**
-	 * Filters the GetPaid option names that requires to add for translation.
-	 *
-	 * @since 2.8.32
-	 *
-	 * @param  array $setting_keys Array of setting keys.
-	 */
-	$setting_keys = apply_filters( 'getpaid_options_to_db_language_strings', $setting_keys );
-
-	$setting_keys = array_unique( $setting_keys );
-
-	if ( ! empty( $settings ) && ! empty( $setting_keys ) ) {
-		foreach ( $setting_keys as $setting_key ) {
-			if ( ! empty( $settings[ $setting_key ] ) && is_string( $settings[ $setting_key ] ) ) {
-				$strings[] = wp_unslash( $settings[ $setting_key ] );
-			}
-		}
-	}
-
-	// Payment forms
-	$results = $wpdb->get_col( "SELECT `pm`.`meta_value` FROM `{$wpdb->postmeta}` AS pm LEFT JOIN `{$wpdb->posts}` AS p ON p.ID = pm.post_id WHERE `pm`.`meta_key` = 'wpinv_form_elements' AND `p`.`post_type` = 'wpi_payment_form'" );
-
-	if ( ! empty( $results ) ) {
-		$string_keys = array( 'label', 'placeholder', 'description', 'text', 'input_label', 'button_label' );
-
-		foreach ( $results as $meta_value ) {
-			$fields = maybe_unserialize( $meta_value );
-
-			if ( ! empty( $fields ) && is_array( $fields ) ) {
-				foreach ( $fields as $field ) {
-					// Labels
-					foreach ( $string_keys as $string_key ) {
-						if ( ! empty( $field[ $string_key ] ) && is_string( $field[ $string_key ] ) ) {
-							$strings[] = wp_unslash( $field[ $string_key ] );
-						}
-					}
-
-					// Address fields
-					if ( ! empty( $field['fields'] ) && ! empty( $field['fields'] ) ) {
-						foreach ( $field['fields'] as $sub_field ) {
-							foreach ( $string_keys as $string_key ) {
-								if ( ! empty( $sub_field[ $string_key ] ) && is_string( $sub_field[ $string_key ] ) ) {
-									$strings[] = wp_unslash( $sub_field[ $string_key ] );
-								}
-							}
-						}
-					}
-
-					// Options
-					if ( ! empty( $field['options'] ) ) {
-						$options = array();
-
-						if ( is_array( $field['options'] ) ) {
-							$options = $field['options'];
-						} else if ( is_string( $field['options'] ) ) {
-							$options = getpaid_convert_price_string_to_options( $field['options'], false );
-							$options = ! empty( $options ) ? array_values( $options ) : array();
-						}
-
-						if ( ! empty( $options ) ) {
-							foreach( $options as $option ) {
-								if ( ! empty( $option ) && is_string( $option ) ) {
-									$strings[] = wp_unslash( $option );
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Filter the database strings to add for translation.
-	 *
-	 * @since 2.8.32
-	 *
-	 * @param array $strings Array of strings.
-	 */
-	$strings = apply_filters( 'getpaid_db_language_strings', $strings );
-
-	$strings = array_unique( $strings );
-
-	return $strings;
+    global $wpdb;
+
+    $strings = array();
+
+    // Options
+    $settings = wpinv_get_options();
+
+    $setting_keys = array(
+        'bank_transfer_info',
+        'vat_invoice_notice_label',
+        'vat_invoice_notice'
+    );
+
+    /**
+     * Filters the GetPaid option names that requires to add for translation.
+     *
+     * @since 2.8.32
+     *
+     * @param  array $setting_keys Array of setting keys.
+     */
+    $setting_keys = apply_filters( 'getpaid_options_to_db_language_strings', $setting_keys );
+
+    $setting_keys = array_unique( $setting_keys );
+
+    if ( ! empty( $settings ) && ! empty( $setting_keys ) ) {
+        foreach ( $setting_keys as $setting_key ) {
+            if ( ! empty( $settings[ $setting_key ] ) && is_string( $settings[ $setting_key ] ) ) {
+                $strings[] = wp_unslash( $settings[ $setting_key ] );
+            }
+        }
+    }
+
+    // Payment forms
+    $results = $wpdb->get_col( "SELECT `pm`.`meta_value` FROM `{$wpdb->postmeta}` AS pm LEFT JOIN `{$wpdb->posts}` AS p ON p.ID = pm.post_id WHERE `pm`.`meta_key` = 'wpinv_form_elements' AND `p`.`post_type` = 'wpi_payment_form'" );
+
+    if ( ! empty( $results ) ) {
+        $string_keys = array( 'label', 'placeholder', 'description', 'text', 'input_label', 'button_label' );
+
+        foreach ( $results as $meta_value ) {
+            $fields = maybe_unserialize( $meta_value );
+
+            if ( ! empty( $fields ) && is_array( $fields ) ) {
+                foreach ( $fields as $field ) {
+                    // Labels
+                    foreach ( $string_keys as $string_key ) {
+                        if ( ! empty( $field[ $string_key ] ) && is_string( $field[ $string_key ] ) ) {
+                            $strings[] = wp_unslash( $field[ $string_key ] );
+                        }
+                    }
+
+                    // Address fields
+                    if ( ! empty( $field['fields'] ) && ! empty( $field['fields'] ) ) {
+                        foreach ( $field['fields'] as $sub_field ) {
+                            foreach ( $string_keys as $string_key ) {
+                                if ( ! empty( $sub_field[ $string_key ] ) && is_string( $sub_field[ $string_key ] ) ) {
+                                    $strings[] = wp_unslash( $sub_field[ $string_key ] );
+                                }
+                            }
+                        }
+                    }
+
+                    // Options
+                    if ( ! empty( $field['options'] ) ) {
+                        $options = array();
+
+                        if ( is_array( $field['options'] ) ) {
+                            $options = $field['options'];
+                        } else if ( is_string( $field['options'] ) ) {
+                            $options = getpaid_convert_price_string_to_options( $field['options'], false );
+                            $options = ! empty( $options ) ? array_values( $options ) : array();
+                        }
+
+                        if ( ! empty( $options ) ) {
+                            foreach( $options as $option ) {
+                                if ( ! empty( $option ) && is_string( $option ) ) {
+                                    $strings[] = wp_unslash( $option );
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Filter the database strings to add for translation.
+     *
+     * @since 2.8.32
+     *
+     * @param array $strings Array of strings.
+     */
+    $strings = apply_filters( 'getpaid_db_language_strings', $strings );
+
+    $strings = array_unique( $strings );
+
+    return $strings;
 }
 
 /**
@@ -724,9 +724,9 @@ 
  * @return bool True if active else false.
  */
 function getpaid_is_wpml() {
-	if ( defined( 'ICL_SITEPRESS_VERSION' ) && ! ICL_PLUGIN_INACTIVE && class_exists( 'SitePress', false ) && function_exists( 'icl_object_id' ) ) {
-		return true;
-	}
+    if ( defined( 'ICL_SITEPRESS_VERSION' ) && ! ICL_PLUGIN_INACTIVE && class_exists( 'SitePress', false ) && function_exists( 'icl_object_id' ) ) {
+        return true;
+    }
 
-	return false;
+    return false;
 }
\ No newline at end of file

includes/wpinv-template-functions.php

Indentation +228 added lines, -228 removed lines

@@ -140,7 +140,7 @@ 
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
+    return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
 }
 
 /**
@@ -158,7 +158,7 @@ 
  * @return string
  */
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
 }
 
 /**
@@ -175,125 +175,125 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) ) {
-		$templates[] = $slug . '-' . $name . '.php';
+    // Setup possible parts
+    $templates = array();
+    if ( isset( $name ) ) {
+        $templates[] = $slug . '-' . $name . '.php';
     }
-	$templates[] = $slug . '.php';
+    $templates[] = $slug . '.php';
 
-	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) ) {
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) ) {
+            continue;
         }
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the template name
+        $template_name = ltrim( $template_name, '/' );
 
-		// try locating this template file by looping through the template paths
-		foreach ( wpinv_get_theme_template_paths() as $template_path ) {
+        // try locating this template file by looping through the template paths
+        foreach ( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if ( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if ( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if ( ! empty( $located ) ) {
-			break;
-		}
-	}
+        if ( ! empty( $located ) ) {
+            break;
+        }
+    }
 
-	if ( ( true == $load ) && ! empty( $located ) ) {
-		load_template( $located, $require_once );
+    if ( ( true == $load ) && ! empty( $located ) ) {
+        load_template( $located, $require_once );
     }
 
-	return $located;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $template_dir = wpinv_get_theme_template_dir_name();
 
-	$file_paths = array(
-		1   => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10  => trailingslashit( get_template_directory() ) . $template_dir,
-		100 => wpinv_get_templates_dir(),
-	);
+    $file_paths = array(
+        1   => trailingslashit( get_stylesheet_directory() ) . $template_dir,
+        10  => trailingslashit( get_template_directory() ) . $template_dir,
+        100 => wpinv_get_templates_dir(),
+    );
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+    $file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
 
-	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+    // sort the file paths based on priority
+    ksort( $file_paths, SORT_NUMERIC );
 
-	return array_map( 'trailingslashit', $file_paths );
+    return array_map( 'trailingslashit', $file_paths );
 }
 
 function wpinv_checkout_meta_tags() {
 
-	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+    $pages   = array();
+    $pages[] = wpinv_get_option( 'success_page' );
+    $pages[] = wpinv_get_option( 'failure_page' );
+    $pages[] = wpinv_get_option( 'invoice_history_page' );
+    $pages[] = wpinv_get_option( 'invoice_subscription_page' );
 
-	if ( ! wpinv_is_checkout() && ! is_page( $pages ) ) {
-		return;
-	}
+    if ( ! wpinv_is_checkout() && ! is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if ( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if ( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if ( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if ( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if ( wpinv_is_subscriptions_history_page() ) {
-		$classes[] = 'wpinv-subscription';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_subscriptions_history_page() ) {
+        $classes[] = 'wpinv-subscription';
+        $classes[] = 'wpinv-page';
+    }
 
-	if ( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    if ( wpinv_is_test_mode() ) {
+        $classes[] = 'wpinv-test-mode';
+        $classes[] = 'wpinv-page';
+    }
 
-	return array_unique( $classes );
+    return array_unique( $classes );
 }
 add_filter( 'body_class', 'wpinv_add_body_classes' );
 
@@ -467,16 +467,16 @@ 
 
     wpinv_html_select(
         array(
-			'name'             => $args['name'],
-			'selected'         => $args['selected'],
-			'id'               => $args['id'],
-			'class'            => $args['class'],
-			'options'          => $options,
-			'multiple'         => $args['multiple'],
-			'placeholder'      => $args['placeholder'],
-			'show_option_all'  => $args['show_option_all'],
-			'show_option_none' => $args['show_option_none'],
-			'data'             => $args['data'],
+            'name'             => $args['name'],
+            'selected'         => $args['selected'],
+            'id'               => $args['id'],
+            'class'            => $args['class'],
+            'options'          => $options,
+            'multiple'         => $args['multiple'],
+            'placeholder'      => $args['placeholder'],
+            'show_option_all'  => $args['show_option_all'],
+            'show_option_none' => $args['show_option_none'],
+            'data'             => $args['data'],
         )
     );
 
@@ -776,21 +776,21 @@ 
 
     $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
 
-	// Remove unavailable tags.
+    // Remove unavailable tags.
     $formatted_address = preg_replace( '/\{\{\w+\}\}/', '', $formatted_address );
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
+    $formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
     $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
 
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+    $formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+    $formatted_address = implode( $separator, $formatted_address );
 
-	// We're done!
-	return $formatted_address;
+    // We're done!
+    return $formatted_address;
 
 }
 
@@ -836,7 +836,7 @@ 
 function getpaid_display_invoice_subscriptions( $invoice ) {
 
     // Subscriptions.
-	$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+    $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
 
     if ( empty( $subscriptions ) || ! $invoice->is_recurring() ) {
         return;
@@ -1052,7 +1052,7 @@ 
 }
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+    return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
 }
 
 /**
@@ -1250,9 +1250,9 @@ 
 
     if ( 0 == count( $form->get_items() ) ) {
         aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No published items found', 'invoicing' ),
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No published items found', 'invoicing' ),
             ),
             true
         );
@@ -1275,10 +1275,10 @@ 
     $invoice = wpinv_get_invoice( $invoice_id );
 
     if ( empty( $invoice ) ) {
-		aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice not found', 'invoicing' ),
+        aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice not found', 'invoicing' ),
             ),
             true
         );
@@ -1286,10 +1286,10 @@ 
     }
 
     if ( $invoice->is_paid() ) {
-		aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice has already been paid', 'invoicing' ),
+        aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice has already been paid', 'invoicing' ),
             ),
             true
         );
@@ -1354,7 +1354,7 @@ 
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-form='$form'>$label</button>";
     }
 
-	if ( ! empty( $items ) ) {
+    if ( ! empty( $items ) ) {
         $items  = esc_attr( $items );
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-item='$items'>$label</button>";
     }
@@ -1554,21 +1554,21 @@ 
 
         return aui()->select(
             array(
-				'options'          => $states,
-				'name'             => esc_attr( $field_name ),
-				'id'               => sanitize_html_class( $field_name ) . $uniqid,
-				'value'            => sanitize_text_field( $state ),
-				'placeholder'      => $placeholder,
-				'required'         => $required,
-				'label'            => wp_kses_post( $label ),
-				'label_type'       => 'vertical',
-				'help_text'        => $help_text,
-				'class'            => 'getpaid-address-field wpinv_state',
-				'wrap_class'       => "$wrapper_class getpaid-address-field-wrapper__state",
-				'label_class'      => 'getpaid-address-field-label getpaid-address-field-label__state',
-				'extra_attributes' => array(
-					'autocomplete' => 'address-level1',
-				),
+                'options'          => $states,
+                'name'             => esc_attr( $field_name ),
+                'id'               => sanitize_html_class( $field_name ) . $uniqid,
+                'value'            => sanitize_text_field( $state ),
+                'placeholder'      => $placeholder,
+                'required'         => $required,
+                'label'            => wp_kses_post( $label ),
+                'label_type'       => 'vertical',
+                'help_text'        => $help_text,
+                'class'            => 'getpaid-address-field wpinv_state',
+                'wrap_class'       => "$wrapper_class getpaid-address-field-wrapper__state",
+                'label_class'      => 'getpaid-address-field-label getpaid-address-field-label__state',
+                'extra_attributes' => array(
+                    'autocomplete' => 'address-level1',
+                ),
             ),
             $echo
         );
@@ -1664,36 +1664,36 @@ 
  * @return array Array of custom fields.
  */
 function getpaid_get_payment_form_custom_fields() {
-	global $wpdb, $payment_form_meta_fields;
+    global $wpdb, $payment_form_meta_fields;
 
-	if ( ! empty( $payment_form_meta_fields ) ) {
-		return $payment_form_meta_fields;
-	}
+    if ( ! empty( $payment_form_meta_fields ) ) {
+        return $payment_form_meta_fields;
+    }
 
-	$results = $wpdb->get_results( "SELECT `pm`.`meta_value` FROM `{$wpdb->postmeta}` AS pm LEFT JOIN `{$wpdb->posts}` AS p ON p.ID = pm.post_id WHERE `pm`.`meta_key` = 'wpinv_form_elements' AND `p`.`post_type` = 'wpi_payment_form'" );
+    $results = $wpdb->get_results( "SELECT `pm`.`meta_value` FROM `{$wpdb->postmeta}` AS pm LEFT JOIN `{$wpdb->posts}` AS p ON p.ID = pm.post_id WHERE `pm`.`meta_key` = 'wpinv_form_elements' AND `p`.`post_type` = 'wpi_payment_form'" );
 
-	$meta_fields = array();
+    $meta_fields = array();
 
-	if ( ! empty( $results ) ) {
-		foreach ( $results as $row ) {
-			$fields = maybe_unserialize( $row->meta_value );
+    if ( ! empty( $results ) ) {
+        foreach ( $results as $row ) {
+            $fields = maybe_unserialize( $row->meta_value );
 
-			if ( ! empty( $fields ) && is_array( $fields ) ) {
-				foreach ( $fields as $field ) {
-					$label = ! empty( $field['add_meta'] ) && ! empty( $field['label'] ) ? wpinv_clean( wp_unslash( $field['label'] ) ) : '';
+            if ( ! empty( $fields ) && is_array( $fields ) ) {
+                foreach ( $fields as $field ) {
+                    $label = ! empty( $field['add_meta'] ) && ! empty( $field['label'] ) ? wpinv_clean( wp_unslash( $field['label'] ) ) : '';
 
-					if ( $label ) {
-						$field_key = '_' . str_replace( array( ' ', "'", '"', ',' ), array( '_', '', '', '_' ), getpaid_strtolower( $label ) );
-						$meta_fields[ $field_key ] = $label;
-					}
-				}
-			}
-		}
-	}
+                    if ( $label ) {
+                        $field_key = '_' . str_replace( array( ' ', "'", '"', ',' ), array( '_', '', '', '_' ), getpaid_strtolower( $label ) );
+                        $meta_fields[ $field_key ] = $label;
+                    }
+                }
+            }
+        }
+    }
 
-	$payment_form_meta_fields = $meta_fields;
+    $payment_form_meta_fields = $meta_fields;
 
-	return $meta_fields;
+    return $meta_fields;
 }
 
 /**
@@ -1704,22 +1704,22 @@ 
  * @return bool True if site uses Gutenberg else False.
  */
 function getpaid_is_gutenberg() {
-	global $wp_version;
+    global $wp_version;
 
-	$is_gutenberg = true;
+    $is_gutenberg = true;
 
-	// If less than v5.
-	if ( version_compare( $wp_version, '5.0.0', '<' ) ) {
-		$is_gutenberg = false;
-	}
+    // If less than v5.
+    if ( version_compare( $wp_version, '5.0.0', '<' ) ) {
+        $is_gutenberg = false;
+    }
 
-	if ( class_exists( 'Classic_Editor' ) ) {
-		$is_gutenberg = false; // Classic Editor plugin is active.
-	} else if ( getpaid_is_classicpress() ) {
-		$is_gutenberg = false; // Site is using ClassicPress.
-	}
+    if ( class_exists( 'Classic_Editor' ) ) {
+        $is_gutenberg = false; // Classic Editor plugin is active.
+    } else if ( getpaid_is_classicpress() ) {
+        $is_gutenberg = false; // Site is using ClassicPress.
+    }
 
-	return $is_gutenberg;
+    return $is_gutenberg;
 }
 
 /**
@@ -1730,13 +1730,13 @@ 
  * @return bool True if site uses ClassicPress else False.
  */
 function getpaid_is_classicpress() {
-	if ( function_exists( 'classicpress_version' ) ) {
-		$is_classicpress = true;
-	} else {
-		$is_classicpress = false;
-	}
+    if ( function_exists( 'classicpress_version' ) ) {
+        $is_classicpress = true;
+    } else {
+        $is_classicpress = false;
+    }
 
-	return $is_classicpress;
+    return $is_classicpress;
 }
 
 /**
@@ -1748,20 +1748,20 @@ 
  * @param @bool $blocks True to use blocks.
  * @return string Page content.
  */
- function getpaid_page_content_checkout( $filtered = false, $blocks = false ) {
-	if ( $blocks ) {
-		$content = "<!-- wp:invoicing/wpinv-checkout-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_checkout title='' ]\"} -->
+    function getpaid_page_content_checkout( $filtered = false, $blocks = false ) {
+    if ( $blocks ) {
+        $content = "<!-- wp:invoicing/wpinv-checkout-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_checkout title='' ]\"} -->
 <div class=\"wp-block-invoicing-wpinv-checkout-widget\"></div>
 <!-- /wp:invoicing/wpinv-checkout-widget -->";
-	} else {
-		$content = "[wpinv_checkout]";
-	}
+    } else {
+        $content = "[wpinv_checkout]";
+    }
 
-	if ( $filtered ) {
-		$content = apply_filters( 'getpaid_page_default_content_checkout', $content, $blocks );
-	}
+    if ( $filtered ) {
+        $content = apply_filters( 'getpaid_page_default_content_checkout', $content, $blocks );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -1773,20 +1773,20 @@ 
  * @param @bool $blocks True to use blocks.
  * @return string Page content.
  */
- function getpaid_page_content_invoice_history( $filtered = false, $blocks = false ) {
-	if ( $blocks ) {
-		$content = "<!-- wp:invoicing/wpinv-history-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_history title='' ]\"} -->
+    function getpaid_page_content_invoice_history( $filtered = false, $blocks = false ) {
+    if ( $blocks ) {
+        $content = "<!-- wp:invoicing/wpinv-history-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_history title='' ]\"} -->
 <div class=\"wp-block-invoicing-wpinv-history-widget\"></div>
 <!-- /wp:invoicing/wpinv-history-widget -->";
-	} else {
-		$content = "[wpinv_history]";
-	}
+    } else {
+        $content = "[wpinv_history]";
+    }
 
-	if ( $filtered ) {
-		$content = apply_filters( 'getpaid_page_default_content_invoice_history', $content, $blocks );
-	}
+    if ( $filtered ) {
+        $content = apply_filters( 'getpaid_page_default_content_invoice_history', $content, $blocks );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -1798,20 +1798,20 @@ 
  * @param @bool $blocks True to use blocks.
  * @return string Page content.
  */
- function getpaid_page_content_receipt( $filtered = false, $blocks = false ) {
-	if ( $blocks ) {
-		$content = "<!-- wp:invoicing/wpinv-receipt-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_receipt title='' ]\"} -->
+    function getpaid_page_content_receipt( $filtered = false, $blocks = false ) {
+    if ( $blocks ) {
+        $content = "<!-- wp:invoicing/wpinv-receipt-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_receipt title='' ]\"} -->
 <div class=\"wp-block-invoicing-wpinv-receipt-widget\"></div>
 <!-- /wp:invoicing/wpinv-receipt-widget -->";
-	} else {
-		$content = "[wpinv_receipt]";
-	}
+    } else {
+        $content = "[wpinv_receipt]";
+    }
 
-	if ( $filtered ) {
-		$content = apply_filters( 'getpaid_page_default_content_receipt', $content, $blocks );
-	}
+    if ( $filtered ) {
+        $content = apply_filters( 'getpaid_page_default_content_receipt', $content, $blocks );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -1823,20 +1823,20 @@ 
  * @param @bool $blocks True to use blocks.
  * @return string Page content.
  */
- function getpaid_page_content_failure( $filtered = false, $blocks = false ) {
-	if ( $blocks ) {
-		$content = "<!-- wp:html -->
+    function getpaid_page_content_failure( $filtered = false, $blocks = false ) {
+    if ( $blocks ) {
+        $content = "<!-- wp:html -->
 " . __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ) . "
 <!-- /wp:html -->";
-	} else {
-		$content = __( 'Your transaction failed, please try again or contact site support.', 'invoicing' );
-	}
+    } else {
+        $content = __( 'Your transaction failed, please try again or contact site support.', 'invoicing' );
+    }
 
-	if ( $filtered ) {
-		$content = apply_filters( 'getpaid_page_default_content_failure', $content, $blocks );
-	}
+    if ( $filtered ) {
+        $content = apply_filters( 'getpaid_page_default_content_failure', $content, $blocks );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -1848,20 +1848,20 @@ 
  * @param @bool $blocks True to use blocks.
  * @return string Page content.
  */
- function getpaid_page_content_subscriptions( $filtered = false, $blocks = false ) {
-	if ( $blocks ) {
-		$content = "<!-- wp:invoicing/wpinv-subscriptions-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_subscriptions title='' ]\"} -->
+    function getpaid_page_content_subscriptions( $filtered = false, $blocks = false ) {
+    if ( $blocks ) {
+        $content = "<!-- wp:invoicing/wpinv-subscriptions-widget {\"content\":\"\",\"sd_shortcode\":\"[wpinv_subscriptions title='' ]\"} -->
 <div class=\"wp-block-invoicing-wpinv-subscriptions-widget\"></div>
 <!-- /wp:invoicing/wpinv-subscriptions-widget -->";
-	} else {
-		$content = "[wpinv_subscriptions]";
-	}
+    } else {
+        $content = "[wpinv_subscriptions]";
+    }
 
-	if ( $filtered ) {
-		$content = apply_filters( 'getpaid_page_default_content_subscriptions', $content, $blocks );
-	}
+    if ( $filtered ) {
+        $content = apply_filters( 'getpaid_page_default_content_subscriptions', $content, $blocks );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -1874,21 +1874,21 @@ 
  * @return array Returns options array.
  */
 function getpaid_parse_field_options( $options, $translated = true ) {
-	$orig_options = $options;
+    $orig_options = $options;
 
-	$options = array();
+    $options = array();
 
-	if ( ! empty( $orig_options ) ) {
-		foreach ( $orig_options as $key => $value ) {
-			if ( $value && is_string( $value ) ) {
-				$label = $translated ? __( wp_unslash( $value ), 'invoicing' ) : $value;
-			} else {
-				$label = $value;
-			}
+    if ( ! empty( $orig_options ) ) {
+        foreach ( $orig_options as $key => $value ) {
+            if ( $value && is_string( $value ) ) {
+                $label = $translated ? __( wp_unslash( $value ), 'invoicing' ) : $value;
+            } else {
+                $label = $value;
+            }
 
-			$options[ $value ] = $label;
-		}
-	}
+            $options[ $value ] = $label;
+        }
+    }
 
-	return apply_filters( 'getpaid_parse_field_options', $options, $orig_options, $translated );
+    return apply_filters( 'getpaid_parse_field_options', $options, $orig_options, $translated );
 }

includes/wpinv-helper-functions.php

Indentation +75 added lines, -75 removed lines

@@ -137,13 +137,13 @@ 
  */
 function wpinv_get_invoice_statuses( $draft = false, $trashed = false, $invoice = false ) {
 
-	$invoice_statuses = array(
-		'wpi-pending'    => _x( 'Pending payment', 'Invoice status', 'invoicing' ),
+    $invoice_statuses = array(
+        'wpi-pending'    => _x( 'Pending payment', 'Invoice status', 'invoicing' ),
         'publish'        => _x( 'Paid', 'Invoice status', 'invoicing' ),
         'wpi-processing' => _x( 'Processing', 'Invoice status', 'invoicing' ),
-		'wpi-onhold'     => _x( 'On hold', 'Invoice status', 'invoicing' ),
-		'wpi-cancelled'  => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-		'wpi-refunded'   => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'wpi-onhold'     => _x( 'On hold', 'Invoice status', 'invoicing' ),
+        'wpi-cancelled'  => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'wpi-refunded'   => _x( 'Refunded', 'Invoice status', 'invoicing' ),
         'wpi-failed'     => _x( 'Failed', 'Invoice status', 'invoicing' ),
         'wpi-renewal'    => _x( 'Renewal Payment', 'Invoice status', 'invoicing' ),
     );
@@ -160,7 +160,7 @@ 
         $invoice = $invoice->get_post_type();
     }
 
-	return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
+    return apply_filters( 'wpinv_statuses', $invoice_statuses, $invoice );
 }
 
 /**
@@ -278,25 +278,25 @@ 
  * @return string
  */
 function getpaid_get_price_format() {
-	$currency_pos = wpinv_currency_position();
-	$format       = '%1$s%2$s';
-
-	switch ( $currency_pos ) {
-		case 'left':
-			$format = '%1$s%2$s';
-			break;
-		case 'right':
-			$format = '%2$s%1$s';
-			break;
-		case 'left_space':
-			$format = '%1$s %2$s';
-			break;
-		case 'right_space':
-			$format = '%2$s %1$s';
-			break;
-	}
-
-	return apply_filters( 'getpaid_price_format', $format, $currency_pos );
+    $currency_pos = wpinv_currency_position();
+    $format       = '%1$s%2$s';
+
+    switch ( $currency_pos ) {
+        case 'left':
+            $format = '%1$s%2$s';
+            break;
+        case 'right':
+            $format = '%2$s%1$s';
+            break;
+        case 'left_space':
+            $format = '%1$s %2$s';
+            break;
+        case 'right_space':
+            $format = '%2$s %1$s';
+            break;
+    }
+
+    return apply_filters( 'getpaid_price_format', $format, $currency_pos );
 }
 
 /**
@@ -402,13 +402,13 @@ 
  * @param mixed  $value Value.
  */
 function getpaid_maybe_define_constant( $name, $value ) {
-	if ( ! defined( $name ) ) {
-		define( $name, $value );
-	}
+    if ( ! defined( $name ) ) {
+        define( $name, $value );
+    }
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -719,16 +719,16 @@ 
     return wp_kses(
         html_entity_decode( $var ),
         array(
-			'br'     => array(),
-			'em'     => array(),
-			'strong' => array(),
-			'b'      => array(),
-			'small'  => array(),
-			'span'   => array(),
-			'ul'     => array(),
-			'li'     => array(),
-			'ol'     => array(),
-			'p'      => array(),
+            'br'     => array(),
+            'em'     => array(),
+            'strong' => array(),
+            'b'      => array(),
+            'small'  => array(),
+            'span'   => array(),
+            'ul'     => array(),
+            'li'     => array(),
+            'ol'     => array(),
+            'p'      => array(),
         )
     );
 }
@@ -779,11 +779,11 @@ 
         $list = array();
     }
 
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
 
 /**
@@ -824,17 +824,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
 
     return is_string( $var ) ? sanitize_text_field( stripslashes( $var ) ) : $var;
 }
@@ -847,7 +847,7 @@ 
  */
 function getpaid_convert_price_string_to_options( $str, $translated = true ) {
 
-	$raw_options = array_map( 'trim', explode( ',', $str ) );
+    $raw_options = array_map( 'trim', explode( ',', $str ) );
     $options     = array();
 
     foreach ( $raw_options as $option ) {
@@ -936,7 +936,7 @@ 
  * @return string
  */
 function getpaid_date_format() {
-	return apply_filters( 'getpaid_date_format', get_option( 'date_format' ) );
+    return apply_filters( 'getpaid_date_format', get_option( 'date_format' ) );
 }
 
 /**
@@ -945,7 +945,7 @@ 
  * @return string
  */
 function getpaid_time_format() {
-	return apply_filters( 'getpaid_time_format', get_option( 'time_format' ) );
+    return apply_filters( 'getpaid_time_format', get_option( 'time_format' ) );
 }
 
 /**
@@ -958,15 +958,15 @@ 
 function getpaid_limit_length( $string, $limit ) {
     $str_limit = $limit - 3;
 
-	if ( function_exists( 'mb_strimwidth' ) ) {
-		if ( mb_strlen( $string ) > $limit ) {
-			$string = mb_strimwidth( $string, 0, $str_limit ) . '...';
-		}
-	} else {
-		if ( strlen( $string ) > $limit ) {
-			$string = substr( $string, 0, $str_limit ) . '...';
-		}
-	}
+    if ( function_exists( 'mb_strimwidth' ) ) {
+        if ( mb_strlen( $string ) > $limit ) {
+            $string = mb_strimwidth( $string, 0, $str_limit ) . '...';
+        }
+    } else {
+        if ( strlen( $string ) > $limit ) {
+            $string = substr( $string, 0, $str_limit ) . '...';
+        }
+    }
     return $string;
 
 }
@@ -1096,12 +1096,12 @@ 
     $types = get_allowed_mime_types();
 
     if ( isset( $types['htm|html'] ) ) {
-		unset( $types['htm|html'] );
-	}
+        unset( $types['htm|html'] );
+    }
 
     if ( isset( $types['js'] ) ) {
-		unset( $types['js'] );
-	}
+        unset( $types['js'] );
+    }
 
     return $types;
 
@@ -1157,11 +1157,11 @@ 
  * @return string Returns converted string.
  */
 function getpaid_strtolower( $string, $charset = 'UTF-8' ) {
-	if ( function_exists( 'mb_convert_case' ) ) {
-		return mb_convert_case( $string, MB_CASE_LOWER, $charset );
-	} else {
-		return strtolower( $string );
-	}
+    if ( function_exists( 'mb_convert_case' ) ) {
+        return mb_convert_case( $string, MB_CASE_LOWER, $charset );
+    } else {
+        return strtolower( $string );
+    }
 }
 
 /**
@@ -1174,9 +1174,9 @@ 
  * @return string Returns converted string.
  */
 function getpaid_strtoupper( $string, $charset = 'UTF-8' ) {
-	if ( function_exists( 'mb_convert_case' ) ) {
-		return mb_convert_case( $string, MB_CASE_UPPER, $charset );
-	} else {
-		return strtoupper( $string );
-	}
+    if ( function_exists( 'mb_convert_case' ) ) {
+        return mb_convert_case( $string, MB_CASE_UPPER, $charset );
+    } else {
+        return strtoupper( $string );
+    }
 }
\ No newline at end of file

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

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    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.41";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.2.41";
+    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' );
-	}
+    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();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }

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

Indentation +2346 added lines, -2346 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,472 +21,472 @@ 
  */
 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 version version.
-		 *
-		 * @var string
-		 */
-		public $version = '0.2.41';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'aui';
-
-		/**
-		 * Latest version of Bootstrap at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.2.2";
-
-		/**
-		 * Current version of select2 being used.
-		 *
-		 * @var string
-		 */
-		public $select2_version = "4.0.11";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'AyeCode UI';
-
-		/**
-		 * The relative url to the assets.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		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;
-
-
-		/**
-		 * Main AyeCode_UI_Settings Instance.
-		 *
-		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return AyeCode_UI_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
-
-				self::$instance = new AyeCode_UI_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				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' ) );
-
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
-					}
-				}
+    /**
+     * 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 version version.
+         *
+         * @var string
+         */
+        public $version = '0.2.41';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'aui';
+
+        /**
+         * Latest version of Bootstrap at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.2.2";
+
+        /**
+         * Current version of select2 being used.
+         *
+         * @var string
+         */
+        public $select2_version = "4.0.11";
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'AyeCode UI';
 
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
+        /**
+         * The relative url to the assets.
+         *
+         * @var string
+         */
+        public $url = '';
 
-			return self::$instance;
-		}
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
 
-		/**
-		 * Add custom colors to the color selector.
-		 *
-		 * @param $theme_colors
-		 * @param $include_outlines
-		 * @param $include_branding
-		 *
-		 * @return mixed
-		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+        /**
+         * AyeCode_UI_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_UI_Settings There can be only one!
+         */
+        private static $instance = null;
 
 
-			$setting = wp_get_global_settings();
+        /**
+         * Main AyeCode_UI_Settings Instance.
+         *
+         * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return AyeCode_UI_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
-					$theme_colors[$color['slug']] = esc_attr($color['name']);
-				}
-			}
-
-			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,
-			);
-		}
-
-		/**
-		 * 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';
-
-			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';
-
-			return $classes;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 */
-		public function init() {
+                self::$instance = new AyeCode_UI_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' ) );
+
+                    // 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 );
+                    }
+                }
+
+                add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+
+                do_action( 'ayecode_ui_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Add custom colors to the color selector.
+         *
+         * @param $theme_colors
+         * @param $include_outlines
+         * @param $include_branding
+         *
+         * @return mixed
+         */
+        public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+
+
+            $setting = wp_get_global_settings();
+
+            if(!empty($setting['color']['palette']['custom'])){
+                foreach($setting['color']['palette']['custom'] as $color){
+                    $theme_colors[$color['slug']] = esc_attr($color['name']);
+                }
+            }
+
+            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,
+            );
+        }
+
+        /**
+         * 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';
+
+            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';
+
+            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"));
-				}
-			}
+            // 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();
+            $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;
+            $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' ) );
-			}
-
-		}
-
-		/**
-		 * 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>';
-		}
-
-		/**
-		 * 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;
-		}
-
-		/**
-		 * 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>";
-		}
-
-		/**
-		 * Check if the current admin screen should load scripts.
-		 *
-		 * @return bool
-		 */
-		public function is_aui_screen(){
+                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>';
+        }
+
+        /**
+         * 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;
+        }
+
+        /**
+         * 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>";
+        }
+
+        /**
+         * 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',
+            $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 );
+                    '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();
+                $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;
-				}
+                // 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;
-				}
-			}
+                //load for widget previews in WP 5.8
+                if( !empty($_REQUEST['legacy-widget-preview'])){
+                    $load = true;
+                }
+            }
 
 
 
-			return apply_filters( 'aui_load_on_admin' , $load );
-		}
+            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;
-			}
+        /**
+         * 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;
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		/**
-		 * Adds the styles.
-		 */
-		public function enqueue_style() {
+        /**
+         * Adds the styles.
+         */
+        public function enqueue_style() {
             global $aui_bs5;
 
             $load_fse = false;
 
-			if ( is_admin() && ! $this->is_aui_screen() ) {
-				// Don't add wp-admin scripts if not requested to.
-			} else {
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+            if ( is_admin() && ! $this->is_aui_screen() ) {
+                // Don't add wp-admin scripts if not requested to.
+            } else {
+                $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+                $rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
                 $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if ( $this->settings[ $css_setting ] ) {
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+                if ( $this->settings[ $css_setting ] ) {
+                    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+                    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+                    wp_register_style( 'ayecode-ui', $url, array(), $this->version );
+                    wp_enqueue_style( 'ayecode-ui' );
 
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
-						$load_fse = true;
-					}
+                    if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                        $url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
+                        wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
+                        wp_enqueue_style( 'ayecode-ui-fse' );
+                        $load_fse = true;
+                    }
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+                    // flatpickr
+                    wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+                    // fix some wp-admin issues
+                    if(is_admin()){
+                        $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -526,63 +526,63 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+                        // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+                        $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
-
-					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
-					}
-				}
-			}
-		}
-
-		/**
-		 * 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();
+                        wp_add_inline_style( 'ayecode-ui', $custom_css );
+                    }
 
-			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+                    // custom changes
+                    if ( $load_fse ) {
+                        wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
+                    }else{
+                        wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+                    }
+                }
             }
+        }
 
-			$output = ob_get_clean();
+        /**
+         * 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' );
+            }
+
+            $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) );
-		}
-
-
-		/**
-		 * 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();
-			?>
+            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>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
                 /* With Avada builder */
@@ -590,20 +590,20 @@ 
 				<?php } ?>
             </script>
 			<?php
-			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();
-			?>
+            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();
+            ?>
             <script>
                 // run on doc ready
                 jQuery(document).ready(function () {
@@ -611,127 +611,127 @@ 
                 });
             </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 );
-		}
-
-		/**
-		 * 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 );
-				}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-				// 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() );
+        /**
+         * 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';
 
-				$load_inline = false;
+                $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				// Load select2 only when required.
-				if ( $this->force_load_select2() ) {
-					$dependency = array( 'select2', 'jquery' );
-				} else {
-					$dependency = array( 'jquery' );
-				}
+                // select2
+                wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
 
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
-
-					// If in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
+                // flatpickr
+                wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
 
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', $dependency );
-					wp_enqueue_script( 'bootstrap-dummy' );
+                // 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 );
+                }
 
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-		}
-
-		/**
-		 * Enqueue select2 if called.
-		 *
-		 * @since 0.2.29
-		 */
-		public function force_load_select2() {
-			global $aui_select2_enqueued;
-
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
-
-			if ( $conditional_select2 !== true ) {
-				return true;
-			}
-
-			$load = is_admin() && ! $aui_select2_enqueued;
-
-			return apply_filters( 'aui_force_load_select2', $load );
-		}
-
-		/**
-		 * Enqueue select2 if called.
-		 *
-		 * @since 0.2.29
-		 */
-		public function enqueue_select2() {
-			wp_enqueue_script( 'select2' );
-		}
-
-		/**
-		 * Enqueue flatpickr if called.
-		 */
-		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' );
-		}
+                // Bootstrap file browser
+                wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+                wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+
+                $load_inline = false;
+
+                // Load select2 only when required.
+                if ( $this->force_load_select2() ) {
+                    $dependency = array( 'select2', 'jquery' );
+                } else {
+                    $dependency = array( 'jquery' );
+                }
+
+                if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+                    // Bootstrap bundle
+                    $url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
+                    wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
+
+                    // If in admin then add to footer for compatibility.
+                    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+                } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+                    $url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
+                    wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
+                    wp_enqueue_script( 'bootstrap-js-popper' );
+                    $load_inline = true;
+                } else {
+                    $load_inline = true;
+                }
+
+                // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+                if ( $load_inline ) {
+                    wp_register_script( 'bootstrap-dummy', '', $dependency );
+                    wp_enqueue_script( 'bootstrap-dummy' );
+
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-dummy', $script );
+                }
+            }
+        }
+
+        /**
+         * Enqueue select2 if called.
+         *
+         * @since 0.2.29
+         */
+        public function force_load_select2() {
+            global $aui_select2_enqueued;
+
+            $conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+
+            if ( $conditional_select2 !== true ) {
+                return true;
+            }
+
+            $load = is_admin() && ! $aui_select2_enqueued;
+
+            return apply_filters( 'aui_force_load_select2', $load );
+        }
+
+        /**
+         * Enqueue select2 if called.
+         *
+         * @since 0.2.29
+         */
+        public function enqueue_select2() {
+            wp_enqueue_script( 'select2' );
+        }
+
+        /**
+         * Enqueue flatpickr if called.
+         */
+        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' );
+        }
 
         /**
          * Get the url path to the current folder.
@@ -766,173 +766,173 @@ 
             return trailingslashit($url);
         }
 
-		/**
-		 * Get the url path to the current folder.
-		 * @todo remove
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$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());
-
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		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'
-			) );
-		}
-
-		/**
-		 * 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
-			);
-		}
-
-		/**
+        /**
+         * Get the url path to the current folder.
+         * @todo remove
+         * @return string
+         */
+        public function get_url_old() {
+
+            $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());
+
+            if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        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'
+            ) );
+        }
+
+        /**
+         * 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
+            );
+        }
+
+        /**
          * Get the date the site was installed.
          *
-		 * @return false|string
-		 */
+         * @return false|string
+         */
         public function get_site_install_date() {
-	        global $wpdb; // This gives you access to the WordPress database object
+            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>';
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-			$db_settings = get_option( 'ayecode-ui-settings' );
-
-			// Maybe show default version notice
-			if ( empty( $db_settings ) ) {
-				$site_install_date = new DateTime( self::get_site_install_date() );
-				$switch_over_date = new DateTime( "2024-02-01" );
-
-				if ( $site_install_date < $switch_over_date ) {
-					add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
-				}
-			}
-
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
+        /**
+         * 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>';
+        }
 
-			/**
-			 * 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
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+            $db_settings = get_option( 'ayecode-ui-settings' );
+
+            // Maybe show default version notice
+            if ( empty( $db_settings ) ) {
+                $site_install_date = new DateTime( self::get_site_install_date() );
+                $switch_over_date = new DateTime( "2024-02-01" );
+
+                if ( $site_install_date < $switch_over_date ) {
+                    add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+                }
+            }
+
+            $js_default = 'core-popper';
+            $js_default_backend = $js_default;
+
+            // maybe set defaults (if no settings set)
+            if(empty($db_settings)){
+                $active_theme = strtolower( get_template() ); // active parent theme.
+                $theme_js_settings = self::theme_js_settings();
+                if(isset($theme_js_settings[$active_theme])){
+                    $js_default = $theme_js_settings[$active_theme];
+                    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+                }
+            }
+
+            /**
+             * 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 );
+            ), $db_settings );
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+            $settings = wp_parse_args( $db_settings, $defaults );
 
-			/**
-			 * Filter the Bootstrap settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
+            /**
+             * 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 );
+        }
 
 
-		/**
-		 * 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' ) );
-			}
+        /**
+         * 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() );
 
-			?>
+            ?>
             <div class="wrap">
                 <h1><?php echo esc_attr( $this->name ); ?></h1>
                 <p><?php echo esc_html( apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) ) );?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+                    settings_fields( 'ayecode-ui-settings' );
+                    do_settings_sections( 'ayecode-ui-settings' );
+                    ?>
 
                     <h2><?php esc_html_e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
                     <p><?php echo esc_html( apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) ) );?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
-		                echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			                'type'=> 'info',
-			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
-		                ));
-	                }
-	                ?>
+                    if ( ! empty( $overrides ) ) {
+                        echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                            'type'=> 'info',
+                            'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+                        ));
+                    }
+                    ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
@@ -1016,77 +1016,77 @@ 
                     </table>
 
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
                 </form>
                 <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo esc_html( $this->version ); ?></div>
             </div>
 			<?php
-		}
+        }
 
         public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-	        // Find source plugin/theme of SD
-	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-		        }
-	        }
+            $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 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();
+            ?>
             <style>
                 /* Bootstrap 3 compatibility */
                 body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1115,376 +1115,376 @@ 
                 <?php } ?>
             </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, $is_fse = false ) {
-			global $aui_bs5;
+        public static function custom_css( $compatibility = true, $is_fse = false ) {
+            global $aui_bs5;
 
-			$colors = array();
+            $colors = array();
 
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-				$setting = wp_get_global_settings();
+            if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+                $setting = wp_get_global_settings();
 
-				if ( ! empty( $setting['color']['palette']['theme'] ) ) {
-					foreach ( $setting['color']['palette']['theme'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
+                if ( ! empty( $setting['color']['palette']['theme'] ) ) {
+                    foreach ( $setting['color']['palette']['theme'] as $color ) {
+                        $colors[$color['slug']] = esc_attr( $color['color'] );
+                    }
+                }
 
-				if ( ! empty( $setting['color']['palette']['custom'] ) ) {
-					foreach ( $setting['color']['palette']['custom'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
-			} else {
-				$settings = get_option( 'aui_options' );
-
-				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
-				);
-			}
-
-			ob_start();
-			?><style><?php
-			// BS v3 compat
-			if( self::is_bs3_compat() ){
-				echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			//$is_fse = false;
-			//if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-				//$is_fse = true;
-			//}
-
-			$custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
-			$custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
+                if ( ! empty( $setting['color']['palette']['custom'] ) ) {
+                    foreach ( $setting['color']['palette']['custom'] as $color ) {
+                        $colors[$color['slug']] = esc_attr( $color['color'] );
+                    }
+                }
+            } else {
+                $settings = get_option( 'aui_options' );
+
+                $colors = array(
+                    'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+                    'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+                );
+            }
+
+            ob_start();
+            ?><style><?php
+            // BS v3 compat
+            if( self::is_bs3_compat() ){
+                echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
+
+            //$is_fse = false;
+            //if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                //$is_fse = true;
+            //}
+
+            $custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
+            $custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
             $bs_custom_css = apply_filters( 'ayecode_ui_bs_custom_css', $custom_admin || $custom_front );
-			//$bs_custom_css = true; // Force true to fix any color issue.
+            //$bs_custom_css = true; // Force true to fix any color issue.
 
-			$colors_css = '';
-			if ( ! empty( $colors ) && $bs_custom_css ) {
-				$d_colors = self::get_colors(true);
+            $colors_css = '';
+            if ( ! empty( $colors ) && $bs_custom_css ) {
+                $d_colors = self::get_colors(true);
 
-				foreach ( $colors as $key => $color ) {
-					if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
-						$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
-						$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
+                foreach ( $colors as $key => $color ) {
+                    if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
+                        $var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
+                        $compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
 
-						$colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
-					}
-				}
-			}
+                        $colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
+                    }
+                }
+            }
 
-			if ( $colors_css ) {
-				echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            if ( $colors_css ) {
+                echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			// Set admin bar z-index lower when modal is open.
-			echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
+            // 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 ( is_admin() ) {
+                echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
+            }
 
-			$custom_css = '';
+            $custom_css = '';
 
-			if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
-				$css = '';
-				$theme_settings = wp_get_global_styles();
+            if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
+                $css = '';
+                $theme_settings = wp_get_global_styles();
 
-				// Font face
-				if( !empty( $theme_settings['typography']['fontFamily'] ) ){
-					$t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
-					$css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
-				}
+                // Font face
+                if( !empty( $theme_settings['typography']['fontFamily'] ) ){
+                    $t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
+                    $css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
+                }
 
-				// font size
-				if( !empty( $theme_settings['typography']['fontSize'] ) ){
-					$css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
-				}
+                // font size
+                if( !empty( $theme_settings['typography']['fontSize'] ) ){
+                    $css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
+                }
 
-				// line height
-				 if( !empty( $theme_settings['typography']['lineHeight'] ) ){
-					$css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
-				}
+                // line height
+                    if( !empty( $theme_settings['typography']['lineHeight'] ) ){
+                    $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
+                }
 
 
-				   // font weight
-				 if( !empty( $theme_settings['typography']['fontWeight'] ) ){
-					$css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
-				}
+                    // font weight
+                    if( !empty( $theme_settings['typography']['fontWeight'] ) ){
+                    $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
+                }
 
-				// Background
-				 if( !empty( $theme_settings['color']['background'] ) ){
-					$css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
-				}
+                // Background
+                    if( !empty( $theme_settings['color']['background'] ) ){
+                    $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
+                }
 
-				 // Background Gradient
-				 if( !empty( $theme_settings['color']['gradient'] ) ){
-					$css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
-				}
+                    // Background Gradient
+                    if( !empty( $theme_settings['color']['gradient'] ) ){
+                    $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                }
 
-				   // 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'] ) . ';';
-				}
+                // text color
+                if( !empty( $theme_settings['color']['text'] ) ){
+                    $css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
+                }
 
 
-				// link colors
-				if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
-					$css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
-				}
-				if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
-					$css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
-				}
+                // link colors
+                if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
+                    $css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
+                }
+                if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
+                    $css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
+                }
 
-				if($css){
-					$custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
-				}
+                if($css){
+                    $custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
+                }
 
-				$bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
+                $bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
 
-				// Headings
-				$headings_css = '';
-				if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
-					$headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
-				}
+                // Headings
+                $headings_css = '';
+                if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
+                    $headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
+                }
 
-				// heading background
-				if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
-					$headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
-				}
+                // heading background
+                if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
+                    $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
+                }
 
-				 // heading font family
-				if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
-					$headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
-				}
+                    // heading font family
+                if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
+                    $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
+                }
 
-				if( $headings_css ){
-					$custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
-				}
+                if( $headings_css ){
+                    $custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
+                }
 
-				$hs = array('h1','h2','h3','h4','h5','h6');
+                $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'] ) . ';';
-					 }
+                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']['fontSize'] ) ){
+                        $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
+                        }
 
-					  if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
-						$h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
-					 }
+                        if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
+                        $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
+                        }
 
-					 if($h_css){
-						$custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
-					 }
-				}
-			}
+                        if($h_css){
+                        $custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
+                        }
+                }
+            }
 			
-			if ( $custom_css ) {
-				echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            if ( $custom_css ) {
+                echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			// Pagination on Hello Elementor theme.
-			if ( function_exists( 'hello_elementor_setup' ) ) {
-				echo '.aui-nav-links .pagination{justify-content:inherit}';
-			}
+            // Pagination on Hello Elementor theme.
+            if ( function_exists( 'hello_elementor_setup' ) ) {
+                echo '.aui-nav-links .pagination{justify-content:inherit}';
+            }
 
             // Astra theme - when woocommerce active they add compatibility CSS which breaks select2 in modals
             if( defined('ASTRA_THEME_VERSION')){
                 echo '.woocommerce-js.modal-open .select2-container .select2-dropdown, .woocommerce-js.modal-open .select2-container .select2-search__field, .woocommerce-page.modal-open .select2-container .select2-dropdown, .woocommerce-page.modal-open .select2-container .select2-search__field{z-index: 1056;}';
             }
 
-			?></style><?php
-			$custom_css = ob_get_clean();
+            ?></style><?php
+            $custom_css = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( $custom_css ) );
-		}
-
-		/**
-		 * 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 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 ) );
-
-				$rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
-
-				return $rgb;
-			}
-
-			// Convert 3-digit hex to 6-digit hex
-			if ( strlen( $hex ) == 3 ) {
-				$hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
-			}
-
-			// 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;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		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;
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( $custom_css ) );
+        }
+
+        /**
+         * Check if we should add booststrap 3 compatibility changes.
+         *
+         * @return bool
+         */
+        public static function is_bs3_compat(){
+            return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+        }
+
+        public static function 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 ) );
+
+                $rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
+
+                return $rgb;
+            }
+
+            // Convert 3-digit hex to 6-digit hex
+            if ( strlen( $hex ) == 3 ) {
+                $hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
+            }
+
+            // 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;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        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;
-			}
+            }
 
 //            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 = '';
 
 //            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}" ]);
+            }
 
-			/**
-			 * 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' ),
-					);
-			}
+            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).'; }';
+            if ( $type === 'primary' ) {
+                $output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
+                $output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
+                $output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
 
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+                $output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
 
                 // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
 
                 // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
 
-			} else if ( $aui_bs5 ) {
-				$output .= $prefix . ' .text-' . sanitize_key( $type ) . '{color: var(--bs-' . sanitize_key( $type ) . ') !important;}';
-			}
+            } else if ( $aui_bs5 ) {
+                $output .= $prefix . ' .text-' . sanitize_key( $type ) . '{color: var(--bs-' . sanitize_key( $type ) . ') !important;}';
+            }
 
-			$output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+            $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 .= ' 
+            //  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);
@@ -1502,11 +1502,11 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
-			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
-			$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);
@@ -1524,41 +1524,41 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
             // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
-			$output .= ' 
+            $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 ) {
-				// translucent primary
-				if ( $type == 'primary' ) {
-					$output .= $prefix . ' .btn-translucent-primary{color:rgb(var(--bs-primary-rgb));}';
-					$output .= $prefix . ' .btn-translucent-primary:hover,' . $prefix . ' .btn-translucent-primary:focus,' . $prefix . ' .btn-translucent-primary.focus{background-color: rgb(var(--bs-primary-rgb));}';
-				}
+            if ( $aui_bs5 ) {
+                // translucent primary
+                if ( $type == 'primary' ) {
+                    $output .= $prefix . ' .btn-translucent-primary{color:rgb(var(--bs-primary-rgb));}';
+                    $output .= $prefix . ' .btn-translucent-primary:hover,' . $prefix . ' .btn-translucent-primary:focus,' . $prefix . ' .btn-translucent-primary.focus{background-color: rgb(var(--bs-primary-rgb));}';
+                }
 
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
+                $output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
 
 
-			if ( $is_custom ) {
+            if ( $is_custom ) {
 
 //				echo '###'.$type;exit;
 
-				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
-				}
+                // 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){
@@ -1570,853 +1570,853 @@ 
 //					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 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
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        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;
+            }
+
+//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+
+            if(!$color_code){return '';}
+
+            $rgb = self::hex_to_rgb($hex);
+
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
+
+
+
+//            echo '####'.$color_code;exit;
+
+            $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;
+        }
+
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         * @param $use_variable
+         *
+         * @return string
+         */
+        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 '';}
+            }
+
+            /**
+             * 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;} ";
+            }
+
 
-				// 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;} ";
-				}
+            $prefix = $compatibility ? ".bsui " : "";
 
-				// 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;} ";
-				}
+            // 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");
 
-				// 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;} ";
-				}
+            // 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;} ";
 
 
-			$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");
+            // dropdown's
+            $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-			// 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
+            // 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;} ";
 
-			// 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);} ";
+            return $output;
+        }
 
-			// text
-//			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        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 = '';
 
-//			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;} ";
-//			}
+            // 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;}
+            }
 
-			// 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
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
-            global $aui_bs5;
+            // 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;}
+            }
 
-			$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;
-			}
+            // 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;} ";
+            }
 
-//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+            // 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;} ";
+            }
 
-			if(!$color_code){return '';}
+            // 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;} ";
+            }
 
-            $rgb = self::hex_to_rgb($hex);
+            // 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;} ";
+            }
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
 
+            $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");
 
-//            echo '####'.$color_code;exit;
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
 
-			$type = sanitize_html_class($type);
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
-			/**
-			 * 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;} ";
-			}
+            // 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;} ";
 
-			// 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;} ";
-			}
 
+            return $output;
+        }
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+        /**
+         * Increases or decreases the brightness of a color by a percentage of the current brightness.
+         *
+         * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
+         * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
+         *
+         * @return  string
+         */
+        public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+            $hexCode = ltrim($hexCode, '#');
 
-			$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");
+            if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
+                return $hexCode;
+            }
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            if (strlen($hexCode) == 3) {
+                $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+            }
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            $hexCode = array_map('hexdec', str_split($hexCode, 2));
 
+            foreach ($hexCode as & $color) {
+                $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+                $adjustAmount = ceil($adjustableLimit * $adjustPercent);
 
-			// 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;} ";
+                $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            }
 
-			if ( $type == 'primary' ) {
-				// dropdown's
-				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+            return '#' . implode($hexCode);
+        }
 
-				// input states
-				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+        /**
+         * 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;
+            }
+        }
 
-				// page link
-				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			}
+        /**
+         * Get developer examples.
+         *
+         * @return string
+         */
+        public function get_examples(){
+            $output = '';
 
-            // 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()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 * @param $use_variable
-		 *
-		 * @return string
-		 */
-		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 '';}
-			}
-
-			/**
-			 * 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;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		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;
-		}
-
-		/**
-		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
-		 *
-		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-		 * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-		 *
-		 * @return  string
-		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($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];
-			}
-
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-			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);
-			}
-
-			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;
-			}
-		}
-
-		/**
-		 * 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;
-		}
-
-		/**
-		 * 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 );
-		}
-
-		/**
-		 * 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();
+            // 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 );
+        }
+
+        /**
+         * 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' );
+                }
+            }
 
-			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
-			}
+            $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();
+            $month_s = array();
+            $month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            for ( $i = 1; $i <= 12; $i ++ ) {
+                $month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                $month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+            ob_start();
+        if ( 0 ) { ?><script><?php } ?>
                 {
                     weekdays: {
                         shorthand: ['<?php echo implode( "','", $day_s3 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
@@ -2455,189 +2455,189 @@ 
                 }
 				<?php if ( 0 ) { ?></script><?php } ?>
 			<?php
-			$locale = ob_get_clean();
-
-			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 );
-		}
-
-		/**
-		 * Select2 JS localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Select2 JS locale.
-		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            $locale = ob_get_clean();
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			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;
-				}
+            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 );
+        }
+
+        /**
+         * Select2 JS localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Select2 JS locale.
+         */
+        public static function select2_locale() {
+            $params = self::select2_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_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 ) );
-		}
-
-		/**
-		 * 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);
-		}
-
-		/**
-		 * 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);
-		}
-
-		/**
-		 * Get the conditional fields JavaScript.
-		 *
-		 * @return mixed
-		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+                $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);
+        }
+
+        /**
+         * 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);
+        }
+
+        /**
+         * Get the conditional fields JavaScript.
+         *
+         * @return mixed
+         */
+        public function conditional_fields_js() {
+            ob_start();
+            ?>
             <script>
                 /**
                  * Conditional Fields
@@ -3172,237 +3172,237 @@ 
 				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
             </script>
 			<?php
-			$output = ob_get_clean();
-
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
-		}
-
-		/**
-		 * Check if block editor page.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_block_editor() {
-			if ( is_admin() ) {
-				$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
-
-				if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @return bool
-		 *@since 1.1.0
-		 */
-		public static function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.18
-		 */
-		public static function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Check for Kallyas theme Zion builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_kallyas_zion_preview() {
-			$result = false;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Check for Bricks theme builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_bricks_preview() {
-			$result = false;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_preview() {
-			$preview = false;
-
-			if ( self::is_block_editor() ) {
-				return true;
-			}
-
-			if( self::is_block_content_call() ) {
-				$preview = true;
-			} elseif ( self::is_divi_preview() ) {
-				$preview = true;
-			} elseif ( self::is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( self::is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( self::is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( self::is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( self::is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( self::is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( self::is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( self::is_bricks_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-	}
-
-	global $ayecode_ui_settings;
-
-	/**
-	 * Run the class if found.
-	 */
-	$ayecode_ui_settings = AyeCode_UI_Settings::instance();
+            $output = ob_get_clean();
+
+            return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+        }
+
+        /**
+         * Check if block editor page.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_block_editor() {
+            if ( is_admin() ) {
+                $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
+
+                if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @return bool
+         *@since 1.1.0
+         */
+        public static function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @return bool
+         *@since 1.0.18
+         */
+        public static function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Check for Kallyas theme Zion builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_kallyas_zion_preview() {
+            $result = false;
+
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_bricks_preview() {
+            $result = false;
+
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_preview() {
+            $preview = false;
+
+            if ( self::is_block_editor() ) {
+                return true;
+            }
+
+            if( self::is_block_content_call() ) {
+                $preview = true;
+            } elseif ( self::is_divi_preview() ) {
+                $preview = true;
+            } elseif ( self::is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( self::is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( self::is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( self::is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( self::is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( self::is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( self::is_kallyas_zion_preview() ) {
+                $preview = true;
+            } elseif( self::is_bricks_preview() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+    }
+
+    global $ayecode_ui_settings;
+
+    /**
+     * Run the class if found.
+     */
+    $ayecode_ui_settings = AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

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

Indentation +2674 added lines, -2674 removed lines

@@ -1,148 +1,148 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.26' );
-
-	/**
-	 * 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.
-	 *
-	 * Class WP_Super_Duper
-	 * @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;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		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]);
-				}
-			}
+    define( 'SUPER_DUPER_VER', '1.2.26' );
+
+    /**
+     * 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.
+     *
+     * Class WP_Super_Duper
+     * @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;
 
-			// 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'] );
-			}
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        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();
+            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' ) );
-				}
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
 
                 // maybe load the Bricks transformer class
                 if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                    add_action( 'init', array( $this, 'load_bricks_element_class' ) );
                 }
 
-				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-				}
-			}
+                // 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;
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
 
-				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+                // maybe add elementor editor styles
+                add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
 
-				$sd_widget_scripts = true;
+                $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' ) );
-				}
+                // 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() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
-					add_thickbox();
-					add_action( 'admin_footer', 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() ) || ( function_exists( 'et_builder_d5_enabled' ) && et_builder_d5_enabled() && isset( $_GET['et_fb'] ) && '1' === $_GET['et_fb'] && et_pb_is_allowed( 'use_visual_builder' ) ) ) {
+                    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' ) );
+                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_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
 
-				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
-			}
+                // add 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 );
-		}
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
 
         /**
          * Load the Bricks conversion class if we are running Bricks.
@@ -152,163 +152,163 @@ 
                     include_once __DIR__ . '/includes/class-super-duper-bricks-element.php';
         }
 
-		/**
-		 * The register widget function
-		 * @return void
-		 */
-		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 );
-			}
+        /**
+         * The register widget function
+         * @return void
+         */
+        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 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",
+        public function register_fusion_element() {
 
-						),
-						$val['type'] );
+            $options = $this->options;
 
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
+            if ( $this->base_id ) {
 
-					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+                $params = $this->get_fusion_params();
 
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
 
-					// param_name
-					$param['param_name'] = $key;
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
 
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+                fusion_builder_map( $args );
+            }
 
-					// 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'] : '';
-					}
+        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;
 
-					// setup the param
-					$params[] = $param;
+                }
+            }
 
-				}
-			}
 
+            return $params;
+        }
 
-			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();
+            }
+        }
 
-		/**
-		 * 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();
-			}
-		}
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
 
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		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;
-			?>
+            ?>
 
 			<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>
 			<div class="sd-shortcode-right-wrap">
@@ -321,147 +321,147 @@ 
 				</div>
 			</div>
 			<?php
-			$html = ob_get_clean();
-
-			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
-				);
+            $html = ob_get_clean();
+
+            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
+                );
+
+                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();
+                }
+            } else {
+                return $html;
+            }
 
-				if ( $should_die ) {
-					wp_die();
-				}
-			} 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 ), "/" ) );
+                }
+            }
 
-		/**
-		 * 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] ) . '"' : '' ) . ' />';
+        }
 
-			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;
 
-		/**
-		 * 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();
-			}
+            $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;
+            // 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>";
-			?>
+            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.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 *
-		 *@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();
+            wp_die();
+        }
 
-			/**
-			 * 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">';
-			}
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         *
+         *@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();
+
+            /**
+             * 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">';
+            }
 
-			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
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        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>
@@ -472,21 +472,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();
-			?>
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @return mixed
+         *@since 1.0.6
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -560,29 +560,29 @@ 
 				});
 			</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
-		 * @param string $insert_shortcode_function
-		 *
-		 *@since 1.0.6
-		 *
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         *
+         *@since 1.0.6
+         *
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -710,35 +710,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                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;
 						}
@@ -1069,18 +1069,18 @@ 
 				}
 			</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();
-			?>
+        /**
+         * 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>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
@@ -1120,26 +1120,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();
-			?>
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1290,517 +1290,517 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</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;
-				}
-			}
+        /**
+         * 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;
-		}
+            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' ) );
-		}
+        /**
+         * 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' ) );
+        }
 
-		/**
-		 * 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();
-			}
+        /**
+         * 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;
-				}
-			}
+            // 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 ( 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 ) . "' ";
+                    }
+                }
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+                $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
 
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
+                $content = do_shortcode( $shortcode );
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
 
-				$content = do_shortcode( $shortcode );
+                echo $content;
+            }
+            wp_die();
+        }
 
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $_instance = $args;
 
-				echo $content;
-			}
-			wp_die();
-		}
+            $args = $this->argument_values( $args );
 
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
-
-			$args = $this->argument_values( $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;
-			}
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
 
-			if ( ! $this->is_preview() ) {
-				/**
-				 * Filters the settings for a particular widget args.
-				 *
-				 * @param array          $args      The current widget instance's settings.
-				 * @param WP_Super_Duper $widget    The current widget settings.
-				 * @param array          $_instance An array of default widget arguments.
-				 *
-				 *@since 1.0.28
-				 *
-				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
 
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
+            if ( ! $this->is_preview() ) {
+                /**
+                 * Filters the settings for a particular widget args.
+                 *
+                 * @param array          $args      The current widget instance's settings.
+                 * @param WP_Super_Duper $widget    The current widget settings.
+                 * @param array          $_instance An array of default widget arguments.
+                 *
+                 *@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 = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
 
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
-				$no_wrap = 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;
-			}
+            $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 . "}}" );
-			}
+            // 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 );
-		}
+            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>";
-		}
+        /**
+         * 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>";
+        }
 
-		/**
-		 * 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;
-				}
-			}
+        /**
+         * 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;
-		}
+            return $options;
+        }
 
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @return array
-		 *@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();
-			}
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @return array
+         *@since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
 
-			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'];
-					}
-				}
-			}
+            // set widget instance
+            $this->instance = $instance;
 
-			return $argument_values;
-		}
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
 
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @return array Set arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function set_arguments() {
-			return $this->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'];
+                    }
+                }
+            }
 
-		/**
-		 * 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();
-			}
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @return array Set arguments.
+         *@since 1.0.0
+         *
+         */
+        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();
+            }
 
-			$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 );
 
             if( !empty( $this->arguments['title']['value'] ) ){
                 $this->arguments['title']['value'] = wp_kses_post( $this->arguments['title']['value'] );
             }
 
-			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 = '' ) {
+        /**
+         * 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 = '' ) {
 
-		}
+        }
 
-		/**
-		 * 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() );
-			}
-		}
+        /**
+         * 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() );
+            }
+        }
 
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$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
-					}
-				}
-			}
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
 
-			return $show;
-		}
+            $show      = false;
+            $arguments = $this->get_arguments();
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$url = $this->url;
-
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
-
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
+            if ( ! 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
+                    }
+                }
+            }
 
-				// 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 $show;
+        }
 
-			return $url;
-		}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $url = $this->url;
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
+            if ( ! $url ) {
+                $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+                $content_url = untrailingslashit( WP_CONTENT_URL );
 
-			$url = $this->url;
+                // Replace http:// to https://.
+                if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                    $content_url = str_replace( 'http://', 'https://', $content_url );
+                }
 
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+                // 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;
+            }
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+            return $url;
+        }
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
 
+            $url = $this->url;
 
-			return $url;
-		}
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
 
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 *
-		 * @param $icon
-		 *
-		 * @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 . "'";
-			}
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
 
-			// 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 . "'}))";
-			}
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
 
-			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;
-					}
-				}
+            return $url;
+        }
 
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         *
+         * @param $icon
+         *
+         * @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 . "'";
+            }
 
-			return $arguments;
-		}
+            // 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 . "'}))";
+            }
 
-		/**
-		 * 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;
-					}
-				}
+            return $icon;
+        }
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
+        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;
+                    }
+                }
 
-				$new_tabs = array();
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+            return $arguments;
+        }
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+        /**
+         * 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;
+                    }
+                }
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+                if ( ! $has_sections ) {
+                    return $tabs;
+                }
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+                $new_tabs = array();
 
-				$tabs = $new_tabs;
-			}
+                foreach ( $tabs as $tab_key => $tab ) {
+                    $new_groups = array();
 
-			return $tabs;
-		}
+                    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+                        foreach ( $tab['groups'] as $group ) {
+                            if ( isset( $arguments[ $group ] ) ) {
+                                $new_groups[] = $group;
+                            }
+                        }
+                    }
+
+                    if ( ! empty( $new_groups ) ) {
+                        $tab['groups'] = $new_groups;
+
+                        $new_tabs[ $tab_key ] = $tab;
+                    }
+                }
+
+                $tabs = $new_tabs;
+            }
+
+            return $tabs;
+        }
 
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @return mixed
-		 *@since 1.0.9 Save numbers as numbers and not strings.
-		 * @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;
-
-			$show_advanced = $this->block_show_advanced();
-
-			ob_start();
-			?>
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @return mixed
+         *@since 1.0.9 Save numbers as numbers and not strings.
+         * @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;
+
+            $show_advanced = $this->block_show_advanced();
+
+            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('');
@@ -2300,8 +2300,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+                if($aui_bs5){
+                    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2309,8 +2309,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+                }else{
+                        ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2318,8 +2318,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;}
@@ -2503,12 +2503,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() {
 
@@ -2561,13 +2561,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;' : '';
@@ -2577,155 +2577,155 @@ 
 						},
 						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;
+                        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;
 	
-							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 = '';
-									$_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
-
-									if ( ! empty( $_default ) ) {
-										$_default = wp_slash( $_default );
-									}
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									} else if ( $args['type'] == 'checkbox' ) {
-										$type    = 'boolean';
-										$default = $_default ? 'true' : 'false';
-									} else if ( $args['type'] == 'number' ) {
-										$type    = 'number';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
-										} else {
-											$default = "'" . $_default . "'";
-										}
-									} else if ( $args['type'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = "'" . $_default . "'";
-									} else if ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = "'" . $_default . "'";
-									} else {
-										$type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
-										$default = "'" . $_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 = '';
+                                    $_default = isset( $args['default'] ) && ! is_null( $args['default'] ) ? $args['default'] : '';
+
+                                    if ( ! empty( $_default ) ) {
+                                        $_default = wp_slash( $_default );
+                                    }
+
+                                    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+                                        continue;
+                                    } else if ( $args['type'] == 'checkbox' ) {
+                                        $type    = 'boolean';
+                                        $default = $_default ? 'true' : 'false';
+                                    } else if ( $args['type'] == 'number' ) {
+                                        $type    = 'number';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                        $type = 'array';
+                                        if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                            $default = ! empty( $_default ) ? "['" . implode( "','", $_default ) . "']" : "[]";
+                                        } else {
+                                            $default = "'" . $_default . "'";
+                                        }
+                                    } else if ( $args['type'] == 'tagselect' ) {
+                                        $type    = 'array';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'multiselect' ) {
+                                        $type    = 'array';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'image_xy' ) {
+                                        $type    = 'object';
+                                        $default = "'" . $_default . "'";
+                                    } else if ( $args['type'] == 'image' ) {
+                                        $type    = 'string';
+                                        $default = "'" . $_default . "'";
+                                    } else {
+                                        $type    = ! empty( $args['hidden_type'] ) ? esc_attr( $args['hidden_type'] ) : 'string';
+                                        $default = "'" . $_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) {
 							const selectedBlock = wp.data.select('core/block-editor').getSelectedBlock();
@@ -2796,10 +2796,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');
@@ -2821,9 +2821,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' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2836,11 +2836,11 @@ 
 			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){
@@ -2932,7 +2932,7 @@ 
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    echo 'const { deviceType } = "";';
 }else{
 ?>
 /** Get device type const. */
@@ -2986,8 +2986,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' );?>'
 									};
 
@@ -3000,20 +3000,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
 										if (typeof aui_init === "function") {
@@ -3026,28 +3026,28 @@ 
 							}
 
 							<?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;
-								   }
-								?>
+                                    // 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') {
@@ -3058,10 +3058,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+                                }
+                                }
 
-								?>
+                                ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3073,17 +3073,17 @@ 
 
 
 									<?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 [
 
@@ -3107,10 +3107,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'}
 										},
@@ -3127,119 +3127,119 @@ 
 									)
 									,
 									<?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 ++;
+                                        $panel_count ++;
 
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
+                                        if($close_tab || $close_tabs){
+                                            $tab_args = array(
+                                                'tab'	=> array(
+                                                    'tabs_close' => $close_tabs,
+                                                'close' => true,
+                                                )
 
-											);
-											$this->block_tab_end( '', $tab_args );
+                                            );
+                                            $this->block_tab_end( '', $tab_args );
 //											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
+                                            $panel_count = 0;
+                                        }
 //
 
-									}
-									}else {
-									?>
+                                    }
+                                    }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';
-								?>
+                                // 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,
@@ -3247,13 +3247,13 @@ 
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // 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.
@@ -3267,16 +3267,16 @@ 
 							$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;
-							   }
-							?>
+                                // 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 );?>;
@@ -3287,10 +3287,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 							 content = '';
 
@@ -3300,7 +3300,7 @@ 
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
 //                            }
-							?>
+                            ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3333,12 +3333,12 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+                            if(!empty($this->options['block-output'])){
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
 
-							   ?>
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3348,10 +3348,10 @@ 
 							   );
 								<?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(
 								   '',
 								   {},
@@ -3360,22 +3360,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'] == ''){
-							?>
+                            }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
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -3389,43 +3389,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',
 							},
@@ -3438,8 +3438,8 @@ 
 								<?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
-								}
-								?>
+                                }
+                                ?>
 
 
 							),
@@ -3463,51 +3463,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'},
 
@@ -3520,12 +3520,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']) ); ?>'}}),
@@ -3534,93 +3534,93 @@ 
 									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;
-			}
+        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>';
-			}
+            $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'] = '';
-			}
+            // 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 && " : "";
+            // 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 ) . " && " : "";
+            // 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) : '' } )";
-				}
+            $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 : ''";
-				}
-			}
+                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';
@@ -3638,21 +3638,21 @@ 
 //
 //				$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;
-			}
-			/*
+            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'){
 							?>
@@ -3705,22 +3705,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%)',
@@ -3757,10 +3757,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+            }elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
-				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
+                $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,
@@ -3781,16 +3781,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',
@@ -3816,11 +3816,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) => (
@@ -3847,9 +3847,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++) {
@@ -3862,9 +3862,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',{},
@@ -3891,40 +3891,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
+                $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"}, ';
-				}
+                //$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, {
+                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(){
@@ -3935,8 +3935,8 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+                }
+            } elseif ( $args['type'] == 'tagselect' ) {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3971,20 +3971,20 @@ 
 //				$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, {
+            } 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 . ";
@@ -4010,39 +4010,39 @@ 
 					},
 					'" . 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.
-			}
+            } 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'] )."'),";
-			}
+            // 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;
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+            echo $device_type_require;
 
-			// icon
-			echo $icon;
-			?>
+            // 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'] ) . "',";
-			} ?>
+                echo "type: '" . addslashes( $args['type'] ) . "',";
+            } ?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
-			} ?>
+                echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -4054,1366 +4054,1366 @@ 
 			<?php } ?>
 		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
+            echo $after_elements;
+        }
 
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 *@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 ) ) {
-
-				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',";
-					}
-				}
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         *@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 ) ) {
+
+                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 ) {
+        /**
+         * 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 ) {
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
 
-					if ( is_array( $new_args ) ) { // its an element
+                    if ( is_array( $new_args ) ) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+                        if ( isset( $new_args['element'] ) ) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
+                            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, {";
+                            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 $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 ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
 
-							  //  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 );
-			}
+        /**
+         * 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 );
+            }
 
-			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();
-			}
+        /**
+         * 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 );
+            // 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;
-			}
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
 
-			ob_start();
-			if ( $output && ! $no_wrap ) {
+            ob_start();
+            if ( $output && ! $no_wrap ) {
 
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+                $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 );
+                // 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 );
+                // 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 );
+                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 );
+                    $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();
+                    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 );
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
 
-			echo $output;
-		}
+            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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-			}
+        /**
+         * 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;
+            }
 
-			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;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+        /**
+         * 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;
 
-			return $result;
-		}
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
 
-		/**
-		 * 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;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$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;
 
-		/**
-		 * 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;
-			}
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
 
-			return $preview;
-		}
+            return $result;
+        }
 
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @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'] = '';
-					}
+        /**
+         * 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;
+            }
 
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
+            return $preview;
+        }
 
-					$output = $args['before_title'] . $title . $args['after_title'];
-				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
-
-					// 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>";
-				}
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @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 {
+                    $tag 			= esc_attr( $instance['widget_title_tag'] );
+                    $allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
+                    $title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+
+                    // 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;
-		}
+            return $output;
+        }
 
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        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'] ) ) {
-					?>
+        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'];
-						}
-					?>
+                        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='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'>";
-				}
-			}
-		}
+                } 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>";
-			}
-		}
+        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() {
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        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.
-		 *
-		 * @return string $output
-		 *@since 1.0.0
-		 *
-		 */
-		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 ) );
-
-			return $output;
-		}
+        /**
+         * Convert require element.
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         *@since 1.0.0
+         *
+         */
+        public function convert_element_require( $input ) {
+            $input = str_replace( "'", '"', $input );// we only want double quotes
 
-		/**
-		 * 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 = '';
-			}
+            $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()",
+                "\"]').find('input:checked').val()"
+            ), $input ) );
 
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
+            return $output;
+        }
 
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
+        /**
+         * 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 = '';
+            }
 
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
 
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
+            // 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
-			?>
+            // 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')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="<?php echo esc_attr( $args['type'] ); ?>" value="<?php echo esc_attr( $value ); ?>">
 					<?php
 
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); if ( $multiple ) { echo "[]"; } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?> <?php checked( 1, $value, true ) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox" value="1">
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
-			// after wrapper
-			?></p><?php
-		}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
+            // after wrapper
+            ?></p><?php
+        }
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
-			}
-		}
+        public function get_widget_icon($icon = 'box-top', $title = ''){
+            if($icon=='box-top'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-right'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-bottom'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+            }elseif($icon=='box-left'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+            }
+        }
 
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
 
-			return $description;
-		}
+            return $description;
+        }
 
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-			$title = '';
-
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
-					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
-				}
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+            $title = '';
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr( $args['title'] );
-				}
-			}
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( ! empty( $args['device_type'] ) ) {
+                    $args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
+                }
 
-			return $title;
-		}
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr( $args['title'] );
+                }
+            }
 
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
+            return $title;
+        }
 
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
 
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
 
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
 
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
 
             // maybe sanitize widget title
             if(!empty($instance['title'])) {
                 $instance['title'] = wp_kses_post( $instance['title'] );
             }
 
-			return $instance;
-		}
+            return $instance;
+        }
 
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @return bool
-		 *@since 1.0.3
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @return bool
+         *@since 1.0.3
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
-		}
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
 
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
 
-			return $css;
-		}
+            return $css;
+        }
 
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Encode shortcodes tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with shortcode tags removed.
-		 *@since 1.0.28
-		 *
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&#39;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
+         *@since 1.0.28
+         *
+         */
+        public function encode_shortcodes( $content ) {
+            // Avoids existing encoded tags.
+            $trans   = array(
+                '&#91;' => '&#091;',
+                '&#93;' => '&#093;',
+                '&amp;#91;' => '&#091;',
+                '&amp;#93;' => '&#093;',
+                '&lt;' => '&0lt;',
+                '&gt;' => '&0gt;',
+                '&amp;lt;' => '&0lt;',
+                '&amp;gt;' => '&0gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '[' => '&#91;',
+                ']' => '&#93;',
+                '<' => '&lt;',
+                '>' => '&gt;',
+                '"' => '&quot;',
+                "'" => '&#39;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with decoded shortcode tags.
-		 *@since 1.0.28
-		 *
-		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
-				'&#91;' => '[',
-				'&#93;' => ']',
-				'&amp;#91;' => '[',
-				'&amp;#93;' => ']',
-				'&lt;' => '<',
-				'&gt;' => '>',
-				'&amp;lt;' => '<',
-				'&amp;gt;' => '>',
-				'&quot;' => '"',
-				'&apos;' => "'",
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'&#091;' => '&#91;',
-				'&#093;' => '&#93;',
-				'&amp;#091;' => '&#91;',
-				'&amp;#093;' => '&#93;',
-				'&0lt;' => '&lt;',
-				'&0gt;' => '&gt;',
-				'&amp;0lt;' => '&lt;',
-				'&amp;0gt;' => '&gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
-			$content = '<div class="bs-vc-rule-template d-none">';
-				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
-					$content .= '<div class="row">';
-						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
-							$content .= aui()->select(
-								array(
-									'id'          => 'bsvc_rule_BSVCINDEX',
-									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
-									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
-									'options'     => sd_visibility_rules_options(),
-									'default'     => '',
-									'value'       => '',
-									'label_type'  => '',
-									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
-									'extra_attributes' => array(
-										'data-minimum-results-for-search' => '-1'
-									)
-								)
-							);
-
-						$content .= '</div>';
-
-						if ( class_exists( 'GeoDirectory' ) ) {
-							$content .= '<div class="col-md-7 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_gd_field_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-md-5 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_field_condition_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-sm-12">';
-
-								$content .= aui()->input(
-									array(
-										'type'            => 'text',
-										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
-										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'label_type'      => '',
-										'value'           => '',
-										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
-									)
-								);
+         *@since 1.0.28
+         *
+         */
+        public function decode_shortcodes( $content ) {
+            $trans   = array(
+                '&#91;' => '[',
+                '&#93;' => ']',
+                '&amp;#91;' => '[',
+                '&amp;#93;' => ']',
+                '&lt;' => '<',
+                '&gt;' => '>',
+                '&amp;lt;' => '<',
+                '&amp;gt;' => '>',
+                '&quot;' => '"',
+                '&apos;' => "'",
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '&#091;' => '&#91;',
+                '&#093;' => '&#93;',
+                '&amp;#091;' => '&#91;',
+                '&amp;#093;' => '&#93;',
+                '&0lt;' => '&lt;',
+                '&0gt;' => '&gt;',
+                '&amp;0lt;' => '&lt;',
+                '&amp;0gt;' => '&gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-							$content .= '</div>';
-						}
+        public function block_visibility_fields( $args ) {
+            $value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+            $content = '<div class="bs-vc-rule-template d-none">';
+                $content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
+                    $content .= '<div class="row">';
+                        $content .= '<div class="col-sm-12">';
+                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+                            $content .= aui()->select(
+                                array(
+                                    'id'          => 'bsvc_rule_BSVCINDEX',
+                                    'name'        => 'bsvc_rule_BSVCINDEX',
+                                    'label'       => __( 'Rule', 'ayecode-connect' ),
+                                    'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+                                    'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
+                                    'options'     => sd_visibility_rules_options(),
+                                    'default'     => '',
+                                    'value'       => '',
+                                    'label_type'  => '',
+                                    'select2'     => false,
+                                    'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+                                    'extra_attributes' => array(
+                                        'data-minimum-results-for-search' => '-1'
+                                    )
+                                )
+                            );
+
+                        $content .= '</div>';
+
+                        if ( class_exists( 'GeoDirectory' ) ) {
+                            $content .= '<div class="col-md-7 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_BSVCINDEX',
+                                        'label'       => __( 'FIELD', 'ayecode-connect' ),
+                                        'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_gd_field_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-md-5 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'label'       => __( 'CONDITION', 'ayecode-connect' ),
+                                        'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_field_condition_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-sm-12">';
+
+                                $content .= aui()->input(
+                                    array(
+                                        'type'            => 'text',
+                                        'id'              => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'name'            => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'class'           => 'bsvc_gd_field_search form-control-sm',
+                                        'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'label_type'      => '',
+                                        'value'           => '',
+                                        'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
+                                    )
+                                );
+
+                            $content .= '</div>';
+                        }
 
                         $content .= apply_filters( 'sd_block_visibility_fields', '', $args );
 
-					$content .= '</div>';
-
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
-						$role_options = sd_user_roles_options();
-
-						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
-							$role_option_i++;
-
-							$content .= '<div class="col-sm-6">';
-							$content .= aui()->input(
-								array(
-									'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
-									'name'             => 'bsvc_user_roles_BSVCINDEX[]',
-									'type'             => 'checkbox',
-									'label'            => $role_option_name,
-									'label_type'       => 'hidden',
-									'class'            => 'bsvc_user_roles',
-									'value'            => $role_option_key,
-									'switch'           => 'md',
-									'no_wrap'          => true
-								)
-							);
-							$content .= '</div>';
-						}
-					$content .= '</div>';
-					$content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__( 'AND', 'ayecode-connect' ) . '</div></div>';
-				$content .= '</div>';
-			$content .= '</div>';
-			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
-			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
-			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output',
-					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
-					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page',
-					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part',
-					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type',
-					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message',
-					'name'            => 'bsvc_message',
-					'label'           => '',
-					'class'           => 'bsvc_message form-control-sm mb-3',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output%]=="message"',
-				)
-			);
-
-			$content .= '</div></div><div class="row"><div class="col col-12"><div class="pt-3 mt-1 border-top"></div></div><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output_n',
-					'name'        => 'bsvc_output_n',
-					'label'       => __( 'What should happen if rules NOT met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Show Block', 'ayecode-connect' ),
-					'class'       => 'bsvc_output_n form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page_n',
-					'name'            => 'bsvc_page_n',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page_n form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output_n%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part_n',
-					'name'        => 'bsvc_tmpl_part_n',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part_n form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output_n%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type_n',
-					'name'             => 'bsvc_message_type_n',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type_n form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output_n%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message_n',
-					'name'            => 'bsvc_message_n',
-					'label'           => '',
-					'class'           => 'bsvc_message_n form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output_n%]=="message"',
-				)
-			);
-
-			$content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
-
-			return $content;
-		}
+                    $content .= '</div>';
+
+                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+                        $role_options = sd_user_roles_options();
+
+                        $role_option_i = 0;
+                        foreach ( $role_options as $role_option_key => $role_option_name ) {
+                            $role_option_i++;
+
+                            $content .= '<div class="col-sm-6">';
+                            $content .= aui()->input(
+                                array(
+                                    'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
+                                    'name'             => 'bsvc_user_roles_BSVCINDEX[]',
+                                    'type'             => 'checkbox',
+                                    'label'            => $role_option_name,
+                                    'label_type'       => 'hidden',
+                                    'class'            => 'bsvc_user_roles',
+                                    'value'            => $role_option_key,
+                                    'switch'           => 'md',
+                                    'no_wrap'          => true
+                                )
+                            );
+                            $content .= '</div>';
+                        }
+                    $content .= '</div>';
+                    $content .= '<div class="bs-vc-sep-wrap text-center position-absolute top-0 mt-n3"><div class="bs-vc-sep-cond d-inline-block badge text-dark bg-gray mt-1">' . esc_html__( 'AND', 'ayecode-connect' ) . '</div></div>';
+                $content .= '</div>';
+            $content .= '</div>';
+            $content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
+            $content .= '<div class="bs-vc-rule-sets"></div>';
+            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+            $content .= '<div class="row"><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output',
+                    'name'        => 'bsvc_output',
+                    'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page',
+                    'name'            => 'bsvc_page',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part',
+                    'name'        => 'bsvc_tmpl_part',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type',
+                    'name'             => 'bsvc_message_type',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message',
+                    'name'            => 'bsvc_message',
+                    'label'           => '',
+                    'class'           => 'bsvc_message form-control-sm mb-3',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output%]=="message"',
+                )
+            );
+
+            $content .= '</div></div><div class="row"><div class="col col-12"><div class="pt-3 mt-1 border-top"></div></div><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output_n',
+                    'name'        => 'bsvc_output_n',
+                    'label'       => __( 'What should happen if rules NOT met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Show Block', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output_n form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page_n',
+                    'name'            => 'bsvc_page_n',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page_n form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output_n%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part_n',
+                    'name'        => 'bsvc_tmpl_part_n',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part_n form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output_n%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type_n',
+                    'name'             => 'bsvc_message_type_n',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type_n form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output_n%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message_n',
+                    'name'            => 'bsvc_message_n',
+                    'label'           => '',
+                    'class'           => 'bsvc_message_n form-control-sm',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output_n%]=="message"',
+                )
+            );
+
+            $content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
+
+            return $content;
+        }
 
-		/**
-		 * Handle media_buttons hook.
-		 *
-		 * @since 1.2.7
-		 */
-		public function wp_media_buttons() {
-			global $shortcode_insert_button_once;
-
-			// Fix conflicts with UpSolution Core in header template edit element.
-			if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
-				$shortcode_insert_button_once = true;
-			}
-		}
-	}
+        /**
+         * Handle media_buttons hook.
+         *
+         * @since 1.2.7
+         */
+        public function wp_media_buttons() {
+            global $shortcode_insert_button_once;
+
+            // Fix conflicts with UpSolution Core in header template edit element.
+            if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
+                $shortcode_insert_button_once = true;
+            }
+        }
+    }
 }

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

Indentation +2869 added lines, -2869 removed lines

@@ -11,21 +11,21 @@ 
  * @return mixed|void
  */
 function sd_pagenow_exclude() {
-	return apply_filters(
-		'sd_pagenow_exclude',
-		array(
-			'upload.php',
-			'edit-comments.php',
-			'edit-tags.php',
-			'index.php',
-			'media-new.php',
-			'options-discussion.php',
-			'options-writing.php',
-			'edit.php',
-			'themes.php',
-			'users.php',
-		)
-	);
+    return apply_filters(
+        'sd_pagenow_exclude',
+        array(
+            'upload.php',
+            'edit-comments.php',
+            'edit-tags.php',
+            'index.php',
+            'media-new.php',
+            'options-discussion.php',
+            'options-writing.php',
+            'edit.php',
+            'themes.php',
+            'users.php',
+        )
+    );
 }
 
 
@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+    return apply_filters( 'sd_widget_exclude', array() );
 }
 
 
@@ -50,83 +50,83 @@ 
  * @return array
  */
 function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
-	global $aui_bs5;
-	$options = array(
-		''     => __( 'None', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'0'    => '0',
-		'1'    => '1',
-		'2'    => '2',
-		'3'    => '3',
-		'4'    => '4',
-		'5'    => '5',
-		'6'    => '6',
-		'7'    => '7',
-		'8'    => '8',
-		'9'    => '9',
-		'10'   => '10',
-		'11'   => '11',
-		'12'   => '12',
-	);
-
-	if ( $include_negatives ) {
-		$options['n1']  = '-1';
-		$options['n2']  = '-2';
-		$options['n3']  = '-3';
-		$options['n4']  = '-4';
-		$options['n5']  = '-5';
-		$options['n6']  = '-6';
-		$options['n7']  = '-7';
-		$options['n8']  = '-8';
-		$options['n9']  = '-9';
-		$options['n10'] = '-10';
-		$options['n11'] = '-11';
-		$options['n12'] = '-12';
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Margin top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Margins', 'ayecode-connect' ),
-			'key'   => 'wrapper-margins',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-margins',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+    $options = array(
+        ''     => __( 'None', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '0'    => '0',
+        '1'    => '1',
+        '2'    => '2',
+        '3'    => '3',
+        '4'    => '4',
+        '5'    => '5',
+        '6'    => '6',
+        '7'    => '7',
+        '8'    => '8',
+        '9'    => '9',
+        '10'   => '10',
+        '11'   => '11',
+        '12'   => '12',
+    );
+
+    if ( $include_negatives ) {
+        $options['n1']  = '-1';
+        $options['n2']  = '-2';
+        $options['n3']  = '-3';
+        $options['n4']  = '-4';
+        $options['n5']  = '-5';
+        $options['n6']  = '-6';
+        $options['n7']  = '-7';
+        $options['n8']  = '-8';
+        $options['n9']  = '-9';
+        $options['n10'] = '-10';
+        $options['n11'] = '-11';
+        $options['n12'] = '-12';
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Margin top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'mt' ) {
+        $defaults['title'] = __( 'Margin top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Margins', 'ayecode-connect' ),
+            'key'   => 'wrapper-margins',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'mr' ) {
+        $defaults['title'] = __( 'Margin right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'mb' ) {
+        $defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'ml' ) {
+        $defaults['title'] = __( 'Margin left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-margins',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -138,67 +138,67 @@ 
  * @return array
  */
 function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
-	$options = array(
-		''   => __( 'None', 'ayecode-connect' ),
-		'0'  => '0',
-		'1'  => '1',
-		'2'  => '2',
-		'3'  => '3',
-		'4'  => '4',
-		'5'  => '5',
-		'6'  => '6',
-		'7'  => '7',
-		'8'  => '8',
-		'9'  => '9',
-		'10' => '10',
-		'11' => '11',
-		'12' => '12',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Padding top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Padding', 'ayecode-connect' ),
-			'key'   => 'wrapper-padding',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-padding',
-			'close' => true,
-
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''   => __( 'None', 'ayecode-connect' ),
+        '0'  => '0',
+        '1'  => '1',
+        '2'  => '2',
+        '3'  => '3',
+        '4'  => '4',
+        '5'  => '5',
+        '6'  => '6',
+        '7'  => '7',
+        '8'  => '8',
+        '9'  => '9',
+        '10' => '10',
+        '11' => '11',
+        '12' => '12',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Padding top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'pt' ) {
+        $defaults['title'] = __( 'Padding top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Padding', 'ayecode-connect' ),
+            'key'   => 'wrapper-padding',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'pr' ) {
+        $defaults['title'] = __( 'Padding right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pb' ) {
+        $defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pl' ) {
+        $defaults['title'] = __( 'Padding left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-padding',
+            'close' => true,
+
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -210,96 +210,96 @@ 
  * @return array
  */
 function sd_get_border_input( $type = 'border', $overwrite = array() ) {
-	global $aui_bs5;
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Border', 'ayecode-connect' ),
-		'options'  => array(),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''               => __( 'Default', 'ayecode-connect' ),
-			'rounded'        => 'rounded',
-			'rounded-top'    => 'rounded-top',
-			'rounded-right'  => 'rounded-right',
-			'rounded-bottom' => 'rounded-bottom',
-			'rounded-left'   => 'rounded-left',
-		);
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
-
-		if ( $aui_bs5 ) {
-			$defaults['options'] = array(
-				''       => __( 'Default', 'ayecode-connect' ),
-				'0'      => '0',
-				'1'      => '1',
-				'2'      => '2',
-				'3'      => '3',
-				'4'      => '4',
-				'circle' => 'circle',
-				'pill'   => 'pill',
-			);
-		} else {
-			$defaults['options'] = array(
-				''   => __( 'Default', 'ayecode-connect' ),
-				'sm' => __( 'Small', 'ayecode-connect' ),
-				'lg' => __( 'Large', 'ayecode-connect' ),
-			);
-		}
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''         => __( 'Default', 'ayecode-connect' ),
-			'border-2' => '2',
-			'border-3' => '3',
-			'border-4' => '4',
-			'border-5' => '5',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''                  => __( 'Default', 'ayecode-connect' ),
-			'border-opacity-75' => '75%',
-			'border-opacity-50' => '50%',
-			'border-opacity-25' => '25%',
-			'border-opacity-10' => '10%',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'ayecode-connect' );
-		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
-			'border-top'      => __( 'Top', 'ayecode-connect' ),
-			'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
-			'border-left'     => __( 'Left', 'ayecode-connect' ),
-			'border-right'    => __( 'Right', 'ayecode-connect' ),
-			'border-top-0'    => __( '-Top', 'ayecode-connect' ),
-			'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
-			'border-left-0'   => __( '-Left', 'ayecode-connect' ),
-			'border-right-0'  => __( '-Right', 'ayecode-connect' ),
-		);
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} else {
-		$defaults['title']   = __( 'Border color', 'ayecode-connect' );
-		$defaults['options'] = array(
-			''  => __( 'Default', 'ayecode-connect' ),
-			'0' => __( 'None', 'ayecode-connect' )
-		) + sd_aui_colors( false, false, false, false, true );
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Border', 'ayecode-connect' ),
+        'options'  => array(),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( 'rounded' === $type ) {
+        $defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''               => __( 'Default', 'ayecode-connect' ),
+            'rounded'        => 'rounded',
+            'rounded-top'    => 'rounded-top',
+            'rounded-right'  => 'rounded-right',
+            'rounded-bottom' => 'rounded-bottom',
+            'rounded-left'   => 'rounded-left',
+        );
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } elseif ( 'rounded_size' === $type ) {
+        $defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
+
+        if ( $aui_bs5 ) {
+            $defaults['options'] = array(
+                ''       => __( 'Default', 'ayecode-connect' ),
+                '0'      => '0',
+                '1'      => '1',
+                '2'      => '2',
+                '3'      => '3',
+                '4'      => '4',
+                'circle' => 'circle',
+                'pill'   => 'pill',
+            );
+        } else {
+            $defaults['options'] = array(
+                ''   => __( 'Default', 'ayecode-connect' ),
+                'sm' => __( 'Small', 'ayecode-connect' ),
+                'lg' => __( 'Large', 'ayecode-connect' ),
+            );
+        }
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } elseif ( 'width' === $type ) { // BS%
+        $defaults['title']           = __( 'Border width', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''         => __( 'Default', 'ayecode-connect' ),
+            'border-2' => '2',
+            'border-3' => '3',
+            'border-4' => '4',
+            'border-5' => '5',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
+    } elseif ( 'opacity' === $type ) { // BS%
+        $defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''                  => __( 'Default', 'ayecode-connect' ),
+            'border-opacity-75' => '75%',
+            'border-opacity-50' => '50%',
+            'border-opacity-25' => '25%',
+            'border-opacity-10' => '10%',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
+    } elseif ( 'type' === $type ) {
+        $defaults['title']           = __( 'Border show', 'ayecode-connect' );
+        $defaults['options']         = array(
+            'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
+            'border-top'      => __( 'Top', 'ayecode-connect' ),
+            'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
+            'border-left'     => __( 'Left', 'ayecode-connect' ),
+            'border-right'    => __( 'Right', 'ayecode-connect' ),
+            'border-top-0'    => __( '-Top', 'ayecode-connect' ),
+            'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
+            'border-left-0'   => __( '-Left', 'ayecode-connect' ),
+            'border-right-0'  => __( '-Right', 'ayecode-connect' ),
+        );
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } else {
+        $defaults['title']   = __( 'Border color', 'ayecode-connect' );
+        $defaults['options'] = array(
+            ''  => __( 'Default', 'ayecode-connect' ),
+            '0' => __( 'None', 'ayecode-connect' )
+        ) + sd_aui_colors( false, false, false, false, true );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -311,25 +311,25 @@ 
  * @return array
  */
 function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
-	$options = array(
-		''          => __( 'None', 'ayecode-connect' ),
-		'shadow-sm' => __( 'Small', 'ayecode-connect' ),
-		'shadow'    => __( 'Regular', 'ayecode-connect' ),
-		'shadow-lg' => __( 'Large', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''          => __( 'None', 'ayecode-connect' ),
+        'shadow-sm' => __( 'Small', 'ayecode-connect' ),
+        'shadow'    => __( 'Regular', 'ayecode-connect' ),
+        'shadow-lg' => __( 'Large', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Shadow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Shadow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -341,23 +341,23 @@ 
  * @return array
  */
 function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true);
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,true);
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -369,35 +369,35 @@ 
  * @return array
  */
 function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
-	$options = array(
-		''            => __( 'Default', 'ayecode-connect' ),
-		'opacity-10'  => '10%',
-		'opacity-15'  => '15%',
-		'opacity-25'  => '25%',
-		'opacity-35'  => '35%',
-		'opacity-40'  => '40%',
-		'opacity-50'  => '50%',
-		'opacity-60'  => '60%',
-		'opacity-65'  => '65%',
-		'opacity-70'  => '70%',
-		'opacity-75'  => '75%',
-		'opacity-80'  => '80%',
-		'opacity-90'  => '90%',
-		'opacity-100' => '100%',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Opacity', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''            => __( 'Default', 'ayecode-connect' ),
+        'opacity-10'  => '10%',
+        'opacity-15'  => '15%',
+        'opacity-25'  => '25%',
+        'opacity-35'  => '35%',
+        'opacity-40'  => '40%',
+        'opacity-50'  => '50%',
+        'opacity-60'  => '60%',
+        'opacity-65'  => '65%',
+        'opacity-70'  => '70%',
+        'opacity-75'  => '75%',
+        'opacity-80'  => '80%',
+        'opacity-90'  => '90%',
+        'opacity-100' => '100%',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Opacity', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -410,124 +410,124 @@ 
  */
 function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true, true ) : sd_aui_colors(false, false, false, false, true );
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + $color_options;
-
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
-	}
-
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background Color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Background', 'ayecode-connect' ),
-	);
-
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-	}
-
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
-			$overwrite_color,
-			array(
-				'type'            => 'color',
-				'title'           => __( 'Custom color', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => '#0073aa',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-color"',
-			)
-		);
-	}
-
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
-			$overwrite_gradient,
-			array(
-				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-gradient"',
-			)
-		);
-	}
-
-	if ( $overwrite_image !== false ) {
-
-		$input[ $type . '_image_fixed' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image_use_featured' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image',
-				'title'       => __( 'Custom image', 'ayecode-connect' ),
-				'placeholder' => '',
-				'default'     => '',
-				'desc_tip'    => true,
-				'group'       => __( 'Background', 'ayecode-connect' ),
-				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
-			)
-		);
-
-		$input[ $type . '_image_id' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'hidden',
-				'hidden_type' => 'number',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-
-		$input[ $type . '_image_xy' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image_xy',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-	}
-
-	return $input;
+    $color_options = $include_button_colors ? sd_aui_colors( false, true, true, true, true ) : sd_aui_colors(false, false, false, false, true );
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + $color_options;
+
+    if ( false !== $overwrite_color ) {
+        $options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
+    }
+
+    if ( false !== $overwrite_gradient ) {
+        $options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background Color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Background', 'ayecode-connect' ),
+    );
+
+    if ( $overwrite !== false ) {
+        $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+    }
+
+    if ( $overwrite_color !== false ) {
+        $input[ $type . '_color' ] = wp_parse_args(
+            $overwrite_color,
+            array(
+                'type'            => 'color',
+                'title'           => __( 'Custom color', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => '#0073aa',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-color"',
+            )
+        );
+    }
+
+    if ( $overwrite_gradient !== false ) {
+        $input[ $type . '_gradient' ] = wp_parse_args(
+            $overwrite_gradient,
+            array(
+                'type'            => 'gradient',
+                'title'           => __( 'Custom gradient', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-gradient"',
+            )
+        );
+    }
+
+    if ( $overwrite_image !== false ) {
+
+        $input[ $type . '_image_fixed' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Fixed background', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image_use_featured' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Use featured image', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image',
+                'title'       => __( 'Custom image', 'ayecode-connect' ),
+                'placeholder' => '',
+                'default'     => '',
+                'desc_tip'    => true,
+                'group'       => __( 'Background', 'ayecode-connect' ),
+                //          'element_require' => ' ![%' . $type . '_image_use_featured%] '
+            )
+        );
+
+        $input[ $type . '_image_id' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'hidden',
+                'hidden_type' => 'number',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+
+        $input[ $type . '_image_xy' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image_xy',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+    }
+
+    return $input;
 }
 
 /**
@@ -540,175 +540,175 @@ 
  */
 function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
 
-	$options = array(
-		''                      => __( 'None', 'ayecode-connect' ),
-		'mountains'             => __( 'Mountains', 'ayecode-connect' ),
-		'drops'                 => __( 'Drops', 'ayecode-connect' ),
-		'clouds'                => __( 'Clouds', 'ayecode-connect' ),
-		'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
-		'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
-		'triangle'              => __( 'Triangle', 'ayecode-connect' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
-		'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
-		'curve'                 => __( 'Curve', 'ayecode-connect' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
-		'waves'                 => __( 'Waves', 'ayecode-connect' ),
-		'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
-		'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
-		'split'                 => __( 'Split', 'ayecode-connect' ),
-		'book'                  => __( 'Book', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'ayecode-connect' ),
-	);
-
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-
-	$input[ $type . '_notice' ] = array(
-		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
-		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-	);
-
-	$input[ $type . '_position' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Position', 'ayecode-connect' ),
-			'options'         => array(
-				'top'    => __( 'Top', 'ayecode-connect' ),
-				'bottom' => __( 'Bottom', 'ayecode-connect' ),
-			),
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true )
-	           + array(
-		           'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
-	           );
-
-	$input[ $type . '_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Color', 'ayecode-connect' ),
-			'options'         => $options,
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_custom_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'color',
-			'title'           => __( 'Custom color', 'ayecode-connect' ),
-			'placeholder'     => '',
-			'default'         => '#0073aa',
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_width' ] = wp_parse_args(
-		$overwrite_gradient,
-		array(
-			'type'              => 'range',
-			'title'             => __( 'Width', 'ayecode-connect' ),
-			'placeholder'       => '',
-			'default'           => '200',
-			'desc_tip'          => true,
-			'custom_attributes' => array(
-				'min' => 100,
-				'max' => 300,
-			),
-			'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require'   => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_height' ] = array(
-		'type'              => 'range',
-		'title'             => __( 'Height', 'ayecode-connect' ),
-		'default'           => '100',
-		'desc_tip'          => true,
-		'custom_attributes' => array(
-			'min' => 0,
-			'max' => 500,
-		),
-		'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require'   => '[%' . $type . '%]!=""',
-	);
-
-	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
-		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
-		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
-	);
-
-	$input[ $type . '_flip' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
-	);
-
-	$input[ $type . '_invert' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
-	);
-
-	$input[ $type . '_btf' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-
-	);
-
-	return $input;
+    $options = array(
+        ''                      => __( 'None', 'ayecode-connect' ),
+        'mountains'             => __( 'Mountains', 'ayecode-connect' ),
+        'drops'                 => __( 'Drops', 'ayecode-connect' ),
+        'clouds'                => __( 'Clouds', 'ayecode-connect' ),
+        'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
+        'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
+        'triangle'              => __( 'Triangle', 'ayecode-connect' ),
+        'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
+        'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
+        'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
+        'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
+        'curve'                 => __( 'Curve', 'ayecode-connect' ),
+        'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
+        'waves'                 => __( 'Waves', 'ayecode-connect' ),
+        'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
+        'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
+        'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
+        'split'                 => __( 'Split', 'ayecode-connect' ),
+        'book'                  => __( 'Book', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Shape Divider', 'ayecode-connect' ),
+    );
+
+    $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+
+    $input[ $type . '_notice' ] = array(
+        'type'            => 'notice',
+        'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
+        'status'          => 'warning',
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+    );
+
+    $input[ $type . '_position' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Position', 'ayecode-connect' ),
+            'options'         => array(
+                'top'    => __( 'Top', 'ayecode-connect' ),
+                'bottom' => __( 'Bottom', 'ayecode-connect' ),
+            ),
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,true )
+               + array(
+                    'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
+                );
+
+    $input[ $type . '_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Color', 'ayecode-connect' ),
+            'options'         => $options,
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_custom_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'color',
+            'title'           => __( 'Custom color', 'ayecode-connect' ),
+            'placeholder'     => '',
+            'default'         => '#0073aa',
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_width' ] = wp_parse_args(
+        $overwrite_gradient,
+        array(
+            'type'              => 'range',
+            'title'             => __( 'Width', 'ayecode-connect' ),
+            'placeholder'       => '',
+            'default'           => '200',
+            'desc_tip'          => true,
+            'custom_attributes' => array(
+                'min' => 100,
+                'max' => 300,
+            ),
+            'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require'   => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_height' ] = array(
+        'type'              => 'range',
+        'title'             => __( 'Height', 'ayecode-connect' ),
+        'default'           => '100',
+        'desc_tip'          => true,
+        'custom_attributes' => array(
+            'min' => 0,
+            'max' => 500,
+        ),
+        'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require'   => '[%' . $type . '%]!=""',
+    );
+
+    $requires = array(
+        'mountains'             => array( 'flip' ),
+        'drops'                 => array( 'flip', 'invert' ),
+        'clouds'                => array( 'flip', 'invert' ),
+        'zigzag'                => array(),
+        'pyramids'              => array( 'flip', 'invert' ),
+        'triangle'              => array( 'invert' ),
+        'triangle-asymmetrical' => array( 'flip', 'invert' ),
+        'tilt'                  => array( 'flip' ),
+        'opacity-tilt'          => array( 'flip' ),
+        'opacity-fan'           => array(),
+        'curve'                 => array( 'invert' ),
+        'curve-asymmetrical'    => array( 'flip', 'invert' ),
+        'waves'                 => array( 'flip', 'invert' ),
+        'wave-brush'            => array( 'flip' ),
+        'waves-pattern'         => array( 'flip' ),
+        'arrow'                 => array( 'invert' ),
+        'split'                 => array( 'invert' ),
+        'book'                  => array( 'invert' ),
+    );
+
+    $input[ $type . '_flip' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Flip', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+    );
+
+    $input[ $type . '_invert' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Invert', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+    );
+
+    $input[ $type . '_btf' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Bring to front', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+
+    );
+
+    return $input;
 }
 
 /**
@@ -721,22 +721,22 @@ 
  * @return string
  */
 function sd_get_element_require_string( $args, $key, $type ) {
-	$output   = '';
-	$requires = array();
+    $output   = '';
+    $requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
-				$requires[] = '[%' . $type . '%]=="' . $t . '"';
-			}
-		}
+    if ( ! empty( $args ) ) {
+        foreach ( $args as $t => $k ) {
+            if ( in_array( $key, $k ) ) {
+                $requires[] = '[%' . $type . '%]=="' . $t . '"';
+            }
+        }
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
-		}
-	}
+        if ( ! empty( $requires ) ) {
+            $output = '(' . implode( ' || ', $requires ) . ')';
+        }
+    }
 
-	return $output;
+    return $output;
 }
 
 /**
@@ -748,41 +748,41 @@ 
  * @return array
  */
 function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false, $emphasis = true ) {
-	$options = array(
-		           '' => __( 'None', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,false, true);
+    $options = array(
+                    '' => __( 'None', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,false, true);
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'ayecode-connect' );
-	}
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom color', 'ayecode-connect' );
+    }
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -795,22 +795,22 @@ 
  */
 function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'        => 'color',
-		'title'       => __( 'Custom color', 'ayecode-connect' ),
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'color',
+        'title'       => __( 'Custom color', 'ayecode-connect' ),
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -823,44 +823,44 @@ 
  */
 function sd_get_col_input( $type = 'col', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''     => __( 'Default', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'1'    => '1/12',
-		'2'    => '2/12',
-		'3'    => '3/12',
-		'4'    => '4/12',
-		'5'    => '5/12',
-		'6'    => '6/12',
-		'7'    => '7/12',
-		'8'    => '8/12',
-		'9'    => '9/12',
-		'10'   => '10/12',
-		'11'   => '11/12',
-		'12'   => '12/12',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Column width', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="col"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''     => __( 'Default', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '1'    => '1/12',
+        '2'    => '2/12',
+        '3'    => '3/12',
+        '4'    => '4/12',
+        '5'    => '5/12',
+        '6'    => '6/12',
+        '7'    => '7/12',
+        '8'    => '8/12',
+        '9'    => '9/12',
+        '10'   => '10/12',
+        '11'   => '11/12',
+        '12'   => '12/12',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Column width', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="col"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -873,37 +873,37 @@ 
  */
 function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''  => __( 'auto', 'ayecode-connect' ),
-		'1' => '1',
-		'2' => '2',
-		'3' => '3',
-		'4' => '4',
-		'5' => '5',
-		'6' => '6',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Row columns', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="row"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''  => __( 'auto', 'ayecode-connect' ),
+        '1' => '1',
+        '2' => '2',
+        '3' => '3',
+        '4' => '4',
+        '5' => '5',
+        '6' => '6',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Row columns', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="row"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -916,33 +916,33 @@ 
  */
 function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                => __( 'Default', 'ayecode-connect' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
-		'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
-	);
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                => __( 'Default', 'ayecode-connect' ),
+        'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
+        'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
+        'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text align', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text align', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -955,39 +955,39 @@ 
  */
 function sd_get_display_input( $type = 'display', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                   => __( 'Default', 'ayecode-connect' ),
-		'd' . $device_size . '-none'         => 'none',
-		'd' . $device_size . '-inline'       => 'inline',
-		'd' . $device_size . '-inline-block' => 'inline-block',
-		'd' . $device_size . '-block'        => 'block',
-		'd' . $device_size . '-table'        => 'table',
-		'd' . $device_size . '-table-cell'   => 'table-cell',
-		'd' . $device_size . '-table-row'    => 'table-row',
-		'd' . $device_size . '-flex'         => 'flex',
-		'd' . $device_size . '-inline-flex'  => 'inline-flex',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Display', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                   => __( 'Default', 'ayecode-connect' ),
+        'd' . $device_size . '-none'         => 'none',
+        'd' . $device_size . '-inline'       => 'inline',
+        'd' . $device_size . '-inline-block' => 'inline-block',
+        'd' . $device_size . '-block'        => 'block',
+        'd' . $device_size . '-table'        => 'table',
+        'd' . $device_size . '-table-cell'   => 'table-cell',
+        'd' . $device_size . '-table-row'    => 'table-row',
+        'd' . $device_size . '-flex'         => 'flex',
+        'd' . $device_size . '-inline-flex'  => 'inline-flex',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Display', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1000,17 +1000,17 @@ 
  */
 function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Text justify', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1023,114 +1023,114 @@ 
  * @return array
  */
 function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false, $include_subtle = false, $include_emphasis = false ) {
-	$theme_colors = array();
-
-	$theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
-	$theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
-	$theme_colors['success']   = __( 'Success', 'ayecode-connect' );
-	$theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
-	$theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
-	$theme_colors['info']      = __( 'Info', 'ayecode-connect' );
-	$theme_colors['light']     = __( 'Light', 'ayecode-connect' );
-	$theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
-	$theme_colors['black']     = __( 'Black', 'ayecode-connect' );
-	$theme_colors['white']     = __( 'White', 'ayecode-connect' );
-	$theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
-	$theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
-	$theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
-	$theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
-	$theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
-	$theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
-	$theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
-	$theme_colors['body']      = __( 'Body', 'ayecode-connect' );
-
-
-	// for bg and borders
-	if ( $include_subtle ) {
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['secondary-subtle'] = __( 'Secondary Subtle', 'ayecode-connect' );
-		$theme_colors['success-subtle']   = __( 'Success Subtle', 'ayecode-connect' );
-		$theme_colors['danger-subtle']    = __( 'Danger Subtle', 'ayecode-connect' );
-		$theme_colors['warning-subtle']   = __( 'Warning Subtle', 'ayecode-connect' );
-		$theme_colors['info-subtle']      = __( 'Info Subtle', 'ayecode-connect' );
-		$theme_colors['light-subtle']     = __( 'Light Subtle', 'ayecode-connect' );
-		$theme_colors['dark-subtle']      = __( 'Dark Subtle', 'ayecode-connect' );
-		$theme_colors['purple-subtle']    = __( 'Purple Subtle', 'ayecode-connect' );
-		$theme_colors['salmon-subtle']    = __( 'Salmon Subtle', 'ayecode-connect' );
-		$theme_colors['cyan-subtle']      = __( 'Cyan Subtle', 'ayecode-connect' );
-		$theme_colors['gray-subtle']      = __( 'Gray Subtle', 'ayecode-connect' );
-		$theme_colors['gray-dark-subtle'] = __( 'Gray dark Subtle', 'ayecode-connect' );
-		$theme_colors['indigo-subtle']    = __( 'Indigo Subtle', 'ayecode-connect' );
-		$theme_colors['orange-subtle']    = __( 'Orange Subtle', 'ayecode-connect' );
-	}
-
-	// for texts
-	if ($include_emphasis) {
-		$theme_colors['primary-emphasis']   = __( 'Primary Emphasis', 'ayecode-connect' );
-		$theme_colors['secondary-emphasis'] = __( 'Secondary Emphasis', 'ayecode-connect' );
-		$theme_colors['success-emphasis']   = __( 'Success Emphasis', 'ayecode-connect' );
-		$theme_colors['danger-emphasis']    = __( 'Danger Emphasis', 'ayecode-connect' );
-		$theme_colors['warning-emphasis']   = __( 'Warning Emphasis', 'ayecode-connect' );
-		$theme_colors['info-emphasis']      = __( 'Info Emphasis', 'ayecode-connect' );
-		$theme_colors['light-emphasis']     = __( 'Light Emphasis', 'ayecode-connect' );
-		$theme_colors['dark-emphasis']      = __( 'Dark Emphasis', 'ayecode-connect' );
-		$theme_colors['purple-emphasis']    = __( 'Purple Emphasis', 'ayecode-connect' );
-		$theme_colors['salmon-emphasis']    = __( 'Salmon Emphasis', 'ayecode-connect' );
-		$theme_colors['cyan-emphasis']      = __( 'Cyan Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-emphasis']      = __( 'Gray Emphasis', 'ayecode-connect' );
-		$theme_colors['muted-emphasis']     = __( 'Muted Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-dark-emphasis'] = __( 'Gray dark Emphasis', 'ayecode-connect' );
-		$theme_colors['indigo-emphasis']    = __( 'Indigo Emphasis', 'ayecode-connect' );
-		$theme_colors['orange-emphasis']    = __( 'Orange Emphasis', 'ayecode-connect' );
-	}
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
-		$theme_colors = $theme_colors + sd_aui_branding_colors();
-	}
-
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
-	}
-
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+    $theme_colors = array();
+
+    $theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
+    $theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
+    $theme_colors['success']   = __( 'Success', 'ayecode-connect' );
+    $theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
+    $theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
+    $theme_colors['info']      = __( 'Info', 'ayecode-connect' );
+    $theme_colors['light']     = __( 'Light', 'ayecode-connect' );
+    $theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
+    $theme_colors['black']     = __( 'Black', 'ayecode-connect' );
+    $theme_colors['white']     = __( 'White', 'ayecode-connect' );
+    $theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
+    $theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
+    $theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
+    $theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
+    $theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
+    $theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
+    $theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
+    $theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
+    $theme_colors['body']      = __( 'Body', 'ayecode-connect' );
+
+
+    // for bg and borders
+    if ( $include_subtle ) {
+        $theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
+        $theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
+        $theme_colors['secondary-subtle'] = __( 'Secondary Subtle', 'ayecode-connect' );
+        $theme_colors['success-subtle']   = __( 'Success Subtle', 'ayecode-connect' );
+        $theme_colors['danger-subtle']    = __( 'Danger Subtle', 'ayecode-connect' );
+        $theme_colors['warning-subtle']   = __( 'Warning Subtle', 'ayecode-connect' );
+        $theme_colors['info-subtle']      = __( 'Info Subtle', 'ayecode-connect' );
+        $theme_colors['light-subtle']     = __( 'Light Subtle', 'ayecode-connect' );
+        $theme_colors['dark-subtle']      = __( 'Dark Subtle', 'ayecode-connect' );
+        $theme_colors['purple-subtle']    = __( 'Purple Subtle', 'ayecode-connect' );
+        $theme_colors['salmon-subtle']    = __( 'Salmon Subtle', 'ayecode-connect' );
+        $theme_colors['cyan-subtle']      = __( 'Cyan Subtle', 'ayecode-connect' );
+        $theme_colors['gray-subtle']      = __( 'Gray Subtle', 'ayecode-connect' );
+        $theme_colors['gray-dark-subtle'] = __( 'Gray dark Subtle', 'ayecode-connect' );
+        $theme_colors['indigo-subtle']    = __( 'Indigo Subtle', 'ayecode-connect' );
+        $theme_colors['orange-subtle']    = __( 'Orange Subtle', 'ayecode-connect' );
+    }
+
+    // for texts
+    if ($include_emphasis) {
+        $theme_colors['primary-emphasis']   = __( 'Primary Emphasis', 'ayecode-connect' );
+        $theme_colors['secondary-emphasis'] = __( 'Secondary Emphasis', 'ayecode-connect' );
+        $theme_colors['success-emphasis']   = __( 'Success Emphasis', 'ayecode-connect' );
+        $theme_colors['danger-emphasis']    = __( 'Danger Emphasis', 'ayecode-connect' );
+        $theme_colors['warning-emphasis']   = __( 'Warning Emphasis', 'ayecode-connect' );
+        $theme_colors['info-emphasis']      = __( 'Info Emphasis', 'ayecode-connect' );
+        $theme_colors['light-emphasis']     = __( 'Light Emphasis', 'ayecode-connect' );
+        $theme_colors['dark-emphasis']      = __( 'Dark Emphasis', 'ayecode-connect' );
+        $theme_colors['purple-emphasis']    = __( 'Purple Emphasis', 'ayecode-connect' );
+        $theme_colors['salmon-emphasis']    = __( 'Salmon Emphasis', 'ayecode-connect' );
+        $theme_colors['cyan-emphasis']      = __( 'Cyan Emphasis', 'ayecode-connect' );
+        $theme_colors['gray-emphasis']      = __( 'Gray Emphasis', 'ayecode-connect' );
+        $theme_colors['muted-emphasis']     = __( 'Muted Emphasis', 'ayecode-connect' );
+        $theme_colors['gray-dark-emphasis'] = __( 'Gray dark Emphasis', 'ayecode-connect' );
+        $theme_colors['indigo-emphasis']    = __( 'Indigo Emphasis', 'ayecode-connect' );
+        $theme_colors['orange-emphasis']    = __( 'Orange Emphasis', 'ayecode-connect' );
+    }
+
+    if ( $include_outlines ) {
+        $button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
+    }
+
+    if ( $include_branding ) {
+        $theme_colors = $theme_colors + sd_aui_branding_colors();
+    }
+
+    if ( $include_translucent ) {
+        $button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
+    }
+
+    return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
 }
 
 /**
@@ -1139,19 +1139,19 @@ 
  * @return array
  */
 function sd_aui_branding_colors() {
-	return array(
-		'facebook'  => __( 'Facebook', 'ayecode-connect' ),
-		'twitter'   => __( 'Twitter', 'ayecode-connect' ),
-		'instagram' => __( 'Instagram', 'ayecode-connect' ),
-		'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
-		'flickr'    => __( 'Flickr', 'ayecode-connect' ),
-		'github'    => __( 'GitHub', 'ayecode-connect' ),
-		'youtube'   => __( 'YouTube', 'ayecode-connect' ),
-		'wordpress' => __( 'WordPress', 'ayecode-connect' ),
-		'google'    => __( 'Google', 'ayecode-connect' ),
-		'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
-		'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
-	);
+    return array(
+        'facebook'  => __( 'Facebook', 'ayecode-connect' ),
+        'twitter'   => __( 'Twitter', 'ayecode-connect' ),
+        'instagram' => __( 'Instagram', 'ayecode-connect' ),
+        'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
+        'flickr'    => __( 'Flickr', 'ayecode-connect' ),
+        'github'    => __( 'GitHub', 'ayecode-connect' ),
+        'youtube'   => __( 'YouTube', 'ayecode-connect' ),
+        'wordpress' => __( 'WordPress', 'ayecode-connect' ),
+        'google'    => __( 'Google', 'ayecode-connect' ),
+        'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
+        'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
+    );
 }
 
 
@@ -1165,43 +1165,43 @@ 
  */
 function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
 
-	$options = array(
-		'container'                                                             => __( 'container (default)', 'ayecode-connect' ),
-		'container-sm'                                                          => 'container-sm',
-		'container-md'                                                          => 'container-md',
-		'container-lg'                                                          => 'container-lg',
-		'container-xl'                                                          => 'container-xl',
-		'container-xxl'                                                         => 'container-xxl',
-		'container-fluid'                                                       => 'container-fluid',
-		'row'                                                                   => 'row',
-		'col'                                                                   => 'col',
-		'card'                                                                  => 'card',
-		'card-header'                                                           => 'card-header',
-		'card-img-top'                                                          => 'card-img-top',
-		'card-body'                                                             => 'card-body',
-		'card-footer'                                                           => 'card-footer',
-		'list-group'                                                            => 'list-group',
-		'list-group list-group-flush'                                           => 'list-group list-group-flush',
-		'list-group list-group-numbered'                                        => 'list-group list-group-numbered',
-		'list-group list-group-flush list-group-numbered'                       => 'list-group list-group-flush list-group-numbered',
-		'list-group list-group-horizontal'                                      => 'list-group list-group-horizontal',
-		'list-group list-group-horizontal list-group-numbered'                  => 'list-group list-group-horizontal list-group-numbered',
-		'list-group-item'                                                       => 'list-group-item',
-		''                                                                      => __( 'no container class', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Container', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        'container'                                                             => __( 'container (default)', 'ayecode-connect' ),
+        'container-sm'                                                          => 'container-sm',
+        'container-md'                                                          => 'container-md',
+        'container-lg'                                                          => 'container-lg',
+        'container-xl'                                                          => 'container-xl',
+        'container-xxl'                                                         => 'container-xxl',
+        'container-fluid'                                                       => 'container-fluid',
+        'row'                                                                   => 'row',
+        'col'                                                                   => 'col',
+        'card'                                                                  => 'card',
+        'card-header'                                                           => 'card-header',
+        'card-img-top'                                                          => 'card-img-top',
+        'card-body'                                                             => 'card-body',
+        'card-footer'                                                           => 'card-footer',
+        'list-group'                                                            => 'list-group',
+        'list-group list-group-flush'                                           => 'list-group list-group-flush',
+        'list-group list-group-numbered'                                        => 'list-group list-group-numbered',
+        'list-group list-group-flush list-group-numbered'                       => 'list-group list-group-flush list-group-numbered',
+        'list-group list-group-horizontal'                                      => 'list-group list-group-horizontal',
+        'list-group list-group-horizontal list-group-numbered'                  => 'list-group list-group-horizontal list-group-numbered',
+        'list-group-item'                                                       => 'list-group-item',
+        ''                                                                      => __( 'no container class', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Container', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1214,30 +1214,30 @@ 
  */
 function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
 
-	$options = array(
-		''                  => __( 'Default', 'ayecode-connect' ),
-		'position-static'   => 'static',
-		'position-relative' => 'relative',
-		'position-absolute' => 'absolute',
-		'position-fixed'    => 'fixed',
-		'position-sticky'   => 'sticky',
-		'fixed-top'         => 'fixed-top',
-		'fixed-bottom'      => 'fixed-bottom',
-		'sticky-top'        => 'sticky-top',
-	);
+    $options = array(
+        ''                  => __( 'Default', 'ayecode-connect' ),
+        'position-static'   => 'static',
+        'position-relative' => 'relative',
+        'position-absolute' => 'absolute',
+        'position-fixed'    => 'fixed',
+        'position-sticky'   => 'sticky',
+        'fixed-top'         => 'fixed-top',
+        'fixed-bottom'      => 'fixed-bottom',
+        'sticky-top'        => 'sticky-top',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Position', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Position', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1248,32 +1248,32 @@ 
  */
 function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
 
-	$options = array(
-		''              => __( 'Default', 'ayecode-connect' ),
-		'top-left'      => 'top-left',
-		'top-center'    => 'top-center',
-		'top-right'     => 'top-right',
-		'center-left'   => 'middle-left',
-		'center'        => 'center',
-		'center-right'  => 'middle-right',
-		'bottom-left'   => 'bottom-left',
-		'bottom-center' => 'bottom-center',
-		'bottom-right'  => 'bottom-right',
-	);
+    $options = array(
+        ''              => __( 'Default', 'ayecode-connect' ),
+        'top-left'      => 'top-left',
+        'top-center'    => 'top-center',
+        'top-right'     => 'top-right',
+        'center-left'   => 'middle-left',
+        'center'        => 'center',
+        'center-right'  => 'middle-right',
+        'bottom-left'   => 'bottom-left',
+        'bottom-center' => 'bottom-center',
+        'bottom-right'  => 'bottom-right',
+    );
 
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="position-absolute"',
-	);
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Absolute Position', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="position-absolute"',
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1286,38 +1286,38 @@ 
  */
 function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'ayecode-connect' ),
-		//'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
-	);
-
-	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'ayecode-connect' ),
-			'key'   => 'sticky-offset',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key'   => 'sticky-offset',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $defaults = array(
+        'type'            => 'number',
+        'title'           => __( 'Sticky offset', 'ayecode-connect' ),
+        //'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
+    );
+
+    // title
+    if ( $type == 'top' ) {
+        $defaults['title'] = __( 'Top offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Sticky offset', 'ayecode-connect' ),
+            'key'   => 'sticky-offset',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'bottom' ) {
+        $defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key'   => 'sticky-offset',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1329,61 +1329,61 @@ 
  * @return array
  */
 function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
-	global $aui_bs5;
-
-	$options[] = __( 'Inherit from parent', 'ayecode-connect' );
-	if ( $aui_bs5 ) {
-		// responsive font sizes
-		$options['fs-base'] = 'fs-base (body default)';
-		$options['fs-6']    = 'fs-6';
-		$options['fs-5']    = 'fs-5';
-		$options['fs-4']    = 'fs-4';
-		$options['fs-3']    = 'fs-3';
-		$options['fs-2']    = 'fs-2';
-		$options['fs-1']    = 'fs-1';
-
-		// custom
-		$options['fs-lg']  = 'fs-lg';
-		$options['fs-sm']  = 'fs-sm';
-		$options['fs-xs']  = 'fs-xs';
-		$options['fs-xxs'] = 'fs-xxs';
-
-	}
-
-	$options = $options + array(
-			'h6'        => 'h6',
-			'h5'        => 'h5',
-			'h4'        => 'h4',
-			'h3'        => 'h3',
-			'h2'        => 'h2',
-			'h1'        => 'h1',
-			'display-1' => 'display-1',
-			'display-2' => 'display-2',
-			'display-3' => 'display-3',
-			'display-4' => 'display-4',
-		);
-
-	if ( $aui_bs5 ) {
-		$options['display-5'] = 'display-5';
-		$options['display-6'] = 'display-6';
-	}
-
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font size', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $options[] = __( 'Inherit from parent', 'ayecode-connect' );
+    if ( $aui_bs5 ) {
+        // responsive font sizes
+        $options['fs-base'] = 'fs-base (body default)';
+        $options['fs-6']    = 'fs-6';
+        $options['fs-5']    = 'fs-5';
+        $options['fs-4']    = 'fs-4';
+        $options['fs-3']    = 'fs-3';
+        $options['fs-2']    = 'fs-2';
+        $options['fs-1']    = 'fs-1';
+
+        // custom
+        $options['fs-lg']  = 'fs-lg';
+        $options['fs-sm']  = 'fs-sm';
+        $options['fs-xs']  = 'fs-xs';
+        $options['fs-xxs'] = 'fs-xxs';
+
+    }
+
+    $options = $options + array(
+            'h6'        => 'h6',
+            'h5'        => 'h5',
+            'h4'        => 'h4',
+            'h3'        => 'h3',
+            'h2'        => 'h2',
+            'h1'        => 'h1',
+            'display-1' => 'display-1',
+            'display-2' => 'display-2',
+            'display-3' => 'display-3',
+            'display-4' => 'display-4',
+        );
+
+    if ( $aui_bs5 ) {
+        $options['display-5'] = 'display-5';
+        $options['display-6'] = 'display-6';
+    }
+
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom size', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font size', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1396,27 +1396,27 @@ 
  */
 function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.25',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.25',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1429,23 +1429,23 @@ 
  */
 function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.75',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font Line Height', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.75',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1458,18 +1458,18 @@ 
  */
 function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
 
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -1482,33 +1482,33 @@ 
  */
 function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                                => __( 'Inherit', 'ayecode-connect' ),
-		'font-weight-bold'                => 'bold',
-		'font-weight-bolder'              => 'bolder',
-		'font-weight-normal'              => 'normal',
-		'font-weight-light'               => 'light',
-		'font-weight-lighter'             => 'lighter',
-		'font-italic'                     => 'italic',
-		'font-weight-bold font-italic'    => 'bold italic',
-		'font-weight-bolder font-italic'  => 'bolder italic',
-		'font-weight-normal font-italic'  => 'normal italic',
-		'font-weight-light font-italic'   => 'light italic',
-		'font-weight-lighter font-italic' => 'lighter italic',
-	);
+    $options = array(
+        ''                                => __( 'Inherit', 'ayecode-connect' ),
+        'font-weight-bold'                => 'bold',
+        'font-weight-bolder'              => 'bolder',
+        'font-weight-normal'              => 'normal',
+        'font-weight-light'               => 'light',
+        'font-weight-lighter'             => 'lighter',
+        'font-italic'                     => 'italic',
+        'font-weight-bold font-italic'    => 'bold italic',
+        'font-weight-bolder font-italic'  => 'bolder italic',
+        'font-weight-normal font-italic'  => 'normal italic',
+        'font-weight-light font-italic'   => 'light italic',
+        'font-weight-lighter font-italic' => 'lighter italic',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Appearance', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Appearance', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1521,25 +1521,25 @@ 
  */
 function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                => __( 'Default', 'ayecode-connect' ),
-		'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
-		'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                => __( 'Default', 'ayecode-connect' ),
+        'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
+        'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
+        'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Letter case', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Letter case', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1553,23 +1553,23 @@ 
  */
 function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
 
-	$options = array(
-		''            => __( 'No', 'ayecode-connect' ),
-		'font-italic' => __( 'Yes', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''            => __( 'No', 'ayecode-connect' ),
+        'font-italic' => __( 'Yes', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font italic', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font italic', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1582,18 +1582,18 @@ 
  */
 function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'ayecode-connect' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'HTML anchor', 'ayecode-connect' ),
+        'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1606,18 +1606,18 @@ 
  */
 function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
+        'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1630,18 +1630,18 @@ 
  */
 function sd_get_custom_name_input( $type = 'metadata_name', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'Block Name', 'ayecode-connect' ),
-		'desc'     => __( 'Set a custom name for this block', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'Block Name', 'ayecode-connect' ),
+        'desc'     => __( 'Set a custom name for this block', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1654,341 +1654,341 @@ 
  */
 function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'none', 'ayecode-connect' ),
-		'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
-		'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
-		'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
-		'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
-		'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
-		'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'none', 'ayecode-connect' ),
+        'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
+        'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
+        'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
+        'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
+        'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
+        'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'multiple' => true,
+        'title'    => __( 'Hover Animations', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Hover Animations', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 
 function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                            => __( 'Default', 'ayecode-connect' ),
-		'justify-content' . $device_size . '-start'   => 'justify-content-start',
-		'justify-content' . $device_size . '-end'     => 'justify-content-end',
-		'justify-content' . $device_size . '-center'  => 'justify-content-center',
-		'justify-content' . $device_size . '-between' => 'justify-content-between',
-		'justify-content' . $device_size . '-stretch' => 'justify-content-around',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Justify content', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                            => __( 'Default', 'ayecode-connect' ),
+        'justify-content' . $device_size . '-start'   => 'justify-content-start',
+        'justify-content' . $device_size . '-end'     => 'justify-content-end',
+        'justify-content' . $device_size . '-center'  => 'justify-content-center',
+        'justify-content' . $device_size . '-between' => 'justify-content-between',
+        'justify-content' . $device_size . '-stretch' => 'justify-content-around',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Justify content', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 
 function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Align Self', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Align Self', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __( 'Default', 'ayecode-connect' ),
-	);
-
-	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
-		$i++;
-	}
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __( 'Default', 'ayecode-connect' ),
+    );
+
+    $i = 0;
+    while ( $i <= 5 ) {
+        $options[ 'order' . $device_size . '-' . $i ] = $i;
+        $i++;
+    }
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Flex Order', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'flex' . $device_size . '-nowrap'       => 'nowrap',
-		'flex' . $device_size . '-wrap'         => 'wrap',
-		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'flex' . $device_size . '-nowrap'       => 'nowrap',
+        'flex' . $device_size . '-wrap'         => 'wrap',
+        'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Flex wrap', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_float_group( $type = 'float', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 function sd_get_float_input( $type = 'float', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'float' . $device_size . '-start'       => 'left',
-		'float' . $device_size . '-end'         => 'right',
-		'float' . $device_size . '-none' => 'none',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Float', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'float' . $device_size . '-start'       => 'left',
+        'float' . $device_size . '-end'         => 'right',
+        'float' . $device_size . '-none' => 'none',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Float', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1999,26 +1999,26 @@ 
  */
 function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
 
-	$options = array(
-		''          => __( 'Default', 'ayecode-connect' ),
-		'zindex-0'  => '0',
-		'zindex-1'  => '1',
-		'zindex-5'  => '5',
-		'zindex-10' => '10',
-	);
+    $options = array(
+        ''          => __( 'Default', 'ayecode-connect' ),
+        'zindex-0'  => '0',
+        'zindex-1'  => '1',
+        'zindex-5'  => '5',
+        'zindex-10' => '10',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Z-index', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Z-index', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2029,26 +2029,26 @@ 
  */
 function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'Default', 'ayecode-connect' ),
-		'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
-		'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
-		'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
-		'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'Default', 'ayecode-connect' ),
+        'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
+        'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
+        'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
+        'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Overflow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Overflow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2059,19 +2059,19 @@ 
  */
 function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'        => 'text',
-		'title'       => __( 'Max height', 'ayecode-connect' ),
-		'value'       => '',
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'text',
+        'title'       => __( 'Max height', 'ayecode-connect' ),
+        'value'       => '',
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2082,23 +2082,23 @@ 
  */
 function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
 
-	$options = array(
-		''               => __( 'Default', 'ayecode-connect' ),
-		'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''               => __( 'Default', 'ayecode-connect' ),
+        'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Scrollbars', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2109,17 +2109,17 @@ 
  */
 function sd_get_new_window_input( $type = 'target', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Open in new window', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Open in new window', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2130,17 +2130,17 @@ 
  */
 function sd_get_nofollow_input( $type = 'nofollow', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Add nofollow', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Add nofollow', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2153,35 +2153,35 @@ 
  */
 function sd_get_width_input( $type = 'width', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __('Default', 'ayecode-connect'),
-		'w' . $device_size . '-25' => '25%',
-		'w' . $device_size . '-50' => '50%',
-		'w' . $device_size . '-75' => '75%',
-		'w' . $device_size . '-100' => '100%',
-		'w' . $device_size . '-auto' => 'auto',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Width', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __('Default', 'ayecode-connect'),
+        'w' . $device_size . '-25' => '25%',
+        'w' . $device_size . '-50' => '50%',
+        'w' . $device_size . '-75' => '75%',
+        'w' . $device_size . '-100' => '100%',
+        'w' . $device_size . '-auto' => 'auto',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Width', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -2194,35 +2194,35 @@ 
  */
 function sd_get_height_input( $type = 'height', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __('Default', 'ayecode-connect'),
-		'h' . $device_size . '-25' => '25%',
-		'h' . $device_size . '-50' => '50%',
-		'h' . $device_size . '-75' => '75%',
-		'h' . $device_size . '-100' => '100%',
-		'h' . $device_size . '-auto' => 'auto',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Height', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __('Default', 'ayecode-connect'),
+        'h' . $device_size . '-25' => '25%',
+        'h' . $device_size . '-50' => '50%',
+        'h' . $device_size . '-75' => '75%',
+        'h' . $device_size . '-100' => '100%',
+        'h' . $device_size . '-auto' => 'auto',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Height', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -2233,19 +2233,19 @@ 
  */
 function sd_get_attributes_input( $type = 'attributes', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'        => 'text',
-		'title'       => __( 'Custom Attributes', 'ayecode-connect' ),
-		'value'       => '',
-		'default'     => '',
-		'placeholder' => 'key|value,key2|value2',
-		'desc_tip'    => true,
-		'group'       => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'text',
+        'title'       => __( 'Custom Attributes', 'ayecode-connect' ),
+        'value'       => '',
+        'default'     => '',
+        'placeholder' => 'key|value,key2|value2',
+        'desc_tip'    => true,
+        'group'       => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2254,32 +2254,32 @@ 
  * @return string
  */
 function sd_build_attributes_string_escaped( $args ) {
-	global $aui_bs5;
+    global $aui_bs5;
 
-	$attributes = array();
-	$string_escaped = '';
+    $attributes = array();
+    $string_escaped = '';
 
-	if ( ! empty( $args['custom'] ) ) {
-		$attributes = sd_parse_custom_attributes($args['custom']);
-	}
+    if ( ! empty( $args['custom'] ) ) {
+        $attributes = sd_parse_custom_attributes($args['custom']);
+    }
 
-	// new window
-	if ( ! empty( $args['new_window'] ) ) {
-		$attributes['target'] = '_blank';
-	}
+    // new window
+    if ( ! empty( $args['new_window'] ) ) {
+        $attributes['target'] = '_blank';
+    }
 
-	// nofollow
-	if ( ! empty( $args['nofollow'] ) ) {
-		$attributes['rel'] = isset($attributes['rel']) ? $attributes['rel'] . ' nofollow' : 'nofollow';
-	}
+    // nofollow
+    if ( ! empty( $args['nofollow'] ) ) {
+        $attributes['rel'] = isset($attributes['rel']) ? $attributes['rel'] . ' nofollow' : 'nofollow';
+    }
 
-	if(!empty($attributes )){
-		foreach ( $attributes as $key => $val ) {
-			$string_escaped .= esc_attr($key) . '="' . esc_attr($val) . '" ';
-		}
-	}
+    if(!empty($attributes )){
+        foreach ( $attributes as $key => $val ) {
+            $string_escaped .= esc_attr($key) . '="' . esc_attr($val) . '" ';
+        }
+    }
 
-	return $string_escaped;
+    return $string_escaped;
 }
 
 /**
@@ -2291,38 +2291,38 @@ 
  * @return array
  */
 function sd_parse_custom_attributes( $attributes_string, $delimiter = ',' ) {
-	$attributes = explode( $delimiter, $attributes_string );
-	$result = [];
+    $attributes = explode( $delimiter, $attributes_string );
+    $result = [];
 
-	foreach ( $attributes as $attribute ) {
-		$attr_key_value = explode( '|', $attribute );
+    foreach ( $attributes as $attribute ) {
+        $attr_key_value = explode( '|', $attribute );
 
-		$attr_key = mb_strtolower( $attr_key_value[0] );
+        $attr_key = mb_strtolower( $attr_key_value[0] );
 
-		// Remove any not allowed characters.
-		preg_match( '/[-_a-z0-9]+/', $attr_key, $attr_key_matches );
+        // Remove any not allowed characters.
+        preg_match( '/[-_a-z0-9]+/', $attr_key, $attr_key_matches );
 
-		if ( empty( $attr_key_matches[0] ) ) {
-			continue;
-		}
+        if ( empty( $attr_key_matches[0] ) ) {
+            continue;
+        }
 
-		$attr_key = $attr_key_matches[0];
+        $attr_key = $attr_key_matches[0];
 
-		// Avoid Javascript events and unescaped href.
-		if ( 'href' === $attr_key || 'on' === substr( $attr_key, 0, 2 ) ) {
-			continue;
-		}
+        // Avoid Javascript events and unescaped href.
+        if ( 'href' === $attr_key || 'on' === substr( $attr_key, 0, 2 ) ) {
+            continue;
+        }
 
-		if ( isset( $attr_key_value[1] ) ) {
-			$attr_value = trim( $attr_key_value[1] );
-		} else {
-			$attr_value = '';
-		}
+        if ( isset( $attr_key_value[1] ) ) {
+            $attr_value = trim( $attr_key_value[1] );
+        } else {
+            $attr_value = '';
+        }
 
-		$result[ $attr_key ] = $attr_value;
-	}
+        $result[ $attr_key ] = $attr_value;
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -2334,424 +2334,424 @@ 
  * @todo find best way to use px- py- or general p-
  */
 function sd_build_aui_class( $args ) {
-	global $aui_bs5;
-
-	$classes = array();
-
-	if ( $aui_bs5 ) {
-		$p_ml = 'ms-';
-		$p_mr = 'me-';
-
-		$p_pl = 'ps-';
-		$p_pr = 'pe-';
-	} else {
-		$p_ml = 'ml-';
-		$p_mr = 'mr-';
-
-		$p_pl = 'pl-';
-		$p_pr = 'pr-';
-	}
-
-	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
-		$mt        = $args['mt'];
-	} else {
-		$mt = null;
-	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
-		$mr        = $args['mr'];
-	} else {
-		$mr = null;
-	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
-		$mb        = $args['mb'];
-	} else {
-		$mb = null;
-	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
-		$ml        = $args['ml'];
-	} else {
-		$ml = null;
-	}
-
-	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
-		$mt_md     = $args['mt_md'];
-	} else {
-		$mt_md = null;
-	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
-		$mr_md     = $args['mr_md'];
-	} else {
-		$mr_md = null;
-	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
-		$mb_md     = $args['mb_md'];
-	} else {
-		$mb_md = null;
-	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
-		$ml_md     = $args['ml_md'];
-	} else {
-		$ml_md = null;
-	}
-
-	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
-		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
-		}
-	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
-		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
-		}
-	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
-		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
-		}
-	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
-		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
-		}
-	}
-
-	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
-		$pt        = $args['pt'];
-	} else {
-		$pt = null;
-	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
-		$pr        = $args['pr'];
-	} else {
-		$pr = null;
-	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
-		$pb        = $args['pb'];
-	} else {
-		$pb = null;
-	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
-		$pl        = $args['pl'];
-	} else {
-		$pl = null;
-	}
-
-	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
-		$pt_md     = $args['pt_md'];
-	} else {
-		$pt_md = null;
-	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
-		$pr_md     = $args['pr_md'];
-	} else {
-		$pr_md = null;
-	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
-		$pb_md     = $args['pb_md'];
-	} else {
-		$pb_md = null;
-	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
-		$pl_md     = $args['pl_md'];
-	} else {
-		$pl_md = null;
-	}
-
-	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
-		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
-		}
-	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
-		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
-		}
-	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
-		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
-		}
-	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
-		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
-		}
-	}
-
-	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
-		$row_cols  = $args['row_cols'];
-	} else {
-		$row_cols = null;
-	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
-		$row_cols_md = $args['row_cols_md'];
-	} else {
-		$row_cols_md = null;
-	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
-		}
-	}
-
-	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
-		$col       = $args['col'];
-	} else {
-		$col = null;
-	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
-		$col_md    = $args['col_md'];
-	} else {
-		$col_md = null;
-	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
-		}
-	}
-
-	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
-		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
-		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
-			$border_class = '';
-		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
-	}
-
-	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
-	}
-
-	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
-		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
-		}
-	} else {
-
-		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
-			$rounded_size = $args['rounded_size'];
-		} else {
-			$rounded_size = null;
-		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
-			$rounded_size_md = $args['rounded_size_md'];
-		} else {
-			$rounded_size_md = null;
-		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
-			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
-			}
-		}
-	}
-
-	// shadow
-	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
-
-	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
-	}
-
-	// background image fixed bg_image_fixed this helps fix a iOS bug
-	if ( ! empty( $args['bg_image_fixed'] ) ) {
-		$classes[] = 'bg-image-fixed';
-	}
-
-	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
-	}
-
-	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
-		$classes[] = 'text-justify';
-	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
-			$text_align = $args['text_align'];
-		} else {
-			$text_align = null;
-		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
-			$text_align_md = $args['text_align_md'];
-		} else {
-			$text_align_md = null;
-		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
-			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
-			}
-		}
-	}
-
-	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
-		$display   = $args['display'];
-	} else {
-		$display = null;
-	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
-		$display_md = $args['display_md'];
-	} else {
-		$display_md = null;
-	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
-		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
-		}
-	}
-
-	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
-	}
-
-	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
-	}
-
-	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
-	}
-
-	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 bottom-0';
-		}
-	}
-
-	// build classes from build keys
-	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
-
-			if ( substr( $key, -4 ) == '-MTD' ) {
-
-				$k = str_replace( '-MTD', '', $key );
-
-				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
-				} else {
-					$v = null;
-				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
-				} else {
-					$v_md = null;
-				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
-					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
-					}
-				}
-			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
-					continue;
-				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
-				}
-			}
-		}
-	}
-
-	if ( ! empty( $classes ) ) {
-		$classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
-	}
-
-	return implode( ' ', $classes );
+    global $aui_bs5;
+
+    $classes = array();
+
+    if ( $aui_bs5 ) {
+        $p_ml = 'ms-';
+        $p_mr = 'me-';
+
+        $p_pl = 'ps-';
+        $p_pr = 'pe-';
+    } else {
+        $p_ml = 'ml-';
+        $p_mr = 'mr-';
+
+        $p_pl = 'pl-';
+        $p_pr = 'pr-';
+    }
+
+    // margins.
+    if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
+        $classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+        $mt        = $args['mt'];
+    } else {
+        $mt = null;
+    }
+    if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
+        $classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+        $mr        = $args['mr'];
+    } else {
+        $mr = null;
+    }
+    if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
+        $classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+        $mb        = $args['mb'];
+    } else {
+        $mb = null;
+    }
+    if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
+        $classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+        $ml        = $args['ml'];
+    } else {
+        $ml = null;
+    }
+
+    // margins tablet.
+    if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
+        $classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+        $mt_md     = $args['mt_md'];
+    } else {
+        $mt_md = null;
+    }
+    if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
+        $classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+        $mr_md     = $args['mr_md'];
+    } else {
+        $mr_md = null;
+    }
+    if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
+        $classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+        $mb_md     = $args['mb_md'];
+    } else {
+        $mb_md = null;
+    }
+    if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
+        $classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+        $ml_md     = $args['ml_md'];
+    } else {
+        $ml_md = null;
+    }
+
+    // margins desktop.
+    if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
+        if ( $mt == null && $mt_md == null ) {
+            $classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+        } else {
+            $classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+        }
+    }
+    if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
+        if ( $mr == null && $mr_md == null ) {
+            $classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+        } else {
+            $classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+        }
+    }
+    if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
+        if ( $mb == null && $mb_md == null ) {
+            $classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+        } else {
+            $classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+        }
+    }
+    if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
+        if ( $ml == null && $ml_md == null ) {
+            $classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+        } else {
+            $classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+        }
+    }
+
+    // padding.
+    if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
+        $classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+        $pt        = $args['pt'];
+    } else {
+        $pt = null;
+    }
+    if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
+        $classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+        $pr        = $args['pr'];
+    } else {
+        $pr = null;
+    }
+    if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
+        $classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+        $pb        = $args['pb'];
+    } else {
+        $pb = null;
+    }
+    if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
+        $classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+        $pl        = $args['pl'];
+    } else {
+        $pl = null;
+    }
+
+    // padding tablet.
+    if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
+        $classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+        $pt_md     = $args['pt_md'];
+    } else {
+        $pt_md = null;
+    }
+    if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
+        $classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+        $pr_md     = $args['pr_md'];
+    } else {
+        $pr_md = null;
+    }
+    if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
+        $classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+        $pb_md     = $args['pb_md'];
+    } else {
+        $pb_md = null;
+    }
+    if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
+        $classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+        $pl_md     = $args['pl_md'];
+    } else {
+        $pl_md = null;
+    }
+
+    // padding desktop.
+    if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
+        if ( $pt == null && $pt_md == null ) {
+            $classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+        } else {
+            $classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+        }
+    }
+    if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
+        if ( $pr == null && $pr_md == null ) {
+            $classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+        } else {
+            $classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+        }
+    }
+    if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
+        if ( $pb == null && $pb_md == null ) {
+            $classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+        } else {
+            $classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+        }
+    }
+    if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
+        if ( $pl == null && $pl_md == null ) {
+            $classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+        } else {
+            $classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+        }
+    }
+
+    // row cols, mobile, tablet, desktop
+    if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
+        $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+        $row_cols  = $args['row_cols'];
+    } else {
+        $row_cols = null;
+    }
+    if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
+        $classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+        $row_cols_md = $args['row_cols_md'];
+    } else {
+        $row_cols_md = null;
+    }
+    if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
+        if ( $row_cols == null && $row_cols_md == null ) {
+            $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+        }
+    }
+
+    // columns , mobile, tablet, desktop
+    if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-' . $args['col'] );
+        $col       = $args['col'];
+    } else {
+        $col = null;
+    }
+    if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+        $col_md    = $args['col_md'];
+    } else {
+        $col_md = null;
+    }
+    if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
+        if ( $col == null && $col_md == null ) {
+            $classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+        }
+    }
+
+    // border
+    if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+        $classes[] = 'border-0';
+    } elseif ( ! empty( $args['border'] ) ) {
+        $border_class = 'border';
+        if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+            $border_class = '';
+        }
+        $classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+    }
+
+    // border radius type
+    if ( ! empty( $args['rounded'] ) ) {
+        $classes[] = sanitize_html_class( $args['rounded'] );
+    }
+
+    // border radius size BS4
+    if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
+        $classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+        // if we set a size then we need to remove "rounded" if set
+        if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+    } else {
+
+        // border radius size , mobile, tablet, desktop
+        if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
+            $classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+            $rounded_size = $args['rounded_size'];
+        } else {
+            $rounded_size = null;
+        }
+        if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
+            $classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+            $rounded_size_md = $args['rounded_size_md'];
+        } else {
+            $rounded_size_md = null;
+        }
+        if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
+            if ( $rounded_size == null && $rounded_size_md == null ) {
+                $classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+            } else {
+                $classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+            }
+        }
+    }
+
+    // shadow
+    //if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
+
+    // background
+    if ( ! empty( $args['bg'] ) ) {
+        $classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+    }
+
+    // background image fixed bg_image_fixed this helps fix a iOS bug
+    if ( ! empty( $args['bg_image_fixed'] ) ) {
+        $classes[] = 'bg-image-fixed';
+    }
+
+    // text_color
+    if ( ! empty( $args['text_color'] ) ) {
+        $classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+    }
+
+    // text_align
+    if ( ! empty( $args['text_justify'] ) ) {
+        $classes[] = 'text-justify';
+    } else {
+        if ( ! empty( $args['text_align'] ) ) {
+            $classes[]  = sanitize_html_class( $args['text_align'] );
+            $text_align = $args['text_align'];
+        } else {
+            $text_align = null;
+        }
+        if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
+            $classes[]     = sanitize_html_class( $args['text_align_md'] );
+            $text_align_md = $args['text_align_md'];
+        } else {
+            $text_align_md = null;
+        }
+        if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
+            if ( $text_align == null && $text_align_md == null ) {
+                $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+            } else {
+                $classes[] = sanitize_html_class( $args['text_align_lg'] );
+            }
+        }
+    }
+
+    // display
+    if ( ! empty( $args['display'] ) ) {
+        $classes[] = sanitize_html_class( $args['display'] );
+        $display   = $args['display'];
+    } else {
+        $display = null;
+    }
+    if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
+        $classes[]  = sanitize_html_class( $args['display_md'] );
+        $display_md = $args['display_md'];
+    } else {
+        $display_md = null;
+    }
+    if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
+        if ( $display == null && $display_md == null ) {
+            $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+        } else {
+            $classes[] = sanitize_html_class( $args['display_lg'] );
+        }
+    }
+
+    // bgtus - background transparent until scroll
+    if ( ! empty( $args['bgtus'] ) ) {
+        $classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+    }
+
+    // cscos - change color scheme on scroll
+    if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
+        $classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+    }
+
+    // hover animations
+    if ( ! empty( $args['hover_animations'] ) ) {
+        $classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+    }
+
+    // absolute_position
+    if ( ! empty( $args['absolute_position'] ) ) {
+        if ( 'top-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-0';
+        } elseif ( 'top-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-0 translate-middle';
+        } elseif ( 'top-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-0';
+        } elseif ( 'center-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-50';
+        } elseif ( 'center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-50 translate-middle';
+        } elseif ( 'center-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-50';
+        } elseif ( 'bottom-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 bottom-0';
+        } elseif ( 'bottom-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 bottom-0 translate-middle';
+        } elseif ( 'bottom-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 bottom-0';
+        }
+    }
+
+    // build classes from build keys
+    $build_keys = sd_get_class_build_keys();
+    if ( ! empty( $build_keys ) ) {
+        foreach ( $build_keys as $key ) {
+
+            if ( substr( $key, -4 ) == '-MTD' ) {
+
+                $k = str_replace( '-MTD', '', $key );
+
+                // Mobile, Tablet, Desktop
+                if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k ] );
+                    $v         = $args[ $k ];
+                } else {
+                    $v = null;
+                }
+                if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k . '_md' ] );
+                    $v_md      = $args[ $k . '_md' ];
+                } else {
+                    $v_md = null;
+                }
+                if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
+                    if ( $v == null && $v_md == null ) {
+                        $classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+                    } else {
+                        $classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+                    }
+                }
+            } else {
+                if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+                    continue;
+                }
+                if ( ! empty( $args[ $key ] ) ) {
+                    $classes[] = sd_sanitize_html_classes( $args[ $key ] );
+                }
+            }
+        }
+    }
+
+    if ( ! empty( $classes ) ) {
+        $classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
+    }
+
+    return implode( ' ', $classes );
 }
 
 /**
@@ -2763,90 +2763,90 @@ 
  */
 function sd_build_aui_styles( $args ) {
 
-	$styles = array();
-
-	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
-			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] = $args['bg_gradient'];
-
-			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
-				$styles['background-clip']         = 'text';
-				$styles['-webkit-background-clip'] = 'text';
-				$styles['text-fill-color']         = 'transparent';
-				$styles['-webkit-text-fill-color'] = 'transparent';
-			}
-		}
-	}
-
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
-		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
-			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
-			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
-			// do nothing as we alreay have a preset
-			$hasImage = false;
-		} else {
-			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
-		}
-
-		if ( $hasImage ) {
-			$styles['background-size'] = 'cover';
-
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
-				$styles['background-attachment'] = 'fixed';
-			}
-		}
-
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
-		}
-	}
-
-	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
-	}
-
-	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
-	}
-
-	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
-		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
-	}
-
-	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
-	}
-
-	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
-	}
-
-	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
-	}
-
-	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
-		}
-	}
-
-	return $style_string;
+    $styles = array();
+
+    // background color
+    if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
+        if ( $args['bg'] == 'custom-color' ) {
+            $styles['background-color'] = $args['bg_color'];
+        } elseif ( $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] = $args['bg_gradient'];
+
+            // use background on text.
+            if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+                $styles['background-clip']         = 'text';
+                $styles['-webkit-background-clip'] = 'text';
+                $styles['text-fill-color']         = 'transparent';
+                $styles['-webkit-text-fill-color'] = 'transparent';
+            }
+        }
+    }
+
+    if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+        $hasImage = true;
+        if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+            $styles['background-image']      = 'url(' . $args['bg_image'] . ')';
+            $styles['background-blend-mode'] = 'overlay';
+        } elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
+        } elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+            // do nothing as we alreay have a preset
+            $hasImage = false;
+        } else {
+            $styles['background-image'] = 'url(' . $args['bg_image'] . ')';
+        }
+
+        if ( $hasImage ) {
+            $styles['background-size'] = 'cover';
+
+            if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+                $styles['background-attachment'] = 'fixed';
+            }
+        }
+
+        if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
+            $styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+        }
+    }
+
+    // sticky offset top
+    if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
+        $styles['top'] = absint( $args['sticky_offset_top'] );
+    }
+
+    // sticky offset bottom
+    if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
+        $styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+    }
+
+    // font size
+    if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+        $styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
+    }
+
+    // font color
+    if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
+        $styles['color'] = esc_attr( $args['text_color_custom'] );
+    }
+
+    // font line height
+    if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
+        $styles['line-height'] = esc_attr( $args['font_line_height'] );
+    }
+
+    // max height
+    if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
+        $styles['max-height'] = esc_attr( $args['max_height'] );
+    }
+
+    $style_string = '';
+    if ( ! empty( $styles ) ) {
+        foreach ( $styles as $key => $val ) {
+            $style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+        }
+    }
+
+    return $style_string;
 
 }
 
@@ -2859,34 +2859,34 @@ 
  * @return string
  */
 function sd_build_hover_styles( $args, $is_preview = false ) {
-	$rules = '';
-	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
-
-		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
-			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
-		}
-
-		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
-				$color  = $args['bg_hover_gradient'];
-				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
-			} else {
-				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
-				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
-			}
-		}
-	}
-
-	return $rules ? '<style>' . $rules . '</style>' : '';
+    $rules = '';
+    // text color
+    if ( ! empty( $args['styleid'] ) ) {
+        $styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+
+        // text
+        if ( ! empty( $args['text_color_hover'] ) ) {
+            $key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
+            $color  = sd_get_color_from_var( $args[ $key ] );
+            $rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
+        }
+
+        // bg
+        if ( ! empty( $args['bg_hover'] ) ) {
+            if ( 'custom-gradient' === $args['bg_hover'] ) {
+                $color  = $args['bg_hover_gradient'];
+                $rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
+            } else {
+                $key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
+                $color  = sd_get_color_from_var( $args[ $key ] );
+                $rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
+            }
+        }
+    }
+
+    return $rules ? '<style>' . $rules . '</style>' : '';
 }
 
 /**
@@ -2898,12 +2898,12 @@ 
  */
 function sd_get_color_from_var( $var ) {
 
-	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
-	}
+    //sanitize_hex_color() @todo this does not cover transparency
+    if ( strpos( $var, '#' ) === false ) {
+        $var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+    }
 
-	return $var;
+    return $var;
 }
 
 /**
@@ -2915,19 +2915,19 @@ 
  * @return string
  */
 function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
-	$return = '';
+    $return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
-	}
+    if ( ! is_array( $classes ) ) {
+        $classes = explode( $sep, $classes );
+    }
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
-		}
-	}
+    if ( ! empty( $classes ) ) {
+        foreach ( $classes as $class ) {
+            $return .= sanitize_html_class( $class ) . ' ';
+        }
+    }
 
-	return $return;
+    return $return;
 }
 
 
@@ -2937,40 +2937,40 @@ 
  * @return void
  */
 function sd_get_class_build_keys() {
-	$keys = array(
-		'container',
-		'position',
-		'flex_direction',
-		'shadow',
-		'rounded',
-		'nav_style',
-		'horizontal_alignment',
-		'nav_fill',
-		'width',
-		'font_weight',
-		'font_size',
-		'font_case',
-		'css_class',
-		'flex_align_items-MTD',
-		'flex_justify_content-MTD',
-		'flex_align_self-MTD',
-		'flex_order-MTD',
-		'styleid',
-		'border_opacity',
-		'border_width',
-		'border_type',
-		'opacity',
-		'zindex',
-		'flex_wrap-MTD',
-		'h100',
-		'overflow',
-		'scrollbars',
-		'float-MTD',
-		'height-MTD',
-		'width-MTD'
-	);
-
-	return apply_filters( 'sd_class_build_keys', $keys );
+    $keys = array(
+        'container',
+        'position',
+        'flex_direction',
+        'shadow',
+        'rounded',
+        'nav_style',
+        'horizontal_alignment',
+        'nav_fill',
+        'width',
+        'font_weight',
+        'font_size',
+        'font_case',
+        'css_class',
+        'flex_align_items-MTD',
+        'flex_justify_content-MTD',
+        'flex_align_self-MTD',
+        'flex_order-MTD',
+        'styleid',
+        'border_opacity',
+        'border_width',
+        'border_type',
+        'opacity',
+        'zindex',
+        'flex_wrap-MTD',
+        'h100',
+        'overflow',
+        'scrollbars',
+        'float-MTD',
+        'height-MTD',
+        'width-MTD'
+    );
+
+    return apply_filters( 'sd_class_build_keys', $keys );
 }
 
 /**
@@ -2982,18 +2982,18 @@ 
  * @return array
  */
 function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
-	$defaults = array(
-		'type'         => 'visibility_conditions',
-		'title'        => __( 'Block Visibility', 'ayecode-connect' ),
-		'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
-		'default'      => '',
-		'desc_tip'     => true,
-		'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'         => 'visibility_conditions',
+        'title'        => __( 'Block Visibility', 'ayecode-connect' ),
+        'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
+        'default'      => '',
+        'desc_tip'     => true,
+        'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -3005,24 +3005,24 @@ 
  * @return array An array of roles.
  */
 function sd_user_roles_options( $exclude = array() ) {
-	$user_roles = array();
+    $user_roles = array();
 
-	if ( !function_exists('get_editable_roles') ) {
-		require_once( ABSPATH . '/wp-admin/includes/user.php' );
-	}
+    if ( !function_exists('get_editable_roles') ) {
+        require_once( ABSPATH . '/wp-admin/includes/user.php' );
+    }
 
-	$roles = get_editable_roles();
+    $roles = get_editable_roles();
 
-	foreach ( $roles as $role => $data ) {
-		if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
-			$user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
-		}
-	}
+    foreach ( $roles as $role => $data ) {
+        if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
+            $user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
+        }
+    }
 
-	// Logged out as a custom role.
-	$user_roles['logged_out'] = __( 'Guest (logged out)', 'ayecode-connect' );
+    // Logged out as a custom role.
+    $user_roles['logged_out'] = __( 'Guest (logged out)', 'ayecode-connect' );
 
-	return apply_filters( 'sd_user_roles_options', $user_roles );
+    return apply_filters( 'sd_user_roles_options', $user_roles );
 }
 
 /**
@@ -3033,18 +3033,18 @@ 
  * @return array Rule options.
  */
 function sd_visibility_rules_options() {
-	$options = array(
-		'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
-		'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
-		'post_author'  => __( 'Post Author', 'ayecode-connect' ),
-		'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
-	);
+    $options = array(
+        'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
+        'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
+        'post_author'  => __( 'Post Author', 'ayecode-connect' ),
+        'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
+    );
 
-	if ( class_exists( 'GeoDirectory' ) ) {
-		$options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
-	}
+    if ( class_exists( 'GeoDirectory' ) ) {
+        $options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
+    }
 
-	return apply_filters( 'sd_visibility_rules_options', $options );
+    return apply_filters( 'sd_visibility_rules_options', $options );
 }
 
 /**
@@ -3053,39 +3053,39 @@ 
  * @return array
  */
 function sd_visibility_gd_field_options() {
-	$fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
+    $fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
 
-	$keys = array();
-	if ( ! empty( $fields ) ) {
-		foreach( $fields as $field ) {
-			if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
-				continue;
-			}
+    $keys = array();
+    if ( ! empty( $fields ) ) {
+        foreach( $fields as $field ) {
+            if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
+                continue;
+            }
 
-			$keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
+            $keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
 
-			// Extra address fields
-			if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				foreach ( $address_fields as $_field => $args ) {
-					if ( $_field != 'map_directions' && $_field != 'street' ) {
-						$keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
-					}
-				}
-			}
-		}
-	}
+            // Extra address fields
+            if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                foreach ( $address_fields as $_field => $args ) {
+                    if ( $_field != 'map_directions' && $_field != 'street' ) {
+                        $keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
+                    }
+                }
+            }
+        }
+    }
 
-	$standard_fields = sd_visibility_gd_standard_field_options();
+    $standard_fields = sd_visibility_gd_standard_field_options();
 
-	if ( ! empty( $standard_fields ) ) {
-		foreach ( $standard_fields as $key => $option ) {
-			$keys[ $key ] = $option;
-		}
-	}
+    if ( ! empty( $standard_fields ) ) {
+        foreach ( $standard_fields as $key => $option ) {
+            $keys[ $key ] = $option;
+        }
+    }
 
-	$options = apply_filters( 'geodir_badge_field_keys', $keys );
+    $options = apply_filters( 'geodir_badge_field_keys', $keys );
 
-	return apply_filters( 'sd_visibility_gd_field_options', $options );
+    return apply_filters( 'sd_visibility_gd_field_options', $options );
 }
 
 /**
@@ -3094,17 +3094,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_field_options( $post_type = '' ) {
-	$fields = sd_visibility_gd_standard_fields( $post_type );
+    $fields = sd_visibility_gd_standard_fields( $post_type );
 
-	$options = array();
+    $options = array();
 
-	foreach ( $fields as $key => $field ) {
-		if ( ! empty( $field['frontend_title'] ) ) {
-			$options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
-		}
-	}
+    foreach ( $fields as $key => $field ) {
+        if ( ! empty( $field['frontend_title'] ) ) {
+            $options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
+    return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
 }
 
 /**
@@ -3113,17 +3113,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_fields( $post_type = '' ) {
-	$standard_fields = geodir_post_meta_standard_fields( $post_type );
+    $standard_fields = geodir_post_meta_standard_fields( $post_type );
 
-	$fields = array();
+    $fields = array();
 
-	foreach ( $standard_fields as $key => $field ) {
-		if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
-			$fields[ $key ] = $field;
-		}
-	}
+    foreach ( $standard_fields as $key => $field ) {
+        if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
+            $fields[ $key ] = $field;
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
+    return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
 }
 
 /**
@@ -3132,18 +3132,18 @@ 
  * @return array
  */
 function sd_visibility_field_condition_options(){
-	$options = array(
-		'is_empty' => __( 'is empty', 'ayecode-connect' ),
-		'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
-		'is_equal' => __( 'is equal', 'ayecode-connect' ),
-		'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
-		'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
-		'is_less_than' => __( 'is less than', 'ayecode-connect' ),
-		'is_contains' => __( 'is contains', 'ayecode-connect' ),
-		'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
-	);
+    $options = array(
+        'is_empty' => __( 'is empty', 'ayecode-connect' ),
+        'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
+        'is_equal' => __( 'is equal', 'ayecode-connect' ),
+        'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
+        'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
+        'is_less_than' => __( 'is less than', 'ayecode-connect' ),
+        'is_contains' => __( 'is contains', 'ayecode-connect' ),
+        'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_field_condition_options', $options );
+    return apply_filters( 'sd_visibility_field_condition_options', $options );
 }
 
 /**
@@ -3154,15 +3154,15 @@ 
  * @return array Template type options.
  */
 function sd_visibility_output_options() {
-	$options = array(
-		''              => __( 'Show Block', 'ayecode-connect' ),
-		'hide'          => __( 'Hide Block', 'ayecode-connect' ),
-		'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
-		'page'          => __( 'Show Page Content', 'ayecode-connect' ),
-		'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''              => __( 'Show Block', 'ayecode-connect' ),
+        'hide'          => __( 'Hide Block', 'ayecode-connect' ),
+        'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
+        'page'          => __( 'Show Page Content', 'ayecode-connect' ),
+        'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_output_options', $options );
+    return apply_filters( 'sd_visibility_output_options', $options );
 }
 
 /**
@@ -3174,73 +3174,73 @@ 
  * @return array Template page options.
  */
 function sd_template_page_options( $args = array() ) {
-	global $wpdb, $sd_tmpl_page_options;
+    global $wpdb, $sd_tmpl_page_options;
 
-	$defaults = array(
-		'nocache' => false,
-		'with_slug' => false,
-		'default_label' => __( 'Select Page...', 'ayecode-connect' )
-	);
+    $defaults = array(
+        'nocache' => false,
+        'with_slug' => false,
+        'default_label' => __( 'Select Page...', 'ayecode-connect' )
+    );
 
-	$args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args( $args, $defaults );
 
-	if ( ! empty( $sd_tmpl_page_options ) && empty( $args['nocache'] ) ) {
-		return $sd_tmpl_page_options;
-	}
+    if ( ! empty( $sd_tmpl_page_options ) && empty( $args['nocache'] ) ) {
+        return $sd_tmpl_page_options;
+    }
 
-	$exclude_pages = array();
-	if ( $page_on_front = get_option( 'page_on_front' ) ) {
-		$exclude_pages[] = $page_on_front;
-	}
+    $exclude_pages = array();
+    if ( $page_on_front = get_option( 'page_on_front' ) ) {
+        $exclude_pages[] = $page_on_front;
+    }
 
-	if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
-		$exclude_pages[] = $page_for_posts;
-	}
+    if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
+        $exclude_pages[] = $page_for_posts;
+    }
 
-	$exclude_pages_placeholders = '';
-	if ( ! empty( $exclude_pages ) ) {
-		// Sanitize the array of excluded pages and implode it for the SQL query.
-		$exclude_pages_placeholders = implode( ',', array_fill( 0, count( $exclude_pages ), '%d' ) );
-	}
+    $exclude_pages_placeholders = '';
+    if ( ! empty( $exclude_pages ) ) {
+        // Sanitize the array of excluded pages and implode it for the SQL query.
+        $exclude_pages_placeholders = implode( ',', array_fill( 0, count( $exclude_pages ), '%d' ) );
+    }
 
-	// Prepare the base SQL query.
-	$sql = "SELECT ID, post_title, post_name FROM " . $wpdb->posts . " WHERE post_type = 'page' AND post_status = 'publish'";
+    // Prepare the base SQL query.
+    $sql = "SELECT ID, post_title, post_name FROM " . $wpdb->posts . " WHERE post_type = 'page' AND post_status = 'publish'";
 
-	// Add the exclusion if there are pages to exclude
-	if ( ! empty( $exclude_pages ) ) {
-		$sql .= " AND ID NOT IN ($exclude_pages_placeholders)";
-	}
+    // Add the exclusion if there are pages to exclude
+    if ( ! empty( $exclude_pages ) ) {
+        $sql .= " AND ID NOT IN ($exclude_pages_placeholders)";
+    }
 
-	// Add sorting.
-	$sql .= " ORDER BY post_title ASC";
+    // Add sorting.
+    $sql .= " ORDER BY post_title ASC";
 
-	// Add a limit.
-	$limit = (int) apply_filters( 'sd_template_page_options_limit', 500, $args );
+    // Add a limit.
+    $limit = (int) apply_filters( 'sd_template_page_options_limit', 500, $args );
 
-	if ( $limit > 0 ) {
-		$sql .= " LIMIT " . (int) $limit;
-	}
+    if ( $limit > 0 ) {
+        $sql .= " LIMIT " . (int) $limit;
+    }
 
-	// Prepare the SQL query to include the excluded pages only if we have placeholders.
-	$pages = $exclude_pages_placeholders ? $wpdb->get_results( $wpdb->prepare( $sql, ...$exclude_pages ) ) : $wpdb->get_results( $sql );
+    // Prepare the SQL query to include the excluded pages only if we have placeholders.
+    $pages = $exclude_pages_placeholders ? $wpdb->get_results( $wpdb->prepare( $sql, ...$exclude_pages ) ) : $wpdb->get_results( $sql );
 
-	if ( ! empty( $args['default_label'] ) ) {
-		$options = array( '' => $args['default_label'] );
-	} else {
-		$options = array();
-	}
+    if ( ! empty( $args['default_label'] ) ) {
+        $options = array( '' => $args['default_label'] );
+    } else {
+        $options = array();
+    }
 
-	if ( ! empty( $pages ) ) {
-		foreach ( $pages as $page ) {
-			$title = ! empty( $args['with_slug'] ) ? $page->post_title . ' (' . $page->post_name . ')' : ( $page->post_title . ' (#' . $page->ID . ')' );
+    if ( ! empty( $pages ) ) {
+        foreach ( $pages as $page ) {
+            $title = ! empty( $args['with_slug'] ) ? $page->post_title . ' (' . $page->post_name . ')' : ( $page->post_title . ' (#' . $page->ID . ')' );
 
-			$options[ $page->ID ] = $title;
-		}
-	}
+            $options[ $page->ID ] = $title;
+        }
+    }
 
-	$sd_tmpl_page_options = $options;
+    $sd_tmpl_page_options = $options;
 
-	return apply_filters( 'sd_template_page_options', $options, $args );
+    return apply_filters( 'sd_template_page_options', $options, $args );
 }
 
 /**
@@ -3252,25 +3252,25 @@ 
  * @return array Template part options.
  */
 function sd_template_part_options( $args = array() ) {
-	global $sd_tmpl_part_options;
+    global $sd_tmpl_part_options;
 
-	if ( ! empty( $sd_tmpl_part_options ) ) {
-		return $sd_tmpl_part_options;
-	}
+    if ( ! empty( $sd_tmpl_part_options ) ) {
+        return $sd_tmpl_part_options;
+    }
 
-	$options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
+    $options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
 
-	$parts = get_block_templates( array(), 'wp_template_part' );
+    $parts = get_block_templates( array(), 'wp_template_part' );
 
-	if ( ! empty( $parts ) ) {
-		foreach ( $parts as $part ) {
-			$options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
-		}
-	}
+    if ( ! empty( $parts ) ) {
+        foreach ( $parts as $part ) {
+            $options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
+        }
+    }
 
-	$sd_tmpl_part_options = $options;
+    $sd_tmpl_part_options = $options;
 
-	return apply_filters( 'sd_template_part_options', $options, $args );
+    return apply_filters( 'sd_template_part_options', $options, $args );
 }
 
 /**
@@ -3282,25 +3282,25 @@ 
  * @return array Template part object.
  */
 function sd_get_template_part_by_slug( $slug ) {
-	global $bs_tmpl_part_by_slug;
+    global $bs_tmpl_part_by_slug;
 
-	if ( empty( $bs_tmpl_part_by_slug ) ) {
-		$bs_tmpl_part_by_slug = array();
-	}
+    if ( empty( $bs_tmpl_part_by_slug ) ) {
+        $bs_tmpl_part_by_slug = array();
+    }
 
-	if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
-		return $bs_tmpl_part_by_slug[ $slug ];
-	}
+    if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
+        return $bs_tmpl_part_by_slug[ $slug ];
+    }
 
-	$template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
+    $template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
 
-	$query_post = ! empty( $template_query ) ? $template_query[0] : array();
+    $query_post = ! empty( $template_query ) ? $template_query[0] : array();
 
-	$template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
+    $template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
 
-	$bs_tmpl_part_by_slug[ $slug ] = $template_part;
+    $bs_tmpl_part_by_slug[ $slug ] = $template_part;
 
-	return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
+    return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
 }
 
 /**
@@ -3313,511 +3313,511 @@ 
  * @param WP_Block $instance      The block instance.
  */
 function sd_render_block( $block_content, $block, $instance = '' ) {
-	// No block visibility conditions set.
-	if ( empty( $block['attrs']['visibility_conditions'] ) ) {
-		return $block_content;
-	}
-
-	$attributes = json_decode( $block['attrs']['visibility_conditions'], true );
-	$rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
-
-	// remove rules with missing validators.
-	$valid_rules = sd_visibility_rules_options();
-
-	if ( ! empty( $rules ) ) {
-		foreach ( $rules as $key => $rule ) {
-			if ( ! isset( $valid_rules[ $rule['type'] ] ) ) {
-				unset( $rules[ $key ] );
-			}
-		}
-	}
-
-	// No rules set.
-	if ( empty( $rules ) ) {
-		return $block_content;
-	}
-
-	$check_rules = null;
-	$_block_content = $block_content;
-
-	if ( ! empty( $rules ) && ( ! empty( $attributes['output'] ) || ! empty( $attributes['outputN'] ) ) ) {
-		$check_rules = sd_block_check_rules( $rules );
-
-		if ( $check_rules ) {
-			$output_condition = ! empty( $attributes['output'] ) ? $attributes['output'] : array();
-		} else {
-			$output_condition = ! empty( $attributes['outputN'] ) ? $attributes['outputN'] : array();
-		}
-
-		if ( ! empty( $output_condition ) && ! empty( $output_condition['type'] ) ) {
-			switch ( $output_condition['type'] ) {
-				case 'hide':
-					$valid_type = true;
-					$content = '';
-
-					break;
-				case 'message':
-					$valid_type = true;
-
-					if ( isset( $output_condition['message'] ) ) {
-						$content = $output_condition['message'] != '' ? __( stripslashes( $output_condition['message'] ), 'ayecode-connect' ) : $output_condition['message'];
-
-						if ( ! empty( $output_condition['message_type'] ) ) {
-							$content = aui()->alert( array(
-									'type'=> $output_condition['message_type'],
-									'content'=> $content
-								)
-							);
-						}
-					}
-
-					break;
-				case 'page':
-					$valid_type = true;
-
-					$page_id = ! empty( $output_condition['page'] ) ? absint( $output_condition['page'] ) : 0;
-					$content = sd_get_page_content( $page_id );
-
-					break;
-				case 'template_part':
-					$valid_type = true;
-
-					$template_part = ! empty( $output_condition['template_part'] ) ? $output_condition['template_part'] : '';
-					$content = sd_get_template_part_content( $template_part );
-
-					break;
-				default:
-					$valid_type = false;
-					break;
-			}
-
-			if ( $valid_type ) {
-				$block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule' . ( $output_condition['type'] == 'hide' ? ' sd-block-hide-rule' : '' ) . '">' . $content . '</div>';
-			}
-		}
-	}
-
-	return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance, $check_rules );
+    // No block visibility conditions set.
+    if ( empty( $block['attrs']['visibility_conditions'] ) ) {
+        return $block_content;
+    }
+
+    $attributes = json_decode( $block['attrs']['visibility_conditions'], true );
+    $rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
+
+    // remove rules with missing validators.
+    $valid_rules = sd_visibility_rules_options();
+
+    if ( ! empty( $rules ) ) {
+        foreach ( $rules as $key => $rule ) {
+            if ( ! isset( $valid_rules[ $rule['type'] ] ) ) {
+                unset( $rules[ $key ] );
+            }
+        }
+    }
+
+    // No rules set.
+    if ( empty( $rules ) ) {
+        return $block_content;
+    }
+
+    $check_rules = null;
+    $_block_content = $block_content;
+
+    if ( ! empty( $rules ) && ( ! empty( $attributes['output'] ) || ! empty( $attributes['outputN'] ) ) ) {
+        $check_rules = sd_block_check_rules( $rules );
+
+        if ( $check_rules ) {
+            $output_condition = ! empty( $attributes['output'] ) ? $attributes['output'] : array();
+        } else {
+            $output_condition = ! empty( $attributes['outputN'] ) ? $attributes['outputN'] : array();
+        }
+
+        if ( ! empty( $output_condition ) && ! empty( $output_condition['type'] ) ) {
+            switch ( $output_condition['type'] ) {
+                case 'hide':
+                    $valid_type = true;
+                    $content = '';
+
+                    break;
+                case 'message':
+                    $valid_type = true;
+
+                    if ( isset( $output_condition['message'] ) ) {
+                        $content = $output_condition['message'] != '' ? __( stripslashes( $output_condition['message'] ), 'ayecode-connect' ) : $output_condition['message'];
+
+                        if ( ! empty( $output_condition['message_type'] ) ) {
+                            $content = aui()->alert( array(
+                                    'type'=> $output_condition['message_type'],
+                                    'content'=> $content
+                                )
+                            );
+                        }
+                    }
+
+                    break;
+                case 'page':
+                    $valid_type = true;
+
+                    $page_id = ! empty( $output_condition['page'] ) ? absint( $output_condition['page'] ) : 0;
+                    $content = sd_get_page_content( $page_id );
+
+                    break;
+                case 'template_part':
+                    $valid_type = true;
+
+                    $template_part = ! empty( $output_condition['template_part'] ) ? $output_condition['template_part'] : '';
+                    $content = sd_get_template_part_content( $template_part );
+
+                    break;
+                default:
+                    $valid_type = false;
+                    break;
+            }
+
+            if ( $valid_type ) {
+                $block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule' . ( $output_condition['type'] == 'hide' ? ' sd-block-hide-rule' : '' ) . '">' . $content . '</div>';
+            }
+        }
+    }
+
+    return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance, $check_rules );
 }
 add_filter( 'render_block', 'sd_render_block', 9, 3 );
 
 function sd_get_page_content( $page_id ) {
-	$content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
+    $content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_page_content', $content, $page_id );
+    return apply_filters( 'sd_get_page_content', $content, $page_id );
 }
 
 function sd_get_template_part_content( $template_part ) {
-	$template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
-	$content = ! empty( $template_part_post ) ? $template_part_post->content : '';
+    $template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
+    $content = ! empty( $template_part_post ) ? $template_part_post->content : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_template_part_content', $content, $template_part );
+    return apply_filters( 'sd_get_template_part_content', $content, $template_part );
 }
 
 function sd_block_parse_rules( $attrs ) {
-	$rules = array();
+    $rules = array();
 
-	if ( ! empty( $attrs ) && is_array( $attrs ) ) {
-		$attrs_keys = array_keys( $attrs );
+    if ( ! empty( $attrs ) && is_array( $attrs ) ) {
+        $attrs_keys = array_keys( $attrs );
 
-		for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
-			if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
-				$rules[] = $attrs[ 'rule' . $i ];
-			}
-		}
-	}
+        for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
+            if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
+                $rules[] = $attrs[ 'rule' . $i ];
+            }
+        }
+    }
 
-	return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
+    return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
 }
 
 function sd_block_check_rules( $rules ) {
-	if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
-		return true;
-	}
+    if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
+        return true;
+    }
 
-	foreach ( $rules as $key => $rule ) {
-		$match = apply_filters( 'sd_block_check_rule', true, $rule );
+    foreach ( $rules as $key => $rule ) {
+        $match = apply_filters( 'sd_block_check_rule', true, $rule );
 
-		if ( ! $match ) {
-			break;
-		}
-	}
+        if ( ! $match ) {
+            break;
+        }
+    }
 
-	return apply_filters( 'sd_block_check_rules', $match, $rules );
+    return apply_filters( 'sd_block_check_rules', $match, $rules );
 }
 
 function sd_block_check_rule( $match, $rule ) {
-	global $post;
-
-	if ( $match && ! empty( $rule['type'] ) ) {
-		switch ( $rule['type'] ) {
-			case 'logged_in':
-				$match = (bool) is_user_logged_in();
-
-				break;
-			case 'logged_out':
-				$match = ! is_user_logged_in();
-
-				break;
-			case 'post_author':
-				if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
-					$match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
-				} else {
-					$match = false;
-				}
-
-				break;
-			case 'user_roles':
-				$match = false;
-
-				if ( ! empty( $rule['user_roles'] ) ) {
-					$user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
-
-					if ( is_array( $user_roles ) ) {
-						$user_roles = array_filter( array_map( 'trim', $user_roles ) );
-					}
-
-					if ( ! empty( $user_roles ) && is_array( $user_roles ) ) {
-						if ( is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
-							$current_user_roles = $current_user->roles;
-
-							foreach ( $user_roles as $role ) {
-								if ( in_array( $role, $current_user_roles ) ) {
-									$match = true;
-								}
-							}
-						} else {
-							// Logged out role.
-							if ( in_array( 'logged_out', $user_roles ) ) {
-								$match = true;
-							}
-						}
-					}
-				}
-
-				break;
-			case 'gd_field':
-				$match = sd_block_check_rule_gd_field( $rule );
-
-				break;
-
-			default:
-				$match = apply_filters( 'sd_block_check_custom_rule', $match, $rule );
-				break;
-		}
-	}
-
-	return $match;
+    global $post;
+
+    if ( $match && ! empty( $rule['type'] ) ) {
+        switch ( $rule['type'] ) {
+            case 'logged_in':
+                $match = (bool) is_user_logged_in();
+
+                break;
+            case 'logged_out':
+                $match = ! is_user_logged_in();
+
+                break;
+            case 'post_author':
+                if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
+                    $match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
+                } else {
+                    $match = false;
+                }
+
+                break;
+            case 'user_roles':
+                $match = false;
+
+                if ( ! empty( $rule['user_roles'] ) ) {
+                    $user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
+
+                    if ( is_array( $user_roles ) ) {
+                        $user_roles = array_filter( array_map( 'trim', $user_roles ) );
+                    }
+
+                    if ( ! empty( $user_roles ) && is_array( $user_roles ) ) {
+                        if ( is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
+                            $current_user_roles = $current_user->roles;
+
+                            foreach ( $user_roles as $role ) {
+                                if ( in_array( $role, $current_user_roles ) ) {
+                                    $match = true;
+                                }
+                            }
+                        } else {
+                            // Logged out role.
+                            if ( in_array( 'logged_out', $user_roles ) ) {
+                                $match = true;
+                            }
+                        }
+                    }
+                }
+
+                break;
+            case 'gd_field':
+                $match = sd_block_check_rule_gd_field( $rule );
+
+                break;
+
+            default:
+                $match = apply_filters( 'sd_block_check_custom_rule', $match, $rule );
+                break;
+        }
+    }
+
+    return $match;
 }
 add_filter( 'sd_block_check_rule', 'sd_block_check_rule', 10, 2 );
 
 function sd_block_check_rule_gd_field( $rule ) {
-	global $gd_post;
-
-	$match_found = false;
-
-	if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
-		$args['block_visibility'] = true;
-		$args['key'] = $rule['field'];
-		$args['condition'] = $rule['condition'];
-		$args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
-
-		if ( $args['key'] == 'street' ) {
-			$args['key'] = 'address';
-		}
-
-		$match_field = $_match_field = $args['key'];
-
-		if ( $match_field == 'address' ) {
-			$match_field = 'street';
-		} elseif ( $match_field == 'post_images' ) {
-			$match_field = 'featured_image';
-		}
-
-		$find_post = $gd_post;
-		$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-
-		if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
-			$find_post = geodir_get_post_info( (int) $find_post->ID );
-			$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-		}
-
-		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
-			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
-			$field = array();
-			$empty_field = false;
-
-			$standard_fields = sd_visibility_gd_standard_fields();
-
-			if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
-				$package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
-				$fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
-
-				foreach ( $fields as $field_info ) {
-					if ( $match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					} elseif( $_match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					}
-				}
-
-				if ( empty( $field ) ) {
-					$empty_field = true;
-				}
-			}
-
-			// Address fields.
-			if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				if ( ! empty( $address_fields[ $match_field ] ) ) {
-					$field = $address_fields[ $match_field ];
-				}
-			} else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
-				if ( ! empty( $standard_fields[ $match_field ] ) ) {
-					$field = $standard_fields[ $match_field ];
-				}
-			}
-
-			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
-
-			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
-			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
-
-			$match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
-			$match_found = $match_field === '' ? true : false;
-
-			if ( ! $match_found ) {
-				if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
-					if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
-						$search = '+' . $search;
-					}
-					$the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
-					$until_time = strtotime( $the_time . ' ' . $search . ' days' );
-					$now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
-					if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
-						$match_found = true;
-					} elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
-						$match_found = true;
-					}
-				} else {
-					switch ( $args['condition'] ) {
-						case 'is_equal':
-							$match_found = (bool) ( $search != '' && $match_value == $search );
-							break;
-						case 'is_not_equal':
-							$match_found = (bool) ( $search != '' && $match_value != $search );
-							break;
-						case 'is_greater_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
-							break;
-						case 'is_less_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
-							break;
-						case 'is_empty':
-							$match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
-							break;
-						case 'is_not_empty':
-							$match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
-							break;
-						case 'is_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
-							break;
-						case 'is_not_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
-							break;
-					}
-				}
-			}
-
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
-		} else {
-			$field = array();
-
-			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
-
-			$match_value = '';
-			$match_found = $match_field === '' ? true : false;
-
-			if ( ! $match_found ) {
-				switch ( $args['condition'] ) {
-					case 'is_equal':
-						$match_found = (bool) ( $search != '' && $match_value == $search );
-						break;
-					case 'is_not_equal':
-						$match_found = (bool) ( $search != '' && $match_value != $search );
-						break;
-					case 'is_greater_than':
-						$match_found = false;
-						break;
-					case 'is_less_than':
-						$match_found = false;
-						break;
-					case 'is_empty':
-						$match_found = true;
-						break;
-					case 'is_not_empty':
-						$match_found = false;
-						break;
-					case 'is_contains':
-						$match_found = false;
-						break;
-					case 'is_not_contains':
-						$match_found = false;
-						break;
-				}
-			}
-
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
-		}
-	}
-
-	return $match_found;
+    global $gd_post;
+
+    $match_found = false;
+
+    if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
+        $args['block_visibility'] = true;
+        $args['key'] = $rule['field'];
+        $args['condition'] = $rule['condition'];
+        $args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
+
+        if ( $args['key'] == 'street' ) {
+            $args['key'] = 'address';
+        }
+
+        $match_field = $_match_field = $args['key'];
+
+        if ( $match_field == 'address' ) {
+            $match_field = 'street';
+        } elseif ( $match_field == 'post_images' ) {
+            $match_field = 'featured_image';
+        }
+
+        $find_post = $gd_post;
+        $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+
+        if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
+            $find_post = geodir_get_post_info( (int) $find_post->ID );
+            $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+        }
+
+        if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
+            $address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
+            $field = array();
+            $empty_field = false;
+
+            $standard_fields = sd_visibility_gd_standard_fields();
+
+            if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
+                $package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
+                $fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
+
+                foreach ( $fields as $field_info ) {
+                    if ( $match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    } elseif( $_match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    }
+                }
+
+                if ( empty( $field ) ) {
+                    $empty_field = true;
+                }
+            }
+
+            // Address fields.
+            if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                if ( ! empty( $address_fields[ $match_field ] ) ) {
+                    $field = $address_fields[ $match_field ];
+                }
+            } else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
+                if ( ! empty( $standard_fields[ $match_field ] ) ) {
+                    $field = $standard_fields[ $match_field ];
+                }
+            }
+
+            // Parse search.
+            $search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+            $is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
+            $is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
+
+            $match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+            $match_found = $match_field === '' ? true : false;
+
+            if ( ! $match_found ) {
+                if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
+                    if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
+                        $search = '+' . $search;
+                    }
+                    $the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
+                    $until_time = strtotime( $the_time . ' ' . $search . ' days' );
+                    $now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
+                    if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
+                        $match_found = true;
+                    } elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
+                        $match_found = true;
+                    }
+                } else {
+                    switch ( $args['condition'] ) {
+                        case 'is_equal':
+                            $match_found = (bool) ( $search != '' && $match_value == $search );
+                            break;
+                        case 'is_not_equal':
+                            $match_found = (bool) ( $search != '' && $match_value != $search );
+                            break;
+                        case 'is_greater_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
+                            break;
+                        case 'is_less_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
+                            break;
+                        case 'is_empty':
+                            $match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
+                            break;
+                        case 'is_not_empty':
+                            $match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
+                            break;
+                        case 'is_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
+                            break;
+                        case 'is_not_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
+                            break;
+                    }
+                }
+            }
+
+            $match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+        } else {
+            $field = array();
+
+            // Parse search.
+            $search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+            $match_value = '';
+            $match_found = $match_field === '' ? true : false;
+
+            if ( ! $match_found ) {
+                switch ( $args['condition'] ) {
+                    case 'is_equal':
+                        $match_found = (bool) ( $search != '' && $match_value == $search );
+                        break;
+                    case 'is_not_equal':
+                        $match_found = (bool) ( $search != '' && $match_value != $search );
+                        break;
+                    case 'is_greater_than':
+                        $match_found = false;
+                        break;
+                    case 'is_less_than':
+                        $match_found = false;
+                        break;
+                    case 'is_empty':
+                        $match_found = true;
+                        break;
+                    case 'is_not_empty':
+                        $match_found = false;
+                        break;
+                    case 'is_contains':
+                        $match_found = false;
+                        break;
+                    case 'is_not_contains':
+                        $match_found = false;
+                        break;
+                }
+            }
+
+            $match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
+        }
+    }
+
+    return $match_found;
 }
 
 function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(), $gd_post = array() ) {
-	global $post;
-
-	if ( ! $search ) {
-		return $search;
-	}
-
-	$orig_search = $search;
-	$_search = strtolower( $search );
-
-	if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
-		if ( $search == 'current_user' ) {
-			$search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
-		} else if ( $search == 'current_author' ) {
-			$search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
-		}
-	} else if ( $_search == 'date_today' ) {
-		$search = date( 'Y-m-d' );
-	} else if ( $_search == 'date_tomorrow' ) {
-		$search = date( 'Y-m-d', strtotime( "+1 day" ) );
-	} else if ( $_search == 'date_yesterday' ) {
-		$search = date( 'Y-m-d', strtotime( "-1 day" ) );
-	} else if ( $_search == 'time_his' ) {
-		$search = date( 'H:i:s' );
-	} else if ( $_search == 'time_hi' ) {
-		$search = date( 'H:i' );
-	} else if ( $_search == 'datetime_now' ) {
-		$search = date( 'Y-m-d H:i:s' );
-	} else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
-		$_searches = explode( 'datetime_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
-		$_searches = explode( 'datetime_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'date_after_' ) === 0 ) {
-		$_searches = explode( 'date_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	} else if ( strpos( $_search, 'date_before_' ) === 0 ) {
-		$_searches = explode( 'date_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	}
-
-	return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
+    global $post;
+
+    if ( ! $search ) {
+        return $search;
+    }
+
+    $orig_search = $search;
+    $_search = strtolower( $search );
+
+    if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
+        if ( $search == 'current_user' ) {
+            $search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
+        } else if ( $search == 'current_author' ) {
+            $search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
+        }
+    } else if ( $_search == 'date_today' ) {
+        $search = date( 'Y-m-d' );
+    } else if ( $_search == 'date_tomorrow' ) {
+        $search = date( 'Y-m-d', strtotime( "+1 day" ) );
+    } else if ( $_search == 'date_yesterday' ) {
+        $search = date( 'Y-m-d', strtotime( "-1 day" ) );
+    } else if ( $_search == 'time_his' ) {
+        $search = date( 'H:i:s' );
+    } else if ( $_search == 'time_hi' ) {
+        $search = date( 'H:i' );
+    } else if ( $_search == 'datetime_now' ) {
+        $search = date( 'Y-m-d H:i:s' );
+    } else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
+        $_searches = explode( 'datetime_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
+        $_searches = explode( 'datetime_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'date_after_' ) === 0 ) {
+        $_searches = explode( 'date_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    } else if ( strpos( $_search, 'date_before_' ) === 0 ) {
+        $_searches = explode( 'date_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    }
+
+    return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
 }
 
 
 if(!function_exists('sd_blocks_render_blocks')){
-	/**
-	 * Add the shortcodes to the block content if set as an attribute.
-	 *
-	 * We have moved the shortcodes from the block content to a block argument to help prevent broken blocks.
-	 *
-	 * @param $block_content
-	 * @param $parsed_block
-	 * @param $thiss
-	 * @return mixed|string
-	 */
-	function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
-		// Check hide block visibility conditions.
-		if ( ! empty( $parsed_block ) && ! empty( $parsed_block['attrs']['visibility_conditions'] ) && $block_content && strpos( strrev( $block_content ), strrev( ' sd-block-has-rule sd-block-hide-rule"></div>' ) ) === 0 && ! empty( $thiss ) && $thiss->name ) {
-			$match_content = '<div class="' . esc_attr( wp_get_block_default_classname( $thiss->name ) ) . ' sd-block-has-rule sd-block-hide-rule"></div>';
-
-			// Return empty content to hide block.
-			if ( $block_content == $match_content ) {
-				return '';
-			}
-		}
-
-		// Check if ita a nested block that needs to be wrapped
-		if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
-			$content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
-			$block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
-
-			$block_content = do_shortcode($block_content);
-
-		}elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
-			$has_warp = false;
-			if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
-				$parts = explode('></', $block_content);
-				if(count($parts) === 2){
-					$block_content = $parts[0].'>'.$parsed_block['attrs']['sd_shortcode'].'</'.$parts[1];
-					$has_warp = true;
-				}
-			}
-			if (!$has_warp) {
-				// Add the shortcode if its not a wrapped block
-				$block_content .= $parsed_block['attrs']['sd_shortcode'];
-			}
-
-			$block_content = do_shortcode($block_content);
-		}
-		return  $block_content;
-	}
+    /**
+     * Add the shortcodes to the block content if set as an attribute.
+     *
+     * We have moved the shortcodes from the block content to a block argument to help prevent broken blocks.
+     *
+     * @param $block_content
+     * @param $parsed_block
+     * @param $thiss
+     * @return mixed|string
+     */
+    function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
+        // Check hide block visibility conditions.
+        if ( ! empty( $parsed_block ) && ! empty( $parsed_block['attrs']['visibility_conditions'] ) && $block_content && strpos( strrev( $block_content ), strrev( ' sd-block-has-rule sd-block-hide-rule"></div>' ) ) === 0 && ! empty( $thiss ) && $thiss->name ) {
+            $match_content = '<div class="' . esc_attr( wp_get_block_default_classname( $thiss->name ) ) . ' sd-block-has-rule sd-block-hide-rule"></div>';
+
+            // Return empty content to hide block.
+            if ( $block_content == $match_content ) {
+                return '';
+            }
+        }
+
+        // Check if ita a nested block that needs to be wrapped
+        if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
+            $content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
+            $block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
+
+            $block_content = do_shortcode($block_content);
+
+        }elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
+            $has_warp = false;
+            if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
+                $parts = explode('></', $block_content);
+                if(count($parts) === 2){
+                    $block_content = $parts[0].'>'.$parsed_block['attrs']['sd_shortcode'].'</'.$parts[1];
+                    $has_warp = true;
+                }
+            }
+            if (!$has_warp) {
+                // Add the shortcode if its not a wrapped block
+                $block_content .= $parsed_block['attrs']['sd_shortcode'];
+            }
+
+            $block_content = do_shortcode($block_content);
+        }
+        return  $block_content;
+    }
 }
 
 add_filter('render_block', 'sd_blocks_render_blocks',10,3);

invoicing.php

Indentation +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@ 
 
 // Define constants.
 if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+    define( 'WPINV_PLUGIN_FILE', __FILE__ );
 }
 
 if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.8.32' );
+    define( 'WPINV_VERSION', '2.8.32' );
 }
 
 // Include the main Invoicing class.
 if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+    require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
-	return $GLOBALS['invoicing'];
+    return $GLOBALS['invoicing'];
 }
 
 /**