diff --git a/classes/class-astra-hooks-loader.php b/classes/class-astra-hooks-loader.php
index 08644b8..3d91a66 100644
--- a/classes/class-astra-hooks-loader.php
+++ b/classes/class-astra-hooks-loader.php
@@ -39,8 +39,8 @@ public function __construct() {
 
 			$this->includes();
 
-			add_filter( 'astra_theme_defaults',    array( $this, 'theme_defaults' ) );
-			add_action( 'customize_register',    array( $this, 'customize_register' ) );
+			add_filter( 'astra_theme_defaults', array( $this, 'theme_defaults' ) );
+			add_action( 'customize_register', array( $this, 'customize_register' ) );
 
 		}
 
@@ -53,9 +53,9 @@ public function __construct() {
 		function theme_defaults( $defaults ) {
 
 			// Header.
-			$defaults['hook-wp-head']              = '';
-			$defaults['hook-header-before']        = '';
-			$defaults['hook-header-after']         = '';
+			$defaults['hook-wp-head']       = '';
+			$defaults['hook-header-before'] = '';
+			$defaults['hook-header-after']  = '';
 
 			// Content.
 			$defaults['hook-before-container']     = '';
@@ -68,17 +68,17 @@ function theme_defaults( $defaults ) {
 			$defaults['hook-after-container']      = '';
 
 			// Comment.
-			$defaults['hook-comments-before']      = '';
-			$defaults['hook-comments-after']       = '';
+			$defaults['hook-comments-before'] = '';
+			$defaults['hook-comments-after']  = '';
 
 			// Sidebar.
-			$defaults['hook-sidebars-before']      = '';
-			$defaults['hook-sidebars-after']       = '';
+			$defaults['hook-sidebars-before'] = '';
+			$defaults['hook-sidebars-after']  = '';
 
 			// Footer.
-			$defaults['hook-footer-before']        = '';
-			$defaults['hook-footer-after']         = '';
-			$defaults['hook-wp-footer']            = '';
+			$defaults['hook-footer-before'] = '';
+			$defaults['hook-footer-after']  = '';
+			$defaults['hook-wp-footer']     = '';
 
 			return $defaults;
 		}
diff --git a/classes/class-astra-hooks-markup.php b/classes/class-astra-hooks-markup.php
index 5af0764..4edf6e8 100644
--- a/classes/class-astra-hooks-markup.php
+++ b/classes/class-astra-hooks-markup.php
@@ -37,32 +37,32 @@ public static function get_instance() {
 		public function __construct() {
 
 			// Header.
-			add_action( 'wp_head',                      array( $this, 'hook_wp_head' ) );
-			add_action( 'astra_header_before',          array( $this, 'hook_header_before' ) );
-			add_action( 'astra_header_after',           array( $this, 'hook_header_after' ) );
+			add_action( 'wp_head', array( $this, 'hook_wp_head' ) );
+			add_action( 'astra_header_before', array( $this, 'hook_header_before' ) );
+			add_action( 'astra_header_after', array( $this, 'hook_header_after' ) );
 
 			// Sidebar.
-			add_action( 'astra_sidebars_before',        array( $this, 'hook_sidebars_before' ) );
-			add_action( 'astra_sidebars_after',         array( $this, 'hook_sidebars_after' ) );
+			add_action( 'astra_sidebars_before', array( $this, 'hook_sidebars_before' ) );
+			add_action( 'astra_sidebars_after', array( $this, 'hook_sidebars_after' ) );
 
 			// Footer.
-			add_action( 'astra_footer_before',          array( $this, 'hook_footer_before' ) );
-			add_action( 'astra_footer_after',           array( $this, 'hook_footer_after' ) );
-			add_action( 'wp_footer',                    array( $this, 'hook_wp_footer' ) );
+			add_action( 'astra_footer_before', array( $this, 'hook_footer_before' ) );
+			add_action( 'astra_footer_after', array( $this, 'hook_footer_after' ) );
+			add_action( 'wp_footer', array( $this, 'hook_wp_footer' ) );
 
 			// Content.
-			add_action( 'astra_content_before',         array( $this, 'hook_container_before' ) );
-			add_action( 'astra_primary_content_top',    array( $this, 'hook_before_main_content' ) );
-			add_action( 'astra_entry_top',              array( $this, 'hook_entry_top' ) );
-			add_action( 'astra_entry_content_before',   array( $this, 'hook_entry_content_before' ) );
-			add_action( 'astra_entry_content_after',    array( $this, 'hook_entry_content_after' ) );
-			add_action( 'astra_entry_bottom',           array( $this, 'hook_entry_bottom' ) );
+			add_action( 'astra_content_before', array( $this, 'hook_container_before' ) );
+			add_action( 'astra_primary_content_top', array( $this, 'hook_before_main_content' ) );
+			add_action( 'astra_entry_top', array( $this, 'hook_entry_top' ) );
+			add_action( 'astra_entry_content_before', array( $this, 'hook_entry_content_before' ) );
+			add_action( 'astra_entry_content_after', array( $this, 'hook_entry_content_after' ) );
+			add_action( 'astra_entry_bottom', array( $this, 'hook_entry_bottom' ) );
 			add_action( 'astra_primary_content_bottom', array( $this, 'hook_after_main_content' ) );
-			add_action( 'astra_content_after',          array( $this, 'hook_container_after' ) );
+			add_action( 'astra_content_after', array( $this, 'hook_container_after' ) );
 
 			// Comment.
-			add_action( 'astra_comments_before',        array( $this, 'hook_comments_before' ) );
-			add_action( 'astra_comments_after',         array( $this, 'hook_comments_after' ) );
+			add_action( 'astra_comments_before', array( $this, 'hook_comments_before' ) );
+			add_action( 'astra_comments_after', array( $this, 'hook_comments_after' ) );
 
 		}
 
@@ -70,7 +70,7 @@ public function __construct() {
 		 * Ast wp_head Hook
 		 */
 		function hook_wp_head() {
-			$wp_head    = astra_get_option( 'hook-wp-head' );
+			$wp_head = astra_get_option( 'hook-wp-head' );
 			echo do_shortcode( $wp_head );
 		}
 
@@ -78,7 +78,7 @@ function hook_wp_head() {
 		 * Ast Header Before Hook
 		 */
 		function hook_header_before() {
-			$header_before  = astra_get_option( 'hook-header-before' );
+			$header_before = astra_get_option( 'hook-header-before' );
 			echo do_shortcode( $header_before );
 		}
 
@@ -86,7 +86,7 @@ function hook_header_before() {
 		 * Ast Header After Hook
 		 */
 		function hook_header_after() {
-			$header_after   = astra_get_option( 'hook-header-after' );
+			$header_after = astra_get_option( 'hook-header-after' );
 			echo do_shortcode( $header_after );
 		}
 
@@ -94,7 +94,7 @@ function hook_header_after() {
 		 * Ast Page/Post Before Main Container Hook
 		 */
 		function hook_container_before() {
-			$hook_container_before  = astra_get_option( 'hook-before-container' );
+			$hook_container_before = astra_get_option( 'hook-before-container' );
 			echo do_shortcode( $hook_container_before );
 		}
 
@@ -102,7 +102,7 @@ function hook_container_before() {
 		 * Ast Page/Post Before Main Content Hook
 		 */
 		function hook_before_main_content() {
-			$hook_before_main_content   = astra_get_option( 'hook-before-main-content' );
+			$hook_before_main_content = astra_get_option( 'hook-before-main-content' );
 			echo do_shortcode( $hook_before_main_content );
 		}
 
@@ -110,7 +110,7 @@ function hook_before_main_content() {
 		 * Ast Page/Post Before Hook
 		 */
 		function hook_entry_top() {
-			$entry_top  = astra_get_option( 'hook-entry-top' );
+			$entry_top = astra_get_option( 'hook-entry-top' );
 			echo do_shortcode( $entry_top );
 		}
 
@@ -118,7 +118,7 @@ function hook_entry_top() {
 		 * Ast Page/Post After Hook
 		 */
 		function hook_entry_bottom() {
-			$entry_bottom   = astra_get_option( 'hook-entry-bottom' );
+			$entry_bottom = astra_get_option( 'hook-entry-bottom' );
 			echo do_shortcode( $entry_bottom );
 		}
 
@@ -126,7 +126,7 @@ function hook_entry_bottom() {
 		 * Ast Page/Post After Main Content Hook
 		 */
 		function hook_after_main_content() {
-			$hook_after_main_content    = astra_get_option( 'hook-after-main-content' );
+			$hook_after_main_content = astra_get_option( 'hook-after-main-content' );
 			echo do_shortcode( $hook_after_main_content );
 		}
 
@@ -134,7 +134,7 @@ function hook_after_main_content() {
 		 * Ast Page/Post After Main Container Hook
 		 */
 		function hook_container_after() {
-			$hook_container_after   = astra_get_option( 'hook-after-container' );
+			$hook_container_after = astra_get_option( 'hook-after-container' );
 			echo do_shortcode( $hook_container_after );
 		}
 
@@ -142,7 +142,7 @@ function hook_container_after() {
 		 * Ast After Entry Content Before Hook
 		 */
 		function hook_entry_content_before() {
-			$after_entry_title  = astra_get_option( 'hook-entry-content-before' );
+			$after_entry_title = astra_get_option( 'hook-entry-content-before' );
 			echo do_shortcode( $after_entry_title );
 		}
 
@@ -150,7 +150,7 @@ function hook_entry_content_before() {
 		 * Ast After Entry Content After Hook
 		 */
 		function hook_entry_content_after() {
-			$after_entry_title  = astra_get_option( 'hook-entry-content-after' );
+			$after_entry_title = astra_get_option( 'hook-entry-content-after' );
 			echo do_shortcode( $after_entry_title );
 		}
 
@@ -158,7 +158,7 @@ function hook_entry_content_after() {
 		 * Ast Comment Before Hook
 		 */
 		function hook_comments_before() {
-			$comment_before     = astra_get_option( 'hook-comments-before' );
+			$comment_before = astra_get_option( 'hook-comments-before' );
 			echo do_shortcode( $comment_before );
 		}
 
@@ -166,7 +166,7 @@ function hook_comments_before() {
 		 * Ast Comment After Hook
 		 */
 		function hook_comments_after() {
-			$comment_after  = astra_get_option( 'hook-comments-after' );
+			$comment_after = astra_get_option( 'hook-comments-after' );
 			echo do_shortcode( $comment_after );
 		}
 
@@ -174,7 +174,7 @@ function hook_comments_after() {
 		 * Ast Sidebars Before Hook
 		 */
 		function hook_sidebars_before() {
-			$sidebar_before     = astra_get_option( 'hook-sidebars-before' );
+			$sidebar_before = astra_get_option( 'hook-sidebars-before' );
 			echo do_shortcode( $sidebar_before );
 		}
 
@@ -182,7 +182,7 @@ function hook_sidebars_before() {
 		 * Ast Sidebars After Hook
 		 */
 		function hook_sidebars_after() {
-			$sidebar_after  = astra_get_option( 'hook-sidebars-after' );
+			$sidebar_after = astra_get_option( 'hook-sidebars-after' );
 			echo do_shortcode( $sidebar_after );
 		}
 
@@ -190,7 +190,7 @@ function hook_sidebars_after() {
 		 * Ast Footer Before Hook
 		 */
 		function hook_footer_before() {
-			$footer_before  = astra_get_option( 'hook-footer-before' );
+			$footer_before = astra_get_option( 'hook-footer-before' );
 			echo do_shortcode( $footer_before );
 		}
 
@@ -198,7 +198,7 @@ function hook_footer_before() {
 		 * Ast Footer After Hook
 		 */
 		function hook_footer_after() {
-			$footer_after   = astra_get_option( 'hook-footer-after' );
+			$footer_after = astra_get_option( 'hook-footer-after' );
 			echo do_shortcode( $footer_after );
 		}
 
@@ -206,7 +206,7 @@ function hook_footer_after() {
 		 * Ast wp_head Hook
 		 */
 		function hook_wp_footer() {
-			$wp_footer  = astra_get_option( 'hook-wp-footer' );
+			$wp_footer = astra_get_option( 'hook-wp-footer' );
 			echo do_shortcode( $wp_footer );
 		}
 	}
diff --git a/classes/class-astra-hooks-white-label.php b/classes/class-astra-hooks-white-label.php
index 70224c6..5a938a2 100644
--- a/classes/class-astra-hooks-white-label.php
+++ b/classes/class-astra-hooks-white-label.php
@@ -53,9 +53,9 @@ public static function set_instance() {
 		 */
 		public function __construct() {
 
-			add_filter( 'all_plugins'                               , array( $this, 'plugins_page' ) );
-			add_filter( 'astra_addon_branding_options'              , __CLASS__ . '::settings' );
-			add_action( 'astra_pro_white_label_add_form'            , __CLASS__ . '::add_white_lavel_form' );
+			add_filter( 'all_plugins', array( $this, 'plugins_page' ) );
+			add_filter( 'astra_addon_branding_options', __CLASS__ . '::settings' );
+			add_action( 'astra_pro_white_label_add_form', __CLASS__ . '::add_white_lavel_form' );
 
 			if ( is_admin() ) {
 				// Display the link with the plugin meta.
@@ -71,7 +71,7 @@ public function __construct() {
 		 */
 		function plugins_page( $plugins ) {
 
-			$get_white_label = 'Astra_Ext_White_Label_Markup::get_white_label';
+			$get_white_label = 'Astra_Ext_White_Label_Markup::get_whitelabel_string';
 			if ( ! is_callable( $get_white_label ) ) {
 				return $plugins;
 			}
@@ -81,10 +81,10 @@ function plugins_page( $plugins ) {
 			}
 
 			// Set White Labels.
-			$name        = Astra_Ext_White_Label_Markup::get_white_label( 'astra-hooks', 'name' );
-			$description = Astra_Ext_White_Label_Markup::get_white_label( 'astra-hooks', 'description' );
-			$author      = Astra_Ext_White_Label_Markup::get_white_label( 'astra-agency', 'author' );
-			$author_uri  = Astra_Ext_White_Label_Markup::get_white_label( 'astra-agency', 'author_url' );
+			$name        = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-hooks', 'name' );
+			$description = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-hooks', 'description' );
+			$author      = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-agency', 'author' );
+			$author_uri  = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-agency', 'author_url' );
 
 			if ( ! empty( $name ) ) {
 				$plugins[ ASTRA_HOOKS_BASE ]['Name'] = $name;
@@ -120,11 +120,11 @@ function plugins_page( $plugins ) {
 		 */
 		public function plugin_links( $plugin_meta, $plugin_file, $plugin_data ) {
 
-			if ( is_callable( 'Astra_Ext_White_Label_Markup::get_white_label' ) ) {
+			if ( is_callable( 'Astra_Ext_White_Label_Markup::get_whitelabel_string' ) ) {
 				if ( ASTRA_HOOKS_BASE == $plugin_file ) {
 					// Set White Labels.
-					$name        = Astra_Ext_White_Label_Markup::get_white_label( 'astra-hooks', 'name' );
-					$description = Astra_Ext_White_Label_Markup::get_white_label( 'astra-hooks', 'description' );
+					$name        = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-hooks', 'name' );
+					$description = Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-hooks', 'description' );
 
 					if ( ! empty( $name ) ) {
 						// Remove Plugin URI if Agency White Label name is set.
@@ -146,8 +146,8 @@ public function plugin_links( $plugin_meta, $plugin_file, $plugin_data ) {
 		public static function settings( $settings = array() ) {
 
 			$settings['astra-hooks'] = array(
-				'name'          => '',
-				'description'   => '',
+				'name'        => '',
+				'description' => '',
 			);
 
 			return $settings;
diff --git a/classes/customizer-panels-and-sections.php b/classes/customizer-panels-and-sections.php
index ac3c028..2c56d75 100644
--- a/classes/customizer-panels-and-sections.php
+++ b/classes/customizer-panels-and-sections.php
@@ -6,43 +6,49 @@
  */
 
 $wp_customize->add_panel(
-	'panel-hooks', array(
+	'panel-hooks',
+	array(
 		'priority' => 55,
-		'title' => __( 'Hooks', 'astra-hooks' ),
+		'title'    => __( 'Hooks', 'astra-hooks' ),
 	)
 );
 
 $wp_customize->add_section(
-	'section-hooks-header', array(
-		'title'    => __( 'Header', 'astra-hooks' ),
-		'panel'    => 'panel-hooks',
+	'section-hooks-header',
+	array(
+		'title' => __( 'Header', 'astra-hooks' ),
+		'panel' => 'panel-hooks',
 	)
 );
 
 $wp_customize->add_section(
-	'section-hooks-content', array(
-		'title'    => __( 'Content', 'astra-hooks' ),
-		'panel'    => 'panel-hooks',
+	'section-hooks-content',
+	array(
+		'title' => __( 'Content', 'astra-hooks' ),
+		'panel' => 'panel-hooks',
 	)
 );
 
 $wp_customize->add_section(
-	'section-hooks-comment', array(
-		'title'    => __( 'Comment', 'astra-hooks' ),
-		'panel'    => 'panel-hooks',
+	'section-hooks-comment',
+	array(
+		'title' => __( 'Comment', 'astra-hooks' ),
+		'panel' => 'panel-hooks',
 	)
 );
 
 $wp_customize->add_section(
-	'section-hooks-sidebar', array(
-		'title'    => __( 'Sidebar', 'astra-hooks' ),
-		'panel'    => 'panel-hooks',
+	'section-hooks-sidebar',
+	array(
+		'title' => __( 'Sidebar', 'astra-hooks' ),
+		'panel' => 'panel-hooks',
 	)
 );
 
 $wp_customize->add_section(
-	'section-hooks-footer', array(
-		'title'    => __( 'Footer', 'astra-hooks' ),
-		'panel'    => 'panel-hooks',
+	'section-hooks-footer',
+	array(
+		'title' => __( 'Footer', 'astra-hooks' ),
+		'panel' => 'panel-hooks',
 	)
 );
diff --git a/classes/sections/section-hooks.php b/classes/sections/section-hooks.php
index 4e42fcf..faf7b89 100644
--- a/classes/sections/section-hooks.php
+++ b/classes/sections/section-hooks.php
@@ -20,16 +20,18 @@
 	 * Option: wp_head
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-wp-head]', array(
-			'default'   => astra_get_option( 'hook-wp-head' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-wp-head]',
+		array(
+			'default' => astra_get_option( 'hook-wp-head' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-wp-head]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-header',
-			'label'       => __( 'wp_head', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-wp-head]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-header',
+			'label'   => __( 'wp_head', 'astra-hooks' ),
 		)
 	);
 
@@ -37,16 +39,18 @@
 	 * Option: astra_header_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-header-before]', array(
-			'default'   => astra_get_option( 'hook-header-before' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-header-before]',
+		array(
+			'default' => astra_get_option( 'hook-header-before' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-header-before]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-header',
-			'label'       => __( 'Before Header (astra_header_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-header-before]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-header',
+			'label'   => __( 'Before Header (astra_header_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -54,16 +58,18 @@
 	 * Option: astra_header_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-header-after]', array(
-			'default'   => astra_get_option( 'hook-header-after' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-header-after]',
+		array(
+			'default' => astra_get_option( 'hook-header-after' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-header-after]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-header',
-			'label'       => __( 'After Header (astra_header_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-header-after]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-header',
+			'label'   => __( 'After Header (astra_header_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -74,16 +80,18 @@
 	 * Option: astra_content_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-before-container]', array(
-			'default'   => astra_get_option( 'hook-before-container' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-before-container]',
+		array(
+			'default' => astra_get_option( 'hook-before-container' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-before-container]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'Before Container (astra_content_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-before-container]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'Before Container (astra_content_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -91,16 +99,18 @@
 	 * Option: astra_primary_content_top
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-before-main-content]', array(
-			'default'   => astra_get_option( 'hook-before-main-content' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-before-main-content]',
+		array(
+			'default' => astra_get_option( 'hook-before-main-content' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-before-main-content]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'Before Main Content (astra_primary_content_top)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-before-main-content]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'Before Main Content (astra_primary_content_top)', 'astra-hooks' ),
 		)
 	);
 
@@ -108,16 +118,18 @@
 	 * Option: astra_entry_top
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-entry-top]', array(
-			'default'   => astra_get_option( 'hook-entry-top' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-entry-top]',
+		array(
+			'default' => astra_get_option( 'hook-entry-top' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-entry-top]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'Before Content (astra_entry_top)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-entry-top]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'Before Content (astra_entry_top)', 'astra-hooks' ),
 		)
 	);
 
@@ -125,16 +137,18 @@
 	 * Option: astra_entry_content_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-entry-content-before]', array(
-			'default'   => astra_get_option( 'hook-entry-content-before' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-entry-content-before]',
+		array(
+			'default' => astra_get_option( 'hook-entry-content-before' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-entry-content-before]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'Before Entry Content (astra_entry_content_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-entry-content-before]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'Before Entry Content (astra_entry_content_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -142,16 +156,18 @@
 	 * Option: astra_entry_content_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-entry-content-after]', array(
-			'default'   => astra_get_option( 'hook-entry-content-after' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-entry-content-after]',
+		array(
+			'default' => astra_get_option( 'hook-entry-content-after' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-entry-content-after]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'After Entry Content (astra_entry_content_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-entry-content-after]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'After Entry Content (astra_entry_content_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -159,16 +175,18 @@
 	 * Option: astra_entry_bottom
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-entry-bottom]', array(
-			'default'   => astra_get_option( 'hook-entry-bottom' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-entry-bottom]',
+		array(
+			'default' => astra_get_option( 'hook-entry-bottom' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-entry-bottom]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'After Content (astra_entry_bottom)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-entry-bottom]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'After Content (astra_entry_bottom)', 'astra-hooks' ),
 		)
 	);
 
@@ -176,16 +194,18 @@
 	 * Option: astra_primary_content_bottom
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-after-main-content]', array(
-			'default'   => astra_get_option( 'hook-after-main-content' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-after-main-content]',
+		array(
+			'default' => astra_get_option( 'hook-after-main-content' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-after-main-content]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'After Main Content (astra_primary_content_bottom)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-after-main-content]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'After Main Content (astra_primary_content_bottom)', 'astra-hooks' ),
 		)
 	);
 
@@ -193,16 +213,18 @@
 	 * Option: astra_content_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-after-container]', array(
-			'default'   => astra_get_option( 'hook-after-container' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-after-container]',
+		array(
+			'default' => astra_get_option( 'hook-after-container' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-after-container]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-content',
-			'label'       => __( 'After Container (astra_content_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-after-container]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-content',
+			'label'   => __( 'After Container (astra_content_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -213,16 +235,18 @@
 	 * Option: astra_comments_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-comments-before]', array(
-			'default'   => astra_get_option( 'hook-comments-before' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-comments-before]',
+		array(
+			'default' => astra_get_option( 'hook-comments-before' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-comments-before]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-comment',
-			'label'       => __( 'Before Comment (astra_comments_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-comments-before]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-comment',
+			'label'   => __( 'Before Comment (astra_comments_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -230,16 +254,18 @@
 	 * Option: astra_comments_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-comments-after]', array(
-			'default'   => astra_get_option( 'hook-comments-after' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-comments-after]',
+		array(
+			'default' => astra_get_option( 'hook-comments-after' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-comments-after]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-comment',
-			'label'       => __( 'After Comment (astra_comments_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-comments-after]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-comment',
+			'label'   => __( 'After Comment (astra_comments_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -250,16 +276,18 @@
 	 * Option: astra_sidebars_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-sidebars-before]', array(
-			'default'   => astra_get_option( 'hook-sidebars-before' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-sidebars-before]',
+		array(
+			'default' => astra_get_option( 'hook-sidebars-before' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-sidebars-before]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-sidebar',
-			'label'       => __( 'Before Sidebar (astra_sidebars_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-sidebars-before]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-sidebar',
+			'label'   => __( 'Before Sidebar (astra_sidebars_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -267,16 +295,18 @@
 	 * Option: astra_sidebars_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-sidebars-after]', array(
-			'default'   => astra_get_option( 'hook-sidebars-after' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-sidebars-after]',
+		array(
+			'default' => astra_get_option( 'hook-sidebars-after' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-sidebars-after]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-sidebar',
-			'label'       => __( 'After Sidebar (astra_sidebars_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-sidebars-after]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-sidebar',
+			'label'   => __( 'After Sidebar (astra_sidebars_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -287,16 +317,18 @@
 	 * Option: astra_footer_before
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-footer-before]', array(
-			'default'   => astra_get_option( 'hook-footer-before' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-footer-before]',
+		array(
+			'default' => astra_get_option( 'hook-footer-before' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-footer-before]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-footer',
-			'label'       => __( 'Before Footer (astra_footer_before)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-footer-before]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-footer',
+			'label'   => __( 'Before Footer (astra_footer_before)', 'astra-hooks' ),
 		)
 	);
 
@@ -304,16 +336,18 @@
 	 * Option: astra_footer_after
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-footer-after]', array(
-			'default'   => astra_get_option( 'hook-footer-after' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-footer-after]',
+		array(
+			'default' => astra_get_option( 'hook-footer-after' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-footer-after]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-footer',
-			'label'       => __( 'After Footer (astra_footer_after)', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-footer-after]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-footer',
+			'label'   => __( 'After Footer (astra_footer_after)', 'astra-hooks' ),
 		)
 	);
 
@@ -321,15 +355,17 @@
 	 * Option: wp_footer
 	 */
 	$wp_customize->add_setting(
-		ASTRA_THEME_SETTINGS . '[hook-wp-footer]', array(
-			'default'   => astra_get_option( 'hook-wp-footer' ),
-			'type'      => 'option',
+		ASTRA_THEME_SETTINGS . '[hook-wp-footer]',
+		array(
+			'default' => astra_get_option( 'hook-wp-footer' ),
+			'type'    => 'option',
 		)
 	);
 	$wp_customize->add_control(
-		ASTRA_THEME_SETTINGS . '[hook-wp-footer]', array(
-			'type'        => 'textarea',
-			'section'     => 'section-hooks-footer',
-			'label'       => __( 'wp_footer', 'astra-hooks' ),
+		ASTRA_THEME_SETTINGS . '[hook-wp-footer]',
+		array(
+			'type'    => 'textarea',
+			'section' => 'section-hooks-footer',
+			'label'   => __( 'wp_footer', 'astra-hooks' ),
 		)
 	);
diff --git a/includes/white-label.php b/includes/white-label.php
index 8916af7..d73feee 100644
--- a/includes/white-label.php
+++ b/includes/white-label.php
@@ -5,6 +5,12 @@
  * @package Astra Hooks
  */
 
+?>
+<?php
+// Bail from displaying settings screen if Astra Pro is older version.
+if ( ! is_callable( 'Astra_Ext_White_Label_Markup::branding_key_to_constant' ) ) {
+	return;
+}
 ?>
 <li>
 	<div class="branding-form postbox">
@@ -12,21 +18,21 @@
 			<span class="screen-reader-text"><?php _e( 'Astra Hooks Branding', 'astra-hooks' ); ?></span>
 			<span class="toggle-indicator" aria-hidden="true"></span>
 		</button>
-		
+
 		<h2 class="hndle ui-sortable-handle">
 			<span><?php _e( 'Astra Hooks Branding', 'astra-hooks' ); ?></span>
 		</h2>
-		
+
 		<div class="inside">
 			<div class="form-wrap">
 				<div class="form-field">
 					<label><?php _e( 'Plugin Name:', 'astra-hooks' ); ?>
-						<input type="text" name="ast_white_label[astra-hooks][name]" class="placeholder placeholder-active" value="<?php echo esc_attr( $settings['astra-hooks']['name'] ); ?>">
+						<input type="text" name="ast_white_label[astra-hooks][name]" class="placeholder placeholder-active" <?php disabled( defined( Astra_Ext_White_Label_Markup::branding_key_to_constant( 'astra-hooks', 'name' ) ), true, true ); ?> value="<?php echo esc_attr( Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-hooks', 'name' ) ); ?>">
 					</label>
 				</div>
 				<div class="form-field">
 					<label><?php _e( 'Plugin Description:', 'astra-hooks' ); ?>
-						<textarea name="ast_white_label[astra-hooks][description]" class="placeholder placeholder-active" rows="2"><?php echo esc_attr( $settings['astra-hooks']['description'] ); ?></textarea>
+						<textarea name="ast_white_label[astra-hooks][description]" class="placeholder placeholder-active" <?php disabled( defined( Astra_Ext_White_Label_Markup::branding_key_to_constant( 'astra-hooks', 'description' ) ), true, true ); ?> rows="2"><?php echo esc_attr( Astra_Ext_White_Label_Markup::get_whitelabel_string( 'astra-sites', 'description' ) ); ?></textarea>
 					</label>
 				</div>
 				<div class="clear"></div>