2 files changed, 936 insertions, 936 deletions
diff --git a/inc/customizer/configurations/buttons/class-astra-customizer-button-configs.php b/inc/customizer/configurations/buttons/class-astra-customizer-button-configs.php
index b153ee6..7c49a4d 100644
--- a/inc/customizer/configurations/buttons/class-astra-customizer-button-configs.php
+++ b/inc/customizer/configurations/buttons/class-astra-customizer-button-configs.php
@@ -1,484 +1,484 @@
-<?php
-/**
- * Astra Theme Customizer Configuration Base.
- *
- * @package     Astra
- * @author      Astra
- * @copyright   Copyright (c) 2020, Astra
- * @link        https://wpastra.com/
- * @since       Astra 1.4.3
- */
-
-// No direct access, please.
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-/**
- * Customizer Sanitizes
- *
- * @since 1.4.3
- */
-if ( ! class_exists( 'Astra_Customizer_Button_Configs' ) ) {
-
-	/**
-	 * Register Button Customizer Configurations.
-	 */
-	class Astra_Customizer_Button_Configs extends Astra_Customizer_Config_Base {
-
-		/**
-		 * Register Button Customizer Configurations.
-		 *
-		 * @param Array                $configurations Astra Customizer Configurations.
-		 * @param WP_Customize_Manager $wp_customize instance of WP_Customize_Manager.
-		 * @since 1.4.3
-		 * @return Array Astra Customizer Configurations with updated configurations.
-		 */
-		public function register_configuration( $configurations, $wp_customize ) {
-
-			$_configs = array(
-				/**
-				 * Group: Theme Button color Group
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
-					'default'   => astra_get_option( 'theme-button-color-group' ),
-					'type'      => 'control',
-					'control'   => 'ast-color-group',
-					'title'     => __( 'Text Color', 'astra' ),
-					'section'   => 'section-buttons',
-					'transport' => 'postMessage',
-					'priority'  => 18,
-				),
-
-				/**
-				 * Group: Theme Button background colors Group
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
-					'default'   => astra_get_option( 'theme-button-bg-color-group' ),
-					'type'      => 'control',
-					'control'   => 'ast-color-group',
-					'title'     => __( 'Background Color', 'astra' ),
-					'section'   => 'section-buttons',
-					'transport' => 'postMessage',
-					'priority'  => 18.5,
-					'divider'   => array( 'ast_class' => 'ast-bottom-divider' ),
-				),
-
-				/**
-				 * Option: Button Color
-				 */
-				array(
-					'name'    => 'button-color',
-					'default' => astra_get_option( 'button-color' ),
-					'type'    => 'sub-control',
-					'parent'  => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
-					'section' => 'section-buttons',
-					'control' => 'ast-color',
-					'title'   => __( 'Normal', 'astra' ),
-				),
-
-				/**
-				 * Option: Button Hover Color
-				 */
-				array(
-					'name'     => 'button-h-color',
-					'default'  => astra_get_option( 'button-h-color' ),
-					'type'     => 'sub-control',
-					'parent'   => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
-					'section'  => 'section-buttons',
-					'control'  => 'ast-color',
-					'title'    => __( 'Hover', 'astra' ),
-					'priority' => 39,
-				),
-
-				/**
-				 * Option: Button Background Color
-				 */
-				array(
-					'name'    => 'button-bg-color',
-					'default' => astra_get_option( 'button-bg-color' ),
-					'type'    => 'sub-control',
-					'parent'  => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
-					'section' => 'section-buttons',
-					'control' => 'ast-color',
-					'title'   => __( 'Normal', 'astra' ),
-				),
-
-				/**
-				 * Option: Button Background Hover Color
-				 */
-				array(
-					'name'     => 'button-bg-h-color',
-					'default'  => astra_get_option( 'button-bg-h-color' ),
-					'type'     => 'sub-control',
-					'parent'   => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
-					'section'  => 'section-buttons',
-					'control'  => 'ast-color',
-					'title'    => __( 'Hover', 'astra' ),
-					'priority' => 40,
-				),
-
-				/**
-				 * Option: Global Button Border Size
-				 */
-				array(
-					'type'           => 'control',
-					'section'        => 'section-buttons',
-					'control'        => 'ast-border',
-					'name'           => ASTRA_THEME_SETTINGS . '[theme-button-border-group-border-size]',
-					'transport'      => 'postMessage',
-					'linked_choices' => true,
-					'priority'       => 19,
-					'default'        => astra_get_option( 'theme-button-border-group-border-size' ),
-					'title'          => __( 'Border Width', 'astra' ),
-					'choices'        => array(
-						'top'    => __( 'Top', 'astra' ),
-						'right'  => __( 'Right', 'astra' ),
-						'bottom' => __( 'Bottom', 'astra' ),
-						'left'   => __( 'Left', 'astra' ),
-					),
-				),
-
-				/**
-				 * Group: Theme Button Border Group
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
-					'default'   => astra_get_option( 'theme-button-border-color-group' ),
-					'type'      => 'control',
-					'control'   => 'ast-color-group',
-					'title'     => __( 'Border Color', 'astra' ),
-					'section'   => 'section-buttons',
-					'transport' => 'postMessage',
-					'priority'  => 19,
-				),
-
-				/**
-				 * Option: Global Button Border Color
-				 */
-				array(
-					'name'              => 'theme-button-border-group-border-color',
-					'parent'            => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
-					'default'           => astra_get_option( 'theme-button-border-group-border-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'section'           => 'section-buttons',
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 19,
-					'title'             => __( 'Border Color', 'astra' ),
-				),
-
-				/**
-				 * Option: Global Button Border Hover Color
-				 */
-				array(
-					'name'              => 'theme-button-border-group-border-h-color',
-					'default'           => astra_get_option( 'theme-button-border-group-border-h-color' ),
-					'parent'            => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'section'           => 'section-buttons',
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 19,
-					'title'             => __( 'Border Hover Color', 'astra' ),
-				),
-
-				/**
-				 * Option: Global Button Radius
-				 */
-				array(
-					'name'        => ASTRA_THEME_SETTINGS . '[button-radius]',
-					'default'     => astra_get_option( 'button-radius' ),
-					'type'        => 'control',
-					'section'     => 'section-buttons',
-					'control'     => 'ast-slider',
-					'priority'    => 19,
-					'suffix'      => 'px',
-					'title'       => __( 'Border Radius', 'astra' ),
-					'input_attrs' => array(
-						'min'  => 0,
-						'step' => 1,
-						'max'  => 200,
-					),
-					'divider'     => array( 'ast_class' => 'ast-bottom-divider' ),
-				),
-
-				/**
-				 * Option: Theme Button Padding
-				 */
-				array(
-					'name'              => ASTRA_THEME_SETTINGS . '[theme-button-padding]',
-					'default'           => astra_get_option( 'theme-button-padding' ),
-					'type'              => 'control',
-					'control'           => 'ast-responsive-spacing',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
-					'section'           => 'section-buttons',
-					'title'             => __( 'Padding', 'astra' ),
-					'linked_choices'    => true,
-					'transport'         => 'postMessage',
-					'unit_choices'      => array( 'px', 'em', '%' ),
-					'choices'           => array(
-						'top'    => __( 'Top', 'astra' ),
-						'right'  => __( 'Right', 'astra' ),
-						'bottom' => __( 'Bottom', 'astra' ),
-						'left'   => __( 'Left', 'astra' ),
-					),
-					'priority'          => 35,
-					'connected'         => false,
-				),
-
-			);
-
-			if ( false === Astra_Builder_Helper::$is_header_footer_builder_active ) {
-
-				$_trans_config = array(
-					/**
-					 * Option: Transparent Header Button Colors Divider
-					 */
-					array(
-						'name'     => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-divider]',
-						'type'     => 'control',
-						'control'  => 'ast-heading',
-						'section'  => 'section-transparent-header',
-						'title'    => __( 'Header Button', 'astra' ),
-						'settings' => array(),
-						'priority' => 40,
-						'context'  => array(
-							Astra_Builder_Helper::$general_tab_config,
-							array(
-								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-								'operator' => '===',
-								'value'    => 'custom-button',
-							),
-						),
-					),
-					/**
-					 * Group: Transparent Header Button Colors Group
-					 */
-					array(
-						'name'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
-						'default'   => astra_get_option( 'transparent-header-button-color-group' ),
-						'type'      => 'control',
-						'control'   => 'ast-settings-group',
-						'title'     => __( 'Colors', 'astra' ),
-						'section'   => 'section-transparent-header',
-						'transport' => 'postMessage',
-						'priority'  => 40,
-						'context'   => array(
-							Astra_Builder_Helper::$general_tab_config,
-							array(
-								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-								'operator' => '===',
-								'value'    => 'custom-button',
-							),
-						),
-					),
-					/**
-					 * Group: Transparent Header Button Border Group
-					 */
-					array(
-						'name'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
-						'default'   => astra_get_option( 'transparent-header-button-border-group' ),
-						'type'      => 'control',
-						'control'   => 'ast-settings-group',
-						'title'     => __( 'Border', 'astra' ),
-						'section'   => 'section-transparent-header',
-						'transport' => 'postMessage',
-						'priority'  => 40,
-						'context'   => array(
-							Astra_Builder_Helper::$general_tab_config,
-							array(
-								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-								'operator' => '===',
-								'value'    => 'custom-button',
-							),
-						),
-					),
-
-					/**
-					 * Option: Button Text Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-text-color',
-						'transport'         => 'postMessage',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-text-color' ),
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
-						'section'           => 'section-transparent-header',
-						'tab'               => __( 'Normal', 'astra' ),
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 10,
-						'title'             => __( 'Text Color', 'astra' ),
-					),
-
-					/**
-					 * Option: Button Text Hover Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-text-h-color',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-text-h-color' ),
-						'transport'         => 'postMessage',
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
-						'section'           => 'section-transparent-header',
-						'tab'               => __( 'Hover', 'astra' ),
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 10,
-						'title'             => __( 'Text Color', 'astra' ),
-					),
-
-					/**
-					 * Option: Button Background Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-back-color',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-back-color' ),
-						'transport'         => 'postMessage',
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
-						'section'           => 'section-transparent-header',
-						'tab'               => __( 'Normal', 'astra' ),
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 10,
-						'title'             => __( 'Background Color', 'astra' ),
-					),
-
-					/**
-					 * Option: Button Button Hover Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-back-h-color',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-back-h-color' ),
-						'transport'         => 'postMessage',
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
-						'section'           => 'section-transparent-header',
-						'tab'               => __( 'Hover', 'astra' ),
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 10,
-						'title'             => __( 'Background Color', 'astra' ),
-					),
-
-					// Option: Custom Menu Button Border.
-					array(
-						'type'              => 'control',
-						'control'           => 'ast-responsive-spacing',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
-						'name'              => ASTRA_THEME_SETTINGS . '[header-main-rt-trans-section-button-padding]',
-						'section'           => 'section-transparent-header',
-						'transport'         => 'postMessage',
-						'linked_choices'    => true,
-						'priority'          => 40,
-						'context'           => array(
-							Astra_Builder_Helper::$general_tab_config,
-							array(
-								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-								'operator' => '===',
-								'value'    => 'custom-button',
-							),
-						),
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-padding' ),
-						'title'             => __( 'Padding', 'astra' ),
-						'choices'           => array(
-							'top'    => __( 'Top', 'astra' ),
-							'right'  => __( 'Right', 'astra' ),
-							'bottom' => __( 'Bottom', 'astra' ),
-							'left'   => __( 'Left', 'astra' ),
-						),
-					),
-
-					/**
-					 * Option: Button Border Size
-					 */
-					array(
-						'type'           => 'sub-control',
-						'parent'         => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
-						'section'        => 'section-transparent-header',
-						'control'        => 'ast-border',
-						'name'           => 'header-main-rt-trans-section-button-border-size',
-						'transport'      => 'postMessage',
-						'linked_choices' => true,
-						'priority'       => 10,
-						'default'        => astra_get_option( 'header-main-rt-trans-section-button-border-size' ),
-						'title'          => __( 'Width', 'astra' ),
-						'choices'        => array(
-							'top'    => __( 'Top', 'astra' ),
-							'right'  => __( 'Right', 'astra' ),
-							'bottom' => __( 'Bottom', 'astra' ),
-							'left'   => __( 'Left', 'astra' ),
-						),
-					),
-
-					/**
-					 * Option: Button Border Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-border-color',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-border-color' ),
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
-						'section'           => 'section-transparent-header',
-						'transport'         => 'postMessage',
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 12,
-						'title'             => __( 'Color', 'astra' ),
-					),
-
-					/**
-					 * Option: Button Border Hover Color
-					 */
-					array(
-						'name'              => 'header-main-rt-trans-section-button-border-h-color',
-						'default'           => astra_get_option( 'header-main-rt-trans-section-button-border-h-color' ),
-						'transport'         => 'postMessage',
-						'type'              => 'sub-control',
-						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
-						'control'           => 'ast-color',
-						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-						'priority'          => 14,
-						'title'             => __( 'Hover Color', 'astra' ),
-					),
-
-					/**
-					 * Option: Button Border Radius
-					 */
-					array(
-						'name'        => 'header-main-rt-trans-section-button-border-radius',
-						'default'     => astra_get_option( 'header-main-rt-trans-section-button-border-radius' ),
-						'type'        => 'sub-control',
-						'parent'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
-						'section'     => 'section-transparent-header',
-						'control'     => 'ast-slider',
-						'suffix'      => 'px',
-						'transport'   => 'postMessage',
-						'priority'    => 16,
-						'title'       => __( 'Border Radius', 'astra' ),
-						'input_attrs' => array(
-							'min'  => 0,
-							'step' => 1,
-							'max'  => 100,
-						),
-					),
-				);
-				$_configs = array_merge( $_configs, $_trans_config );
-
-			}
-
-			return array_merge( $configurations, $_configs );
-		}
-	}
-}
-
-/**
- * Kicking this off by calling 'get_instance()' method
- */
-new Astra_Customizer_Button_Configs();
+<?php
+/**
+ * Astra Theme Customizer Configuration Base.
+ *
+ * @package     Astra
+ * @author      Astra
+ * @copyright   Copyright (c) 2020, Astra
+ * @link        https://wpastra.com/
+ * @since       Astra 1.4.3
+ */
+
+// No direct access, please.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Customizer Sanitizes
+ *
+ * @since 1.4.3
+ */
+if ( ! class_exists( 'Astra_Customizer_Button_Configs' ) ) {
+
+	/**
+	 * Register Button Customizer Configurations.
+	 */
+	class Astra_Customizer_Button_Configs extends Astra_Customizer_Config_Base {
+
+		/**
+		 * Register Button Customizer Configurations.
+		 *
+		 * @param Array                $configurations Astra Customizer Configurations.
+		 * @param WP_Customize_Manager $wp_customize instance of WP_Customize_Manager.
+		 * @since 1.4.3
+		 * @return Array Astra Customizer Configurations with updated configurations.
+		 */
+		public function register_configuration( $configurations, $wp_customize ) {
+
+			$_configs = array(
+				/**
+				 * Group: Theme Button color Group
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
+					'default'   => astra_get_option( 'theme-button-color-group' ),
+					'type'      => 'control',
+					'control'   => 'ast-color-group',
+					'title'     => __( 'Text Color', 'astra' ),
+					'section'   => 'section-buttons',
+					'transport' => 'postMessage',
+					'priority'  => 18,
+				),
+
+				/**
+				 * Group: Theme Button background colors Group
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
+					'default'   => astra_get_option( 'theme-button-bg-color-group' ),
+					'type'      => 'control',
+					'control'   => 'ast-color-group',
+					'title'     => __( 'Background Color', 'astra' ),
+					'section'   => 'section-buttons',
+					'transport' => 'postMessage',
+					'priority'  => 18.5,
+					'divider'   => array( 'ast_class' => 'ast-bottom-divider' ),
+				),
+
+				/**
+				 * Option: Button Color
+				 */
+				array(
+					'name'    => 'button-color',
+					'default' => astra_get_option( 'button-color' ),
+					'type'    => 'sub-control',
+					'parent'  => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
+					'section' => 'section-buttons',
+					'control' => 'ast-color',
+					'title'   => __( 'Normal', 'astra' ),
+				),
+
+				/**
+				 * Option: Button Hover Color
+				 */
+				array(
+					'name'     => 'button-h-color',
+					'default'  => astra_get_option( 'button-h-color' ),
+					'type'     => 'sub-control',
+					'parent'   => ASTRA_THEME_SETTINGS . '[theme-button-color-group]',
+					'section'  => 'section-buttons',
+					'control'  => 'ast-color',
+					'title'    => __( 'Hover', 'astra' ),
+					'priority' => 39,
+				),
+
+				/**
+				 * Option: Button Background Color
+				 */
+				array(
+					'name'    => 'button-bg-color',
+					'default' => astra_get_option( 'button-bg-color' ),
+					'type'    => 'sub-control',
+					'parent'  => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
+					'section' => 'section-buttons',
+					'control' => 'ast-color',
+					'title'   => __( 'Normal', 'astra' ),
+				),
+
+				/**
+				 * Option: Button Background Hover Color
+				 */
+				array(
+					'name'     => 'button-bg-h-color',
+					'default'  => astra_get_option( 'button-bg-h-color' ),
+					'type'     => 'sub-control',
+					'parent'   => ASTRA_THEME_SETTINGS . '[theme-button-bg-color-group]',
+					'section'  => 'section-buttons',
+					'control'  => 'ast-color',
+					'title'    => __( 'Hover', 'astra' ),
+					'priority' => 40,
+				),
+
+				/**
+				 * Option: Global Button Border Size
+				 */
+				array(
+					'type'           => 'control',
+					'section'        => 'section-buttons',
+					'control'        => 'ast-border',
+					'name'           => ASTRA_THEME_SETTINGS . '[theme-button-border-group-border-size]',
+					'transport'      => 'postMessage',
+					'linked_choices' => true,
+					'priority'       => 19,
+					'default'        => astra_get_option( 'theme-button-border-group-border-size' ),
+					'title'          => __( 'Border Width', 'astra' ),
+					'choices'        => array(
+						'top'    => __( 'Top', 'astra' ),
+						'right'  => __( 'Right', 'astra' ),
+						'bottom' => __( 'Bottom', 'astra' ),
+						'left'   => __( 'Left', 'astra' ),
+					),
+				),
+
+				/**
+				 * Group: Theme Button Border Group
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
+					'default'   => astra_get_option( 'theme-button-border-color-group' ),
+					'type'      => 'control',
+					'control'   => 'ast-color-group',
+					'title'     => __( 'Border Color', 'astra' ),
+					'section'   => 'section-buttons',
+					'transport' => 'postMessage',
+					'priority'  => 19,
+				),
+
+				/**
+				 * Option: Global Button Border Color
+				 */
+				array(
+					'name'              => 'theme-button-border-group-border-color',
+					'parent'            => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
+					'default'           => astra_get_option( 'theme-button-border-group-border-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'section'           => 'section-buttons',
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 19,
+					'title'             => __( 'Border Color', 'astra' ),
+				),
+
+				/**
+				 * Option: Global Button Border Hover Color
+				 */
+				array(
+					'name'              => 'theme-button-border-group-border-h-color',
+					'default'           => astra_get_option( 'theme-button-border-group-border-h-color' ),
+					'parent'            => ASTRA_THEME_SETTINGS . '[theme-button-border-color-group]',
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'section'           => 'section-buttons',
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 19,
+					'title'             => __( 'Border Hover Color', 'astra' ),
+				),
+
+				/**
+				 * Option: Global Button Radius
+				 */
+				array(
+					'name'        => ASTRA_THEME_SETTINGS . '[button-radius]',
+					'default'     => astra_get_option( 'button-radius' ),
+					'type'        => 'control',
+					'section'     => 'section-buttons',
+					'control'     => 'ast-slider',
+					'priority'    => 19,
+					'suffix'      => 'px',
+					'title'       => __( 'Border Radius', 'astra' ),
+					'input_attrs' => array(
+						'min'  => 0,
+						'step' => 1,
+						'max'  => 200,
+					),
+					'divider'     => array( 'ast_class' => 'ast-bottom-divider' ),
+				),
+
+				/**
+				 * Option: Theme Button Padding
+				 */
+				array(
+					'name'              => ASTRA_THEME_SETTINGS . '[theme-button-padding]',
+					'default'           => astra_get_option( 'theme-button-padding' ),
+					'type'              => 'control',
+					'control'           => 'ast-responsive-spacing',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
+					'section'           => 'section-buttons',
+					'title'             => __( 'Padding', 'astra' ),
+					'linked_choices'    => true,
+					'transport'         => 'postMessage',
+					'unit_choices'      => array( 'px', 'em', '%' ),
+					'choices'           => array(
+						'top'    => __( 'Top', 'astra' ),
+						'right'  => __( 'Right', 'astra' ),
+						'bottom' => __( 'Bottom', 'astra' ),
+						'left'   => __( 'Left', 'astra' ),
+					),
+					'priority'          => 35,
+					'connected'         => false,
+				),
+
+			);
+
+			if ( false === Astra_Builder_Helper::$is_header_footer_builder_active ) {
+
+				$_trans_config = array(
+					/**
+					 * Option: Transparent Header Button Colors Divider
+					 */
+					array(
+						'name'     => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-divider]',
+						'type'     => 'control',
+						'control'  => 'ast-heading',
+						'section'  => 'section-transparent-header',
+						'title'    => __( 'Header Button', 'astra' ),
+						'settings' => array(),
+						'priority' => 40,
+						'context'  => array(
+							Astra_Builder_Helper::$general_tab_config,
+							array(
+								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+								'operator' => '===',
+								'value'    => 'custom-button',
+							),
+						),
+					),
+					/**
+					 * Group: Transparent Header Button Colors Group
+					 */
+					array(
+						'name'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
+						'default'   => astra_get_option( 'transparent-header-button-color-group' ),
+						'type'      => 'control',
+						'control'   => 'ast-settings-group',
+						'title'     => __( 'Colors', 'astra' ),
+						'section'   => 'section-transparent-header',
+						'transport' => 'postMessage',
+						'priority'  => 40,
+						'context'   => array(
+							Astra_Builder_Helper::$general_tab_config,
+							array(
+								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+								'operator' => '===',
+								'value'    => 'custom-button',
+							),
+						),
+					),
+					/**
+					 * Group: Transparent Header Button Border Group
+					 */
+					array(
+						'name'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
+						'default'   => astra_get_option( 'transparent-header-button-border-group' ),
+						'type'      => 'control',
+						'control'   => 'ast-settings-group',
+						'title'     => __( 'Border', 'astra' ),
+						'section'   => 'section-transparent-header',
+						'transport' => 'postMessage',
+						'priority'  => 40,
+						'context'   => array(
+							Astra_Builder_Helper::$general_tab_config,
+							array(
+								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+								'operator' => '===',
+								'value'    => 'custom-button',
+							),
+						),
+					),
+
+					/**
+					 * Option: Button Text Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-text-color',
+						'transport'         => 'postMessage',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-text-color' ),
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
+						'section'           => 'section-transparent-header',
+						'tab'               => __( 'Normal', 'astra' ),
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 10,
+						'title'             => __( 'Text Color', 'astra' ),
+					),
+
+					/**
+					 * Option: Button Text Hover Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-text-h-color',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-text-h-color' ),
+						'transport'         => 'postMessage',
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
+						'section'           => 'section-transparent-header',
+						'tab'               => __( 'Hover', 'astra' ),
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 10,
+						'title'             => __( 'Text Color', 'astra' ),
+					),
+
+					/**
+					 * Option: Button Background Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-back-color',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-back-color' ),
+						'transport'         => 'postMessage',
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
+						'section'           => 'section-transparent-header',
+						'tab'               => __( 'Normal', 'astra' ),
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 10,
+						'title'             => __( 'Background Color', 'astra' ),
+					),
+
+					/**
+					 * Option: Button Button Hover Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-back-h-color',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-back-h-color' ),
+						'transport'         => 'postMessage',
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-color-group]',
+						'section'           => 'section-transparent-header',
+						'tab'               => __( 'Hover', 'astra' ),
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 10,
+						'title'             => __( 'Background Color', 'astra' ),
+					),
+
+					// Option: Custom Menu Button Border.
+					array(
+						'type'              => 'control',
+						'control'           => 'ast-responsive-spacing',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
+						'name'              => ASTRA_THEME_SETTINGS . '[header-main-rt-trans-section-button-padding]',
+						'section'           => 'section-transparent-header',
+						'transport'         => 'postMessage',
+						'linked_choices'    => true,
+						'priority'          => 40,
+						'context'           => array(
+							Astra_Builder_Helper::$general_tab_config,
+							array(
+								'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+								'operator' => '===',
+								'value'    => 'custom-button',
+							),
+						),
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-padding' ),
+						'title'             => __( 'Padding', 'astra' ),
+						'choices'           => array(
+							'top'    => __( 'Top', 'astra' ),
+							'right'  => __( 'Right', 'astra' ),
+							'bottom' => __( 'Bottom', 'astra' ),
+							'left'   => __( 'Left', 'astra' ),
+						),
+					),
+
+					/**
+					 * Option: Button Border Size
+					 */
+					array(
+						'type'           => 'sub-control',
+						'parent'         => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
+						'section'        => 'section-transparent-header',
+						'control'        => 'ast-border',
+						'name'           => 'header-main-rt-trans-section-button-border-size',
+						'transport'      => 'postMessage',
+						'linked_choices' => true,
+						'priority'       => 10,
+						'default'        => astra_get_option( 'header-main-rt-trans-section-button-border-size' ),
+						'title'          => __( 'Width', 'astra' ),
+						'choices'        => array(
+							'top'    => __( 'Top', 'astra' ),
+							'right'  => __( 'Right', 'astra' ),
+							'bottom' => __( 'Bottom', 'astra' ),
+							'left'   => __( 'Left', 'astra' ),
+						),
+					),
+
+					/**
+					 * Option: Button Border Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-border-color',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-border-color' ),
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
+						'section'           => 'section-transparent-header',
+						'transport'         => 'postMessage',
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 12,
+						'title'             => __( 'Color', 'astra' ),
+					),
+
+					/**
+					 * Option: Button Border Hover Color
+					 */
+					array(
+						'name'              => 'header-main-rt-trans-section-button-border-h-color',
+						'default'           => astra_get_option( 'header-main-rt-trans-section-button-border-h-color' ),
+						'transport'         => 'postMessage',
+						'type'              => 'sub-control',
+						'parent'            => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
+						'control'           => 'ast-color',
+						'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+						'priority'          => 14,
+						'title'             => __( 'Hover Color', 'astra' ),
+					),
+
+					/**
+					 * Option: Button Border Radius
+					 */
+					array(
+						'name'        => 'header-main-rt-trans-section-button-border-radius',
+						'default'     => astra_get_option( 'header-main-rt-trans-section-button-border-radius' ),
+						'type'        => 'sub-control',
+						'parent'      => ASTRA_THEME_SETTINGS . '[transparent-header-button-border-group]',
+						'section'     => 'section-transparent-header',
+						'control'     => 'ast-slider',
+						'suffix'      => 'px',
+						'transport'   => 'postMessage',
+						'priority'    => 16,
+						'title'       => __( 'Border Radius', 'astra' ),
+						'input_attrs' => array(
+							'min'  => 0,
+							'step' => 1,
+							'max'  => 100,
+						),
+					),
+				);
+				$_configs = array_merge( $_configs, $_trans_config );
+
+			}
+
+			return array_merge( $configurations, $_configs );
+		}
+	}
+}
+
+/**
+ * Kicking this off by calling 'get_instance()' method
+ */
+new Astra_Customizer_Button_Configs();
diff --git a/inc/customizer/configurations/buttons/class-astra-existing-button-configs.php b/inc/customizer/configurations/buttons/class-astra-existing-button-configs.php
index 707420a..15d5a81 100644
--- a/inc/customizer/configurations/buttons/class-astra-existing-button-configs.php
+++ b/inc/customizer/configurations/buttons/class-astra-existing-button-configs.php
@@ -1,452 +1,452 @@
-<?php
-/**
- * Astra Theme Customizer Configuration Base.
- *
- * @package     Astra
- * @author      Astra
- * @copyright   Copyright (c) 2020, Astra
- * @link        https://wpastra.com/
- * @since       Astra 2.6.0
- */
-
-// No direct access, please.
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-/**
- * Customizer Sanitizes
- *
- * @since 2.6.0
- */
-if ( ! class_exists( 'Astra_Existing_Button_Configs' ) ) {
-
-	/**
-	 * Register Button Customizer Configurations.
-	 */
-	class Astra_Existing_Button_Configs extends Astra_Customizer_Config_Base {
-
-		/**
-		 * Register Button Customizer Configurations.
-		 *
-		 * @param Array                $configurations Astra Customizer Configurations.
-		 * @param WP_Customize_Manager $wp_customize instance of WP_Customize_Manager.
-		 * @since 2.6.0
-		 * @return Array Astra Customizer Configurations with updated configurations.
-		 */
-		public function register_configuration( $configurations, $wp_customize ) {
-
-			$_configs = array(
-
-				/**
-				 * Option: Primary Header Button Colors Divider
-				 */
-				array(
-					'name'     => ASTRA_THEME_SETTINGS . '[primary-header-button-color-divider]',
-					'type'     => 'control',
-					'control'  => 'ast-heading',
-					'section'  => 'section-primary-menu',
-					'title'    => __( 'Header Button', 'astra' ),
-					'settings' => array(),
-					'priority' => 17,
-					'context'  => array(
-						Astra_Builder_Helper::$general_tab_config,
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-							'operator' => '===',
-							'value'    => 'custom-button',
-						),
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
-							'operator' => '==',
-							'value'    => 'button',
-						),
-					),
-
-				),
-				/**
-				 * Group: Primary Header Button Colors Group
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
-					'default'   => astra_get_option( 'primary-header-button-color-group' ),
-					'type'      => 'control',
-					'control'   => 'ast-settings-group',
-					'title'     => __( 'Colors', 'astra' ),
-					'section'   => 'section-primary-menu',
-					'transport' => 'postMessage',
-					'priority'  => 18,
-					'context'   => array(
-						Astra_Builder_Helper::$general_tab_config,
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-							'operator' => '===',
-							'value'    => 'custom-button',
-						),
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
-							'operator' => '==',
-							'value'    => 'button',
-						),
-					),
-				),
-				/**
-				 * Group: Primary Header Button Border Group
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
-					'default'   => astra_get_option( 'primary-header-button-border-group' ),
-					'type'      => 'control',
-					'control'   => 'ast-settings-group',
-					'title'     => __( 'Border', 'astra' ),
-					'section'   => 'section-primary-menu',
-					'transport' => 'postMessage',
-					'priority'  => 19,
-					'context'   => array(
-						Astra_Builder_Helper::$general_tab_config,
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-							'operator' => '===',
-							'value'    => 'custom-button',
-						),
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
-							'operator' => '==',
-							'value'    => 'button',
-						),
-					),
-				),
-
-				/**
-				* Option: Button Text Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-text-color',
-					'transport'         => 'postMessage',
-					'default'           => astra_get_option( 'header-main-rt-section-button-text-color' ),
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
-					'section'           => 'section-primary-menu',
-					'tab'               => __( 'Normal', 'astra' ),
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 10,
-					'title'             => __( 'Text Color', 'astra' ),
-				),
-
-				/**
-				* Option: Button Text Hover Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-text-h-color',
-					'default'           => astra_get_option( 'header-main-rt-section-button-text-h-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
-					'section'           => 'section-primary-menu',
-					'tab'               => __( 'Hover', 'astra' ),
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 10,
-					'title'             => __( 'Text Color', 'astra' ),
-				),
-
-				/**
-				* Option: Button Background Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-back-color',
-					'default'           => astra_get_option( 'header-main-rt-section-button-back-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
-					'section'           => 'section-primary-menu',
-					'tab'               => __( 'Normal', 'astra' ),
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 10,
-					'title'             => __( 'Background Color', 'astra' ),
-				),
-
-				/**
-				* Option: Button Button Hover Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-back-h-color',
-					'default'           => astra_get_option( 'header-main-rt-section-button-back-h-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
-					'section'           => 'section-primary-menu',
-					'tab'               => __( 'Hover', 'astra' ),
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 10,
-					'title'             => __( 'Background Color', 'astra' ),
-				),
-
-				/**
-				 * Option: Primary Header Button Typography
-				 */
-				array(
-					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'default'   => astra_get_option( 'primary-header-button-text-typography' ),
-					'type'      => 'control',
-					'control'   => 'ast-settings-group',
-					'title'     => __( 'Typography', 'astra' ),
-					'section'   => 'section-primary-menu',
-					'transport' => 'postMessage',
-					'priority'  => 20,
-					'context'   => array(
-						Astra_Builder_Helper::$general_tab_config,
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-							'operator' => '===',
-							'value'    => 'custom-button',
-						),
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
-							'operator' => '==',
-							'value'    => 'button',
-						),
-					),
-				),
-
-				/**
-				 * Option: Primary Header Button Font Family
-				 */
-				array(
-					'name'      => 'primary-header-button-font-family',
-					'type'      => 'sub-control',
-					'parent'    => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'   => 'section-primary-menu',
-					'control'   => 'ast-font',
-					'font_type' => 'ast-font-family',
-					'title'     => __( 'Family', 'astra' ),
-					'default'   => astra_get_option( 'primary-header-button-font-family' ),
-					'connect'   => ASTRA_THEME_SETTINGS . '[primary-header-button-font-weight]',
-					'priority'  => 1,
-				),
-
-				/**
-				 * Option: Primary Header Button Font Size
-				 */
-				array(
-					'name'        => 'primary-header-button-font-size',
-					'transport'   => 'postMessage',
-					'title'       => __( 'Size', 'astra' ),
-					'type'        => 'sub-control',
-					'parent'      => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'     => 'section-primary-menu',
-					'control'     => 'ast-responsive',
-					'default'     => astra_get_option( 'primary-header-button-font-size' ),
-					'input_attrs' => array(
-						'min' => 0,
-					),
-					'units'       => array(
-						'px' => 'px',
-						'em' => 'em',
-					),
-				),
-
-				/**
-				 * Option: Primary Header Button Font Weight
-				 */
-				array(
-					'name'              => 'primary-header-button-font-weight',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'           => 'section-primary-menu',
-					'control'           => 'ast-font',
-					'font_type'         => 'ast-font-weight',
-					'title'             => __( 'Weight', 'astra' ),
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_font_weight' ),
-					'default'           => astra_get_option( 'primary-header-button-font-weight' ),
-					'connect'           => 'primary-header-button-font-family',
-					'priority'          => 2,
-				),
-
-				/**
-				 * Option: Primary Header Button Text Transform
-				 */
-				array(
-					'name'      => 'primary-header-button-text-transform',
-					'transport' => 'postMessage',
-					'default'   => astra_get_option( 'primary-header-button-text-transform' ),
-					'title'     => __( 'Text Transform', 'astra' ),
-					'type'      => 'sub-control',
-					'parent'    => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'   => 'section-primary-menu',
-					'control'   => 'ast-select',
-					'priority'  => 3,
-					'choices'   => array(
-						''           => __( 'Inherit', 'astra' ),
-						'none'       => __( 'None', 'astra' ),
-						'capitalize' => __( 'Capitalize', 'astra' ),
-						'uppercase'  => __( 'Uppercase', 'astra' ),
-						'lowercase'  => __( 'Lowercase', 'astra' ),
-					),
-				),
-
-				/**
-				 * Option: Primary Header Button Line Height
-				 */
-				array(
-					'name'              => 'primary-header-button-line-height',
-					'control'           => 'ast-slider',
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'default'           => astra_get_option( 'primary-header-button-line-height' ),
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'           => 'section-primary-menu',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_number_n_blank' ),
-					'title'             => __( 'Line Height', 'astra' ),
-					'suffix'            => 'em',
-					'priority'          => 4,
-					'input_attrs'       => array(
-						'min'  => 1,
-						'step' => 0.01,
-						'max'  => 5,
-					),
-				),
-
-				/**
-				 * Option: Primary Header Button Letter Spacing
-				 */
-				array(
-					'name'              => 'primary-header-button-letter-spacing',
-					'control'           => 'ast-slider',
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'default'           => astra_get_option( 'primary-header-button-letter-spacing' ),
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
-					'section'           => 'section-primary-menu',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_number_n_blank' ),
-					'title'             => __( 'Letter Spacing', 'astra' ),
-					'suffix'            => 'px',
-					'priority'          => 5,
-					'input_attrs'       => array(
-						'min'  => 1,
-						'step' => 1,
-						'max'  => 100,
-					),
-				),
-
-				// Option: Custom Menu Button Border.
-				array(
-					'type'              => 'control',
-					'control'           => 'ast-responsive-spacing',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
-					'name'              => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-padding]',
-					'section'           => 'section-primary-menu',
-					'transport'         => 'postMessage',
-					'linked_choices'    => true,
-					'priority'          => 21,
-					'context'           => array(
-						Astra_Builder_Helper::$general_tab_config,
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
-							'operator' => '===',
-							'value'    => 'custom-button',
-						),
-						array(
-							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
-							'operator' => '==',
-							'value'    => 'button',
-						),
-					),
-					'default'           => astra_get_option( 'header-main-rt-section-button-padding' ),
-					'title'             => __( 'Padding', 'astra' ),
-					'choices'           => array(
-						'top'    => __( 'Top', 'astra' ),
-						'right'  => __( 'Right', 'astra' ),
-						'bottom' => __( 'Bottom', 'astra' ),
-						'left'   => __( 'Left', 'astra' ),
-					),
-				),
-
-				/**
-				* Option: Button Border Size
-				*/
-				array(
-					'type'           => 'sub-control',
-					'parent'         => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
-					'section'        => 'section-primary-menu',
-					'control'        => 'ast-border',
-					'name'           => 'header-main-rt-section-button-border-size',
-					'transport'      => 'postMessage',
-					'linked_choices' => true,
-					'priority'       => 10,
-					'default'        => astra_get_option( 'header-main-rt-section-button-border-size' ),
-					'title'          => __( 'Width', 'astra' ),
-					'choices'        => array(
-						'top'    => __( 'Top', 'astra' ),
-						'right'  => __( 'Right', 'astra' ),
-						'bottom' => __( 'Bottom', 'astra' ),
-						'left'   => __( 'Left', 'astra' ),
-					),
-				),
-
-				/**
-				* Option: Button Border Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-border-color',
-					'default'           => astra_get_option( 'header-main-rt-section-button-border-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
-					'section'           => 'section-primary-menu',
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 12,
-					'title'             => __( 'Color', 'astra' ),
-				),
-
-				/**
-				* Option: Button Border Hover Color
-				*/
-				array(
-					'name'              => 'header-main-rt-section-button-border-h-color',
-					'default'           => astra_get_option( 'header-main-rt-section-button-border-h-color' ),
-					'transport'         => 'postMessage',
-					'type'              => 'sub-control',
-					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
-					'section'           => 'section-primary-menu',
-					'control'           => 'ast-color',
-					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
-					'priority'          => 14,
-					'title'             => __( 'Hover Color', 'astra' ),
-				),
-
-				/**
-				* Option: Button Border Radius
-				*/
-				array(
-					'name'        => 'header-main-rt-section-button-border-radius',
-					'default'     => astra_get_option( 'header-main-rt-section-button-border-radius' ),
-					'type'        => 'sub-control',
-					'parent'      => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
-					'section'     => 'section-primary-menu',
-					'control'     => 'ast-slider',
-					'suffix'      => 'px',
-					'transport'   => 'postMessage',
-					'priority'    => 16,
-					'title'       => __( 'Border Radius', 'astra' ),
-					'input_attrs' => array(
-						'min'  => 0,
-						'step' => 1,
-						'max'  => 100,
-					),
-				),
-			);
-
-			return array_merge( $configurations, $_configs );
-		}
-	}
-}
-
-/**
- * Kicking this off by calling 'get_instance()' method
- */
-new Astra_Existing_Button_Configs();
+<?php
+/**
+ * Astra Theme Customizer Configuration Base.
+ *
+ * @package     Astra
+ * @author      Astra
+ * @copyright   Copyright (c) 2020, Astra
+ * @link        https://wpastra.com/
+ * @since       Astra 2.6.0
+ */
+
+// No direct access, please.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Customizer Sanitizes
+ *
+ * @since 2.6.0
+ */
+if ( ! class_exists( 'Astra_Existing_Button_Configs' ) ) {
+
+	/**
+	 * Register Button Customizer Configurations.
+	 */
+	class Astra_Existing_Button_Configs extends Astra_Customizer_Config_Base {
+
+		/**
+		 * Register Button Customizer Configurations.
+		 *
+		 * @param Array                $configurations Astra Customizer Configurations.
+		 * @param WP_Customize_Manager $wp_customize instance of WP_Customize_Manager.
+		 * @since 2.6.0
+		 * @return Array Astra Customizer Configurations with updated configurations.
+		 */
+		public function register_configuration( $configurations, $wp_customize ) {
+
+			$_configs = array(
+
+				/**
+				 * Option: Primary Header Button Colors Divider
+				 */
+				array(
+					'name'     => ASTRA_THEME_SETTINGS . '[primary-header-button-color-divider]',
+					'type'     => 'control',
+					'control'  => 'ast-heading',
+					'section'  => 'section-primary-menu',
+					'title'    => __( 'Header Button', 'astra' ),
+					'settings' => array(),
+					'priority' => 17,
+					'context'  => array(
+						Astra_Builder_Helper::$general_tab_config,
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+							'operator' => '===',
+							'value'    => 'custom-button',
+						),
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
+							'operator' => '==',
+							'value'    => 'button',
+						),
+					),
+
+				),
+				/**
+				 * Group: Primary Header Button Colors Group
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
+					'default'   => astra_get_option( 'primary-header-button-color-group' ),
+					'type'      => 'control',
+					'control'   => 'ast-settings-group',
+					'title'     => __( 'Colors', 'astra' ),
+					'section'   => 'section-primary-menu',
+					'transport' => 'postMessage',
+					'priority'  => 18,
+					'context'   => array(
+						Astra_Builder_Helper::$general_tab_config,
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+							'operator' => '===',
+							'value'    => 'custom-button',
+						),
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
+							'operator' => '==',
+							'value'    => 'button',
+						),
+					),
+				),
+				/**
+				 * Group: Primary Header Button Border Group
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
+					'default'   => astra_get_option( 'primary-header-button-border-group' ),
+					'type'      => 'control',
+					'control'   => 'ast-settings-group',
+					'title'     => __( 'Border', 'astra' ),
+					'section'   => 'section-primary-menu',
+					'transport' => 'postMessage',
+					'priority'  => 19,
+					'context'   => array(
+						Astra_Builder_Helper::$general_tab_config,
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+							'operator' => '===',
+							'value'    => 'custom-button',
+						),
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
+							'operator' => '==',
+							'value'    => 'button',
+						),
+					),
+				),
+
+				/**
+				* Option: Button Text Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-text-color',
+					'transport'         => 'postMessage',
+					'default'           => astra_get_option( 'header-main-rt-section-button-text-color' ),
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
+					'section'           => 'section-primary-menu',
+					'tab'               => __( 'Normal', 'astra' ),
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 10,
+					'title'             => __( 'Text Color', 'astra' ),
+				),
+
+				/**
+				* Option: Button Text Hover Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-text-h-color',
+					'default'           => astra_get_option( 'header-main-rt-section-button-text-h-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
+					'section'           => 'section-primary-menu',
+					'tab'               => __( 'Hover', 'astra' ),
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 10,
+					'title'             => __( 'Text Color', 'astra' ),
+				),
+
+				/**
+				* Option: Button Background Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-back-color',
+					'default'           => astra_get_option( 'header-main-rt-section-button-back-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
+					'section'           => 'section-primary-menu',
+					'tab'               => __( 'Normal', 'astra' ),
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 10,
+					'title'             => __( 'Background Color', 'astra' ),
+				),
+
+				/**
+				* Option: Button Button Hover Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-back-h-color',
+					'default'           => astra_get_option( 'header-main-rt-section-button-back-h-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-color-group]',
+					'section'           => 'section-primary-menu',
+					'tab'               => __( 'Hover', 'astra' ),
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 10,
+					'title'             => __( 'Background Color', 'astra' ),
+				),
+
+				/**
+				 * Option: Primary Header Button Typography
+				 */
+				array(
+					'name'      => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'default'   => astra_get_option( 'primary-header-button-text-typography' ),
+					'type'      => 'control',
+					'control'   => 'ast-settings-group',
+					'title'     => __( 'Typography', 'astra' ),
+					'section'   => 'section-primary-menu',
+					'transport' => 'postMessage',
+					'priority'  => 20,
+					'context'   => array(
+						Astra_Builder_Helper::$general_tab_config,
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+							'operator' => '===',
+							'value'    => 'custom-button',
+						),
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
+							'operator' => '==',
+							'value'    => 'button',
+						),
+					),
+				),
+
+				/**
+				 * Option: Primary Header Button Font Family
+				 */
+				array(
+					'name'      => 'primary-header-button-font-family',
+					'type'      => 'sub-control',
+					'parent'    => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'   => 'section-primary-menu',
+					'control'   => 'ast-font',
+					'font_type' => 'ast-font-family',
+					'title'     => __( 'Family', 'astra' ),
+					'default'   => astra_get_option( 'primary-header-button-font-family' ),
+					'connect'   => ASTRA_THEME_SETTINGS . '[primary-header-button-font-weight]',
+					'priority'  => 1,
+				),
+
+				/**
+				 * Option: Primary Header Button Font Size
+				 */
+				array(
+					'name'        => 'primary-header-button-font-size',
+					'transport'   => 'postMessage',
+					'title'       => __( 'Size', 'astra' ),
+					'type'        => 'sub-control',
+					'parent'      => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'     => 'section-primary-menu',
+					'control'     => 'ast-responsive',
+					'default'     => astra_get_option( 'primary-header-button-font-size' ),
+					'input_attrs' => array(
+						'min' => 0,
+					),
+					'units'       => array(
+						'px' => 'px',
+						'em' => 'em',
+					),
+				),
+
+				/**
+				 * Option: Primary Header Button Font Weight
+				 */
+				array(
+					'name'              => 'primary-header-button-font-weight',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'           => 'section-primary-menu',
+					'control'           => 'ast-font',
+					'font_type'         => 'ast-font-weight',
+					'title'             => __( 'Weight', 'astra' ),
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_font_weight' ),
+					'default'           => astra_get_option( 'primary-header-button-font-weight' ),
+					'connect'           => 'primary-header-button-font-family',
+					'priority'          => 2,
+				),
+
+				/**
+				 * Option: Primary Header Button Text Transform
+				 */
+				array(
+					'name'      => 'primary-header-button-text-transform',
+					'transport' => 'postMessage',
+					'default'   => astra_get_option( 'primary-header-button-text-transform' ),
+					'title'     => __( 'Text Transform', 'astra' ),
+					'type'      => 'sub-control',
+					'parent'    => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'   => 'section-primary-menu',
+					'control'   => 'ast-select',
+					'priority'  => 3,
+					'choices'   => array(
+						''           => __( 'Inherit', 'astra' ),
+						'none'       => __( 'None', 'astra' ),
+						'capitalize' => __( 'Capitalize', 'astra' ),
+						'uppercase'  => __( 'Uppercase', 'astra' ),
+						'lowercase'  => __( 'Lowercase', 'astra' ),
+					),
+				),
+
+				/**
+				 * Option: Primary Header Button Line Height
+				 */
+				array(
+					'name'              => 'primary-header-button-line-height',
+					'control'           => 'ast-slider',
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'default'           => astra_get_option( 'primary-header-button-line-height' ),
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'           => 'section-primary-menu',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_number_n_blank' ),
+					'title'             => __( 'Line Height', 'astra' ),
+					'suffix'            => 'em',
+					'priority'          => 4,
+					'input_attrs'       => array(
+						'min'  => 1,
+						'step' => 0.01,
+						'max'  => 5,
+					),
+				),
+
+				/**
+				 * Option: Primary Header Button Letter Spacing
+				 */
+				array(
+					'name'              => 'primary-header-button-letter-spacing',
+					'control'           => 'ast-slider',
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'default'           => astra_get_option( 'primary-header-button-letter-spacing' ),
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-text-typography]',
+					'section'           => 'section-primary-menu',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_number_n_blank' ),
+					'title'             => __( 'Letter Spacing', 'astra' ),
+					'suffix'            => 'px',
+					'priority'          => 5,
+					'input_attrs'       => array(
+						'min'  => 1,
+						'step' => 1,
+						'max'  => 100,
+					),
+				),
+
+				// Option: Custom Menu Button Border.
+				array(
+					'type'              => 'control',
+					'control'           => 'ast-responsive-spacing',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_responsive_spacing' ),
+					'name'              => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-padding]',
+					'section'           => 'section-primary-menu',
+					'transport'         => 'postMessage',
+					'linked_choices'    => true,
+					'priority'          => 21,
+					'context'           => array(
+						Astra_Builder_Helper::$general_tab_config,
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section-button-style]',
+							'operator' => '===',
+							'value'    => 'custom-button',
+						),
+						array(
+							'setting'  => ASTRA_THEME_SETTINGS . '[header-main-rt-section]',
+							'operator' => '==',
+							'value'    => 'button',
+						),
+					),
+					'default'           => astra_get_option( 'header-main-rt-section-button-padding' ),
+					'title'             => __( 'Padding', 'astra' ),
+					'choices'           => array(
+						'top'    => __( 'Top', 'astra' ),
+						'right'  => __( 'Right', 'astra' ),
+						'bottom' => __( 'Bottom', 'astra' ),
+						'left'   => __( 'Left', 'astra' ),
+					),
+				),
+
+				/**
+				* Option: Button Border Size
+				*/
+				array(
+					'type'           => 'sub-control',
+					'parent'         => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
+					'section'        => 'section-primary-menu',
+					'control'        => 'ast-border',
+					'name'           => 'header-main-rt-section-button-border-size',
+					'transport'      => 'postMessage',
+					'linked_choices' => true,
+					'priority'       => 10,
+					'default'        => astra_get_option( 'header-main-rt-section-button-border-size' ),
+					'title'          => __( 'Width', 'astra' ),
+					'choices'        => array(
+						'top'    => __( 'Top', 'astra' ),
+						'right'  => __( 'Right', 'astra' ),
+						'bottom' => __( 'Bottom', 'astra' ),
+						'left'   => __( 'Left', 'astra' ),
+					),
+				),
+
+				/**
+				* Option: Button Border Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-border-color',
+					'default'           => astra_get_option( 'header-main-rt-section-button-border-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
+					'section'           => 'section-primary-menu',
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 12,
+					'title'             => __( 'Color', 'astra' ),
+				),
+
+				/**
+				* Option: Button Border Hover Color
+				*/
+				array(
+					'name'              => 'header-main-rt-section-button-border-h-color',
+					'default'           => astra_get_option( 'header-main-rt-section-button-border-h-color' ),
+					'transport'         => 'postMessage',
+					'type'              => 'sub-control',
+					'parent'            => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
+					'section'           => 'section-primary-menu',
+					'control'           => 'ast-color',
+					'sanitize_callback' => array( 'Astra_Customizer_Sanitizes', 'sanitize_alpha_color' ),
+					'priority'          => 14,
+					'title'             => __( 'Hover Color', 'astra' ),
+				),
+
+				/**
+				* Option: Button Border Radius
+				*/
+				array(
+					'name'        => 'header-main-rt-section-button-border-radius',
+					'default'     => astra_get_option( 'header-main-rt-section-button-border-radius' ),
+					'type'        => 'sub-control',
+					'parent'      => ASTRA_THEME_SETTINGS . '[primary-header-button-border-group]',
+					'section'     => 'section-primary-menu',
+					'control'     => 'ast-slider',
+					'suffix'      => 'px',
+					'transport'   => 'postMessage',
+					'priority'    => 16,
+					'title'       => __( 'Border Radius', 'astra' ),
+					'input_attrs' => array(
+						'min'  => 0,
+						'step' => 1,
+						'max'  => 100,
+					),
+				),
+			);
+
+			return array_merge( $configurations, $_configs );
+		}
+	}
+}
+
+/**
+ * Kicking this off by calling 'get_instance()' method
+ */
+new Astra_Existing_Button_Configs();