diff --git a/Gruntfile.js b/Gruntfile.js
index dc802beae..2e4bcacff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -170,7 +170,19 @@ module.exports = function( grunt ) {
 					}
 				]
 			}
+		},
+
+		copy: {
+			main: {
+				options: {
+					mode: true
+				},
+				src: [
+					'!phpinsights.php',
+				],
+				dest: 'header-footer-elementor/'
 		}
+		},
 
 	} );
 	
diff --git a/admin/bsf-analytics/class-bsf-analytics-loader.php b/admin/bsf-analytics/class-bsf-analytics-loader.php
index de513b792..3d08ea48d 100644
--- a/admin/bsf-analytics/class-bsf-analytics-loader.php
+++ b/admin/bsf-analytics/class-bsf-analytics-loader.php
@@ -8,21 +8,20 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit();
+	exit;
 }
 
 /**
  * Class BSF_Analytics_Loader.
  */
 class BSF_Analytics_Loader {
-
 	/**
 	 * Analytics Entities.
 	 *
 	 * @access private
 	 * @var array Entities array.
 	 */
-	private $entities = array();
+	private $entities = [];
 
 	/**
 	 * Analytics Version.
@@ -48,33 +47,33 @@ class BSF_Analytics_Loader {
 	 */
 	private static $instance = null;
 
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		add_action( 'init', [ $this, 'load_analytics' ] );
+	}
+
 	/**
 	 * Get instace of class.
 	 *
 	 * @return object
 	 */
 	public static function get_instance() {
-		if ( null === self::$instance ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 
 		return self::$instance;
 	}
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		add_action( 'init', array( $this, 'load_analytics' ) );
-	}
-
 	/**
 	 * Set entity for analytics.
 	 *
 	 * @param string $data Entity attributes data.
 	 * @return void
 	 */
-	public function set_entity( $data ) {
+	public function set_entity( $data ): void {
 		array_push( $this->entities, $data );
 	}
 
@@ -83,8 +82,8 @@ public function set_entity( $data ) {
 	 *
 	 * @return void
 	 */
-	public function load_analytics() {
-		$unique_entities = array();
+	public function load_analytics(): void {
+		$unique_entities = [];
 
 		if ( ! empty( $this->entities ) ) {
 			foreach ( $this->entities as $entity ) {
diff --git a/admin/bsf-analytics/class-bsf-analytics-stats.php b/admin/bsf-analytics/class-bsf-analytics-stats.php
index 4d2b7bed3..12591b2fa 100644
--- a/admin/bsf-analytics/class-bsf-analytics-stats.php
+++ b/admin/bsf-analytics/class-bsf-analytics-stats.php
@@ -14,7 +14,6 @@
 	 * BSF analytics stat class.
 	 */
 	class BSF_Analytics_Stats {
-
 		/**
 		 * Active plugins.
 		 *
@@ -40,7 +39,7 @@ class BSF_Analytics_Stats {
 		 * @since 1.0.0
 		 */
 		public static function instance() {
-			if ( null === self::$instance ) {
+			if ( self::$instance === null ) {
 				self::$instance = new self();
 			}
 
@@ -57,6 +56,24 @@ public function get_stats() {
 			return apply_filters( 'bsf_core_stats', $this->get_default_stats() );
 		}
 
+		/**
+		 * Format plugin data.
+		 *
+		 * @param string $plugin plugin.
+		 * @return array formatted plugin data.
+		 * @since 1.0.0
+		 */
+		public function format_plugin( $plugin ) {
+			return [
+				'name'        => html_entity_decode( $plugin['Name'], ENT_COMPAT, 'UTF-8' ),
+				'url'         => $plugin['PluginURI'],
+				'version'     => $plugin['Version'],
+				'slug'        => $plugin['TextDomain'],
+				'author_name' => html_entity_decode( wp_strip_all_tags( $plugin['Author'] ), ENT_COMPAT, 'UTF-8' ),
+				'author_url'  => $plugin['AuthorURI'],
+			];
+		}
+
 		/**
 		 * Retrieve stats for site.
 		 *
@@ -64,7 +81,7 @@ public function get_stats() {
 		 * @since 1.0.0
 		 */
 		private function get_default_stats() {
-			return array(
+			return [
 				'graupi_version'         => defined( 'BSF_UPDATER_VERSION' ) ? BSF_UPDATER_VERSION : false,
 				'domain_name'            => get_site_url(),
 				'php_os'                 => PHP_OS,
@@ -99,7 +116,7 @@ private function get_default_stats() {
 
 				'active_theme'           => get_template(),
 				'active_stylesheet'      => get_stylesheet(),
-			);
+			];
 		}
 
 		/**
@@ -148,30 +165,12 @@ private function get_active_plugins() {
 
 				$plugins       = wp_get_active_and_valid_plugins();
 				$plugins       = array_map( 'get_plugin_data', $plugins );
-				$this->plugins = array_map( array( $this, 'format_plugin' ), $plugins );
+				$this->plugins = array_map( [ $this, 'format_plugin' ], $plugins );
 			}
 
 			return $this->plugins;
 		}
 
-		/**
-		 * Format plugin data.
-		 *
-		 * @param string $plugin plugin.
-		 * @return array formatted plugin data.
-		 * @since 1.0.0
-		 */
-		public function format_plugin( $plugin ) {
-			return array(
-				'name'        => html_entity_decode( $plugin['Name'], ENT_COMPAT, 'UTF-8' ),
-				'url'         => $plugin['PluginURI'],
-				'version'     => $plugin['Version'],
-				'slug'        => $plugin['TextDomain'],
-				'author_name' => html_entity_decode( wp_strip_all_tags( $plugin['Author'] ), ENT_COMPAT, 'UTF-8' ),
-				'author_url'  => $plugin['AuthorURI'],
-			);
-		}
-
 		/**
 		 * Curl SSL version.
 		 *
@@ -179,12 +178,12 @@ public function format_plugin( $plugin ) {
 		 * @since 1.0.0
 		 */
 		private function get_curl_ssl_version() {
-			$curl = array();
+			$curl = [];
 			if ( function_exists( 'curl_version' ) ) {
 				$curl = curl_version(); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_version
 			}
 
-			return isset( $curl['ssl_version'] ) ? $curl['ssl_version'] : false;
+			return $curl['ssl_version'] ?? false;
 		}
 
 		/**
@@ -198,7 +197,7 @@ private function get_curl_version() {
 				$curl = curl_version(); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_version
 			}
 
-			return isset( $curl['version'] ) ? $curl['version'] : false;
+			return $curl['version'] ?? false;
 		}
 
 		/**
@@ -244,13 +243,11 @@ function wp_timezone_string() {
 
 		$offset  = (float) get_option( 'gmt_offset' );
 		$hours   = (int) $offset;
-		$minutes = ( $offset - $hours );
+		$minutes = $offset - $hours;
 
-		$sign      = ( $offset < 0 ) ? '-' : '+';
+		$sign      = $offset < 0 ? '-' : '+';
 		$abs_hour  = abs( $hours );
 		$abs_mins  = abs( $minutes * 60 );
-		$tz_offset = sprintf( '%s%02d:%02d', $sign, $abs_hour, $abs_mins );
-
-		return $tz_offset;
+		return sprintf( '%s%02d:%02d', $sign, $abs_hour, $abs_mins );
 	}
 }
diff --git a/admin/bsf-analytics/class-bsf-analytics.php b/admin/bsf-analytics/class-bsf-analytics.php
index ebf78b1ad..a3c97d835 100644
--- a/admin/bsf-analytics/class-bsf-analytics.php
+++ b/admin/bsf-analytics/class-bsf-analytics.php
@@ -17,20 +17,18 @@
 	 * BSF analytics
 	 */
 	class BSF_Analytics {
-
 		/**
 		 * Member Variable
 		 *
-		 * @var array Entities data.
+		 * @var string Usage tracking document URL
 		 */
-		private $entities;
-
+		public $usage_doc_link = 'https://store.brainstormforce.com/usage-tracking/?utm_source=wp_dashboard&utm_medium=general_settings&utm_campaign=usage_tracking';
 		/**
 		 * Member Variable
 		 *
-		 * @var string Usage tracking document URL
+		 * @var array Entities data.
 		 */
-		public $usage_doc_link = 'https://store.brainstormforce.com/usage-tracking/?utm_source=wp_dashboard&utm_medium=general_settings&utm_campaign=usage_tracking';
+		private $entities;
 
 		/**
 		 * Setup actions, load files.
@@ -53,13 +51,13 @@ public function __construct( $args, $analytics_path, $analytics_version ) {
 			define( 'BSF_ANALYTICS_VERSION', $analytics_version );
 			define( 'BSF_ANALYTICS_URI', $this->get_analytics_url( $analytics_path ) );
 
-			add_action( 'admin_init', array( $this, 'handle_optin_optout' ) );
-			add_action( 'admin_notices', array( $this, 'option_notice' ) );
-			add_action( 'init', array( $this, 'maybe_track_analytics' ), 99 );
+			add_action( 'admin_init', [ $this, 'handle_optin_optout' ] );
+			add_action( 'admin_notices', [ $this, 'option_notice' ] );
+			add_action( 'init', [ $this, 'maybe_track_analytics' ], 99 );
 
 			$this->set_actions();
 
-			add_action( 'admin_init', array( $this, 'register_usage_tracking_setting' ) );
+			add_action( 'admin_init', [ $this, 'register_usage_tracking_setting' ] );
 
 			$this->includes();
 		}
@@ -70,12 +68,12 @@ public function __construct( $args, $analytics_path, $analytics_version ) {
 		 * @since 1.0.4
 		 * @return void
 		 */
-		public function set_actions() {
+		public function set_actions(): void {
 
 			foreach ( $this->entities as $key => $data ) {
-				add_action( 'astra_notice_before_markup_' . $key . '-optin-notice', array( $this, 'enqueue_assets' ) );
-				add_action( 'update_option_' . $key . '_analytics_optin', array( $this, 'update_analytics_option_callback' ), 10, 3 );
-				add_action( 'add_option_' . $key . '_analytics_optin', array( $this, 'add_analytics_option_callback' ), 10, 2 );
+				add_action( 'astra_notice_before_markup_' . $key . '-optin-notice', [ $this, 'enqueue_assets' ] );
+				add_action( 'update_option_' . $key . '_analytics_optin', [ $this, 'update_analytics_option_callback' ], 10, 3 );
+				add_action( 'add_option_' . $key . '_analytics_optin', [ $this, 'add_analytics_option_callback' ], 10, 2 );
 			}
 		}
 
@@ -95,32 +93,22 @@ public function get_analytics_url( $analytics_path ) {
 			return str_replace( $content_dir_path, content_url(), $analytics_path );
 		}
 
-		/**
-		 * Get API URL for sending analytics.
-		 *
-		 * @return string API URL.
-		 * @since 1.0.0
-		 */
-		private function get_api_url() {
-			return defined( 'BSF_API_URL' ) ? BSF_API_URL : 'https://support.brainstormforce.com/';
-		}
-
 		/**
 		 * Enqueue Scripts.
 		 *
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function enqueue_assets() {
+		public function enqueue_assets(): void {
 
 			/**
 			 * Load unminified if SCRIPT_DEBUG is true.
 			 *
 			 * Directory and Extensions.
 			 */
-			$dir_name = ( SCRIPT_DEBUG ) ? 'unminified' : 'minified';
-			$file_rtl = ( is_rtl() ) ? '-rtl' : '';
-			$css_ext  = ( SCRIPT_DEBUG ) ? '.css' : '.min.css';
+			$dir_name = SCRIPT_DEBUG ? 'unminified' : 'minified';
+			$file_rtl = is_rtl() ? '-rtl' : '';
+			$css_ext  = SCRIPT_DEBUG ? '.css' : '.min.css';
 
 			$css_uri = BSF_ANALYTICS_URI . '/assets/css/' . $dir_name . '/style' . $file_rtl . $css_ext;
 
@@ -133,14 +121,14 @@ public function enqueue_assets() {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function send() {
+		public function send(): void {
 			wp_remote_post(
 				$this->get_api_url() . 'wp-json/bsf-core/v1/analytics/',
-				array(
+				[
 					'body'     => BSF_Analytics_Stats::instance()->get_stats(),
 					'timeout'  => 5,
 					'blocking' => false,
-				)
+				]
 			);
 		}
 
@@ -174,12 +162,12 @@ public function is_tracking_enabled() {
 		 */
 		public function is_white_label_enabled( $source ) {
 
-			$options    = apply_filters( $source . '_white_label_options', array() );
+			$options    = apply_filters( $source . '_white_label_options', [] );
 			$is_enabled = false;
 
 			if ( is_array( $options ) ) {
 				foreach ( $options as $option ) {
-					if ( true === $option ) {
+					if ( $option === true ) {
 						$is_enabled = true;
 						break;
 					}
@@ -195,7 +183,7 @@ public function is_white_label_enabled( $source ) {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function option_notice() {
+		public function option_notice(): void {
 
 			if ( ! current_user_can( 'manage_options' ) ) {
 				return;
@@ -203,11 +191,11 @@ public function option_notice() {
 
 			foreach ( $this->entities as $key => $data ) {
 
-				$time_to_display = isset( $data['time_to_display'] ) ? $data['time_to_display'] : '+24 hours';
-				$usage_doc_link  = isset( $data['usage_doc_link'] ) ? $data['usage_doc_link'] : $this->usage_doc_link;
+				$time_to_display = $data['time_to_display'] ?? '+24 hours';
+				$usage_doc_link  = $data['usage_doc_link'] ?? $this->usage_doc_link;
 
 				// Don't display the notice if tracking is disabled or White Label is enabled for any of our plugins.
-				if ( false !== get_site_option( $key . '_analytics_optin', false ) || $this->is_white_label_enabled( $key ) ) {
+				if ( get_site_option( $key . '_analytics_optin', false ) !== false || $this->is_white_label_enabled( $key ) ) {
 					continue;
 				}
 
@@ -226,7 +214,7 @@ public function option_notice() {
 				$language_dir = is_rtl() ? 'rtl' : 'ltr';
 
 				Astra_Notices::add_notice(
-					array(
+					[
 						'id'                         => $key . '-optin-notice',
 						'type'                       => '',
 						'message'                    => sprintf(
@@ -246,19 +234,19 @@ public function option_notice() {
 							/* translators: %s usage doc link */
 							sprintf( $notice_string . '<span dir="%2s"><a href="%3s" target="_blank" rel="noreferrer noopener">%4s</a><span>', esc_html( $data['product_name'] ), $language_dir, esc_url( $usage_doc_link ), __( ' Know More.', 'header-footer-elementor' ) ),
 							add_query_arg(
-								array(
+								[
 									$key . '_analytics_optin' => 'yes',
 									$key . '_analytics_nonce' => wp_create_nonce( $key . '_analytics_optin' ),
 									'bsf_analytics_source' => $key,
-								)
+								]
 							),
 							__( 'Yes! Allow it', 'header-footer-elementor' ),
 							add_query_arg(
-								array(
+								[
 									$key . '_analytics_optin' => 'no',
 									$key . '_analytics_nonce' => wp_create_nonce( $key . '_analytics_optin' ),
 									'bsf_analytics_source' => $key,
-								)
+								]
 							),
 							MONTH_IN_SECONDS,
 							__( 'No Thanks', 'header-footer-elementor' )
@@ -267,7 +255,7 @@ public function option_notice() {
 						'repeat-notice-after'        => false,
 						'priority'                   => 18,
 						'display-with-other-notices' => true,
-					)
+					]
 				);
 			}
 		}
@@ -278,7 +266,7 @@ public function option_notice() {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function handle_optin_optout() {
+		public function handle_optin_optout(): void {
 
 			if ( ! current_user_can( 'manage_options' ) ) {
 				return;
@@ -296,62 +284,30 @@ public function handle_optin_optout() {
 
 			$optin_status = isset( $_GET[ $source . '_analytics_optin' ] ) ? sanitize_text_field( wp_unslash( $_GET[ $source . '_analytics_optin' ] ) ) : '';
 
-			if ( 'yes' === $optin_status ) {
+			if ( $optin_status === 'yes' ) {
 				$this->optin( $source );
-			} elseif ( 'no' === $optin_status ) {
+			} elseif ( $optin_status === 'no' ) {
 				$this->optout( $source );
 			}
 
 			wp_safe_redirect(
 				remove_query_arg(
-					array(
+					[
 						$source . '_analytics_optin',
 						$source . '_analytics_nonce',
 						'bsf_analytics_source',
-					)
+					]
 				)
 			);
 		}
 
-		/**
-		 * Opt in to usage tracking.
-		 *
-		 * @param string $source source of analytics.
-		 * @since 1.0.0
-		 * @return void
-		 */
-		private function optin( $source ) {
-			update_site_option( $source . '_analytics_optin', 'yes' );
-		}
-
-		/**
-		 * Opt out to usage tracking.
-		 *
-		 * @param string $source source of analytics.
-		 * @since 1.0.0
-		 * @return void
-		 */
-		private function optout( $source ) {
-			update_site_option( $source . '_analytics_optin', 'no' );
-		}
-
-		/**
-		 * Load analytics stat class.
-		 *
-		 * @since 1.0.0
-		 * @return void
-		 */
-		private function includes() {
-			require_once __DIR__ . '/class-bsf-analytics-stats.php';
-		}
-
 		/**
 		 * Register usage tracking option in General settings page.
 		 *
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function register_usage_tracking_setting() {
+		public function register_usage_tracking_setting(): void {
 
 			foreach ( $this->entities as $key => $data ) {
 
@@ -359,29 +315,29 @@ public function register_usage_tracking_setting() {
 					return;
 				}
 
-				$usage_doc_link = isset( $data['usage_doc_link'] ) ? $data['usage_doc_link'] : $this->usage_doc_link;
-				$author         = isset( $data['author'] ) ? $data['author'] : 'Brainstorm Force';
+				$usage_doc_link = $data['usage_doc_link'] ?? $this->usage_doc_link;
+				$author         = $data['author'] ?? 'Brainstorm Force';
 
 				register_setting(
 					'general',             // Options group.
 					$key . '_analytics_optin',      // Option name/database.
-					array( 'sanitize_callback' => array( $this, 'sanitize_option' ) ) // sanitize callback function.
+					[ 'sanitize_callback' => [ $this, 'sanitize_option' ] ] // sanitize callback function.
 				);
 
 				add_settings_field(
 					$key . '-analytics-optin',       // Field ID.
 					__( 'Usage Tracking', 'header-footer-elementor' ),       // Field title.
-					array( $this, 'render_settings_field_html' ), // Field callback function.
+					[ $this, 'render_settings_field_html' ], // Field callback function.
 					'general',
 					'default',                   // Settings page slug.
-					array(
+					[
 						'type'           => 'checkbox',
 						'title'          => $author,
 						'name'           => $key . '_analytics_optin',
 						'label_for'      => $key . '-analytics-optin',
 						'id'             => $key . '-analytics-optin',
 						'usage_doc_link' => $usage_doc_link,
-					)
+					]
 				);
 			}
 		}
@@ -395,7 +351,7 @@ public function register_usage_tracking_setting() {
 		 */
 		public function sanitize_option( $input ) {
 
-			if ( ! $input || 'no' === $input ) {
+			if ( ! $input || $input === 'no' ) {
 				return 'no';
 			}
 
@@ -409,7 +365,7 @@ public function sanitize_option( $input ) {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function render_settings_field_html( $args ) {
+		public function render_settings_field_html( $args ): void {
 			?>
 			<fieldset>
 			<label for="<?php echo esc_attr( $args['label_for'] ); ?>">
@@ -430,25 +386,6 @@ public function render_settings_field_html( $args ) {
 			<?php
 		}
 
-		/**
-		 * Set analytics installed time in option.
-		 *
-		 * @param string $source source of analytics.
-		 * @return string | mixed $time analytics installed time.
-		 * @since 1.0.0
-		 */
-		private function get_analytics_install_time( $source ) {
-
-			$time = get_site_option( $source . '_analytics_installed_time' );
-
-			if ( ! $time ) {
-				$time = time();
-				update_site_option( $source . '_analytics_installed_time', time() );
-			}
-
-			return $time;
-		}
-
 		/**
 		 * Schedule/unschedule cron event on updation of option.
 		 *
@@ -458,7 +395,7 @@ private function get_analytics_install_time( $source ) {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function update_analytics_option_callback( $old_value, $value, $option ) {
+		public function update_analytics_option_callback( $old_value, $value, $option ): void {
 			if ( is_multisite() ) {
 				$this->add_option_to_network( $option, $value );
 			}
@@ -472,7 +409,7 @@ public function update_analytics_option_callback( $old_value, $value, $option )
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function add_analytics_option_callback( $option, $value ) {
+		public function add_analytics_option_callback( $option, $value ): void {
 			if ( is_multisite() ) {
 				$this->add_option_to_network( $option, $value );
 			}
@@ -484,7 +421,7 @@ public function add_analytics_option_callback( $option, $value ) {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function maybe_track_analytics() {
+		public function maybe_track_analytics(): void {
 
 			if ( ! $this->is_tracking_enabled() ) {
 				return;
@@ -507,10 +444,10 @@ public function maybe_track_analytics() {
 		 * @return void
 		 * @since 1.0.0
 		 */
-		public function add_option_to_network( $option, $value ) {
+		public function add_option_to_network( $option, $value ): void {
 
 			// If action coming from general settings page.
-			if ( isset( $_POST['option_page'] ) && 'general' === $_POST['option_page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			if ( isset( $_POST['option_page'] ) && $_POST['option_page'] === 'general' ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 				if ( get_site_option( $option ) ) {
 					update_site_option( $option, $value );
@@ -519,5 +456,66 @@ public function add_option_to_network( $option, $value ) {
 				}
 			}
 		}
+
+		/**
+		 * Get API URL for sending analytics.
+		 *
+		 * @return string API URL.
+		 * @since 1.0.0
+		 */
+		private function get_api_url() {
+			return defined( 'BSF_API_URL' ) ? BSF_API_URL : 'https://support.brainstormforce.com/';
+		}
+
+		/**
+		 * Opt in to usage tracking.
+		 *
+		 * @param string $source source of analytics.
+		 * @since 1.0.0
+		 * @return void
+		 */
+		private function optin( $source ): void {
+			update_site_option( $source . '_analytics_optin', 'yes' );
+		}
+
+		/**
+		 * Opt out to usage tracking.
+		 *
+		 * @param string $source source of analytics.
+		 * @since 1.0.0
+		 * @return void
+		 */
+		private function optout( $source ): void {
+			update_site_option( $source . '_analytics_optin', 'no' );
+		}
+
+		/**
+		 * Load analytics stat class.
+		 *
+		 * @since 1.0.0
+		 * @return void
+		 */
+		private function includes(): void {
+			require_once __DIR__ . '/class-bsf-analytics-stats.php';
+		}
+
+		/**
+		 * Set analytics installed time in option.
+		 *
+		 * @param string $source source of analytics.
+		 * @return string | mixed $time analytics installed time.
+		 * @since 1.0.0
+		 */
+		private function get_analytics_install_time( $source ) {
+
+			$time = get_site_option( $source . '_analytics_installed_time' );
+
+			if ( ! $time ) {
+				$time = time();
+				update_site_option( $source . '_analytics_installed_time', time() );
+			}
+
+			return $time;
+		}
 	}
 }
diff --git a/admin/class-hfe-addons-actions.php b/admin/class-hfe-addons-actions.php
index 0e16fafd5..3e53a5f63 100644
--- a/admin/class-hfe-addons-actions.php
+++ b/admin/class-hfe-addons-actions.php
@@ -19,7 +19,6 @@
 	 * @since 1.6.0
 	 */
 	class HFE_Addons_Actions {
-
 		/**
 		 * Member Variable
 		 *
@@ -29,23 +28,11 @@ class HFE_Addons_Actions {
 
 		/**
 		 * Widget list variable
-		 * 
+		 *
 		 * @var HFE_Addons_Actions
 		 */
 		private static $widget_list;
 
-		/**
-		 *  Initiator
-		 *
-		 * @return HFE_Addons_Actions
-		 */
-		public static function get_instance() {
-			if ( ! isset( self::$instance ) ) {
-				self::$instance = new self();
-			}
-			return self::$instance;
-		}
-
 		/**
 		 *  Constructor
 		 */
@@ -63,7 +50,6 @@ public function __construct() {
 			add_action( 'wp_ajax_hfe_bulk_deactivate_widgets', [ $this, 'bulk_deactivate_widgets' ] );
 
 			add_action( 'wp_ajax_save_theme_compatibility_option', [ $this, 'save_hfe_compatibility_option_callback' ] );
-
 		}
 
 		/**
@@ -75,7 +61,7 @@ public function __construct() {
 		 *
 		 * @since x.x.x
 		 */
-		public function hfe_plugin_install() {
+		public function hfe_plugin_install(): void {
 
 			check_ajax_referer( 'updates', '_ajax_nonce' );
 
@@ -84,13 +70,13 @@ public function hfe_plugin_install() {
 			$plugin_slug = isset( $_POST['slug'] ) && is_string( $_POST['slug'] ) ? sanitize_text_field( wp_unslash( $_POST['slug'] ) ) : '';
 
 			if ( empty( $plugin_slug ) ) {
-				wp_send_json_error( array( 'message' => __( 'Plugin slug is missing.', 'header-footer-elementor' ) ) );
+				wp_send_json_error( [ 'message' => __( 'Plugin slug is missing.', 'header-footer-elementor' ) ] );
 			}
 
 			// Schedule the database update if the plugin is installed successfully.
 			add_action(
 				'shutdown',
-				function () use ( $plugin_slug ) {
+				static function () use ( $plugin_slug ): void {
 					// Iterate through all plugins to check if the installed plugin matches the current plugin slug.
 					$all_plugins = get_plugins();
 					foreach ( $all_plugins as $plugin_file => $_ ) {
@@ -107,11 +93,10 @@ function () use ( $plugin_slug ) {
 				// @psalm-suppress NoValue
 				wp_ajax_install_plugin();
 			} else {
-				wp_send_json_error( array( 'message' => __( 'Plugin installation function not found.', 'header-footer-elementor' ) ) );
+				wp_send_json_error( [ 'message' => __( 'Plugin installation function not found.', 'header-footer-elementor' ) ] );
 			}
 		}
 
-		
 		/**
 		 * Handles the installation and saving of required theme.
 		 *
@@ -121,7 +106,7 @@ function () use ( $plugin_slug ) {
 		 *
 		 * @since x.x.x
 		 */
-		public function hfe_theme_install() {
+		public function hfe_theme_install(): void {
 
 			check_ajax_referer( 'updates', '_ajax_nonce' );
 
@@ -130,13 +115,13 @@ public function hfe_theme_install() {
 			$theme_slug = isset( $_POST['slug'] ) && is_string( $_POST['slug'] ) ? sanitize_text_field( wp_unslash( $_POST['slug'] ) ) : '';
 
 			if ( empty( $theme_slug ) ) {
-				wp_send_json_error( array( 'message' => __( 'Theme slug is missing.', 'header-footer-elementor' ) ) );
+				wp_send_json_error( [ 'message' => __( 'Theme slug is missing.', 'header-footer-elementor' ) ] );
 			}
 
 			// Schedule the database update if the theme is installed successfully.
 			add_action(
 				'shutdown',
-				function () use ( $theme_slug ) {
+				static function () use ( $theme_slug ): void {
 					// Iterate through all themes to check if the installed theme matches the current theme slug.
 					$all_themes = wp_get_themes();
 					foreach ( $all_themes as $theme_file => $_ ) {
@@ -153,14 +138,26 @@ function () use ( $theme_slug ) {
 				// @psalm-suppress NoValue
 				wp_ajax_install_theme();
 			} else {
-				wp_send_json_error( array( 'message' => __( 'Theme installation function not found.', 'header-footer-elementor' ) ) );
+				wp_send_json_error( [ 'message' => __( 'Theme installation function not found.', 'header-footer-elementor' ) ] );
 			}
 		}
 
+		/**
+		 *  Initiator
+		 *
+		 * @return HFE_Addons_Actions
+		 */
+		public static function get_instance() {
+			if ( ! isset( self::$instance ) ) {
+				self::$instance = new self();
+			}
+			return self::$instance;
+		}
+
 		/**
 		 * Activate all module
 		 */
-		public static function bulk_activate_widgets() {
+		public static function bulk_activate_widgets(): void {
 
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
@@ -188,7 +185,7 @@ public static function bulk_activate_widgets() {
 		/**
 		 * Deactivate all module
 		 */
-		public static function bulk_deactivate_widgets() {
+		public static function bulk_deactivate_widgets(): void {
 
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
@@ -216,7 +213,7 @@ public static function bulk_deactivate_widgets() {
 		/**
 		 * Deactivate module
 		 */
-		public static function deactivate_widget() {
+		public static function deactivate_widget(): void {
 
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
@@ -235,7 +232,7 @@ public static function deactivate_widget() {
 		/**
 		 * Activate module
 		 */
-		public static function activate_widget() {
+		public static function activate_widget(): void {
 
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
@@ -256,7 +253,7 @@ public static function activate_widget() {
 		 * @since 1.6.0
 		 * @return void
 		 */
-		public function hfe_admin_modal() {
+		public function hfe_admin_modal(): void {
 
 			// Run a security check.
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
@@ -270,7 +267,7 @@ public function hfe_admin_modal() {
 		 * @since 1.6.0
 		 * @return void
 		 */
-		public function update_subscription() {
+		public function update_subscription(): void {
 
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
@@ -315,7 +312,7 @@ public function get_api_domain() {
 		 * @since 1.6.0
 		 * @return void
 		 */
-		public function hfe_activate_addon() {
+		public function hfe_activate_addon(): void {
 
 			// Run a security check.
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
@@ -329,7 +326,7 @@ public function hfe_activate_addon() {
 
 				$plugin = sanitize_text_field( wp_unslash( $_POST['plugin'] ) );
 
-				if ( 'plugin' === $type ) {
+				if ( $type === 'plugin' ) {
 
 					// Check for permissions.
 					if ( ! current_user_can( 'activate_plugins' ) ) {
@@ -346,13 +343,13 @@ public function hfe_activate_addon() {
 					}
 				}
 
-				if ( 'theme' === $type ) {
+				if ( $type === 'theme' ) {
 
 					if ( isset( $_POST['slug'] ) ) {
 						$slug = sanitize_key( wp_unslash( $_POST['slug'] ) );
 
 						// Check for permissions.
-						if ( ! ( current_user_can( 'switch_themes' ) ) ) {
+						if ( ! current_user_can( 'switch_themes' ) ) {
 							wp_send_json_error( esc_html__( 'Theme activation is disabled for you on this site.', 'header-footer-elementor' ) );
 						}
 
@@ -368,9 +365,9 @@ public function hfe_activate_addon() {
 				}
 			}
 
-			if ( 'plugin' === $type ) {
+			if ( $type === 'plugin' ) {
 				wp_send_json_error( esc_html__( 'Could not activate plugin. Please activate from the Plugins page.', 'header-footer-elementor' ) );
-			} elseif ( 'theme' === $type ) {
+			} elseif ( $type === 'theme' ) {
 				wp_send_json_error( esc_html__( 'Could not activate theme. Please activate from the Themes page.', 'header-footer-elementor' ) );
 			}
 		}
@@ -381,7 +378,7 @@ public function hfe_activate_addon() {
 		 * @since x.x.x
 		 * @return void
 		 */
-		public function save_hfe_compatibility_option_callback() {
+		public function save_hfe_compatibility_option_callback(): void {
 			// Check nonce for security.
 			check_ajax_referer( 'hfe-admin-nonce', 'nonce' );
 
diff --git a/admin/class-hfe-admin.php b/admin/class-hfe-admin.php
index 8fef89ae1..8ac267fb1 100644
--- a/admin/class-hfe-admin.php
+++ b/admin/class-hfe-admin.php
@@ -33,7 +33,7 @@ public static function instance() {
 			self::$_instance = new self();
 		}
 
-		add_action( 'elementor/init', __CLASS__ . '::load_admin', 0 );
+		add_action( 'elementor/init', self::class . '::load_admin', 0 );
 
 		return self::$_instance;
 	}
@@ -46,8 +46,8 @@ public static function instance() {
 	 * @return void
 	 */
 	public static function load_admin() {
-		add_action( 'elementor/editor/after_enqueue_styles', __CLASS__ . '::hfe_admin_enqueue_scripts' );
-		add_action( 'admin_head', __CLASS__ . '::hfe_admin_enqueue_scripts' );		
+		add_action( 'elementor/editor/after_enqueue_styles', self::class . '::hfe_admin_enqueue_scripts' );
+		add_action( 'admin_head', self::class . '::hfe_admin_enqueue_scripts' );
 	}
 
 	/**
@@ -69,7 +69,6 @@ public static function hfe_admin_enqueue_scripts( $hook ) {
 		);
 
 		wp_enqueue_style( 'hfe-style' );
-
 	}
 
 
@@ -107,25 +106,25 @@ private function __construct() {
 
 
 
-/**
- * Hide admin notices on the custom settings page.
- *
- * @since x.x.x
- * @return void
- */
-public static function hide_admin_notices() {
-    $screen = get_current_screen();
-    $pages_to_hide_notices = array(
-        'edit-elementor-hf',     // Edit screen for elementor-hf post type
-        'elementor-hf',          // New post screen for elementor-hf post type
-    );
-
-    if ( in_array( $screen->id, $pages_to_hide_notices ) || 'toplevel_page_hfe' === $screen->id ) {
-        remove_all_actions( 'admin_notices' );
-        remove_all_actions( 'all_admin_notices' );
-    }
-}
-	
+	/**
+	 * Hide admin notices on the custom settings page.
+	 *
+	 * @since x.x.x
+	 * @return void
+	 */
+	public static function hide_admin_notices() {
+		$screen                = get_current_screen();
+		$pages_to_hide_notices = [
+			'edit-elementor-hf',     // Edit screen for elementor-hf post type
+			'elementor-hf',          // New post screen for elementor-hf post type
+		];
+
+		if ( in_array( $screen->id, $pages_to_hide_notices ) || $screen->id === 'toplevel_page_hfe' ) {
+			remove_all_actions( 'admin_notices' );
+			remove_all_actions( 'all_admin_notices' );
+		}
+	}
+
 	/**
 	 * Script for Elementor Pro full site editing support.
 	 *
@@ -185,7 +184,7 @@ public function column_headings( $columns ) {
 	 */
 	public function column_content( $column, $post_id ) {
 
-		if ( 'elementor_hf_display_rules' === $column ) {
+		if ( $column === 'elementor_hf_display_rules' ) {
 
 			$locations = get_post_meta( $post_id, 'ehf_target_include_locations', true );
 			if ( ! empty( $locations ) ) {
@@ -230,7 +229,7 @@ public function column_display_location_rules( $locations ) {
 		$location_label = [];
 		if ( is_array( $locations ) && is_array( $locations['rule'] ) && isset( $locations['rule'] ) ) {
 			$index = array_search( 'specifics', $locations['rule'] );
-			if ( false !== $index && ! empty( $index ) ) {
+			if ( $index !== false && ! empty( $index ) ) {
 				unset( $locations['rule'][ $index ] );
 			}
 		}
@@ -258,7 +257,7 @@ public function column_display_location_rules( $locations ) {
 	public function header_footer_posttype() {
 
 		$setting_location = $this->is_pro_active() ? 'uaepro' : 'hfe';
-		
+
 		$labels = [
 			'name'               => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
 			'singular_name'      => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
@@ -288,7 +287,7 @@ public function header_footer_posttype() {
 			'menu_icon'           => 'dashicons-editor-kitchensink',
 			'supports'            => [ 'title', 'thumbnail', 'elementor' ],
 			'menu_position'       => 5,
-			'capabilities'        => array(
+			'capabilities'        => [
 				'edit_post'          => 'manage_options',
 				'read_post'          => 'read',
 				'delete_post'        => 'manage_options',
@@ -296,7 +295,7 @@ public function header_footer_posttype() {
 				'edit_others_posts'  => 'manage_options',
 				'publish_posts'      => 'manage_options',
 				'read_private_posts' => 'manage_options',
-			),
+			],
 		];
 
 		register_post_type( 'elementor-hf', $args );
@@ -565,17 +564,17 @@ public function location_notice() {
 		global $pagenow;
 		global $post;
 
-		if ( 'post.php' != $pagenow || ! is_object( $post ) || 'elementor-hf' != $post->post_type ) {
+		if ( $pagenow !== 'post.php' || ! is_object( $post ) || $post->post_type !== 'elementor-hf' ) {
 			return;
 		}
 
 		$template_type = get_post_meta( $post->ID, 'ehf_template_type', true );
 
-		if ( '' !== $template_type ) {
+		if ( $template_type !== '' ) {
 			$templates = Header_Footer_Elementor::get_template_id( $template_type );
 
 			// Check if more than one template is selected for current template type.
-			if ( is_array( $templates ) && isset( $templates[1] ) && $post->ID != $templates[0] ) {
+			if ( is_array( $templates ) && isset( $templates[1] ) && $post->ID !== $templates[0] ) {
 				$post_title        = '<strong>' . esc_html( get_the_title( $templates[0] ) ) . '</strong>';
 				$template_location = '<strong>' . esc_html( $this->template_location( $template_type ) ) . '</strong>';
 				/* Translators: Post title, Template Location */
@@ -627,7 +626,7 @@ public function block_template_frontend() {
 	public function load_canvas_template( $single_template ) {
 		global $post;
 
-		if ( 'elementor-hf' == $post->post_type ) {
+		if ( $post->post_type === 'elementor-hf' ) {
 			$elementor_2_0_canvas = ELEMENTOR_PATH . '/modules/page-templates/templates/canvas.php';
 
 			if ( file_exists( $elementor_2_0_canvas ) ) {
diff --git a/build/main.asset.php b/build/main.asset.php
index 2862dfecb..84c1577f7 100644
--- a/build/main.asset.php
+++ b/build/main.asset.php
@@ -1 +1,4 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '040f153744e2d6563457');
+<?php return [
+	'dependencies' => [ 'react', 'react-dom', 'wp-api-fetch', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill' ],
+	'version'      => '040f153744e2d6563457',
+];
diff --git a/composer.json b/composer.json
index 8f5d82a4b..7d0e812d0 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
     "php-stubs/generator": "^0.8.4",
     "php-stubs/wordpress-stubs": "^6.5",
     "szepeviktor/phpstan-wordpress": "^1.3",
-    "nunomaduro/phpinsights": "^2.11"
+    "nunomaduro/phpinsights": "^2.12"
   },
   "scripts": {
     "format": "phpcbf",
diff --git a/composer.lock b/composer.lock
index b8e17f61a..3a3b1aad7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "289c6550aaede4f73d8e16bde6708e8e",
+    "content-hash": "d052942237d6af20c3477c183ab343a2",
     "packages": [
         {
             "name": "brainstormforce/astra-notices",
@@ -431,24 +431,24 @@
         },
         {
             "name": "cmgmyr/phploc",
-            "version": "8.0.3",
+            "version": "8.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cmgmyr/phploc.git",
-                "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f"
+                "reference": "b0c4ec71f40ef84c9893e1a7212a72e1098b90f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/e61d4729df46c5920ab61973bfa3f70f81a70b5f",
-                "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f",
+                "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/b0c4ec71f40ef84c9893e1a7212a72e1098b90f7",
+                "reference": "b0c4ec71f40ef84c9893e1a7212a72e1098b90f7",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
                 "php": "^7.4 || ^8.0",
-                "phpunit/php-file-iterator": "^3.0|^4.0",
-                "sebastian/cli-parser": "^1.0|^2.0"
+                "phpunit/php-file-iterator": "^3.0|^4.0|^5.0",
+                "sebastian/cli-parser": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
@@ -484,7 +484,7 @@
             "homepage": "https://github.com/cmgmyr/phploc",
             "support": {
                 "issues": "https://github.com/cmgmyr/phploc/issues",
-                "source": "https://github.com/cmgmyr/phploc/tree/8.0.3"
+                "source": "https://github.com/cmgmyr/phploc/tree/8.0.4"
             },
             "funding": [
                 {
@@ -492,32 +492,40 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-05T16:49:39+00:00"
+            "time": "2024-10-31T19:26:53+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.4",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24"
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
                 "branch-alias": {
                     "dev-main": "3.x-dev"
                 }
@@ -547,7 +555,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.4"
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
             },
             "funding": [
                 {
@@ -563,7 +571,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-27T13:40:54+00:00"
+            "time": "2024-11-12T16:29:46+00:00"
         },
         {
             "name": "composer/semver",
@@ -897,16 +905,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.64.0",
+            "version": "v3.68.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "58dd9c931c785a79739310aef5178928305ffa67"
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67",
-                "reference": "58dd9c931c785a79739310aef5178928305ffa67",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b9db2b2ea3cdba7201067acee46f984ef2397cff",
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff",
                 "shasum": ""
             },
             "require": {
@@ -916,38 +924,38 @@
                 "ext-filter": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "fidry/cpu-core-counter": "^1.0",
+                "fidry/cpu-core-counter": "^1.2",
                 "php": "^7.4 || ^8.0",
                 "react/child-process": "^0.6.5",
                 "react/event-loop": "^1.0",
                 "react/promise": "^2.0 || ^3.0",
                 "react/socket": "^1.0",
                 "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.28",
-                "symfony/polyfill-php80": "^1.28",
-                "symfony/polyfill-php81": "^1.28",
-                "symfony/process": "^5.4 || ^6.0 || ^7.0",
-                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.31",
+                "symfony/polyfill-php80": "^1.31",
+                "symfony/polyfill-php81": "^1.31",
+                "symfony/process": "^5.4 || ^6.4 || ^7.2",
+                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3 || ^2.3",
-                "infection/infection": "^0.29.5",
-                "justinrainbow/json-schema": "^5.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.4",
+                "infection/infection": "^0.29.8",
+                "justinrainbow/json-schema": "^5.3 || ^6.0",
                 "keradus/cli-executor": "^2.1",
-                "mikey179/vfsstream": "^1.6.11",
+                "mikey179/vfsstream": "^1.6.12",
                 "php-coveralls/php-coveralls": "^2.7",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
-                "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
-                "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
-                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^9.6.22 || ^10.5.40 || ^11.5.2",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.15 || ^7.2.0",
+                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.2.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -988,7 +996,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.68.1"
             },
             "funding": [
                 {
@@ -996,7 +1004,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-30T23:09:38+00:00"
+            "time": "2025-01-17T09:20:36+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -1065,16 +1073,16 @@
         },
         {
             "name": "league/container",
-            "version": "4.2.2",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/container.git",
-                "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88"
+                "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88",
-                "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/7ea728b013b9a156c409c6f0fc3624071b742dec",
+                "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec",
                 "shasum": ""
             },
             "require": {
@@ -1099,11 +1107,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev",
-                    "dev-4.x": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
+                    "dev-1.x": "1.x-dev",
                     "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
+                    "dev-3.x": "3.x-dev",
+                    "dev-4.x": "4.x-dev",
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -1135,7 +1143,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/container/issues",
-                "source": "https://github.com/thephpleague/container/tree/4.2.2"
+                "source": "https://github.com/thephpleague/container/tree/4.2.4"
             },
             "funding": [
                 {
@@ -1143,7 +1151,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-13T13:12:53+00:00"
+            "time": "2024-11-10T12:42:13+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1203,16 +1211,16 @@
         },
         {
             "name": "nunomaduro/phpinsights",
-            "version": "v2.11.0",
+            "version": "v2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/phpinsights.git",
-                "reference": "f476219759a61aad988641476259465c77203383"
+                "reference": "5c12a8d626712de6db5e6d2db52b1eb4e9596650"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/f476219759a61aad988641476259465c77203383",
-                "reference": "f476219759a61aad988641476259465c77203383",
+                "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/5c12a8d626712de6db5e6d2db52b1eb4e9596650",
+                "reference": "5c12a8d626712de6db5e6d2db52b1eb4e9596650",
                 "shasum": ""
             },
             "require": {
@@ -1229,7 +1237,7 @@
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "psr/container": "^1.0|^2.0.2",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "sebastian/diff": "^4.0|^5.0.3",
+                "sebastian/diff": "^4.0|^5.0.3|^6.0",
                 "slevomat/coding-standard": "^8.14.1",
                 "squizlabs/php_codesniffer": "^3.7.2",
                 "symfony/cache": "^5.4|^6.0|^7.0",
@@ -1289,7 +1297,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/phpinsights/issues",
-                "source": "https://github.com/nunomaduro/phpinsights/tree/v2.11.0"
+                "source": "https://github.com/nunomaduro/phpinsights/tree/v2.12.0"
             },
             "funding": [
                 {
@@ -1305,7 +1313,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-30T10:54:50+00:00"
+            "time": "2024-11-11T14:42:55+00:00"
         },
         {
             "name": "php-parallel-lint/php-parallel-lint",
@@ -1893,27 +1901,22 @@
         },
         {
             "name": "psr/container",
-            "version": "2.0.2",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -1940,9 +1943,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-11-05T16:47:00+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -2169,33 +2172,33 @@
         },
         {
             "name": "react/child-process",
-            "version": "v0.6.5",
+            "version": "v0.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/child-process.git",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
                 "shasum": ""
             },
             "require": {
                 "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                 "php": ">=5.3.0",
                 "react/event-loop": "^1.2",
-                "react/stream": "^1.2"
+                "react/stream": "^1.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-                "react/socket": "^1.8",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
                 "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "React\\ChildProcess\\": "src"
+                    "React\\ChildProcess\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2232,19 +2235,15 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
             },
             "funding": [
                 {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-09-16T13:41:56+00:00"
+            "time": "2025-01-01T16:37:48+00:00"
         },
         {
             "name": "react/dns",
@@ -2871,16 +2870,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.2",
+            "version": "3.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
                 "shasum": ""
             },
             "require": {
@@ -2945,22 +2944,26 @@
                 {
                     "url": "https://opencollective.com/php_codesniffer",
                     "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2024-12-11T16:04:26+00:00"
+            "time": "2025-01-23T17:04:15+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v5.4.44",
+            "version": "v5.4.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "4b3e7bf157b8b5a010865701d9106b5f0a9c99a8"
+                "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/4b3e7bf157b8b5a010865701d9106b5f0a9c99a8",
-                "reference": "4b3e7bf157b8b5a010865701d9106b5f0a9c99a8",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/0fe08ee32cec2748fbfea10c52d3ee02049e0f6b",
+                "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b",
                 "shasum": ""
             },
             "require": {
@@ -3028,7 +3031,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.44"
+                "source": "https://github.com/symfony/cache/tree/v5.4.46"
             },
             "funding": [
                 {
@@ -3044,20 +3047,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-13T16:57:39+00:00"
+            "time": "2024-11-04T11:43:55+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v2.5.3",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463"
+                "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/fee6db04d913094e2fb55ff8e7db5685a8134463",
-                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/517c3a3619dadfa6952c4651767fcadffb4df65e",
+                "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e",
                 "shasum": ""
             },
             "require": {
@@ -3069,12 +3072,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3107,7 +3110,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.3"
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -3123,46 +3126,50 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.0.19",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed"
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c3ebc83d031b71c39da318ca8b7a07ecc67507ed",
-                "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/string": "^5.1|^6.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "psr/log": ">=3",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
+                "symfony/event-dispatcher": "<4.4",
+                "symfony/lock": "<4.4",
+                "symfony/process": "<4.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0|3.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "psr/log": "^1|^2",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -3197,12 +3204,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.0.19"
+                "source": "https://github.com/symfony/console/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -3218,20 +3225,87 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-11-06T11:30:55+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.40",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4"
+                "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4",
-                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9",
+                "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9",
                 "shasum": ""
             },
             "require": {
@@ -3287,7 +3361,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -3303,20 +3377,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.3",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73"
+                "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/540f4c73e87fd0c71ca44a6aa305d024ac68cb73",
-                "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f",
+                "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f",
                 "shasum": ""
             },
             "require": {
@@ -3328,12 +3402,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3366,7 +3440,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.3"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -3382,26 +3456,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.0.19",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214"
+                "reference": "57c8294ed37d4a055b77057827c67f9558c95c54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3d49eec03fda1f0fc19b7349fbbe55ebc1004214",
-                "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c8294ed37d4a055b77057827c67f9558c95c54",
+                "reference": "57c8294ed37d4a055b77057827c67f9558c95c54",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8"
+                "symfony/polyfill-mbstring": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4"
             },
             "type": "library",
             "autoload": {
@@ -3429,7 +3507,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.0.19"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -3445,24 +3523,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:44:14+00:00"
+            "time": "2024-10-22T13:05:35+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.0.19",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "5cc9cac6586fc0c28cd173780ca696e419fefa11"
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/5cc9cac6586fc0c28cd173780ca696e419fefa11",
-                "reference": "5cc9cac6586fc0c28cd173780ca696e419fefa11",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b",
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -3490,7 +3570,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.0.19"
+                "source": "https://github.com/symfony/finder/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -3506,27 +3586,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:44:14+00:00"
+            "time": "2024-09-28T13:32:08+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v5.4.44",
+            "version": "v5.4.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "58d3dc6bfa5fb37137e32d52ddc202ba4d1cea04"
+                "reference": "d77d8e212cde7b5c4a64142bf431522f19487c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/58d3dc6bfa5fb37137e32d52ddc202ba4d1cea04",
-                "reference": "58d3dc6bfa5fb37137e32d52ddc202ba4d1cea04",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/d77d8e212cde7b5c4a64142bf431522f19487c28",
+                "reference": "d77d8e212cde7b5c4a64142bf431522f19487c28",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/http-client-contracts": "^2.5.3",
+                "symfony/http-client-contracts": "^2.5.4",
                 "symfony/polyfill-php73": "^1.11",
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.0|^2|^3"
@@ -3581,7 +3661,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v5.4.44"
+                "source": "https://github.com/symfony/http-client/tree/v5.4.49"
             },
             "funding": [
                 {
@@ -3597,20 +3677,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T14:04:28+00:00"
+            "time": "2024-11-28T08:37:04+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v2.5.3",
+            "version": "v2.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "e5cc97c2b4a4db0ba26bebc154f1426e3fd1d2f1"
+                "reference": "48ef1d0a082885877b664332b9427662065a360c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/e5cc97c2b4a4db0ba26bebc154f1426e3fd1d2f1",
-                "reference": "e5cc97c2b4a4db0ba26bebc154f1426e3fd1d2f1",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/48ef1d0a082885877b664332b9427662065a360c",
+                "reference": "48ef1d0a082885877b664332b9427662065a360c",
                 "shasum": ""
             },
             "require": {
@@ -3621,12 +3701,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3659,7 +3739,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.3"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.5"
             },
             "funding": [
                 {
@@ -3675,20 +3755,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-26T19:42:53+00:00"
+            "time": "2024-11-28T08:37:04+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.40",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4"
+                "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/bd1afbde6613a8d6b956115e0e14b196191fd0c4",
-                "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
+                "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
                 "shasum": ""
             },
             "require": {
@@ -3728,7 +3808,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.40"
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -3744,7 +3824,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4140,6 +4220,86 @@
             ],
             "time": "2024-09-09T11:45:10+00:00"
         },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
         {
             "name": "symfony/polyfill-php81",
             "version": "v1.31.0",
@@ -4160,8 +4320,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4218,16 +4378,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.44",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096"
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
-                "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d",
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d",
                 "shasum": ""
             },
             "require": {
@@ -4260,7 +4420,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.44"
+                "source": "https://github.com/symfony/process/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -4276,25 +4436,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T12:46:43+00:00"
+            "time": "2024-11-06T11:36:42+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.0.2",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66"
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f37b419f7aea2e9abf10abd261832cace12e3300",
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "psr/container": "^2.0"
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -4309,7 +4470,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "2.5-dev"
                 }
             },
             "autoload": {
@@ -4342,7 +4503,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -4358,20 +4519,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:58+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.4.40",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625"
+                "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e9daf3b7c805c747638b2cc48f1649e594f9625",
-                "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb2c199cf302eb207f8c23e7ee174c1c31a5c004",
+                "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004",
                 "shasum": ""
             },
             "require": {
@@ -4404,7 +4565,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.40"
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -4420,37 +4581,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.19",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799",
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": ">=3.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -4489,7 +4651,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.19"
+                "source": "https://github.com/symfony/string/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -4505,20 +4667,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-11-10T20:33:58+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v5.4.40",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "6a13d37336d512927986e09f19a4bed24178baa6"
+                "reference": "862700068db0ddfd8c5b850671e029a90246ec75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/6a13d37336d512927986e09f19a4bed24178baa6",
-                "reference": "6a13d37336d512927986e09f19a4bed24178baa6",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/862700068db0ddfd8c5b850671e029a90246ec75",
+                "reference": "862700068db0ddfd8c5b850671e029a90246ec75",
                 "shasum": ""
             },
             "require": {
@@ -4562,7 +4724,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v5.4.40"
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -4578,7 +4740,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "szepeviktor/phpstan-wordpress",
@@ -4702,5 +4864,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/header-footer-elementor.php b/header-footer-elementor.php
index 90af3a4ed..53e835ccf 100644
--- a/header-footer-elementor.php
+++ b/header-footer-elementor.php
@@ -32,7 +32,7 @@
  *
  * @return void
  */
-function hfe_plugin_activation() {
+function hfe_plugin_activation(): void {
 	update_option( 'hfe_plugin_is_activated', 'yes' );
 }
 
@@ -43,24 +43,24 @@ function hfe_plugin_activation() {
  *
  * @return void
  */
-function hfe_init() {
+function hfe_init(): void {
 	Header_Footer_Elementor::instance();
 }
 
 add_action( 'plugins_loaded', 'hfe_init' );
 
 /** Function for FA5, Social Icons, Icon List */
-function hfe_enqueue_font_awesome() {
+function hfe_enqueue_font_awesome(): void {
 
 	if ( class_exists( 'Elementor\Plugin' ) ) {
 
 		// Ensure Elementor Icons CSS is loaded.
-        wp_enqueue_style(
-            'hfe-elementor-icons',
-            plugins_url( '/elementor/assets/lib/eicons/css/elementor-icons.min.css', 'elementor' ),
-            [],
-            '5.34.0'
-        );
+		wp_enqueue_style(
+			'hfe-elementor-icons',
+			plugins_url( '/elementor/assets/lib/eicons/css/elementor-icons.min.css', 'elementor' ),
+			[],
+			'5.34.0'
+		);
 		wp_enqueue_style(
 			'hfe-icons-list',
 			plugins_url( '/elementor/assets/css/widget-icon-list.min.css', 'elementor' ),
diff --git a/inc/class-header-footer-elementor.php b/inc/class-header-footer-elementor.php
index 800164742..bc615b1da 100644
--- a/inc/class-header-footer-elementor.php
+++ b/inc/class-header-footer-elementor.php
@@ -11,7 +11,6 @@
  * Class Header_Footer_Elementor
  */
 class Header_Footer_Elementor {
-
 	/**
 	 * Current theme template
 	 *
@@ -32,32 +31,19 @@ class Header_Footer_Elementor {
 	 * @var Header_Footer_Elementor
 	 */
 	private static $_instance = null;
-
-	/**
-	 * Instance of Header_Footer_Elementor
-	 *
-	 * @return Header_Footer_Elementor Instance of Header_Footer_Elementor
-	 */
-	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
-			self::$_instance = new self();
-		}
-
-		return self::$_instance;
-	}
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
 		$this->template = get_template();
 
-		$is_elementor_callable = ( defined( 'ELEMENTOR_VERSION' ) && is_callable( 'Elementor\Plugin::instance' ) ) ? true : false;
+		$is_elementor_callable = defined( 'ELEMENTOR_VERSION' ) && is_callable( 'Elementor\Plugin::instance' ) ? true : false;
 
 		$required_elementor_version = '3.5.0';
 
-		$is_elementor_outdated = ( $is_elementor_callable && ( ! version_compare( ELEMENTOR_VERSION, $required_elementor_version, '>=' ) ) ) ? true : false;
+		$is_elementor_outdated = $is_elementor_callable && ( ! version_compare( ELEMENTOR_VERSION, $required_elementor_version, '>=' ) ) ? true : false;
 
-		if ( ( ! $is_elementor_callable ) || $is_elementor_outdated ) {
+		if ( ! $is_elementor_callable || $is_elementor_outdated ) {
 			$this->elementor_not_available( $is_elementor_callable, $is_elementor_outdated );
 		}
 
@@ -65,12 +51,12 @@ public function __construct() {
 			self::$elementor_instance = Elementor\Plugin::instance();
 
 			$this->includes();
-			
+
 			add_action( 'init', [ $this, 'load_textdomain' ] );
 
 			add_filter(
 				'elementor/admin-top-bar/is-active',
-				function( $is_active, $current_screen ) {
+				static function( $is_active, $current_screen ) {
 					if ( strpos( $current_screen->id, 'elementor-hf' ) !== false ) {
 						return false;
 					}
@@ -79,39 +65,38 @@ function( $is_active, $current_screen ) {
 				10,
 				2
 			);
-			
 
 			add_action(
 				'current_screen',
-				function () {
+				function (): void {
 					$current_screen = get_current_screen();
 					if ( $current_screen && ( $current_screen->id === 'edit-elementor-hf' || $current_screen->id === 'elementor-hf' ) ) {
 						add_action(
 							'in_admin_header',
-							function () {
+							function (): void {
 								$this->render_admin_top_bar();
-							} 
+							}
 						);
 					}
-				} 
+				}
 			);
 
 			$is_theme_supported = true;
 
-			if ( 'genesis' == $this->template ) {
+			if ( $this->template === 'genesis' ) {
 				require HFE_DIR . 'themes/genesis/class-hfe-genesis-compat.php';
-			} elseif ( 'astra' == $this->template ) {
+			} elseif ( $this->template === 'astra' ) {
 				require HFE_DIR . 'themes/astra/class-hfe-astra-compat.php';
-			} elseif ( 'bb-theme' == $this->template || 'beaver-builder-theme' == $this->template ) {
+			} elseif ( $this->template === 'bb-theme' || $this->template === 'beaver-builder-theme' ) {
 				$this->template = 'beaver-builder-theme';
 				require HFE_DIR . 'themes/bb-theme/class-hfe-bb-theme-compat.php';
-			} elseif ( 'generatepress' == $this->template ) {
+			} elseif ( $this->template === 'generatepress' ) {
 				require HFE_DIR . 'themes/generatepress/class-hfe-generatepress-compat.php';
-			} elseif ( 'oceanwp' == $this->template ) {
+			} elseif ( $this->template === 'oceanwp' ) {
 				require HFE_DIR . 'themes/oceanwp/class-hfe-oceanwp-compat.php';
-			} elseif ( 'storefront' == $this->template ) {
+			} elseif ( $this->template === 'storefront' ) {
 				require HFE_DIR . 'themes/storefront/class-hfe-storefront-compat.php';
-			} elseif ( 'hello-elementor' == $this->template ) {
+			} elseif ( $this->template === 'hello-elementor' ) {
 				require HFE_DIR . 'themes/hello-elementor/class-hfe-hello-elementor-compat.php';
 			} else {
 				$is_theme_supported = false;
@@ -120,10 +105,10 @@ function () {
 			}
 
 			update_option( 'hfe_is_theme_supported', $is_theme_supported );
-			
+
 			add_action( 'init', [ $this, 'setup_settings_page' ] );
 
-			if ( 'yes' === get_option( 'hfe_plugin_is_activated' ) ) {
+			if ( get_option( 'hfe_plugin_is_activated' ) === 'yes' ) {
 				add_action( 'admin_init', [ $this, 'show_setup_wizard' ] );
 			}
 
@@ -160,16 +145,21 @@ function () {
 
 			if ( ! class_exists( 'HFE_Utm_Analytics' ) ) {
 				require_once HFE_DIR . 'inc/lib/class-hfe-utm-analytics.php';
-			}
-
+			}       
 		}
 	}
 
-	private function render_admin_top_bar() {
-		?>
-		<div id="hfe-admin-top-bar-root">
-		</div>
-		<?php
+	/**
+	 * Instance of Header_Footer_Elementor
+	 *
+	 * @return Header_Footer_Elementor Instance of Header_Footer_Elementor
+	 */
+	public static function instance() {
+		if ( ! isset( self::$_instance ) ) {
+			self::$_instance = new self();
+		}
+
+		return self::$_instance;
 	}
 
 	/**
@@ -179,7 +169,7 @@ private function render_admin_top_bar() {
 	 *
 	 * @return void
 	 */
-	public function reset_unsupported_theme_notice() {
+	public function reset_unsupported_theme_notice(): void {
 		delete_user_meta( get_current_user_id(), 'unsupported-theme' );
 	}
 
@@ -190,7 +180,7 @@ public function reset_unsupported_theme_notice() {
 	 *
 	 * @return void
 	 */
-	public function register_notices() {
+	public function register_notices(): void {
 		$image_path = HFE_URL . 'assets/images/settings/uael-icon.svg';
 
 		Astra_Notices::add_notice(
@@ -228,7 +218,7 @@ public function register_notices() {
 					__( 'Nope, maybe later', 'header-footer-elementor' ),
 					__( 'I already did', 'header-footer-elementor' )
 				),
-				'show_if'                    => ( hfe_header_enabled() || hfe_footer_enabled() || hfe_is_before_footer_enabled() ) ? true : false,
+				'show_if'                    => hfe_header_enabled() || hfe_footer_enabled() || hfe_is_before_footer_enabled() ? true : false,
 				'repeat-notice-after'        => MONTH_IN_SECONDS,
 				'display-notice-after'       => 1296000, // Display notice after 15 days.
 				'priority'                   => 18,
@@ -243,7 +233,7 @@ public function register_notices() {
 	 * @since 1.2.0
 	 * @return void
 	 */
-	public function rating_notice_css() {
+	public function rating_notice_css(): void {
 		wp_enqueue_style( 'hfe-admin-style', HFE_URL . 'assets/css/admin-header-footer-elementor.css', [], HFE_VER );
 	}
 
@@ -251,11 +241,11 @@ public function rating_notice_css() {
 	 * Prints the admin notics when Elementor is not installed or activated or version outdated.
 	 *
 	 * @since 1.5.9
-	 * @param  boolean $is_elementor_callable specifies if elementor is available.
-	 * @param  boolean $is_elementor_outdated specifies if elementor version is old.
+	 * @param  bool $is_elementor_callable specifies if elementor is available.
+	 * @param  bool $is_elementor_outdated specifies if elementor version is old.
 	 * @return void
 	 */
-	public function elementor_not_available( $is_elementor_callable, $is_elementor_outdated ) {
+	public function elementor_not_available( $is_elementor_callable, $is_elementor_outdated ): void {
 
 		if ( ( ! did_action( 'elementor/loaded' ) ) || ( ! $is_elementor_callable ) ) {
 			add_action( 'admin_notices', [ $this, 'elementor_not_installed_activated' ] );
@@ -275,10 +265,10 @@ public function elementor_not_available( $is_elementor_callable, $is_elementor_o
 	 *
 	 * @return void
 	 */
-	public function elementor_not_installed_activated() {
+	public function elementor_not_installed_activated(): void {
 
 		$screen = get_current_screen();
-		if ( isset( $screen->parent_file ) && 'plugins.php' === $screen->parent_file && 'update' === $screen->id ) {
+		if ( isset( $screen->parent_file ) && $screen->parent_file === 'plugins.php' && $screen->id === 'update' ) {
 			return;
 		}
 
@@ -317,7 +307,7 @@ public function elementor_not_installed_activated() {
 	 *
 	 * @return void
 	 */
-	public function elementor_outdated() {
+	public function elementor_outdated(): void {
 
 		// Check user capability.
 		if ( ! ( current_user_can( 'activate_plugins' ) && current_user_can( 'install_plugins' ) ) ) {
@@ -352,12 +342,12 @@ public function elementor_outdated() {
 	 *
 	 * @return void
 	 */
-	public function show_setup_wizard() {
+	public function show_setup_wizard(): void {
 
 		$screen    = get_current_screen();
 		$screen_id = $screen ? $screen->id : '';
 
-		if ( 'plugins' !== $screen_id ) {
+		if ( $screen_id !== 'plugins' ) {
 			return;
 		}
 
@@ -394,7 +384,7 @@ public function show_setup_wizard() {
 	 *
 	 * @return void
 	 */
-	public function includes() {
+	public function includes(): void {
 		require_once HFE_DIR . 'admin/class-hfe-admin.php';
 
 		require_once HFE_DIR . 'inc/hfe-functions.php';
@@ -428,7 +418,6 @@ public function includes() {
 		if ( ! class_exists( 'Uae_Nps_Survey' ) ) {
 			require_once HFE_DIR . 'inc/lib/class-uae-nps-survey.php';
 		}
-					
 	}
 
 	/**
@@ -436,7 +425,7 @@ public function includes() {
 	 *
 	 * @return void
 	 */
-	public function load_textdomain() {
+	public function load_textdomain(): void {
 		load_plugin_textdomain( 'header-footer-elementor' );
 	}
 
@@ -445,7 +434,7 @@ public function load_textdomain() {
 	 *
 	 * @return void
 	 */
-	public function enqueue_scripts() {
+	public function enqueue_scripts(): void {
 		wp_enqueue_style( 'hfe-style', HFE_URL . 'assets/css/header-footer-elementor.css', [], HFE_VER );
 
 		if ( class_exists( '\Elementor\Plugin' ) ) {
@@ -503,11 +492,11 @@ public function enqueue_scripts() {
 	 *
 	 * @return void
 	 */
-	public function enqueue_admin_scripts() {
+	public function enqueue_admin_scripts(): void {
 		global $pagenow;
 		$screen = get_current_screen();
 
-		if ( ( 'elementor-hf' == $screen->id && ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) ) || ( 'edit.php' == $pagenow && 'edit-elementor-hf' == $screen->id ) ) {
+		if ( ( $screen->id === 'elementor-hf' && ( $pagenow === 'post.php' || $pagenow === 'post-new.php' ) ) || ( $pagenow === 'edit.php' && $screen->id === 'edit-elementor-hf' ) ) {
 
 			wp_enqueue_style( 'hfe-admin-style', HFE_URL . 'admin/assets/css/ehf-admin.css', [], HFE_VER );
 			wp_enqueue_script( 'hfe-admin-script', HFE_URL . 'admin/assets/js/ehf-admin.js', [ 'jquery', 'updates' ], HFE_VER, true );
@@ -543,7 +532,7 @@ public function body_class( $classes ) {
 	 * @since 1.6.0
 	 * @return void
 	 */
-	public function setup_settings_page() {
+	public function setup_settings_page(): void {
 
 		require_once HFE_DIR . 'inc/class-hfe-settings-page.php';
 	}
@@ -572,16 +561,16 @@ public function setup_unsupported_theme( $hfe_settings_tabs = [] ) {
 	 * @since  1.6.1
 	 * @return void
 	 */
-	public function setup_fallback_support() {
+	public function setup_fallback_support(): void {
 
 		if ( ! current_theme_supports( 'header-footer-elementor' ) ) {
 			$hfe_compatibility_option = get_option( 'hfe_compatibility_option', '1' );
 
-			if ( '1' === $hfe_compatibility_option ) {
+			if ( $hfe_compatibility_option === '1' ) {
 				if ( ! class_exists( 'HFE_Default_Compat' ) ) {
 					require_once HFE_DIR . 'themes/default/class-hfe-default-compat.php';
 				}
-			} elseif ( '2' === $hfe_compatibility_option ) {
+			} elseif ( $hfe_compatibility_option === '2' ) {
 				require HFE_DIR . 'themes/default/class-global-theme-compatibility.php';
 			}
 		}
@@ -592,7 +581,7 @@ public function setup_fallback_support() {
 	 *
 	 * @return void
 	 */
-	public static function get_header_content() {
+	public static function get_header_content(): void {
 		$header_content = self::$elementor_instance->frontend->get_builder_content_for_display( get_hfe_header_id() );
 		echo $header_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
@@ -602,7 +591,7 @@ public static function get_header_content() {
 	 *
 	 * @return void
 	 */
-	public static function get_footer_content() {
+	public static function get_footer_content(): void {
 		echo "<div class='footer-width-fixer'>";
 		echo self::$elementor_instance->frontend->get_builder_content_for_display( get_hfe_footer_id() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo '</div>';
@@ -613,7 +602,7 @@ public static function get_footer_content() {
 	 *
 	 * @return void
 	 */
-	public static function get_before_footer_content() {
+	public static function get_before_footer_content(): void {
 		echo "<div class='footer-width-fixer'>";
 		echo self::$elementor_instance->frontend->get_builder_content_for_display( hfe_get_before_footer_id() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo '</div>';
@@ -628,14 +617,12 @@ public static function get_before_footer_content() {
 	 * @return mixed | string
 	 */
 	public static function get_settings( $setting = '', $default = '' ) {
-		if ( 'type_header' == $setting || 'type_footer' == $setting || 'type_before_footer' == $setting ) {
+		if ( $setting === 'type_header' || $setting === 'type_footer' || $setting === 'type_before_footer' ) {
 			$templates = self::get_template_id( $setting );
 
 			$template = ! is_array( $templates ) ? $templates : $templates[0];
 
-			$template = apply_filters( "hfe_get_settings_{$setting}", $template );
-
-			return $template;
+			return apply_filters( "hfe_get_settings_{$setting}", $template );
 		}
 	}
 
@@ -658,7 +645,7 @@ public static function get_template_id( $type ) {
 		foreach ( $hfe_templates as $template ) {
 			if ( get_post_meta( absint( $template['id'] ), 'ehf_template_type', true ) === $type ) {
 				if ( function_exists( 'pll_current_language' ) ) {
-					if ( pll_current_language( 'slug' ) == pll_get_post_language( $template['id'], 'slug' ) ) {
+					if ( pll_current_language( 'slug' ) === pll_get_post_language( $template['id'], 'slug' ) ) {
 						return $template['id'];
 					}
 				} else {
@@ -710,6 +697,13 @@ public function render_template( $atts ) {
 
 		return self::$elementor_instance->frontend->get_builder_content_for_display( $id );
 	}
+
+	private function render_admin_top_bar(): void {
+		?>
+		<div id="hfe-admin-top-bar-root">
+		</div>
+		<?php
+	}
 }
 /**
  * Is elementor plugin installed.
diff --git a/inc/class-hfe-elementor-canvas-compat.php b/inc/class-hfe-elementor-canvas-compat.php
index 3a06dd59a..d6e9c5027 100644
--- a/inc/class-hfe-elementor-canvas-compat.php
+++ b/inc/class-hfe-elementor-canvas-compat.php
@@ -9,7 +9,6 @@
  * Astra theme compatibility.
  */
 class HFE_Elementor_Canvas_Compat {
-
 	/**
 	 * Instance of HFE_Elementor_Canvas_Compat.
 	 *
@@ -37,7 +36,7 @@ public static function instance() {
 	 *
 	 * @return void
 	 */
-	public function hooks() {
+	public function hooks(): void {
 		if ( hfe_header_enabled() ) {
 
 			// Action `elementor/page_templates/canvas/before_content` is introduced in Elementor Version 1.4.1.
@@ -61,10 +60,10 @@ public function hooks() {
 		if ( hfe_is_before_footer_enabled() ) {
 
 			// check if current page template is Elemenntor Canvas.
-			if ( 'elementor_canvas' == get_page_template_slug() ) {
+			if ( get_page_template_slug() === 'elementor_canvas' ) {
 				$override_cannvas_template = get_post_meta( hfe_get_before_footer_id(), 'display-on-canvas-template', true );
 
-				if ( '1' == $override_cannvas_template ) {
+				if ( $override_cannvas_template === '1' ) {
 					add_action( 'elementor/page_templates/canvas/after_content', 'hfe_render_before_footer', 9 );
 				}
 			}
@@ -77,16 +76,16 @@ public function hooks() {
 	 *
 	 * @return void
 	 */
-	public function render_header() {
+	public function render_header(): void {
 
 		// bail if current page template is not Elemenntor Canvas.
-		if ( 'elementor_canvas' !== get_page_template_slug() ) {
+		if ( get_page_template_slug() !== 'elementor_canvas' ) {
 			return;
 		}
 
 		$override_cannvas_template = get_post_meta( get_hfe_header_id(), 'display-on-canvas-template', true );
 
-		if ( '1' == $override_cannvas_template ) {
+		if ( $override_cannvas_template === '1' ) {
 			hfe_render_header();
 		}
 	}
@@ -97,16 +96,16 @@ public function render_header() {
 	 *
 	 * @return void
 	 */
-	public function render_footer() {
+	public function render_footer(): void {
 
 		// bail if current page template is not Elemenntor Canvas.
-		if ( 'elementor_canvas' !== get_page_template_slug() ) {
+		if ( get_page_template_slug() !== 'elementor_canvas' ) {
 			return;
 		}
 
 		$override_cannvas_template = get_post_meta( get_hfe_footer_id(), 'display-on-canvas-template', true );
 
-		if ( '1' == $override_cannvas_template ) {
+		if ( $override_cannvas_template === '1' ) {
 			hfe_render_footer();
 		}
 	}
diff --git a/inc/class-hfe-rollback.php b/inc/class-hfe-rollback.php
index 36f99b3ca..bdd7fa240 100644
--- a/inc/class-hfe-rollback.php
+++ b/inc/class-hfe-rollback.php
@@ -20,7 +20,6 @@
 if ( ! class_exists( 'HFE_Rollback' ) ) {
 
 	class HFE_Rollback {
-
 		/**
 		 * Package URL.
 		 *
@@ -85,6 +84,71 @@ public function __construct( $args = [] ) {
 			}
 		}
 
+		/**
+		 * Run.
+		 *
+		 * Rollback HFE to previous versions.
+		 *
+		 * @since x.x.x
+		 * @access public
+		 */
+		public function run(): void {
+			$this->apply_package();
+			$this->upgrade();
+		}
+
+		/**
+		 * Apply package.
+		 *
+		 * Change the plugin data when WordPress checks for updates. This method
+		 * modifies package data to update the plugin from a specific URL containing
+		 * the version package.
+		 *
+		 * @since x.x.x
+		 * @access protected
+		 */
+		protected function apply_package(): void {
+			$update_plugins = get_site_transient( 'update_plugins' );
+			if ( ! is_object( $update_plugins ) ) {
+				$update_plugins = new \stdClass();
+			}
+
+			$plugin_info              = new \stdClass();
+			$plugin_info->new_version = $this->version;
+			$plugin_info->slug        = $this->plugin_slug;
+			$plugin_info->package     = $this->package_url;
+			$plugin_info->url         = 'https://wordpress.org/plugins/header-footer-elementor/';
+
+			$update_plugins->response[ $this->plugin_name ] = $plugin_info;
+
+			set_site_transient( 'update_plugins', $update_plugins );
+		}
+
+		/**
+		 * Upgrade.
+		 *
+		 * Run WordPress upgrade to HFE Rollback to previous version.
+		 *
+		 * @since x.x.x
+		 * @access protected
+		 */
+		protected function upgrade(): void {
+
+			require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+
+			$upgrader_args = [
+				'url'    => 'update.php?action=upgrade-plugin&plugin=' . rawurlencode( $this->plugin_name ),
+				'plugin' => $this->plugin_name,
+				'nonce'  => 'upgrade-plugin_' . $this->plugin_name,
+				'title'  => __( 'UAE Lite <p>Rollback to Previous Version</p>', 'header-footer-elementor' ),
+			];
+
+			$this->print_inline_style();
+
+			$upgrader = new \Plugin_Upgrader( new \Plugin_Upgrader_Skin( $upgrader_args ) );
+			$upgrader->upgrade( $this->plugin_name );
+		}
+
 		/**
 		 * Print inline style.
 		 *
@@ -93,7 +157,7 @@ public function __construct( $args = [] ) {
 		 * @since x.x.x
 		 * @access private
 		 */
-		private function print_inline_style() {
+		private function print_inline_style(): void {
 			?>
 			<style>
 				.wrap {
diff --git a/inc/class-hfe-settings-page.php b/inc/class-hfe-settings-page.php
index b525eebba..e41383875 100644
--- a/inc/class-hfe-settings-page.php
+++ b/inc/class-hfe-settings-page.php
@@ -18,7 +18,7 @@
  * @since 1.6.0
  */
 class HFE_Settings_Page {
-	
+
 	/**
 	 * Instance
 	 * z
@@ -37,7 +37,7 @@ class HFE_Settings_Page {
 	public function __construct() {
 
 		add_action( 'admin_post_uaelite_rollback', [ $this, 'post_uaelite_rollback' ] );
-		
+
 		add_action( 'admin_head', [ $this, 'hfe_global_css' ] );
 
 		if ( ! HFE_Helper::is_pro_active() ) {
@@ -47,7 +47,7 @@ public function __construct() {
 			add_action( 'admin_init', [ $this, 'hfe_admin_init' ] );
 			add_filter( 'views_edit-elementor-hf', [ $this, 'hfe_settings' ], 10, 1 );
 		}
-		
+
 		// add_filter( 'admin_footer_text', [ $this, 'admin_footer_text' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_scripts' ] );
 		add_filter( 'plugin_action_links_' . HFE_PATH, [ $this, 'settings_link' ] );
@@ -65,9 +65,8 @@ public function __construct() {
 		/* Flow content view */
 		add_action( 'hfe_render_admin_page_content', [ $this, 'render_content' ], 10, 2 );
 
-
 		if ( ! HFE_Helper::is_pro_active() ) {
-			add_action( 'admin_footer', __CLASS__ . '::show_nps_notice' );
+			add_action( 'admin_footer', self::class . '::show_nps_notice' );
 		}
 
 		if ( version_compare( get_bloginfo( 'version' ), '5.1.0', '>=' ) ) {
@@ -77,7 +76,7 @@ public function __construct() {
 		}
 	}
 
-	
+
 
 	/**
 	 * Render UAE NPS Survey Notice.
@@ -124,17 +123,17 @@ public static function get_elementor_new_page_url() {
 				'action'    => 'elementor_new_post',
 				'post_type' => 'page',
 			];
-		
+
 			$new_post_url = add_query_arg( $query_args, admin_url( 'edit.php' ) );
-		
+
 			$new_post_url = add_query_arg( '_wpnonce', wp_create_nonce( 'elementor_action_new_post' ), $new_post_url );
-		
+
 			return $new_post_url;
 		}
 		return '';
 	}
 
-	
+
 
 	/**
 	 * UAELite version rollback.
@@ -171,7 +170,7 @@ public function post_uaelite_rollback() {
 		}
 
 		$plugin_slug = basename( HFE_FILE, '.php' );
-		
+
 		if ( class_exists( 'HFE_Rollback' ) ) {
 			$rollback = new \HFE_Rollback(
 				[
@@ -237,39 +236,39 @@ public function hfe_global_css() {
 	public function enqueue_admin_scripts() {
 
 		global $pagenow, $post_type;
-	
+
 		$uae_logo      = HFE_URL . 'assets/images/settings/dashboard-logo.svg';
 		$white_logo    = HFE_URL . 'assets/images/settings/white-logo.svg';
-		$show_view_all = ( $post_type === 'elementor-hf' && $pagenow === 'post.php' ) ? 'yes' : 'no';
+		$show_view_all = $post_type === 'elementor-hf' && $pagenow === 'post.php' ? 'yes' : 'no';
 		$hfe_edit_url  = admin_url( 'edit.php?post_type=elementor-hf' );
-		$is_hfe_post   = ( 'elementor-hf' === $post_type && ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) ) ? 'yes' : 'no';
-	
-		$additional_condition = ( isset( $_GET['post_type'] ) && 'elementor-hf' === sanitize_text_field( $_GET['post_type'] ) && 
-			( 'edit.php' === $GLOBALS['pagenow'] || 'post.php' === $GLOBALS['pagenow'] || 'post-new.php' === $GLOBALS['pagenow'] ) ) ||
-			( isset( $_GET['post'] ) && 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['action'] ) && 'edit' === sanitize_text_field( $_GET['action'] ) && 'elementor-hf' === get_post_type( sanitize_text_field( $_GET['post'] ) ) ) ||
-			( 'post-new.php' === $GLOBALS['pagenow'] && isset( $_GET['post_type'] ) && 'elementor-hf' === sanitize_text_field( $_GET['post_type'] ) );
-	
-		if ( ( 
-				self::is_current_page( 'hfe' ) || 
-				$additional_condition 
-			) && 
-			! HFE_Helper::is_pro_active() 
+		$is_hfe_post   = $post_type === 'elementor-hf' && ( $pagenow === 'post.php' || $pagenow === 'post-new.php' ) ? 'yes' : 'no';
+
+		$additional_condition = ( isset( $_GET['post_type'] ) && sanitize_text_field( $_GET['post_type'] ) === 'elementor-hf' &&
+			( $GLOBALS['pagenow'] === 'edit.php' || $GLOBALS['pagenow'] === 'post.php' || $GLOBALS['pagenow'] === 'post-new.php' ) ) ||
+			( isset( $_GET['post'] ) && $GLOBALS['pagenow'] === 'post.php' && isset( $_GET['action'] ) && sanitize_text_field( $_GET['action'] ) === 'edit' && get_post_type( sanitize_text_field( $_GET['post'] ) ) === 'elementor-hf' ) ||
+			( $GLOBALS['pagenow'] === 'post-new.php' && isset( $_GET['post_type'] ) && sanitize_text_field( $_GET['post_type'] ) === 'elementor-hf' );
+
+		if ( (
+				self::is_current_page( 'hfe' ) ||
+				$additional_condition
+			) &&
+			! HFE_Helper::is_pro_active()
 		) {
-	
+
 			$rollback_versions = HFE_Helper::get_rollback_versions_options();
 			$st_status         = HFE_Helper::free_starter_templates_status();
 			$stpro_status      = HFE_Helper::premium_starter_templates_status();
 			$st_link           = HFE_Helper::starter_templates_link();
 			$hfe_post_url      = admin_url( 'post-new.php?post_type=elementor-hf' );
-			
+
 			$show_theme_support = 'no';
 			$hfe_theme_status   = get_option( 'hfe_is_theme_supported', false );
-	
+
 			if ( ( ! current_theme_supports( 'header-footer-elementor' ) ) && ! $hfe_theme_status ) {
 				$show_theme_support = 'yes';
 			}
 			$theme_option = get_option( 'hfe_compatibility_option', '1' );
-	
+
 			wp_enqueue_script(
 				'header-footer-elementor-react-app',
 				HFE_URL . 'build/main.js',
@@ -277,7 +276,7 @@ public function enqueue_admin_scripts() {
 				HFE_VER,
 				true
 			);
-	
+
 			wp_localize_script(
 				'header-footer-elementor-react-app',
 				'hfeSettingsData',
@@ -317,7 +316,7 @@ public function enqueue_admin_scripts() {
 					'is_hfe_post'              => $is_hfe_post,
 				]
 			);
-	
+
 			wp_enqueue_style(
 				'header-footer-elementor-react-styles',
 				HFE_URL . 'build/main.css',
@@ -325,9 +324,9 @@ public function enqueue_admin_scripts() {
 				HFE_VER
 			);
 		}
-	
-		if ( '' !== $uae_logo && '' !== $white_logo ) {
-	
+
+		if ( $uae_logo !== '' && $white_logo !== '' ) {
+
 			$custom_css = '
 				#toplevel_page_hfe .wp-menu-image {
 					background-image: url(' . esc_url( $uae_logo ) . ') !important;
@@ -342,11 +341,11 @@ public function enqueue_admin_scripts() {
 			';
 			wp_add_inline_style( 'wp-admin', $custom_css );
 		}
-	
+
 		wp_enqueue_script( 'hfe-admin-script', HFE_URL . 'admin/assets/js/ehf-admin.js', [ 'jquery', 'updates' ], HFE_VER, true );
-	
+
 		$is_dismissed = get_user_meta( get_current_user_id(), 'hfe-popup' );
-	
+
 		$strings = [
 			'addon_activate'        => esc_html__( 'Activate', 'header-footer-elementor' ),
 			'addon_activated'       => esc_html__( 'Activated', 'header-footer-elementor' ),
@@ -371,11 +370,11 @@ public function enqueue_admin_scripts() {
 			'hfe_edit_url'          => $hfe_edit_url,
 			'view_all_text'         => esc_html__( 'View All', 'header-footer-elementor' ),
 			'header_footer_builder' => $hfe_edit_url,
-	
+
 		];
-	
+
 		$strings = apply_filters( 'hfe_admin_strings', $strings );
-	
+
 		wp_localize_script(
 			'hfe-admin-script',
 			'hfe_admin_data',
@@ -543,7 +542,26 @@ public function hfe_register_settings_page() {
 			1
 		);
 
-		
+		add_submenu_page(
+			$menu_slug, // Parent slug.
+			__( 'Widgets & Features', 'header-footer-elementor' ),
+			__( 'Widgets & Features', 'header-footer-elementor' ),
+			$capability,
+			$menu_slug . '#widgets',
+			[ $this, 'render' ],
+			2
+		);
+
+		add_submenu_page(
+			$menu_slug,
+			__( 'Templates', 'header-footer-elementor' ),
+			__( 'Templates', 'header-footer-elementor' ),
+			$capability,
+			$menu_slug . '#templates',
+			[ $this, 'render' ],
+			8
+		);
+
 		// Add the Settings Submenu.
 		add_submenu_page(
 			$menu_slug,
@@ -554,7 +572,6 @@ public function hfe_register_settings_page() {
 			[ $this, 'render' ],
 			9
 		);
-
 	}
 
 	/**
@@ -567,14 +584,14 @@ public function hfe_register_settings_page() {
 	 */
 	public function render() {
 
-		$menu_page_slug = ( ! empty( $_GET['page'] ) ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : $this->menu_slug; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$menu_page_slug = ! empty( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : $this->menu_slug; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		$page_action    = '';
-   
+
 		if ( isset( $_GET['action'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$page_action = sanitize_text_field( wp_unslash( $_GET['action'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$page_action = str_replace( '_', '-', $page_action );
 		}
-   
+
 		include_once HFE_DIR . 'inc/settings/admin-base.php';
 	}
 
@@ -645,9 +662,9 @@ public function hfe_modal() {
 		$is_dismissed = get_user_meta( get_current_user_id(), 'hfe-popup' );
 
 		$is_subscribed   = get_user_meta( get_current_user_ID(), 'hfe-subscribed' );
-		$subscribe_valid = ( is_array( $is_subscribed ) && isset( $is_subscribed[0] ) && 'yes' === $is_subscribed[0] ) ? 'yes' : false;
+		$subscribe_valid = is_array( $is_subscribed ) && isset( $is_subscribed[0] ) && $is_subscribed[0] === 'yes' ? 'yes' : false;
 
-		if ( ( ! empty( $is_dismissed ) && 'dismissed' === $is_dismissed[0] ) || 'yes' === $subscribe_valid ) {
+		if ( ( ! empty( $is_dismissed ) && $is_dismissed[0] === 'dismissed' ) || $subscribe_valid === 'yes' ) {
 			return false;
 		} else {
 			$this->get_guide_modal();
@@ -672,7 +689,7 @@ public function hfe_tabs() {
 			}
 
 			self::$hfe_settings_tabs['hfe_about'] = [
-				
+
 				'name' => __( 'About Us', 'header-footer-elementor' ),
 				'url'  => admin_url( 'themes.php?page=hfe-about' ),
 			];
@@ -683,9 +700,9 @@ public function hfe_tabs() {
 
 				$tab_slug = str_replace( '_', '-', $tab_id );
 
-				$active_tab = ( ( isset( $_GET['page'] ) && $tab_slug == $_GET['page'] ) || ( ! isset( $_GET['page'] ) && 'hfe_templates' == $tab_id ) ) ? $tab_id : ''; // PHPCS:Ignore WordPress.Security.NonceVerification.Recommended
+				$active_tab = ( isset( $_GET['page'] ) && $tab_slug === $_GET['page'] ) || ( ! isset( $_GET['page'] ) && $tab_id === 'hfe_templates' ) ? $tab_id : ''; // PHPCS:Ignore WordPress.Security.NonceVerification.Recommended
 
-				$active = ( $active_tab == $tab_id ) ? ' nav-tab-active' : '';
+				$active = $active_tab === $tab_id ? ' nav-tab-active' : '';
 
 				echo '<a href="' . esc_url( $tab['url'] ) . '" class="nav-tab' . esc_attr( $active ) . '">';
 				echo esc_html( $tab['name'] );
@@ -714,7 +731,7 @@ public function hfe_tabs() {
 	public function admin_footer_text( $footer_text ) {
 		$current_screen = get_current_screen();
 
-		$is_elementor_screen = ( $current_screen && ( 'elementor-hf' === $current_screen->post_type || 'appearance_page_hfe-guide' === $current_screen->id || 'appearance_page_hfe-about' === $current_screen->id || 'appearance_page_hfe-settings' === $current_screen->id ) );
+		$is_elementor_screen = ( $current_screen && ( $current_screen->post_type === 'elementor-hf' || $current_screen->id === 'appearance_page_hfe-guide' || $current_screen->id === 'appearance_page_hfe-about' || $current_screen->id === 'appearance_page_hfe-settings' ) );
 
 		if ( $is_elementor_screen ) {
 			$footer_text = sprintf(
@@ -754,8 +771,8 @@ public function get_themes_support() {
 	public function get_guide_html() {
 
 		$is_subscribed   = get_user_meta( get_current_user_ID(), 'hfe-subscribed' );
-		$subscribe_valid = ( is_array( $is_subscribed ) && isset( $is_subscribed[0] ) && 'yes' === $is_subscribed[0] ) ? 'yes' : false;
-		$subscribe_flag  = ( 'yes' === $subscribe_valid ) ? ' hfe-user-subscribed' : ' hfe-user-unsubscribed';
+		$subscribe_valid = is_array( $is_subscribed ) && isset( $is_subscribed[0] ) && $is_subscribed[0] === 'yes' ? 'yes' : false;
+		$subscribe_flag  = $subscribe_valid === 'yes' ? ' hfe-user-subscribed' : ' hfe-user-unsubscribed';
 		?>
 
 		<div class="hfe-admin-about-section hfe-admin-columns hfe-admin-guide-section<?php echo esc_attr( $subscribe_flag ); ?>">
@@ -766,7 +783,7 @@ public function get_guide_html() {
 					<p><?php esc_html_e( 'Elementor Header & Footer Builder plugin lets you build impactful navigation for your website very easily. Before we begin, we would like to know more about you. This will help us to serve you better.', 'header-footer-elementor' ); ?></p>
 				</div>
 			</div>
-			<?php if ( 'yes' !== $subscribe_valid ) { ?>
+			<?php if ( $subscribe_valid !== 'yes' ) { ?>
 				<div class="hfe-admin-column-50 hfe-admin-column-last">
 					<div class="hfe-guide-content hfe-subscription-step-1-active">
 						<div class="hfe-guide-content-header hfe-admin-columns">
@@ -1029,13 +1046,13 @@ protected function output_about_addons() {
 									</strong>
 								</div>
 								<div class="action-button">
-									<?php if ( 'Visit Website' === $plugin_data['action_text'] ) { ?>
+									<?php if ( $plugin_data['action_text'] === 'Visit Website' ) { ?>
 										<a href="<?php echo esc_url( $plugin_data['plugin_src'] ); ?>" target="_blank" rel="noopener noreferrer" class="pro-plugin button button-primary"><?php echo wp_kses_post( $plugin_data['action_text'] ); ?></a>
-									<?php } elseif ( 'theme' === $details['type'] && $can_install_themes ) { ?>
+									<?php } elseif ( $details['type'] === 'theme' && $can_install_themes ) { ?>
 										<button class="<?php echo esc_attr( $plugin_data['action_class'] ); ?>" data-plugin="<?php echo esc_attr( $plugin_data['plugin_src'] ); ?>" data-type="theme" data-slug="<?php echo esc_attr( $details['slug'] ); ?>" data-site="<?php echo esc_url( $details['url'] ); ?>">
 											<span><?php echo wp_kses_post( $plugin_data['action_text'] ); ?></span>
 										</button>
-									<?php } elseif ( 'plugin' === $details['type'] && $can_install_plugins ) { ?>
+									<?php } elseif ( $details['type'] === 'plugin' && $can_install_plugins ) { ?>
 										<button class="<?php echo esc_attr( $plugin_data['action_class'] ); ?>" data-plugin="<?php echo esc_attr( $plugin_data['plugin_src'] ); ?>" data-type="plugin" data-slug="<?php echo esc_attr( $details['slug'] ); ?>" data-site="<?php echo esc_url( $details['url'] ); ?>" data-file="<?php echo esc_attr( $plugin ); ?>">
 											<span><?php echo wp_kses_post( $plugin_data['action_text'] ); ?></span>
 										</button>
@@ -1069,19 +1086,19 @@ protected function output_about_addons() {
 	 */
 	protected function get_plugin_data( $addon, $details, $all_plugins, $all_themes ) {
 
-		$have_pro = ( ! empty( $details['pro'] ) );
+		$have_pro = ! empty( $details['pro'] );
 		$show_pro = false;
 
 		$theme = wp_get_theme();
 
 		$plugin_data = [];
 
-		$is_plugin = ( 'plugin' === $details['type'] ) ? true : false;
-		$is_theme  = ( 'theme' === $details['type'] ) ? true : false;
+		$is_plugin = $details['type'] === 'plugin' ? true : false;
+		$is_theme  = $details['type'] === 'theme' ? true : false;
 
 		if ( ( $is_plugin && array_key_exists( $addon, $all_plugins ) ) || ( $is_theme && array_key_exists( $addon, $all_themes ) ) ) {
 
-			if ( ( $is_plugin && is_plugin_active( $addon ) ) || ( $is_theme && ( 'Astra' === $theme->name || 'Astra' === $theme->parent_theme ) ) ) {
+			if ( ( $is_plugin && is_plugin_active( $addon ) ) || ( $is_theme && ( $theme->name === 'Astra' || $theme->parent_theme === 'Astra' ) ) ) {
 
 				// Status text/status.
 				$plugin_data['status_class'] = 'status-active';
@@ -1103,7 +1120,7 @@ protected function get_plugin_data( $addon, $details, $all_plugins, $all_themes
 			// install if already doesn't exists.
 			// Status text/status.
 			$plugin_data['status_class'] = 'status-download';
-			if ( isset( $details['act'] ) && 'go-to-url' === $details['act'] ) {
+			if ( isset( $details['act'] ) && $details['act'] === 'go-to-url' ) {
 				$plugin_data['status_class'] = 'status-go-to-url';
 			}
 			$plugin_data['status_text'] = esc_html__( 'Not Installed', 'header-footer-elementor' );
@@ -1194,14 +1211,14 @@ public function hfe_can_install( $type ) {
 			return false;
 		}
 
-		if ( 'theme' === $type ) {
+		if ( $type === 'theme' ) {
 			if ( ! current_user_can( 'install_themes' ) ) {
 				return false;
 			}
 
 			return true;
 
-		} elseif ( 'plugin' === $type ) {
+		} elseif ( $type === 'plugin' ) {
 			if ( ! current_user_can( 'install_plugins' ) ) {
 				return false;
 			}
@@ -1212,7 +1229,7 @@ public function hfe_can_install( $type ) {
 		return false;
 	}
 
-	
+
 	/**
 	 * Add settings link to the Plugins page.
 	 *
@@ -1282,7 +1299,7 @@ public function real_mime_types( $defaults, $file, $filename, $mimes ) {
 	/**
 	 * Real Mime Type
 	 *
-	 * This function checks if the file is an SVG and sanitizes it accordingly. 
+	 * This function checks if the file is an SVG and sanitizes it accordingly.
 	 * PHPCS rules are disabled selectively to allow necessary file operations that are essential for handling SVG files safely.
 	 *
 	 * @since 1.2.15
@@ -1295,7 +1312,7 @@ public function real_mime_types( $defaults, $file, $filename, $mimes ) {
 	 */
 	public function real_mimes( $defaults, $filename, $file ) {
 
-		if ( 'svg' === pathinfo( $filename, PATHINFO_EXTENSION ) ) {
+		if ( pathinfo( $filename, PATHINFO_EXTENSION ) === 'svg' ) {
 			// Perform SVG sanitization using the sanitize_svg function.
 			$svg_content           = file_get_contents( $file ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
 			$sanitized_svg_content = $this->sanitize_svg( $svg_content );
@@ -1313,13 +1330,13 @@ public function real_mimes( $defaults, $filename, $file ) {
 	/**
 	 * Sanitizes SVG Code string.
 	 *
-	 * This function performs sanitization on SVG code to ensure that only safe tags and attributes are retained. 
+	 * This function performs sanitization on SVG code to ensure that only safe tags and attributes are retained.
 	 * PHPCS rules are selectively disabled in specific areas to accommodate necessary file operations, compatibility with different PHP versions, and to enhance code readability:
-	 * 
+	 *
 	 * - File operations are required for reading and writing SVG content.
 	 * - PHP version compatibility is maintained by selectively disabling PHPCS rules for PHP version-specific functions.
 	 * - Code readability is enhanced by selectively disabling PHPCS rules for specific areas.
-	 * 
+	 *
 	 * @param string $original_content SVG code to sanitize.
 	 * @return string|bool
 	 * @since 1.0.7
@@ -1463,15 +1480,15 @@ public function sanitize_svg( $original_content ) {
 		$needle = "\x1f\x8b\x08";
 		// phpcs:disable PHPCompatibility.ParameterValues.NewIconvMbstringCharsetDefault.NotSet
 		if ( function_exists( 'mb_strpos' ) ) {
-			$is_encoded = 0 === mb_strpos( $original_content, $needle );
+			$is_encoded = mb_strpos( $original_content, $needle ) === 0;
 		} else {
-			$is_encoded = 0 === strpos( $original_content, $needle );
+			$is_encoded = strpos( $original_content, $needle ) === 0;
 		}
 		// phpcs:enable PHPCompatibility.ParameterValues.NewIconvMbstringCharsetDefault.NotSet
 
 		if ( $is_encoded ) {
 			$original_content = gzdecode( $original_content );
-			if ( false === $original_content ) {
+			if ( $original_content === false ) {
 				return '';
 			}
 		}
@@ -1481,7 +1498,7 @@ public function sanitize_svg( $original_content ) {
 		$content = preg_replace( '/<\?(.*)\?>/Us', '', $content );
 		$content = preg_replace( '/<\%(.*)\%>/Us', '', $content );
 
-		if ( ( false !== strpos( $content, '<?' ) ) || ( false !== strpos( $content, '<%' ) ) ) {
+		if ( strpos( $content, '<?' ) !== false || ( strpos( $content, '<%' ) !== false ) ) {
 			return '';
 		}
 
@@ -1489,7 +1506,7 @@ public function sanitize_svg( $original_content ) {
 		$content = preg_replace( '/<!--(.*)-->/Us', '', $content );
 		$content = preg_replace( '/\/\*(.*)\*\//Us', '', $content );
 
-		if ( ( false !== strpos( $content, '<!--' ) ) || ( false !== strpos( $content, '/*' ) ) ) {
+		if ( strpos( $content, '<!--' ) !== false || ( strpos( $content, '/*' ) !== false ) ) {
 			return '';
 		}
 
@@ -1499,7 +1516,7 @@ public function sanitize_svg( $original_content ) {
 		// Find the start and end tags so we can cut out miscellaneous garbage.
 		$start = strpos( $content, '<svg' );
 		$end   = strrpos( $content, '</svg>' );
-		if ( false === $start || false === $end ) {
+		if ( $start === false || $end === false ) {
 			return '';
 		}
 
@@ -1528,7 +1545,7 @@ public function sanitize_svg( $original_content ) {
 
 		// Strip Doctype.
 		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType && ! ! $child->parentNode ) {
+			if ( $child->nodeType === XML_DOCUMENT_TYPE_NODE && ! ! $child->parentNode ) {
 				$child->parentNode->removeChild( $child );
 			}
 		}
diff --git a/inc/class-hfe-update.php b/inc/class-hfe-update.php
index c99caf607..806338929 100644
--- a/inc/class-hfe-update.php
+++ b/inc/class-hfe-update.php
@@ -21,7 +21,6 @@
 	 * @since 1.1.4
 	 */
 	class HFE_Update {
-
 		/**
 		 * Option key for stored version number.
 		 *
@@ -29,7 +28,7 @@ class HFE_Update {
 		 * @var string
 		 */
 		// phpcs:ignore
-		private string $db_option_key = '_hfe_db_version'; 
+		private string $db_option_key = '_hfe_db_version';
 
 		/**
 		 *  Constructor
@@ -52,7 +51,7 @@ public function __construct() {
 		 * @since 1.1.4
 		 * @return void
 		 */
-		public function init() {
+		public function init(): void {
 			do_action( 'hfe_update_before' );
 
 			if ( ! $this->needs_db_update() ) {
@@ -73,38 +72,6 @@ public function init() {
 			do_action( 'hfe_update_after' );
 		}
 
-		/**
-		 * Set default target rules for header, footer, before footers being used before target rules were added to the plugin.
-		 *
-		 * @since 1.2.0-beta.1
-		 * @return void
-		 */
-		private function setup_default_terget_rules() {
-			$default_include_locations = [
-				'rule'     => [ 0 => 'basic-global' ],
-				'specific' => [],
-			];
-
-			$header_id        = $this->get_legacy_template_id( 'type_header' );
-			$footer_id        = $this->get_legacy_template_id( 'type_footer' );
-			$before_footer_id = $this->get_legacy_template_id( 'type_before_footer' );
-
-			// Header.
-			if ( ! empty( $header_id ) ) {
-				update_post_meta( $header_id, 'ehf_target_include_locations', $default_include_locations );
-			}
-
-			// Footer.
-			if ( ! empty( $footer_id ) ) {
-				update_post_meta( $footer_id, 'ehf_target_include_locations', $default_include_locations );
-			}
-
-			// Before Footer.
-			if ( ! empty( $before_footer_id ) ) {
-				update_post_meta( $before_footer_id, 'ehf_target_include_locations', $default_include_locations );
-			}
-		}
-
 		/**
 		 * Get header or footer template id based on the meta query.
 		 *
@@ -145,6 +112,38 @@ public function get_legacy_template_id( $type ) {
 			return '';
 		}
 
+		/**
+		 * Set default target rules for header, footer, before footers being used before target rules were added to the plugin.
+		 *
+		 * @since 1.2.0-beta.1
+		 * @return void
+		 */
+		private function setup_default_terget_rules(): void {
+			$default_include_locations = [
+				'rule'     => [ 0 => 'basic-global' ],
+				'specific' => [],
+			];
+
+			$header_id        = $this->get_legacy_template_id( 'type_header' );
+			$footer_id        = $this->get_legacy_template_id( 'type_footer' );
+			$before_footer_id = $this->get_legacy_template_id( 'type_before_footer' );
+
+			// Header.
+			if ( ! empty( $header_id ) ) {
+				update_post_meta( $header_id, 'ehf_target_include_locations', $default_include_locations );
+			}
+
+			// Footer.
+			if ( ! empty( $footer_id ) ) {
+				update_post_meta( $footer_id, 'ehf_target_include_locations', $default_include_locations );
+			}
+
+			// Before Footer.
+			if ( ! empty( $before_footer_id ) ) {
+				update_post_meta( $before_footer_id, 'ehf_target_include_locations', $default_include_locations );
+			}
+		}
+
 		/**
 		 * Check if db upgrade is required.
 		 *
@@ -154,7 +153,7 @@ public function get_legacy_template_id( $type ) {
 		private function needs_db_update() {
 			$db_version = get_option( $this->db_option_key, false );
 
-			if ( false === $db_version || version_compare( $db_version, HFE_VER ) ) {
+			if ( $db_version === false || version_compare( $db_version, HFE_VER ) ) {
 				return true;
 			}
 
@@ -167,7 +166,7 @@ private function needs_db_update() {
 		 * @since 1.1.4
 		 * @return void
 		 */
-		private function update_db_version() {
+		private function update_db_version(): void {
 			update_option( $this->db_option_key, HFE_VER );
 		}
 	}
diff --git a/inc/compatibility/class-hfe-wpml-compatibility.php b/inc/compatibility/class-hfe-wpml-compatibility.php
index 011c00bd2..69af4721c 100644
--- a/inc/compatibility/class-hfe-wpml-compatibility.php
+++ b/inc/compatibility/class-hfe-wpml-compatibility.php
@@ -15,7 +15,6 @@
  * Set up WPML Compatibiblity Class.
  */
 class HFE_WPML_Compatibility {
-
 	/**
 	 * Instance of HFE_WPML_Compatibility.
 	 *
@@ -24,6 +23,18 @@ class HFE_WPML_Compatibility {
 	 */
 	private static $_instance = null;
 
+	/**
+	 * Setup actions and filters.
+	 *
+	 * @since  1.0.9
+	 */
+	private function __construct() {
+		add_filter( 'hfe_get_settings_type_header', [ $this, 'get_wpml_object' ] );
+		add_filter( 'hfe_get_settings_type_footer', [ $this, 'get_wpml_object' ] );
+		add_filter( 'hfe_get_settings_type_before_footer', [ $this, 'get_wpml_object' ] );
+		add_filter( 'hfe_render_template_id', [ $this, 'get_wpml_object' ] );
+	}
+
 	/**
 	 * Get instance of HFE_WPML_Compatibility
 	 *
@@ -38,18 +49,6 @@ public static function instance() {
 		return self::$_instance;
 	}
 
-	/**
-	 * Setup actions and filters.
-	 *
-	 * @since  1.0.9
-	 */
-	private function __construct() {
-		add_filter( 'hfe_get_settings_type_header', [ $this, 'get_wpml_object' ] );
-		add_filter( 'hfe_get_settings_type_footer', [ $this, 'get_wpml_object' ] );
-		add_filter( 'hfe_get_settings_type_before_footer', [ $this, 'get_wpml_object' ] );
-		add_filter( 'hfe_render_template_id', [ $this, 'get_wpml_object' ] );
-	}
-
 	/**
 	 * Pass the final header and footer ID from the WPML's object filter to allow strings to be translated.
 	 *
@@ -62,18 +61,18 @@ public function get_wpml_object( $id ) {
 
 		if ( defined( 'POLYLANG_BASENAME' ) ) {
 
-			if ( null === $translated_id ) {
+			if ( $translated_id === null ) {
 
 				// The current language is not defined yet or translation is not available.
 				return $id;
-			} else {
+			}
 
 				// Return translated post ID.
 				return $translated_id;
-			}
+
 		}
 
-		if ( null === $translated_id ) {
+		if ( $translated_id === null ) {
 			$translated_id = '';
 		}
 
diff --git a/inc/hfe-functions.php b/inc/hfe-functions.php
index f985ef096..248479b03 100644
--- a/inc/hfe-functions.php
+++ b/inc/hfe-functions.php
@@ -15,7 +15,7 @@ function hfe_header_enabled() {
 	$header_id = Header_Footer_Elementor::get_settings( 'type_header', '' );
 	$status    = false;
 
-	if ( '' !== $header_id ) {
+	if ( $header_id !== '' ) {
 		$status = true;
 	}
 
@@ -32,7 +32,7 @@ function hfe_footer_enabled() {
 	$footer_id = Header_Footer_Elementor::get_settings( 'type_footer', '' );
 	$status    = false;
 
-	if ( '' !== $footer_id ) {
+	if ( $footer_id !== '' ) {
 		$status = true;
 	}
 
@@ -43,12 +43,12 @@ function hfe_footer_enabled() {
  * Get HFE Header ID
  *
  * @since  1.0.2
- * @return (String|boolean) header id if it is set else returns false.
+ * @return (String|bool) header id if it is set else returns false.
  */
 function get_hfe_header_id() {
 	$header_id = Header_Footer_Elementor::get_settings( 'type_header', '' );
 
-	if ( '' === $header_id ) {
+	if ( $header_id === '' ) {
 		$header_id = false;
 	}
 
@@ -59,12 +59,12 @@ function get_hfe_header_id() {
  * Get HFE Footer ID
  *
  * @since  1.0.2
- * @return (String|boolean) header id if it is set else returns false.
+ * @return (String|bool) header id if it is set else returns false.
  */
 function get_hfe_footer_id() {
 	$footer_id = Header_Footer_Elementor::get_settings( 'type_footer', '' );
 
-	if ( '' === $footer_id ) {
+	if ( $footer_id === '' ) {
 		$footer_id = false;
 	}
 
@@ -77,9 +77,9 @@ function get_hfe_footer_id() {
  * @since  1.0.2
  * @return void
  */
-function hfe_render_header() {
+function hfe_render_header(): void {
 
-	if ( false === apply_filters( 'enable_hfe_render_header', true ) ) {
+	if ( apply_filters( 'enable_hfe_render_header', true ) === false ) {
 		return;
 	}
 
@@ -98,9 +98,9 @@ function hfe_render_header() {
  * @since  1.0.2
  * @return void
  */
-function hfe_render_footer() {
+function hfe_render_footer(): void {
 
-	if ( false === apply_filters( 'enable_hfe_render_footer', true ) ) {
+	if ( apply_filters( 'enable_hfe_render_footer', true ) === false ) {
 		return;
 	}
 
@@ -111,18 +111,17 @@ function hfe_render_footer() {
 	<?php
 }
 
-
 /**
  * Get HFE Before Footer ID
  *
  * @since  1.0.2
- * @return String|boolean before footer id if it is set else returns false.
+ * @return String|bool before footer id if it is set else returns false.
  */
 function hfe_get_before_footer_id() {
 
 	$before_footer_id = Header_Footer_Elementor::get_settings( 'type_before_footer', '' );
 
-	if ( '' === $before_footer_id ) {
+	if ( $before_footer_id === '' ) {
 		$before_footer_id = false;
 	}
 
@@ -140,7 +139,7 @@ function hfe_is_before_footer_enabled() {
 	$before_footer_id = Header_Footer_Elementor::get_settings( 'type_before_footer', '' );
 	$status           = false;
 
-	if ( '' !== $before_footer_id ) {
+	if ( $before_footer_id !== '' ) {
 		$status = true;
 	}
 
@@ -153,9 +152,9 @@ function hfe_is_before_footer_enabled() {
  * @since  1.0.2
  * @return void
  */
-function hfe_render_before_footer() {
+function hfe_render_before_footer(): void {
 
-	if ( false === apply_filters( 'enable_hfe_render_before_footer', true ) ) {
+	if ( apply_filters( 'enable_hfe_render_before_footer', true ) === false ) {
 		return;
 	}
 
diff --git a/inc/lib/astra-notices/class-astra-notices.php b/inc/lib/astra-notices/class-astra-notices.php
index edc05a9fd..54137ae39 100644
--- a/inc/lib/astra-notices/class-astra-notices.php
+++ b/inc/lib/astra-notices/class-astra-notices.php
@@ -12,7 +12,7 @@
 	exit; // Exit if accessed directly.
 }
 
-if ( ! class_exists( 'Astra_Notices' ) ) :
+if ( ! class_exists( 'Astra_Notices' ) ) {
 
 	/**
 	 * Astra_Notices
@@ -20,7 +20,6 @@
 	 * @since 1.0.0
 	 */
 	class Astra_Notices {
-
 		/**
 		 * Notices
 		 *
@@ -37,7 +36,7 @@ class Astra_Notices {
 		 * @var array Notices.
 		 * @since 1.0.0
 		 */
-		private static $notices = array();
+		private static $notices = [];
 
 		/**
 		 * Instance
@@ -48,6 +47,18 @@ class Astra_Notices {
 		 */
 		private static $instance;
 
+		/**
+		 * Constructor
+		 *
+		 * @since 1.0.0
+		 */
+		public function __construct() {
+			add_action( 'admin_notices', [ $this, 'show_notices' ], 30 );
+			add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
+			add_action( 'wp_ajax_astra-notice-dismiss', [ $this, 'dismiss_notice' ] );
+			add_filter( 'wp_kses_allowed_html', [ $this, 'add_data_attributes' ], 10, 2 );
+		}
+
 		/**
 		 * Initiator
 		 *
@@ -61,18 +72,6 @@ public static function get_instance() {
 			return self::$instance;
 		}
 
-		/**
-		 * Constructor
-		 *
-		 * @since 1.0.0
-		 */
-		public function __construct() {
-			add_action( 'admin_notices', array( $this, 'show_notices' ), 30 );
-			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-			add_action( 'wp_ajax_astra-notice-dismiss', array( $this, 'dismiss_notice' ) );
-			add_filter( 'wp_kses_allowed_html', array( $this, 'add_data_attributes' ), 10, 2 );
-		}
-
 		/**
 		 * Filters and Returns a list of allowed tags and attributes for a given context.
 		 *
@@ -94,7 +93,7 @@ public function add_data_attributes( $allowedposttags, $context ) {
 		 * @param array $args Notice arguments.
 		 * @return void
 		 */
-		public static function add_notice( $args = array() ) {
+		public static function add_notice( $args = [] ): void {
 			self::$notices[] = $args;
 		}
 
@@ -104,18 +103,18 @@ public static function add_notice( $args = array() ) {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function dismiss_notice() {
-			$notice_id           = ( isset( $_POST['notice_id'] ) ) ? sanitize_key( $_POST['notice_id'] ) : '';
-			$repeat_notice_after = ( isset( $_POST['repeat_notice_after'] ) ) ? absint( $_POST['repeat_notice_after'] ) : '';
-			$nonce               = ( isset( $_POST['nonce'] ) ) ? sanitize_key( $_POST['nonce'] ) : '';
+		public function dismiss_notice(): void {
+			$notice_id           = isset( $_POST['notice_id'] ) ? sanitize_key( $_POST['notice_id'] ) : '';
+			$repeat_notice_after = isset( $_POST['repeat_notice_after'] ) ? absint( $_POST['repeat_notice_after'] ) : '';
+			$nonce               = isset( $_POST['nonce'] ) ? sanitize_key( $_POST['nonce'] ) : '';
 			$notice              = $this->get_notice_by_id( $notice_id );
-			$capability          = isset( $notice['capability'] ) ? $notice['capability'] : 'manage_options';
+			$capability          = $notice['capability'] ?? 'manage_options';
 
 			if ( ! apply_filters( 'astra_notices_user_cap_check', current_user_can( $capability ) ) ) {
 				return;
 			}
 
-			if ( false === wp_verify_nonce( $nonce, 'astra-notices' ) ) {
+			if ( wp_verify_nonce( $nonce, 'astra-notices' ) === false ) {
 				wp_send_json_error( esc_html_e( 'WordPress Nonce not validated.' ) );
 			}
 
@@ -140,15 +139,15 @@ public function dismiss_notice() {
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function enqueue_scripts() {
-			wp_register_style( 'astra-notices', self::get_url() . 'notices.css', array(), self::$version );
-			wp_register_script( 'astra-notices', self::get_url() . 'notices.js', array( 'jquery' ), self::$version, true );
+		public function enqueue_scripts(): void {
+			wp_register_style( 'astra-notices', self::get_url() . 'notices.css', [], self::$version );
+			wp_register_script( 'astra-notices', self::get_url() . 'notices.js', [ 'jquery' ], self::$version, true );
 			wp_localize_script(
 				'astra-notices',
 				'astraNotices',
-				array(
+				[
 					'_notice_nonce' => wp_create_nonce( 'astra-notices' ),
-				)
+				]
 			);
 		}
 
@@ -172,49 +171,14 @@ public function sort_notices( $notice_1, $notice_2 ) {
 			return $notice_1['priority'] - $notice_2['priority'];
 		}
 
-		/**
-		 * Get all registered notices.
-		 * Since v1.1.8 it is recommended to register the notices on
-		 *
-		 * @return array|null
-		 */
-		private function get_notices() {
-			usort( self::$notices, array( $this, 'sort_notices' ) );
-
-			return self::$notices;
-		}
-
-		/**
-		 * Get notice by notice_id
-		 *
-		 * @param string $notice_id Notice id.
-		 *
-		 * @return array notice based on the notice id.
-		 */
-		private function get_notice_by_id( $notice_id ) {
-			if ( empty( $notice_id ) ) {
-				return array();
-			}
-
-			$notices = $this->get_notices();
-			$notice  = wp_list_filter(
-				$notices,
-				array(
-					'id' => $notice_id,
-				)
-			);
-
-			return ! empty( $notice ) ? $notice[0] : array();
-		}
-
 		/**
 		 * Display the notices in the WordPress admin.
 		 *
 		 * @since 1.0.0
 		 * @return void
 		 */
-		public function show_notices() {
-			$defaults = array(
+		public function show_notices(): void {
+			$defaults = [
 				'id'                         => '',      // Optional, Notice ID. If empty it set `astra-notices-id-<$array-index>`.
 				'type'                       => 'info',  // Optional, Notice type. Default `info`. Expected [info, warning, notice, error].
 				'message'                    => '',      // Optional, Message.
@@ -226,7 +190,7 @@ public function show_notices() {
 				'display-with-other-notices' => true,    // Should the notice be displayed if other notices  are being displayed from Astra_Notices.
 				'is_dismissible'             => true,
 				'capability'                 => 'manage_options', // User capability - This capability is required for the current user to see this notice.
-			);
+			];
 
 			// Count for the notices that are rendered.
 			$notices_displayed = 0;
@@ -244,10 +208,10 @@ public function show_notices() {
 				$notice['classes'] = self::get_wrap_classes( $notice );
 
 				// Notices visible after transient expire.
-				if ( isset( $notice['show_if'] ) && true === $notice['show_if'] ) {
+				if ( isset( $notice['show_if'] ) && $notice['show_if'] === true ) {
 
 					// don't display the notice if it is not supposed to be displayed with other notices.
-					if ( 0 !== $notices_displayed && false === $notice['display-with-other-notices'] ) {
+					if ( $notices_displayed !== 0 && $notice['display-with-other-notices'] === false ) {
 						continue;
 					}
 
@@ -258,7 +222,6 @@ public function show_notices() {
 					}
 				}
 			}
-
 		}
 
 		/**
@@ -268,7 +231,7 @@ public function show_notices() {
 		 * @param  array $notice Notice markup.
 		 * @return void
 		 */
-		public static function markup( $notice = array() ) {
+		public static function markup( $notice = [] ): void {
 			wp_enqueue_script( 'astra-notices' );
 			wp_enqueue_style( 'astra-notices' );
 
@@ -290,6 +253,57 @@ public static function markup( $notice = array() ) {
 			do_action( 'astra_notice_after_markup' );
 		}
 
+		/**
+		 * Get base URL for the astra-notices.
+		 *
+		 * @return mixed URL.
+		 */
+		public static function get_url() {
+			$path      = wp_normalize_path( dirname( __FILE__ ) );
+			$theme_dir = wp_normalize_path( get_template_directory() );
+
+			if ( strpos( $path, $theme_dir ) !== false ) {
+				return trailingslashit( get_template_directory_uri() . str_replace( $theme_dir, '', $path ) );
+			}
+				return plugin_dir_url( __FILE__ );
+
+		}
+
+		/**
+		 * Get all registered notices.
+		 * Since v1.1.8 it is recommended to register the notices on
+		 *
+		 * @return array|null
+		 */
+		private function get_notices() {
+			usort( self::$notices, [ $this, 'sort_notices' ] );
+
+			return self::$notices;
+		}
+
+		/**
+		 * Get notice by notice_id
+		 *
+		 * @param string $notice_id Notice id.
+		 *
+		 * @return array notice based on the notice id.
+		 */
+		private function get_notice_by_id( $notice_id ) {
+			if ( empty( $notice_id ) ) {
+				return [];
+			}
+
+			$notices = $this->get_notices();
+			$notice  = wp_list_filter(
+				$notices,
+				[
+					'id' => $notice_id,
+				]
+			);
+
+			return ! empty( $notice ) ? $notice[0] : [];
+		}
+
 		/**
 		 * Get wrapper classes for a notice.
 		 *
@@ -299,14 +313,14 @@ public static function markup( $notice = array() ) {
 		 * @return array       Notice wrapper classes.
 		 */
 		private static function get_wrap_classes( $notice ) {
-			$classes = array( 'astra-notice', 'notice' );
+			$classes = [ 'astra-notice', 'notice' ];
 
 			if ( $notice['is_dismissible'] ) {
 				$classes[] = 'is-dismissible';
 			}
 
 			$classes[] = $notice['class'];
-			if ( isset( $notice['type'] ) && '' !== $notice['type'] ) {
+			if ( isset( $notice['type'] ) && $notice['type'] !== '' ) {
 				$classes[] = 'notice-' . $notice['type'];
 			}
 
@@ -336,17 +350,17 @@ private static function get_notice_id( $notice, $key ) {
 		 * @since 1.0.0
 		 *
 		 * @param  array $notice Notice arguments.
-		 * @return boolean
+		 * @return bool
 		 */
 		private static function is_expired( $notice ) {
 			$transient_status = get_transient( $notice['id'] );
 
-			if ( false === $transient_status ) {
+			if ( $transient_status === false ) {
 
-				if ( isset( $notice['display-notice-after'] ) && false !== $notice['display-notice-after'] ) {
+				if ( isset( $notice['display-notice-after'] ) && $notice['display-notice-after'] !== false ) {
 
-					if ( 'delayed-notice' !== get_user_meta( get_current_user_id(), $notice['id'], true ) &&
-						'notice-dismissed' !== get_user_meta( get_current_user_id(), $notice['id'], true ) ) {
+					if ( get_user_meta( get_current_user_id(), $notice['id'], true ) !== 'delayed-notice' &&
+						get_user_meta( get_current_user_id(), $notice['id'], true ) !== 'notice-dismissed' ) {
 						set_transient( $notice['id'], 'delayed-notice', $notice['display-notice-after'] );
 						update_user_meta( get_current_user_id(), $notice['id'], 'delayed-notice' );
 
@@ -357,7 +371,7 @@ private static function is_expired( $notice ) {
 				// Check the user meta status if current notice is dismissed or delay completed.
 				$meta_status = get_user_meta( get_current_user_id(), $notice['id'], true );
 
-				if ( empty( $meta_status ) || 'delayed-notice' === $meta_status ) {
+				if ( empty( $meta_status ) || $meta_status === 'delayed-notice' ) {
 					return true;
 				}
 			}
@@ -365,22 +379,6 @@ private static function is_expired( $notice ) {
 			return false;
 		}
 
-		/**
-		 * Get base URL for the astra-notices.
-		 *
-		 * @return mixed URL.
-		 */
-		public static function get_url() {
-			$path      = wp_normalize_path( dirname( __FILE__ ) );
-			$theme_dir = wp_normalize_path( get_template_directory() );
-
-			if ( strpos( $path, $theme_dir ) !== false ) {
-				return trailingslashit( get_template_directory_uri() . str_replace( $theme_dir, '', $path ) );
-			} else {
-				return plugin_dir_url( __FILE__ );
-			}
-		}
-
 	}
 
 	/**
@@ -388,4 +386,4 @@ public static function get_url() {
 	 */
 	Astra_Notices::get_instance();
 
-endif;
+}
diff --git a/inc/lib/class-hfe-utm-analytics.php b/inc/lib/class-hfe-utm-analytics.php
index c6ea86e31..e62be41f1 100644
--- a/inc/lib/class-hfe-utm-analytics.php
+++ b/inc/lib/class-hfe-utm-analytics.php
@@ -8,18 +8,16 @@
  * @package UTM Analytics
  */
 
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-if ( ! class_exists( 'HFE_Utm_Analytics' ) ) :
+if ( ! class_exists( 'HFE_Utm_Analytics' ) ) {
 
 	/**
 	 * Admin
 	 */
 	class HFE_Utm_Analytics {
-
 		/**
 		 * Instance
 		 *
@@ -28,6 +26,16 @@ class HFE_Utm_Analytics {
 		 */
 		private static $instance = null;
 
+		/**
+		 * Constructor.
+		 *
+		 * @since 1.0.0
+		 */
+		private function __construct() {
+			$this->version_check();
+			add_action( 'init', [ $this, 'load' ], 999 );
+		}
+
 		/**
 		 * Get Instance
 		 *
@@ -43,22 +51,12 @@ public static function get_instance() {
 			return self::$instance;
 		}
 
-		/**
-		 * Constructor.
-		 *
-		 * @since 1.0.0
-		 */
-		private function __construct() {
-			$this->version_check();
-			add_action( 'init', [ $this, 'load' ], 999 );
-		}
-
 		/**
 		 * Version Check
 		 *
 		 * @return void
 		 */
-		public function version_check() {
+		public function version_check(): void {
 
 			$file = realpath( dirname( __FILE__ ) . '/utm-analytics/version.json' );
 
@@ -69,9 +67,9 @@ public function version_check() {
 				// @codingStandardsIgnoreEnd
 				global $utm_analytics_version, $utm_analytics_init;
 				$path = realpath( dirname( __FILE__ ) . '/utm-analytics/bsf-utm-analytics.php' );
-				$version = isset( $file_data['bsf-utm-analytics'] ) ? $file_data['bsf-utm-analytics'] : 0;
+				$version = $file_data['bsf-utm-analytics'] ?? 0;
 
-				if ( null === $utm_analytics_version ) {
+				if ( $utm_analytics_version === null ) {
 					$utm_analytics_version = '0.0.1';
 				}
 
@@ -88,7 +86,7 @@ public function version_check() {
 		 *
 		 * @return void
 		 */
-		public function load() {
+		public function load(): void {
 
 			global $utm_analytics_version, $utm_analytics_init;
 			if ( is_file( realpath( $utm_analytics_init ) ) ) {
@@ -99,4 +97,4 @@ public function load() {
 
 	HFE_Utm_Analytics::get_instance();
 
-endif;
\ No newline at end of file
+}
diff --git a/inc/lib/class-uae-nps-survey.php b/inc/lib/class-uae-nps-survey.php
index 601997ed1..63d53c67f 100644
--- a/inc/lib/class-uae-nps-survey.php
+++ b/inc/lib/class-uae-nps-survey.php
@@ -9,7 +9,7 @@
 	exit;
 }
 
-if ( ! class_exists( 'Uae_Nps_Survey' ) ) :
+if ( ! class_exists( 'Uae_Nps_Survey' ) ) {
 
 	/**
 	 * Admin
@@ -23,6 +23,16 @@ class Uae_Nps_Survey {
 		 */
 		private static $instance = null;
 
+		/**
+		 * Constructor.
+		 *
+		 * @since 1.0.0
+		 */
+		private function __construct() {
+			$this->version_check();
+			add_action( 'init', [ $this, 'load' ], 999 );
+		}
+
 		/**
 		 * Get Instance
 		 *
@@ -38,37 +48,27 @@ public static function get_instance() {
 			return self::$instance;
 		}
 
-		/**
-		 * Constructor.
-		 *
-		 * @since 1.0.0
-		 */
-		private function __construct() {
-			$this->version_check();
-			add_action( 'init', array( $this, 'load' ), 999 );
-		}
-
 		/**
 		 * Version Check
 		 *
 		 * @return void
 		 */
-		public function version_check() {
+		public function version_check(): void {
 
 			$file = realpath( dirname( __FILE__ ) . '/nps-survey/version.json' );
 
 			// Is file exist?
 			if ( is_file( $file ) ) {
-				
+
 				$file_data = json_decode( file_get_contents( $file ), true ); //phpcs:ignore WordPressVIPMinimum.Performance.FetchingRemoteData.FileGetContentsUnknown
-				
+
 				global $nps_survey_version, $nps_survey_init;
-				
+
 				$path = realpath( dirname( __FILE__ ) . '/nps-survey/nps-survey.php' );
-				
-				$version = isset( $file_data['nps-survey'] ) ? $file_data['nps-survey'] : 0;
 
-				if ( null === $nps_survey_version ) {
+				$version = $file_data['nps-survey'] ?? 0;
+
+				if ( $nps_survey_version === null ) {
 					$nps_survey_version = '1.0.0';
 				}
 
@@ -85,7 +85,7 @@ public function version_check() {
 		 *
 		 * @return void
 		 */
-		public function load() {
+		public function load(): void {
 
 			global $nps_survey_version, $nps_survey_init;
 			if ( is_file( realpath( $nps_survey_init ) ) ) {
@@ -99,4 +99,4 @@ public function load() {
 	 */
 	Uae_Nps_Survey::get_instance();
 
-endif;
+}
diff --git a/inc/lib/nps-survey/classes/nps-survey-script.php b/inc/lib/nps-survey/classes/nps-survey-script.php
index f7743f7f5..564da9940 100644
--- a/inc/lib/nps-survey/classes/nps-survey-script.php
+++ b/inc/lib/nps-survey/classes/nps-survey-script.php
@@ -25,7 +25,7 @@ class Nps_Survey {
 	 * @since 1.0.0
 	 */
 	public function __construct() {
-		add_action( 'rest_api_init', array( $this, 'register_route' ) );
+		add_action( 'rest_api_init', [ $this, 'register_route' ] );
 	}
 
 	/**
@@ -35,7 +35,7 @@ public function __construct() {
 	 * @return object initialized object of class.
 	 */
 	public static function get_instance() {
-		if ( null === self::$instance ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;
@@ -87,14 +87,14 @@ public static function show_nps_notice( string $id, array $vars = [] ): void {
 	 */
 	public static function google_fonts_url() {
 
-		$font_families = array(
+		$font_families = [
 			'Figtree:400,500,600,700',
-		);
+		];
 
-		$query_args = array(
+		$query_args = [
 			'family' => rawurlencode( implode( '|', $font_families ) ),
 			'subset' => rawurlencode( 'latin,latin-ext' ),
-		);
+		];
 
 		return add_query_arg( $query_args, '//fonts.googleapis.com/css' );
 	}
@@ -129,12 +129,12 @@ public static function editor_load_scripts( $show_on_screens ): void {
 
 		$script_info = file_exists( $script_asset_path )
 			? include $script_asset_path
-			: array(
-				'dependencies' => array(),
+			: [
+				'dependencies' => [],
 				'version'      => NPS_SURVEY_VER,
-			);
+			];
 
-		$script_dep = array_merge( $script_info['dependencies'], array( 'jquery' ) );
+		$script_dep = array_merge( $script_info['dependencies'], [ 'jquery' ] );
 
 		wp_enqueue_script(
 			$handle,
@@ -160,9 +160,9 @@ public static function editor_load_scripts( $show_on_screens ): void {
 			$data
 		);
 
-		wp_enqueue_style( 'nps-survey-style', $build_url . '/style-main.css', array(), NPS_SURVEY_VER );
+		wp_enqueue_style( 'nps-survey-style', $build_url . '/style-main.css', [], NPS_SURVEY_VER );
 		wp_style_add_data( 'nps-survey-style', 'rtl', 'replace' );
-		wp_enqueue_style( 'nps-survey-google-fonts', self::google_fonts_url(), array(), 'all' );
+		wp_enqueue_style( 'nps-survey-google-fonts', self::google_fonts_url(), [], 'all' );
 	}
 
 	/**
@@ -176,27 +176,27 @@ public static function register_route(): void {
 		register_rest_route(
 			self::get_api_namespace(),
 			'/rating/',
-			array(
-				array(
+			[
+				[
 					'methods'             => \WP_REST_Server::CREATABLE,
-					'callback'            => array( self::class, 'submit_rating' ),
-					'permission_callback' => array( self::class, 'get_item_permissions_check' ),
-					'args'                => array(),
-				),
-			)
+					'callback'            => [ self::class, 'submit_rating' ],
+					'permission_callback' => [ self::class, 'get_item_permissions_check' ],
+					'args'                => [],
+				],
+			]
 		);
 
 		register_rest_route(
 			self::get_api_namespace(),
 			'/dismiss-nps-survey/',
-			array(
-				array(
+			[
+				[
 					'methods'             => \WP_REST_Server::CREATABLE,
-					'callback'            => array( self::class, 'dismiss_nps_survey_panel' ),
-					'permission_callback' => array( self::class, 'get_item_permissions_check' ),
-					'args'                => array(),
-				),
-			)
+					'callback'            => [ self::class, 'dismiss_nps_survey_panel' ],
+					'permission_callback' => [ self::class, 'get_item_permissions_check' ],
+					'args'                => [],
+				],
+			]
 		);
 	}
 
@@ -228,10 +228,10 @@ public static function get_api_namespace() {
 	 * @return array<string, string>
 	 */
 	public static function get_api_headers() {
-		return array(
+		return [
 			'Content-Type' => 'application/json',
 			'Accept'       => 'application/json',
-		);
+		];
 	}
 
 	/**
@@ -246,7 +246,7 @@ public static function get_item_permissions_check( $request ) {
 			return new \WP_Error(
 				'gt_rest_cannot_access',
 				__( 'Sorry, you are not allowed to do that.', 'nps-survey' ),
-				array( 'status' => rest_authorization_required_code() )
+				[ 'status' => rest_authorization_required_code() ]
 			);
 		}
 		return true;
@@ -259,18 +259,18 @@ public static function get_item_permissions_check( $request ) {
 	 * @return void
 	 * @phpstan-ignore-next-line
 	 */
-	public static function submit_rating( $request ) {
+	public static function submit_rating( $request ): void {
 
 		$nonce = $request->get_header( 'X-WP-Nonce' );
 
 		// Verify the nonce.
 		if ( ! wp_verify_nonce( sanitize_text_field( (string) $nonce ), 'wp_rest' ) ) {
 			wp_send_json_error(
-				array(
+				[
 					'data'   => __( 'Nonce verification failed.', 'nps-survey' ),
 					'status' => false,
 
-				)
+				]
 			);
 		}
 
@@ -285,7 +285,7 @@ public static function submit_rating( $request ) {
 		 */
 		$post_data = apply_filters(
 			'nps_survey_post_data',
-			array(
+			[
 				'rating'      => ! empty( $request['rating'] ) ? sanitize_text_field( strval( $request['rating'] ) ) : '',
 				'comment'     => ! empty( $request['comment'] ) ? sanitize_text_field( strval( $request['comment'] ) ) : '',
 				'email'       => $current_user->user_email,
@@ -293,7 +293,7 @@ public static function submit_rating( $request ) {
 				'last_name'   => $current_user->last_name ?? '',
 				'source'      => ! empty( $request['plugin_slug'] ) ? sanitize_text_field( strval( $request['plugin_slug'] ) ) : '',
 				'plugin_slug' => ! empty( $request['plugin_slug'] ) ? sanitize_text_field( strval( $request['plugin_slug'] ) ) : '',
-			)
+			]
 		);
 
 		/**
@@ -311,49 +311,49 @@ public static function submit_rating( $request ) {
 		);
 
 		$post_data_in_json = wp_json_encode( $post_data );
-		$request_args      = array(
+		$request_args      = [
 			'body'    => $post_data_in_json ? $post_data_in_json : '',
 			'headers' => self::get_api_headers(),
 			'timeout' => 60,
-		);
+		];
 
 		$response = wp_safe_remote_post( $api_endpoint, $request_args );
 
 		if ( is_wp_error( $response ) ) {
 			// There was an error in the request.
 			wp_send_json_error(
-				array(
+				[
 					'data'   => 'Failed ' . $response->get_error_message(),
 					'status' => false,
 
-				)
+				]
 			);
 		}
 
 		$response_code = wp_remote_retrieve_response_code( $response );
 
-		if ( 200 === $response_code ) {
+		if ( $response_code === 200 ) {
 
-			$nps_form_status = array(
+			$nps_form_status = [
 				'dismiss_count'       => 0,
 				'dismiss_permanently' => true,
 				'dismiss_step'        => '',
-			);
+			];
 
 			update_option( self::get_nps_id( strval( $request['plugin_slug'] ) ), $nps_form_status, false );
 
 			wp_send_json_success(
-				array(
+				[
 					'status' => true,
-				)
+				]
 			);
 
 		} else {
 			wp_send_json_error(
-				array(
+				[
 					'status' => false,
 
-				)
+				]
 			);
 		}
 	}
@@ -365,18 +365,18 @@ public static function submit_rating( $request ) {
 	 * @return void
 	 * @phpstan-ignore-next-line
 	 */
-	public static function dismiss_nps_survey_panel( $request ) {
+	public static function dismiss_nps_survey_panel( $request ): void {
 
 		$nonce = $request->get_header( 'X-WP-Nonce' );
 
 		// Verify the nonce.
 		if ( ! wp_verify_nonce( sanitize_text_field( (string) $nonce ), 'wp_rest' ) ) {
 			wp_send_json_error(
-				array(
+				[
 					'data'   => __( 'Nonce verification failed.', 'nps-survey' ),
 					'status' => false,
 
-				)
+				]
 			);
 		}
 
@@ -400,9 +400,9 @@ public static function dismiss_nps_survey_panel( $request ) {
 		update_option( self::get_nps_id( strval( $request['plugin_slug'] ) ), $nps_form_status );
 
 		wp_send_json_success(
-			array(
+			[
 				'status' => true,
-			)
+			]
 		);
 	}
 
@@ -416,28 +416,28 @@ public static function get_nps_survey_dismiss_status( string $plugin_slug ) {
 
 		$default_status = get_option(
 			self::get_nps_id( $plugin_slug ),
-			array(
+			[
 				'dismiss_count'       => 0,
 				'dismiss_permanently' => false,
 				'dismiss_step'        => '',
 				'dismiss_time'        => '',
 				'dismiss_timespan'    => null,
 				'first_render_time'   => null,
-			)
+			]
 		);
 
 		if ( ! is_array( $default_status ) ) {
-			return array();
+			return [];
 		}
 
-		return array(
+		return [
 			'dismiss_count'       => ! empty( $default_status['dismiss_count'] ) ? $default_status['dismiss_count'] : 0,
 			'dismiss_permanently' => ! empty( $default_status['dismiss_permanently'] ) ? $default_status['dismiss_permanently'] : false,
 			'dismiss_step'        => ! empty( $default_status['dismiss_step'] ) ? $default_status['dismiss_step'] : '',
 			'dismiss_time'        => ! empty( $default_status['dismiss_time'] ) ? $default_status['dismiss_time'] : '',
 			'dismiss_timespan'    => ! empty( $default_status['dismiss_timespan'] ) ? $default_status['dismiss_timespan'] : null,
 			'first_render_time'   => ! empty( $default_status['first_render_time'] ) ? $default_status['first_render_time'] : null,
-		);
+		];
 	}
 
 	/**
@@ -458,8 +458,8 @@ public static function is_show_nps_survey_form( string $plugin_slug, int $displa
 
 		$first_render_time = $status['first_render_time'];
 
-		if ( 0 !== $display_after ) {
-			if ( null === $first_render_time ) {
+		if ( $display_after !== 0 ) {
+			if ( $first_render_time === null ) {
 				$status['first_render_time'] = $current_time;
 				update_option( self::get_nps_id( $plugin_slug ), $status );
 				$status = self::get_nps_survey_dismiss_status( $plugin_slug );
diff --git a/inc/lib/nps-survey/dist/main.asset.php b/inc/lib/nps-survey/dist/main.asset.php
index 5d60f8003..1072f581f 100644
--- a/inc/lib/nps-survey/dist/main.asset.php
+++ b/inc/lib/nps-survey/dist/main.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-element', 'wp-i18n'), 'version' => '098e9bb53b4690172575');
+<?php return ['dependencies' => ['react', 'wp-api-fetch', 'wp-element', 'wp-i18n'], 'version' => '098e9bb53b4690172575'];
diff --git a/inc/lib/nps-survey/nps-survey-plugin-loader.php b/inc/lib/nps-survey/nps-survey-plugin-loader.php
index e40825bac..d5e707c70 100644
--- a/inc/lib/nps-survey/nps-survey-plugin-loader.php
+++ b/inc/lib/nps-survey/nps-survey-plugin-loader.php
@@ -43,7 +43,7 @@ public function __construct() {
 		 * @return object initialized object of class.
 		 */
 		public static function get_instance() {
-			if ( null === self::$instance ) {
+			if ( self::$instance === null ) {
 				self::$instance = new self();
 			}
 			return self::$instance;
@@ -56,7 +56,7 @@ public static function get_instance() {
 		 * @return void
 		 */
 		public function autoload( $class ): void {
-			if ( 0 !== strpos( $class, __NAMESPACE__ ) ) {
+			if ( strpos( $class, __NAMESPACE__ ) !== 0 ) {
 				return;
 			}
 
diff --git a/inc/lib/target-rule/class-astra-target-rules-fields.php b/inc/lib/target-rule/class-astra-target-rules-fields.php
index cffcc1984..16240d8cf 100644
--- a/inc/lib/target-rule/class-astra-target-rules-fields.php
+++ b/inc/lib/target-rule/class-astra-target-rules-fields.php
@@ -47,7 +47,7 @@ class Astra_Target_Rules_Fields {
 	 *
 	 * @var $current_page_data
 	 */
-	private static $current_page_data = array();
+	private static $current_page_data = [];
 
 	/**
 	 * User Selection Option
@@ -90,8 +90,8 @@ public function __construct() {
 		define( 'AST_TARGET_RULE_VER', '1.0.0' );
 		define( 'AST_TARGET_RULE_DIR', plugin_dir_path( __FILE__ ) );
 
-		add_action( 'admin_action_edit', array( $this, 'initialize_options' ) );
-		add_action( 'wp_ajax_hfe_get_posts_by_query', array( $this, 'hfe_get_posts_by_query' ) );
+		add_action( 'admin_action_edit', [ $this, 'initialize_options' ] );
+		add_action( 'wp_ajax_hfe_get_posts_by_query', [ $this, 'hfe_get_posts_by_query' ] );
 	}
 
 	/**
@@ -110,10 +110,10 @@ public function initialize_options() {
 	 * @return array
 	 */
 	public static function get_location_selections() {
-		$args = array(
+		$args = [
 			'public'   => true,
 			'_builtin' => true,
-		);
+		];
 
 		$post_types = get_post_types( $args, 'objects' );
 		unset( $post_types['attachment'] );
@@ -123,38 +123,38 @@ public static function get_location_selections() {
 
 		$post_types = apply_filters( 'astra_location_rule_post_types', array_merge( $post_types, $custom_post_type ) );
 
-		$special_pages = array(
+		$special_pages = [
 			'special-404'    => __( '404 Page', 'header-footer-elementor' ),
 			'special-search' => __( 'Search Page', 'header-footer-elementor' ),
 			'special-blog'   => __( 'Blog / Posts Page', 'header-footer-elementor' ),
 			'special-front'  => __( 'Front Page', 'header-footer-elementor' ),
 			'special-date'   => __( 'Date Archive', 'header-footer-elementor' ),
 			'special-author' => __( 'Author Archive', 'header-footer-elementor' ),
-		);
+		];
 
 		if ( class_exists( 'WooCommerce' ) ) {
 			$special_pages['special-woo-shop'] = __( 'WooCommerce Shop Page', 'header-footer-elementor' );
 		}
 
-		$selection_options = array(
-			'basic'         => array(
+		$selection_options = [
+			'basic'         => [
 				'label' => __( 'Basic', 'header-footer-elementor' ),
-				'value' => array(
+				'value' => [
 					'basic-global'    => __( 'Entire Website', 'header-footer-elementor' ),
 					'basic-singulars' => __( 'All Singulars', 'header-footer-elementor' ),
 					'basic-archives'  => __( 'All Archives', 'header-footer-elementor' ),
-				),
-			),
+				],
+			],
 
-			'special-pages' => array(
+			'special-pages' => [
 				'label' => __( 'Special Pages', 'header-footer-elementor' ),
 				'value' => $special_pages,
-			),
-		);
+			],
+		];
 
-		$args = array(
+		$args = [
 			'public' => true,
-		);
+		];
 
 		$taxonomies = get_taxonomies( $args, 'objects' );
 
@@ -162,7 +162,7 @@ public static function get_location_selections() {
 			foreach ( $taxonomies as $taxonomy ) {
 
 				// skip post format taxonomy.
-				if ( 'post_format' == $taxonomy->name ) {
+				if ( $taxonomy->name === 'post_format' ) {
 					continue;
 				}
 
@@ -178,21 +178,21 @@ public static function get_location_selections() {
 							}
 						}
 					} else {
-						$selection_options[ $post_opt['post_key'] ] = array(
+						$selection_options[ $post_opt['post_key'] ] = [
 							'label' => $post_opt['label'],
 							'value' => $post_opt['value'],
-						);
+						];
 					}
 				}
 			}
 		}
 
-		$selection_options['specific-target'] = array(
+		$selection_options['specific-target'] = [
 			'label' => __( 'Specific Target', 'header-footer-elementor' ),
-			'value' => array(
+			'value' => [
 				'specifics' => __( 'Specific Pages / Posts / Taxonomies, etc.', 'header-footer-elementor' ),
-			),
-		);
+			],
+		];
 
 		/**
 		 * Filter options displayed in the display conditions select field of Display conditions.
@@ -208,21 +208,21 @@ public static function get_location_selections() {
 	 * @return array
 	 */
 	public static function get_user_selections() {
-		$selection_options = array(
-			'basic'    => array(
+		$selection_options = [
+			'basic'    => [
 				'label' => __( 'Basic', 'header-footer-elementor' ),
-				'value' => array(
+				'value' => [
 					'all'        => __( 'All', 'header-footer-elementor' ),
 					'logged-in'  => __( 'Logged In', 'header-footer-elementor' ),
 					'logged-out' => __( 'Logged Out', 'header-footer-elementor' ),
-				),
-			),
+				],
+			],
 
-			'advanced' => array(
+			'advanced' => [
 				'label' => __( 'Advanced', 'header-footer-elementor' ),
-				'value' => array(),
-			),
-		);
+				'value' => [],
+			],
+		];
 
 		/* User roles */
 		$roles = get_editable_roles();
@@ -309,13 +309,13 @@ function hfe_get_posts_by_query() {
 		check_ajax_referer( 'hfe-get-posts-by-query', 'nonce' );
 
 		$search_string = isset( $_POST['q'] ) ? sanitize_text_field( $_POST['q'] ) : '';
-		$data          = array();
-		$result        = array();
+		$data          = [];
+		$result        = [];
 
-		$args = array(
+		$args = [
 			'public'   => true,
 			'_builtin' => false,
-		);
+		];
 
 		$output     = 'names'; // names or objects, note names is the default.
 		$operator   = 'and'; // also supports 'or'.
@@ -327,46 +327,46 @@ function hfe_get_posts_by_query() {
 		$post_types['Pages'] = 'page';
 
 		foreach ( $post_types as $key => $post_type ) {
-			$data = array();
+			$data = [];
 
-			add_filter( 'posts_search', array( $this, 'search_only_titles' ), 10, 2 );
+			add_filter( 'posts_search', [ $this, 'search_only_titles' ], 10, 2 );
 
 			$query = new \WP_Query(
-				array(
+				[
 					's'              => $search_string,
 					'post_type'      => $post_type,
 					'posts_per_page' => - 1,
-				)
+				]
 			);
 
 			if ( $query->have_posts() ) {
 				while ( $query->have_posts() ) {
 					$query->the_post();
 					$title  = get_the_title();
-					$title .= ( 0 != $query->post->post_parent ) ? ' (' . get_the_title( $query->post->post_parent ) . ')' : '';
+					$title .= $query->post->post_parent !== 0 ? ' (' . get_the_title( $query->post->post_parent ) . ')' : '';
 					$id     = get_the_id();
-					$data[] = array(
+					$data[] = [
 						'id'   => 'post-' . $id,
 						'text' => $title,
-					);
+					];
 				}
 			}
 
 			if ( is_array( $data ) && ! empty( $data ) ) {
-				$result[] = array(
+				$result[] = [
 					'text'     => $key,
 					'children' => $data,
-				);
+				];
 			}
 		}
 
-		$data = array();
+		$data = [];
 
 		wp_reset_postdata();
 
-		$args = array(
+		$args = [
 			'public' => true,
-		);
+		];
 
 		$output     = 'objects'; // names or objects, note names is the default.
 		$operator   = 'and'; // also supports 'or'.
@@ -375,14 +375,14 @@ function hfe_get_posts_by_query() {
 		foreach ( $taxonomies as $taxonomy ) {
 			$terms = get_terms(
 				$taxonomy->name,
-				array(
+				[
 					'orderby'    => 'count',
 					'hide_empty' => 0,
 					'name__like' => $search_string,
-				)
+				]
 			);
 
-			$data = array();
+			$data = [];
 
 			$label = ucwords( $taxonomy->label );
 
@@ -390,23 +390,23 @@ function hfe_get_posts_by_query() {
 				foreach ( $terms as $term ) {
 					$term_taxonomy_name = ucfirst( str_replace( '_', ' ', $taxonomy->name ) );
 
-					$data[] = array(
+					$data[] = [
 						'id'   => 'tax-' . $term->term_id,
 						'text' => $term->name . ' archive page',
-					);
+					];
 
-					$data[] = array(
+					$data[] = [
 						'id'   => 'tax-' . $term->term_id . '-single-' . $taxonomy->name,
 						'text' => 'All singulars from ' . $term->name,
-					);
+					];
 				}
 			}
 
 			if ( is_array( $data ) && ! empty( $data ) ) {
-				$result[] = array(
+				$result[] = [
 					'text'     => $label,
 					'children' => $data,
-				);
+				];
 			}
 		}
 
@@ -430,7 +430,7 @@ function search_only_titles( $search, $wp_query ) {
 			$q = $wp_query->query_vars;
 			$n = ! empty( $q['exact'] ) ? '' : '%';
 
-			$search = array();
+			$search = [];
 
 			foreach ( (array) $q['search_terms'] as $term ) {
 				$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $n . $wpdb->esc_like( $term ) . $n );
@@ -451,12 +451,12 @@ function search_only_titles( $search, $wp_query ) {
 	 * Function Description: admin_styles.
 	 */
 	public function admin_styles() {
-		wp_enqueue_script( 'astra-select2', AST_TARGET_RULE_URI . 'select2.js', array( 'jquery' ), AST_TARGET_RULE_VER, true );
+		wp_enqueue_script( 'astra-select2', AST_TARGET_RULE_URI . 'select2.js', [ 'jquery' ], AST_TARGET_RULE_VER, true );
 
 		$wp_lang  = get_locale();
 		$ast_lang = '';
-		if ( '' !== $wp_lang ) {
-			$select2_lang = array(
+		if ( $wp_lang !== '' ) {
+			$select2_lang = [
 				''               => 'en',
 				'hi_IN'          => 'hi',
 				'mr'             => 'mr',
@@ -569,17 +569,17 @@ public function admin_styles() {
 				'zh_CN'          => 'zh',
 				'zh_TW'          => 'zh',
 				'zh_HK'          => 'zh',
-			);
+			];
 
 			if ( isset( $select2_lang[ $wp_lang ] ) && file_exists( AST_TARGET_RULE_DIR . 'i18n/' . $select2_lang[ $wp_lang ] . '.js' ) ) {
 				$ast_lang = $select2_lang[ $wp_lang ];
 				wp_enqueue_script(
 					'astra-select2-lang',
 					AST_TARGET_RULE_URI . 'i18n/' . $select2_lang[ $wp_lang ] . '.js',
-					array(
+					[
 						'jquery',
 						'astra-select2',
-					),
+					],
 					AST_TARGET_RULE_VER,
 					true
 				);
@@ -589,10 +589,10 @@ public function admin_styles() {
 		wp_register_script(
 			'astra-target-rule',
 			AST_TARGET_RULE_URI . 'target-rule.js',
-			array(
+			[
 				'jquery',
 				'astra-select2',
-			),
+			],
 			AST_TARGET_RULE_VER,
 			true
 		);
@@ -602,9 +602,9 @@ public function admin_styles() {
 		wp_register_script(
 			'astra-user-role',
 			AST_TARGET_RULE_URI . 'user-role.js',
-			array(
+			[
 				'jquery',
-			),
+			],
 			AST_TARGET_RULE_VER,
 			true
 		);
@@ -619,7 +619,7 @@ public function admin_styles() {
 		/**
 		 * Registered localize vars
 		 */
-		$localize_vars = array(
+		$localize_vars = [
 			'ast_lang'      => $ast_lang,
 			'please_enter'  => __( 'Please enter', 'header-footer-elementor' ),
 			'please_delete' => __( 'Please delete', 'header-footer-elementor' ),
@@ -634,7 +634,7 @@ public function admin_styles() {
 			'not_loader'    => __( 'The results could not be loaded.', 'header-footer-elementor' ),
 			'search'        => __( 'Search pages / post / categories', 'header-footer-elementor' ),
 			'ajax_nonce'    => wp_create_nonce( 'hfe-get-posts-by-query' ),
-		);
+		];
 		wp_localize_script( 'astra-select2', 'astRules', $localize_vars );
 	}
 
@@ -714,13 +714,13 @@ public static function get_post_target_rule_options( $post_type, $taxonomy ) {
 		$post_key    = str_replace( ' ', '-', strtolower( $post_type->label ) );
 		$post_label  = ucwords( $post_type->label );
 		$post_name   = $post_type->name;
-		$post_option = array();
+		$post_option = [];
 
 		/* translators: %s post label */
 		$all_posts                          = sprintf( __( 'All %s', 'header-footer-elementor' ), $post_label );
 		$post_option[ $post_name . '|all' ] = $all_posts;
 
-		if ( 'pages' != $post_key ) {
+		if ( $post_key !== 'pages' ) {
 			/* translators: %s post label */
 			$all_archive                                = sprintf( __( 'All %s Archive', 'header-footer-elementor' ), $post_label );
 			$post_option[ $post_name . '|all|archive' ] = $all_archive;
@@ -759,13 +759,13 @@ public static function generate_target_rule_selector( $type, $selection_options,
 		$output = '<div class="target_rule-builder-wrap">';
 
 		if ( ! is_array( $saved_values ) || ( is_array( $saved_values ) && empty( $saved_values ) ) ) {
-			$saved_values                = array();
+			$saved_values                = [];
 			$saved_values['rule'][0]     = '';
 			$saved_values['specific'][0] = '';
 		}
 
 		$index = 0;
-		if ( is_array( $saved_values ) && is_array( $saved_values['rule'] ) ) {	
+		if ( is_array( $saved_values ) && is_array( $saved_values['rule'] ) ) {
 			foreach ( $saved_values['rule'] as $index => $data ) {
 				$output .= '<div class="astra-target-rule-condition ast-target-rule-' . $index . '" data-rule="' . $index . '" >';
 				/* Condition Selection */
@@ -781,7 +781,7 @@ public static function generate_target_rule_selector( $type, $selection_options,
 						// specific rules.
 						$selected = '';
 
-						if ( $data == $opt_key ) {
+						if ( $data === $opt_key ) {
 							$selected = 'selected="selected"';
 						}
 
@@ -798,7 +798,7 @@ public static function generate_target_rule_selector( $type, $selection_options,
 				$output .= '<div class="target_rule-specific-page-wrap" style="display:none">';
 				$output .= '<select name="' . esc_attr( $input_name ) . '[specific][]" class="target-rule-select2 target_rule-specific-page form-control ast-input " multiple="multiple">';
 
-				if ( 'specifics' == $data && isset( $saved_values['specific'] ) && null != $saved_values['specific'] && is_array( $saved_values['specific'] ) ) {
+				if ( $data === 'specifics' && isset( $saved_values['specific'] ) && $saved_values['specific'] !== null && is_array( $saved_values['specific'] ) ) {
 					foreach ( $saved_values['specific'] as $data_key => $sel_value ) {
 						// posts.
 						if ( strpos( $sel_value, 'post-' ) !== false ) {
@@ -818,7 +818,7 @@ public static function generate_target_rule_selector( $type, $selection_options,
 							if ( ! is_wp_error( $term ) ) {
 								$term_taxonomy = ucfirst( str_replace( '_', ' ', $term->taxonomy ) );
 
-								if ( isset( $tax_data[2] ) && 'single' === $tax_data[2] ) {
+								if ( isset( $tax_data[2] ) && $tax_data[2] === 'single' ) {
 									$term_name = 'All singulars from ' . $term->name;
 								} else {
 									$term_name = $term->name . ' - ' . $term_taxonomy;
@@ -841,7 +841,7 @@ public static function generate_target_rule_selector( $type, $selection_options,
 		$output .= '<a href="#" class="button" data-rule-id="' . absint( $index ) . '" data-rule-type="' . $type . '">' . $add_rule_label . '</a>';
 		$output .= '</div>';
 
-		if ( 'display' == $type ) {
+		if ( $type === 'display' ) {
 			/* Add new rule */
 			$output .= '<div class="target_rule-add-exclusion-rule">';
 			$output .= '<a href="#" class="button">' . __( 'Add Exclusion Rule', 'header-footer-elementor' ) . '</a>';
@@ -852,16 +852,16 @@ public static function generate_target_rule_selector( $type, $selection_options,
 	}
 
 	/**
-	 * Get current layout.
-	 * Checks of the passed post id of the layout is to be displayed in the page.
-	 *
-	 * @param int    $layout_id Layout ID.
-	 * @param string $option Option prefix.
-	 *
-	 * @return int|boolean If the current layout is to be displayed it will be returned back else a boolean will be passed.
-	 */
+     * Get current layout.
+     * Checks of the passed post id of the layout is to be displayed in the page.
+     *
+     * @param int    $layout_id Layout ID.
+     * @param string $option Option prefix.
+     *
+     * @return int|bool If the current layout is to be displayed it will be returned back else a boolean will be passed.
+     */
 	public function get_current_layout( $layout_id, $option ) {
-		$post_id        = ( ! is_404() && ! is_search() && ! is_archive() && ! is_home() ) ? get_the_id() : false;
+		$post_id        = ! is_404() && ! is_search() && ! is_archive() && ! is_home() ? get_the_id() : false;
 		$current_layout = false;
 		$is_exclude     = false;
 		$is_user_role   = false;
@@ -872,7 +872,7 @@ public function get_current_layout( $layout_id, $option ) {
 		/* Parse Display On Condition */
 		$is_display = $this->parse_layout_display_condition( $post_id, $display_on );
 
-		if ( true == $is_display ) {
+		if ( $is_display === true ) {
 			/* Parse Exclude On Condition */
 			$is_exclude = $this->parse_layout_display_condition( $post_id, $exclude_on );
 			/* Parse User Role Condition */
@@ -890,13 +890,13 @@ public function get_current_layout( $layout_id, $option ) {
 	}
 
 	/**
-	 * Checks for the display condition for the current page/
-	 *
-	 * @param  int   $post_id Current post ID.
-	 * @param  array $rules   Array of rules Display on | Exclude on.
-	 *
-	 * @return boolean      Returns true or false depending on if the $rules match for the current page and the layout is to be displayed.
-	 */
+     * Checks for the display condition for the current page/
+     *
+     * @param  int   $post_id Current post ID.
+     * @param  array $rules   Array of rules Display on | Exclude on.
+     *
+     * @return bool      Returns true or false depending on if the $rules match for the current page and the layout is to be displayed.
+     */
 	public function parse_layout_display_condition( $post_id, $rules ) {
 		$display           = false;
 		$current_post_type = get_post_type( $post_id );
@@ -974,26 +974,26 @@ public function parse_layout_display_condition( $post_id, $rules ) {
 						$post_type     = isset( $rule_data[0] ) ? $rule_data[0] : false;
 						$archieve_type = isset( $rule_data[2] ) ? $rule_data[2] : false;
 						$taxonomy      = isset( $rule_data[3] ) ? $rule_data[3] : false;
-						if ( false === $archieve_type ) {
+						if ( $archieve_type === false ) {
 							$current_post_type = get_post_type( $post_id );
 
-							if ( false !== $post_id && $current_post_type == $post_type ) {
+							if ( $post_id !== false && $current_post_type === $post_type ) {
 								$display = true;
 							}
 						} else {
 							if ( is_archive() ) {
 								$current_post_type = get_post_type();
-								if ( $current_post_type == $post_type ) {
-									if ( 'archive' == $archieve_type ) {
+								if ( $current_post_type === $post_type ) {
+									if ( $archieve_type === 'archive' ) {
 										$display = true;
-									} elseif ( 'taxarchive' == $archieve_type ) {
+									} elseif ( $archieve_type === 'taxarchive' ) {
 										$obj              = get_queried_object();
 										$current_taxonomy = '';
-										if ( '' !== $obj && null !== $obj ) {
+										if ( $obj !== '' && $obj !== null ) {
 											$current_taxonomy = $obj->taxonomy;
 										}
 
-										if ( $current_taxonomy == $taxonomy ) {
+										if ( $current_taxonomy === $taxonomy ) {
 											$display = true;
 										}
 									}
@@ -1009,11 +1009,11 @@ public function parse_layout_display_condition( $post_id, $rules ) {
 
 								$specific_post_type = isset( $specific_data[0] ) ? $specific_data[0] : false;
 								$specific_post_id   = isset( $specific_data[1] ) ? $specific_data[1] : false;
-								if ( 'post' == $specific_post_type ) {
-									if ( $specific_post_id == $post_id ) {
+								if ( $specific_post_type === 'post' ) {
+									if ( $specific_post_id === $post_id ) {
 										$display = true;
 									}
-								} elseif ( isset( $specific_data[2] ) && ( 'single' == $specific_data[2] ) && 'tax' == $specific_post_type ) {
+								} elseif ( isset( $specific_data[2] ) && ( $specific_data[2] === 'single' ) && $specific_post_type === 'tax' ) {
 									if ( is_singular() ) {
 										$term_details = get_term( $specific_post_id );
 
@@ -1025,9 +1025,9 @@ public function parse_layout_display_condition( $post_id, $rules ) {
 											}
 										}
 									}
-								} elseif ( 'tax' == $specific_post_type ) {
+								} elseif ( $specific_post_type === 'tax' ) {
 									$tax_id = get_queried_object_id();
-									if ( $specific_post_id == $tax_id ) {
+									if ( $specific_post_id === $tax_id ) {
 										$display = true;
 									}
 								}
@@ -1092,7 +1092,7 @@ public static function target_user_role_settings_field( $name, $settings, $value
 		$output             .= '</script>';
 
 		if ( ! is_array( $saved_values ) || ( is_array( $saved_values ) && empty( $saved_values ) ) ) {
-			$saved_values    = array();
+			$saved_values    = [];
 			$saved_values[0] = '';
 		}
 
@@ -1132,14 +1132,14 @@ public static function target_user_role_settings_field( $name, $settings, $value
 	}
 
 	/**
-	 * Parse user role condition.
-	 *
-	 * @since  1.0.0
-	 * @param  int   $post_id Post ID.
-	 * @param  Array $rules   Current user rules.
-	 *
-	 * @return boolean  True = user condition passes. False = User condition does not pass.
-	 */
+     * Parse user role condition.
+     *
+     * @since  1.0.0
+     * @param  int   $post_id Post ID.
+     * @param  Array $rules   Current user rules.
+     *
+     * @return bool  True = user condition passes. False = User condition does not pass.
+     */
 	public function parse_user_role_condition( $post_id, $rules ) {
 		$show_popup = true;
 
@@ -1196,7 +1196,7 @@ public function parse_user_role_condition( $post_id, $rules ) {
 	 * @return string Page Type.
 	 */
 	public function get_current_page_type() {
-		if ( null === self::$current_page_type ) {
+		if ( self::$current_page_type === null ) {
 			$page_type  = '';
 			$current_id = false;
 
@@ -1256,13 +1256,13 @@ public function get_posts_by_conditions( $post_type, $option ) {
 
 		$current_page_type = $this->get_current_page_type();
 
-		self::$current_page_data[ $post_type ] = array();
+		self::$current_page_data[ $post_type ] = [];
 
 		$option['current_post_id'] = self::$current_page_data['ID'];
 		$meta_header               = self::get_meta_option_post( $post_type, $option );
 
 		/* Meta option is enabled */
-		if ( false === $meta_header ) {
+		if ( $meta_header === false ) {
 			$current_post_type = esc_sql( get_post_type() );
 			$current_post_id   = false;
 			$q_obj             = get_queried_object();
@@ -1306,14 +1306,14 @@ public function get_posts_by_conditions( $post_type, $option ) {
 					$meta_args .= " OR pm.meta_value LIKE '%\"basic-archives\"%'";
 					$meta_args .= " OR pm.meta_value LIKE '%\"{$current_post_type}|all|archive\"%'";
 
-					if ( 'is_tax' == $current_page_type && ( is_category() || is_tag() || is_tax() ) ) {
+					if ( $current_page_type === 'is_tax' && ( is_category() || is_tag() || is_tax() ) ) {
 						if ( is_object( $q_obj ) ) {
 							$meta_args .= " OR pm.meta_value LIKE '%\"{$current_post_type}|all|taxarchive|{$q_obj->taxonomy}\"%'";
 							$meta_args .= " OR pm.meta_value LIKE '%\"tax-{$q_obj->term_id}\"%'";
 						}
-					} elseif ( 'is_date' == $current_page_type ) {
+					} elseif ( $current_page_type === 'is_date' ) {
 						$meta_args .= " OR pm.meta_value LIKE '%\"special-date\"%'";
-					} elseif ( 'is_author' == $current_page_type ) {
+					} elseif ( $current_page_type === 'is_author' ) {
 						$meta_args .= " OR pm.meta_value LIKE '%\"special-author\"%'";
 					}
 					break;
@@ -1331,7 +1331,7 @@ public function get_posts_by_conditions( $post_type, $option ) {
 					$meta_args      .= " OR pm.meta_value LIKE '%\"basic-singulars\"%'";
 					$meta_args      .= " OR pm.meta_value LIKE '%\"{$current_post_type}|all\"%'";
 					$meta_args      .= " OR pm.meta_value LIKE '%\"post-{$current_id}\"%'";
-					
+
 					if ( is_object( $q_obj ) ) {
 						$taxonomies = get_object_taxonomies( $q_obj->post_type );
 						$terms      = wp_get_post_terms( $q_obj->ID, $taxonomies );
@@ -1356,10 +1356,10 @@ public function get_posts_by_conditions( $post_type, $option ) {
 			// @codingStandardsIgnoreEnd
 
 			foreach ( $posts as $local_post ) {
-				self::$current_page_data[ $post_type ][ $local_post->ID ] = array(
+				self::$current_page_data[ $post_type ][ $local_post->ID ] = [
 					'id'       => $local_post->ID,
 					'location' => unserialize( $local_post->meta_value ),
-				);
+				];
 			}
 
 			$option['current_post_id'] = $current_post_id;
@@ -1424,8 +1424,8 @@ public static function same_display_on_notice( $post_type, $option ) {
 		global $wpdb;
 		global $post;
 
-		$all_rules        = array();
-		$already_set_rule = array();
+		$all_rules        = [];
+		$already_set_rule = [];
 
 		$location = isset( $option['location'] ) ? $option['location'] : '';
 
@@ -1447,21 +1447,21 @@ public static function same_display_on_notice( $post_type, $option ) {
 			if ( is_array( $location_rules ) && isset( $location_rules['rule'] ) ) {
 				foreach ( $location_rules['rule'] as $key => $rule ) {
 					if ( ! isset( $all_rules[ $rule ] ) ) {
-						$all_rules[ $rule ] = array();
+						$all_rules[ $rule ] = [];
 					}
 
-					if ( 'specifics' == $rule && isset( $location_rules['specific'] ) && is_array( $location_rules['specific'] ) ) {
+					if ( $rule === 'specifics' && isset( $location_rules['specific'] ) && is_array( $location_rules['specific'] ) ) {
 						foreach ( $location_rules['specific'] as $s_index => $s_value ) {
-							$all_rules[ $rule ][ $s_value ][ $header->ID ] = array(
+							$all_rules[ $rule ][ $s_value ][ $header->ID ] = [
 								'ID'   => $header->ID,
 								'name' => $header->post_title,
-							);
+							];
 						}
 					} else {
-						$all_rules[ $rule ][ $header->ID ] = array(
+						$all_rules[ $rule ][ $header->ID ] = [
 							'ID'   => $header->ID,
 							'name' => $header->post_title,
-						);
+						];
 					}
 				}
 			}
@@ -1477,14 +1477,14 @@ public static function same_display_on_notice( $post_type, $option ) {
 					continue;
 				}
 
-				if ( 'specifics' === $c_rule ) {
+				if ( $c_rule === 'specifics' ) {
 					foreach ( $current_post_data['specific'] as $s_index => $s_id ) {
 						if ( ! isset( $all_rules[ $c_rule ][ $s_id ] ) ) {
 							continue;
 						}
 
 						foreach ( $all_rules[ $c_rule ][ $s_id ] as $p_id => $data ) {
-							if ( $p_id == $post->ID ) {
+							if ( $p_id === $post->ID ) {
 								continue;
 							}
 
@@ -1493,7 +1493,7 @@ public static function same_display_on_notice( $post_type, $option ) {
 					}
 				} else {
 					foreach ( $all_rules[ $c_rule ] as $p_id => $data ) {
-						if ( $p_id == $post->ID ) {
+						if ( $p_id === $post->ID ) {
 							continue;
 						}
 
@@ -1506,7 +1506,7 @@ public static function same_display_on_notice( $post_type, $option ) {
 		if ( ! empty( $already_set_rule ) ) {
 			add_action(
 				'admin_notices',
-				function() use ( $already_set_rule ) {
+				static function() use ( $already_set_rule ) {
 					$rule_set_titles = '<strong>' . implode( ',', $already_set_rule ) . '</strong>';
 
 					/* translators: %s post title. */
@@ -1530,17 +1530,17 @@ function() use ( $already_set_rule ) {
 	 * @return false | object
 	 */
 	public static function get_meta_option_post( $post_type, $option ) {
-		$page_meta = ( isset( $option['page_meta'] ) && '' != $option['page_meta'] ) ? $option['page_meta'] : false;
+		$page_meta = isset( $option['page_meta'] ) && $option['page_meta'] !== '' ? $option['page_meta'] : false;
 
-		if ( false !== $page_meta ) {
+		if ( $page_meta !== false ) {
 			$current_post_id = isset( $option['current_post_id'] ) ? $option['current_post_id'] : false;
 			$meta_id         = get_post_meta( $current_post_id, $option['page_meta'], true );
 
-			if ( false !== $meta_id && '' != $meta_id ) {
-				self::$current_page_data[ $post_type ][ $meta_id ] = array(
+			if ( $meta_id !== false && $meta_id !== '' ) {
+				self::$current_page_data[ $post_type ][ $meta_id ] = [
 					'id'       => $meta_id,
 					'location' => '',
-				);
+				];
 
 				return self::$current_page_data[ $post_type ];
 			}
@@ -1558,19 +1558,19 @@ public static function get_meta_option_post( $post_type, $option ) {
 	 * @return object  Posts.
 	 */
 	public static function get_post_selection( $post_type ) {
-		$query_args = array(
+		$query_args = [
 			'post_type'      => $post_type,
 			'posts_per_page' => -1,
 			'post_status'    => 'publish',
-		);
+		];
 
 		$all_headers = get_posts( $query_args );
-		$headers     = array();
+		$headers     = [];
 
 		if ( ! empty( $all_headers ) ) {
-			$headers = array(
+			$headers = [
 				'' => __( 'Select', 'header-footer-elementor' ),
-			);
+			];
 
 			foreach ( $all_headers as $i => $data ) {
 				$headers[ $data->ID ] = $data->post_title;
@@ -1590,7 +1590,7 @@ public static function get_post_selection( $post_type ) {
 	 * @return array Rule data.
 	 */
 	public static function get_format_rule_value( $save_data, $key ) {
-		$meta_value = array();
+		$meta_value = [];
 
 		if ( isset( $save_data[ $key ]['rule'] ) ) {
 			$save_data[ $key ]['rule'] = array_unique( $save_data[ $key ]['rule'] );
@@ -1600,11 +1600,11 @@ public static function get_format_rule_value( $save_data, $key ) {
 
 			// Unset the specifics from rule. This will be readded conditionally in next condition.
 			$index = array_search( '', $save_data[ $key ]['rule'] );
-			if ( false !== $index ) {
+			if ( $index !== false ) {
 				unset( $save_data[ $key ]['rule'][ $index ] );
 			}
 			$index = array_search( 'specifics', $save_data[ $key ]['rule'] );
-			if ( false !== $index ) {
+			if ( $index !== false ) {
 				unset( $save_data[ $key ]['rule'][ $index ] );
 
 				// Only re-add the specifics key if there are specific rules added.
@@ -1619,11 +1619,11 @@ public static function get_format_rule_value( $save_data, $key ) {
 				}
 			}
 			if ( ! isset( $meta_value['rule'] ) || ! in_array( 'specifics', $meta_value['rule'] ) ) {
-				$meta_value['specific'] = array();
+				$meta_value['specific'] = [];
 			}
 
 			if ( empty( $meta_value['rule'] ) ) {
-				$meta_value = array();
+				$meta_value = [];
 			}
 		}
 
@@ -1634,4 +1634,4 @@ public static function get_format_rule_value( $save_data, $key ) {
 /**
  * Kicking this off by calling 'get_instance()' method
  */
-Astra_Target_Rules_Fields::get_instance();
\ No newline at end of file
+Astra_Target_Rules_Fields::get_instance();
diff --git a/inc/lib/utm-analytics/inc/utils.php b/inc/lib/utm-analytics/inc/utils.php
index 29503cf82..25a821365 100644
--- a/inc/lib/utm-analytics/inc/utils.php
+++ b/inc/lib/utm-analytics/inc/utils.php
@@ -17,7 +17,6 @@
  * @since 0.0.1
  */
 class Utils {
-
 	/**
 	 * List of slugs of all the bsf products that will be referer, referring another product.
 	 *
@@ -48,14 +47,13 @@ class Utils {
 		'zipwp',
 	];
 
-
 	/**
 	 * This function will help to determine if provided slug is a valid bsf product or not,
 	 * This way we will maintain consistency through out all our products.
 	 *
 	 * @param string $slug unique slug of the product which can be used for referer, product.
 	 * @since 0.0.1
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function is_valid_bsf_product_slug( $slug ) {
 		if ( empty( $slug ) || ! is_string( $slug ) ) {
@@ -74,7 +72,7 @@ public static function is_valid_bsf_product_slug( $slug ) {
 	 * @since 0.0.1
 	 * @return void
 	 */
-	public static function update_referer( $referer, $product ) {
+	public static function update_referer( $referer, $product ): void {
 
 		$slugs       = [
 			'referer' => $referer,
@@ -117,7 +115,7 @@ public static function update_referer( $referer, $product ) {
 	 */
 	public static function get_utm_ready_link( $link, $product, $utm_args = [] ) {
 
-		if ( false === wp_http_validate_url( $link ) ) {
+		if ( wp_http_validate_url( $link ) === false ) {
 			error_log( 'Invalid url passed to get_utm_ready_link function' ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log -- adding logs in case of failure will help in debugging.
 			return $link;
 		}
@@ -143,11 +141,9 @@ public static function get_utm_ready_link( $link, $product, $utm_args = [] ) {
 
 		$utm_args['utm_source'] = $bsf_product_referers[ $product ];
 
-		$link = add_query_arg(
+		return add_query_arg(
 			$utm_args,
 			$link
 		);
-
-		return $link;
 	}
 }
diff --git a/inc/lib/utm-analytics/plugin-loader.php b/inc/lib/utm-analytics/plugin-loader.php
index 912e8b840..26a677b37 100644
--- a/inc/lib/utm-analytics/plugin-loader.php
+++ b/inc/lib/utm-analytics/plugin-loader.php
@@ -14,7 +14,6 @@
  * @since 0.0.1
  */
 class Plugin_Loader {
-
 	/**
 	 * Instance
 	 *
@@ -24,6 +23,18 @@ class Plugin_Loader {
 	 */
 	private static $instance;
 
+	/**
+	 * Constructor
+	 *
+	 * @since 0.0.1
+	 */
+	public function __construct() {
+
+		spl_autoload_register( [ $this, 'autoload' ] );
+
+		add_action( 'plugins_loaded', [ $this, 'load_textdomain' ] );
+	}
+
 	/**
 	 * Initiator
 	 *
@@ -42,8 +53,8 @@ public static function get_instance() {
 	 *
 	 * @param string $class class name.
 	 */
-	public function autoload( $class ) {
-		if ( 0 !== strpos( $class, __NAMESPACE__ ) ) {
+	public function autoload( $class ): void {
+		if ( strpos( $class, __NAMESPACE__ ) !== 0 ) {
 			return;
 		}
 
@@ -65,18 +76,6 @@ public function autoload( $class ) {
 		}
 	}
 
-	/**
-	 * Constructor
-	 *
-	 * @since 0.0.1
-	 */
-	public function __construct() {
-
-		spl_autoload_register( [ $this, 'autoload' ] );
-
-		add_action( 'plugins_loaded', [ $this, 'load_textdomain' ] );
-	}
-
 	/**
 	 * Load Plugin Text Domain.
 	 * This will load the translation textdomain depending on the file priorities.
@@ -86,7 +85,7 @@ public function __construct() {
 	 * @since 0.0.1
 	 * @return void
 	 */
-	public function load_textdomain() {
+	public function load_textdomain(): void {
 		// Default languages directory.
 		$lang_dir = BSF_UTM_ANALYTICS_DIR . 'languages/';
 
@@ -109,7 +108,7 @@ public function load_textdomain() {
 		/**
 		 * Language Locale for plugin
 		 *
-		 * @var $get_locale The locale to use.
+		 * @var The $get_locale locale to use.
 		 * Uses get_user_locale()` in WordPress 4.7 or greater,
 		 * otherwise uses `get_locale()`.
 		 */
diff --git a/inc/settings/hfe-settings-api.php b/inc/settings/hfe-settings-api.php
index 77078249d..cbdd5eba3 100644
--- a/inc/settings/hfe-settings-api.php
+++ b/inc/settings/hfe-settings-api.php
@@ -16,7 +16,6 @@
  * Class HFE_Settings_Api.
  */
 class HFE_Settings_Api {
-
 	/**
 	 * Instance.
 	 *
@@ -26,18 +25,6 @@ class HFE_Settings_Api {
 	 */
 	private static $instance;
 
-	/**
-	 * Get the singleton instance of the class.
-	 *
-	 * @return HFE_Settings_Api
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
 	/**
 	 * Initialize hooks.
 	 *
@@ -50,13 +37,25 @@ private function __construct() {
 		add_action( 'rest_api_init', [ $this, 'register_routes' ] );
 	}
 
+	/**
+	 * Get the singleton instance of the class.
+	 *
+	 * @return HFE_Settings_Api
+	 */
+	public static function get_instance() {
+		if ( ! isset( self::$instance ) ) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
+
 	/**
 	 * Register REST API routes.
 	 *
 	 * @since x.x.x
 	 * @return void
 	 */
-	public function register_routes() {
+	public function register_routes(): void {
 
 		register_rest_route(
 			'hfe/v1',
@@ -93,7 +92,7 @@ public function register_routes() {
 	 * Check whether a given request has permission to read notes.
 	 *
 	 * @since x.x.x
-	 * @return WP_Error|boolean
+	 * @return WP_Error|bool
 	 */
 	public function get_items_permissions_check() {
 
@@ -106,7 +105,7 @@ public function get_items_permissions_check() {
 
 	/**
 	 * Get Starter Templates Status.
-	 * 
+	 *
 	 * @param WP_REST_Request $request Request object.
 	 */
 	public function get_templates_status( WP_REST_Request $request ) {
@@ -121,8 +120,8 @@ public function get_templates_status( WP_REST_Request $request ) {
 		$response_data = [
 			'templates_status' => $templates_status,
 		];
-	
-		if ( 'Activated' === $templates_status ) {
+
+		if ( $templates_status === 'Activated' ) {
 			$response_data['redirect_url'] = HFE_Helper::starter_templates_link();
 		}
 
@@ -151,13 +150,11 @@ public function get_plugins_list( $request ) {
 		}
 
 		return new WP_REST_Response( $plugins_list, 200 );
-		
 	}
 
 	/**
-	 * 
 	 * Callback function to return widgets list.
-	 * 
+	 *
 	 * @param WP_REST_Request $request Request object.
 	 *
 	 * @return WP_REST_Response
@@ -178,9 +175,7 @@ public function get_hfe_widgets( $request ) {
 		}
 
 		return new WP_REST_Response( $widgets_list, 200 );
-		
 	}
-	
 
 }
 
diff --git a/inc/widgets-manager/base/common-widget.php b/inc/widgets-manager/base/common-widget.php
index 51b574344..6b20dee94 100644
--- a/inc/widgets-manager/base/common-widget.php
+++ b/inc/widgets-manager/base/common-widget.php
@@ -8,8 +8,6 @@
 namespace HFE\WidgetsManager\Base;
 
 use Elementor\Widget_Base;
-use HFE\WidgetsManager\Base\HFE_Helper;
-use Elementor\Controls_Manager;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
@@ -21,7 +19,6 @@
  * @since 0.0.1
  */
 abstract class Common_Widget extends Widget_Base {
-
 	/**
 	 * Get categories
 	 *
diff --git a/inc/widgets-manager/base/hfe-helper.php b/inc/widgets-manager/base/hfe-helper.php
index f725015c6..1a157f000 100644
--- a/inc/widgets-manager/base/hfe-helper.php
+++ b/inc/widgets-manager/base/hfe-helper.php
@@ -11,16 +11,10 @@
 	exit; // Exit if accessed directly.
 }
 
-use Elementor\Plugin;
-use Elementor\Utils;
-use Elementor\Widget_Base;
-use HFE\WidgetsManager\Base\Widgets_Config;
-
 /**
  * Class HFE_Helper.
  */
 class HFE_Helper {
-
 	/**
 	 * Widget Options
 	 *
@@ -77,9 +71,7 @@ public static function is_pro_active() {
 	 */
 	public static function premium_starter_templates_status() {
 
-		$st_pro_status = Widgets_Config::get_plugin_status( 'astra-pro-sites/astra-pro-sites.php' );
-
-		return $st_pro_status;
+		return Widgets_Config::get_plugin_status( 'astra-pro-sites/astra-pro-sites.php' );
 	}
 
 	/**
@@ -89,8 +81,7 @@ public static function premium_starter_templates_status() {
 	 * @return array()
 	 */
 	public static function free_starter_templates_status() {
-		$free_status = Widgets_Config::get_plugin_status( 'astra-sites/astra-sites.php' );
-		return $free_status;
+		return Widgets_Config::get_plugin_status( 'astra-sites/astra-sites.php' );
 	}
 
 	/**
@@ -104,7 +95,7 @@ public static function starter_templates_status() {
 		$st_pro_status = self::premium_starter_templates_status();
 		$free_status   = self::free_starter_templates_status();
 
-		if ( 'Activated' !== $free_status && ( 'Installed' === $st_pro_status || 'Activated' === $st_pro_status ) ) {
+		if ( $free_status !== 'Activated' && ( $st_pro_status === 'Installed' || $st_pro_status === 'Activated' ) ) {
 			return $st_pro_status;
 		}
 
@@ -140,7 +131,7 @@ public static function get_widget_list() {
 
 		return apply_filters( 'hfe_widgets_list', self::$widget_list );
 	}
-	
+
 	/**
 	 * Provide General settings array().
 	 *
@@ -280,7 +271,7 @@ public static function get_widget_keywords( $slug = '' ) {
 	 */
 	public static function get_widget_options() {
 
-		if ( null === self::$widget_options ) {
+		if ( self::$widget_options === null ) {
 
 			if ( ! isset( self::$widget_list ) ) {
 				$widgets = self::get_widget_list();
@@ -296,13 +287,13 @@ public static function get_widget_options() {
 
 					if ( isset( $saved_widgets[ $slug ] ) ) {
 
-						if ( 'disabled' === $saved_widgets[ $slug ] ) {
+						if ( $saved_widgets[ $slug ] === 'disabled' ) {
 							$widgets[ $slug ]['is_activate'] = false;
 						} else {
 							$widgets[ $slug ]['is_activate'] = true;
 						}
 					} else {
-						$widgets[ $slug ]['is_activate'] = ( isset( $data['default'] ) ) ? $data['default'] : false;
+						$widgets[ $slug ]['is_activate'] = $data['default'] ?? false;
 					}
 				}
 			}
@@ -313,7 +304,6 @@ public static function get_widget_options() {
 		return apply_filters( 'hfe_enabled_widgets', self::$widget_options );
 	}
 
-	
 	/**
 	 * Updates an option from the admin settings page.
 	 *
@@ -330,16 +320,15 @@ public static function update_admin_settings_option( $key, $value, $network = fa
 		} else {
 			update_option( $key, $value );
 		}
-
 	}
 
 	/**
 	 * Returns an option from the database for
 	 * the admin settings page.
 	 *
-	 * @param  string  $key     The option key.
-	 * @param  mixed   $default Option default value if option is not available.
-	 * @param  boolean $network_override Whether to allow the network admin setting to be overridden on subsites.
+	 * @param  string $key     The option key.
+	 * @param  mixed  $default Option default value if option is not available.
+	 * @param  bool   $network_override Whether to allow the network admin setting to be overridden on subsites.
 	 * @return string           Return the option value
 	 */
 	public static function get_admin_settings_option( $key, $default = false, $network_override = false ) {
@@ -451,17 +440,17 @@ public static function get_rollback_versions() {
 
 			usort(
 				$rollback_versions,
-				function( $prev, $next ) {
+				static function( $prev, $next ) {
 					if ( version_compare( $prev, $next, '==' ) ) {
 						return 0;
 					}
-		
+
 					if ( version_compare( $prev, $next, '>' ) ) {
 						return -1;
 					}
-		
+
 					return 1;
-				} 
+				}
 			);
 
 			$rollback_versions = array_slice( $rollback_versions, 0, $max_versions, true );
diff --git a/inc/widgets-manager/base/module-base.php b/inc/widgets-manager/base/module-base.php
index eebc633d0..12d3fa60f 100644
--- a/inc/widgets-manager/base/module-base.php
+++ b/inc/widgets-manager/base/module-base.php
@@ -7,8 +7,6 @@
 
 namespace HFE\WidgetsManager\Base;
 
-use HFE\WidgetsManager\Base\HFE_Helper;
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
 }
@@ -19,7 +17,12 @@
  * @since x.x.x
  */
 abstract class Module_Base {
-
+	/**
+	 * Reflection
+	 *
+	 * @var instances
+	 */
+	protected static $instances = [];
 	/**
 	 * Reflection
 	 *
@@ -28,11 +31,13 @@ abstract class Module_Base {
 	private $reflection;
 
 	/**
-	 * Reflection
-	 *
-	 * @var instances
+	 * Constructor
 	 */
-	protected static $instances = [];
+	public function __construct() {
+		$this->reflection = new \ReflectionClass( $this );
+
+		add_action( 'elementor/widgets/register', [ $this, 'init_widgets' ] );
+	}
 
 	/**
 	 * Get Name
@@ -47,7 +52,7 @@ abstract public function get_name();
 	 * @since x.x.x
 	 */
 	public static function class_name() {
-		return get_called_class();
+		return static::class;
 	}
 
 	/**
@@ -78,21 +83,12 @@ public static function instance() {
 		return static::$instances[ $class_name ];
 	}
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->reflection = new \ReflectionClass( $this );
-
-		add_action( 'elementor/widgets/register', [ $this, 'init_widgets' ] );
-	}
-
 	/**
 	 * Init Widgets
 	 *
 	 * @since x.x.x
 	 */
-	public function init_widgets() {
+	public function init_widgets(): void {
 
 		$widget_manager = \Elementor\Plugin::instance()->widgets_manager;
 
diff --git a/inc/widgets-manager/base/widgets-config.php b/inc/widgets-manager/base/widgets-config.php
index ddb44d1e4..bccc4d36c 100644
--- a/inc/widgets-manager/base/widgets-config.php
+++ b/inc/widgets-manager/base/widgets-config.php
@@ -7,9 +7,6 @@
 
 namespace HFE\WidgetsManager\Base;
 
-
-use HFE\WidgetsManager\Base\Widgets_Config;
-
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
 }
@@ -23,7 +20,6 @@
  * Class Widgets_Config.
  */
 class Widgets_Config {
-
 	/**
 	 * Widget List
 	 *
@@ -222,13 +218,13 @@ public static function get_widget_list() {
 	 */
 	public static function get_pro_widget_list() {
 
-		if ( null === self::$pro_widget_list ) {
+		if ( self::$pro_widget_list === null ) {
 
 			$integration_url = '';
 			$post_url        = '';
 
 			self::$pro_widget_list = [
-				
+
 				'Advanced_Heading'    => [
 					'slug'        => 'uael-advanced-heading',
 					'title'       => __( 'Advanced Heading', 'header-footer-elementor' ),
@@ -932,7 +928,7 @@ public static function get_pro_widget_list() {
 							'is_pro'      => true,
 						],
 					];
-	
+
 					self::$pro_widget_list = array_merge_recursive( self::$pro_widget_list, $caldera );
 				}
 			}
@@ -952,7 +948,6 @@ public static function get_all_widgets() {
 		return self::get_widget_list() + self::get_pro_widget_list(); // Use + operator to merge associative arrays.
 	}
 
-   
 	/**
 	 * Function for Astra Pro white labels with defaults.
 	 *
@@ -1090,18 +1085,18 @@ public static function get_bsf_plugins() {
 
 		foreach ( $plugins as $key => $plugin ) {
 			// Check if it's a plugin and is active.
-			if ( 'plugin' === $plugin['type'] && is_plugin_active( $key ) ) {
+			if ( $plugin['type'] === 'plugin' && is_plugin_active( $key ) ) {
 				unset( $plugins[ $key ] );
 			}
 
-			if ( 'plugin' === $plugin['type'] && 'astra-sites/astra-sites.php' === $key ) {
+			if ( $plugin['type'] === 'plugin' && $key === 'astra-sites/astra-sites.php' ) {
 				$st_pro_status = self::get_plugin_status( 'astra-pro-sites/astra-pro-sites.php' );
-				if ( 'Installed' === $st_pro_status || 'Activated' === $st_pro_status ) {
+				if ( $st_pro_status === 'Installed' || $st_pro_status === 'Activated' ) {
 					unset( $plugins[ $key ] );
 				}
 			}
 
-			if ( 'theme' === $plugin['type'] ) {
+			if ( $plugin['type'] === 'theme' ) {
 				$current_theme = wp_get_theme();
 				if ( $current_theme->get_stylesheet() === $plugin['slug'] ) {
 					unset( $plugins[ $key ] );
@@ -1126,11 +1121,11 @@ public static function get_plugin_status( $plugin_init_file ) {
 
 		if ( ! isset( $installed_plugins[ $plugin_init_file ] ) ) {
 			return 'Install';
-		} elseif ( is_plugin_active( $plugin_init_file ) ) {
+		}
+		if ( is_plugin_active( $plugin_init_file ) ) {
 			return 'Activated';
-		} else {
-			return 'Installed';
 		}
+			return 'Installed';
 	}
 	/**
 	 * Get the status of a theme.
@@ -1142,22 +1137,19 @@ public static function get_plugin_status( $plugin_init_file ) {
 	 */
 	public static function get_theme_status( $theme_slug ) {
 		$installed_themes = wp_get_themes();
-	
+
 		// Check if the theme is installed.
 		if ( isset( $installed_themes[ $theme_slug ] ) ) {
 			$current_theme = wp_get_theme();
-		
+
 			// Check if the current theme slug matches the provided theme slug.
 			if ( $current_theme->get_stylesheet() === $theme_slug ) {
 				return 'Activated'; // Theme is active.
-			} else {
-				return 'Installed'; // Theme is installed but not active.
 			}
-		} else {
-			return 'Install'; // Theme is not installed at all.
+				return 'Installed'; // Theme is installed but not active.
+
 		}
+			return 'Install'; // Theme is not installed at all.
 	}
 
-
-
 }
diff --git a/inc/widgets-manager/class-extensions-loader.php b/inc/widgets-manager/class-extensions-loader.php
index 181ccccba..fdf08aa05 100644
--- a/inc/widgets-manager/class-extensions-loader.php
+++ b/inc/widgets-manager/class-extensions-loader.php
@@ -11,7 +11,6 @@
 
 namespace HFE\WidgetsManager;
 
-use Elementor\Plugin;
 use HFE\WidgetsManager\Base\HFE_Helper;
 
 defined( 'ABSPATH' ) || exit;
@@ -20,7 +19,6 @@
  * Set up Extensions Loader class
  */
 class Extensions_Loader {
-
 	/**
 	 * Instance of Extensions_Loader.
 	 *
@@ -29,6 +27,17 @@ class Extensions_Loader {
 	 */
 	private static $_instance = null;
 
+	/**
+	 * Setup actions and filters.
+	 *
+	 * @since  x.x.x
+	 * @access private
+	 */
+	private function __construct() {
+
+		$this->include_extensions_files();
+	}
+
 	/**
 	 * Get instance of Extensions_Loader
 	 *
@@ -72,11 +81,9 @@ public function elementor_init() {
 	 * @since 1.3.0
 	 */
 	public static function get_extensions_list() {
-		$extensions_list = [
+		return [
 			'Scroll_To_Top' => 'scroll-to-top',
 		];
-
-		return $extensions_list;
 	}
 
 	/**
@@ -88,7 +95,7 @@ public static function get_extensions_list() {
 	 * @access public
 	 * @return void
 	 */
-	public function include_extensions_files() {
+	public function include_extensions_files(): void {
 		$extensions_list = $this->get_extensions_list();
 
 		if ( ! empty( $extensions_list ) ) {
diff --git a/inc/widgets-manager/class-widgets-loader.php b/inc/widgets-manager/class-widgets-loader.php
index 9f76e4b43..6d844d158 100644
--- a/inc/widgets-manager/class-widgets-loader.php
+++ b/inc/widgets-manager/class-widgets-loader.php
@@ -11,9 +11,8 @@
 
 namespace HFE\WidgetsManager;
 
-use Elementor\Plugin;
-use Elementor\Utils;
 use Elementor\Core\Files\File_Types\Svg;
+use Elementor\Plugin;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -21,7 +20,12 @@
  * Set up Widgets Loader class
  */
 class Widgets_Loader {
-
+	/**
+	 * Member Variable
+	 *
+	 * @var Modules Manager
+	 */
+	public $modules_manager;
 	/**
 	 * Instance of Widgets_Loader.
 	 *
@@ -39,11 +43,19 @@ class Widgets_Loader {
 	private static $widgets_data = null;
 
 	/**
-	 * Member Variable
+	 * Setup actions and filters.
 	 *
-	 * @var Modules Manager
+	 * @since  1.2.0
+	 * @access private
 	 */
-	public $modules_manager;
+	private function __construct() {
+
+		spl_autoload_register( [ $this, 'autoload' ] );
+
+		$this->includes();
+
+		$this->setup_actions_filters();
+	}
 
 	/**
 	 * Get instance of Widgets_Loader
@@ -59,30 +71,15 @@ public static function instance() {
 		return self::$_instance;
 	}
 
-	/**
-	 * Setup actions and filters.
-	 *
-	 * @since  1.2.0
-	 * @access private
-	 */
-	private function __construct() {
-
-		spl_autoload_register( [ $this, 'autoload' ] );
-
-		$this->includes();
-
-		$this->setup_actions_filters();
-	}
-
 	/**
 	 * AutoLoad
 	 *
 	 * @since 0.0.1
 	 * @param string $class class.
 	 */
-	public function autoload( $class ) {
+	public function autoload( $class ): void {
 
-		if ( 0 !== strpos( $class, __NAMESPACE__ ) ) {
+		if ( strpos( $class, __NAMESPACE__ ) !== 0 ) {
 			return;
 		}
 
@@ -96,7 +93,7 @@ public function autoload( $class ) {
 					$class_to_load
 				)
 			);
-			
+
 			$filename = HFE_DIR . 'inc/widgets-manager/' . $filename . '.php'; // Adjusted path.
 
 			if ( is_readable( $filename ) ) {
@@ -105,50 +102,12 @@ public function autoload( $class ) {
 		}
 	}
 
-	/**
-	 * Includes.
-	 *
-	 * @since 0.0.1
-	 */
-	private function includes() {
-		require HFE_DIR . 'inc/widgets-manager/modules-manager.php';
-	}
-
-	/**
-	 * Setup Actions Filters.
-	 *
-	 * @since 0.0.1
-	 */
-	private function setup_actions_filters() {
-
-		add_action( 'elementor/init', [ $this, 'elementor_init' ] );
-
-		// Register category.
-		add_action( 'elementor/elements/categories_registered', [ $this, 'register_widget_category' ] );
-
-		// Register widgets script.
-		add_action( 'elementor/frontend/after_register_scripts', [ $this, 'register_widget_scripts' ] );
-
-		// Add svg support.
-		add_filter( 'upload_mimes', [ $this, 'hfe_svg_mime_types' ] ); // PHPCS:Ignore WordPressVIPMinimum.Hooks.RestrictedHooks.upload_mimes
-
-		// Add filter to sanitize uploaded SVG files.
-		add_filter( 'wp_handle_upload_prefilter', [ $this, 'sanitize_uploaded_svg' ] );
-
-		// Refresh the cart fragments.
-		if ( class_exists( 'woocommerce' ) ) {
-
-			add_filter( 'woocommerce_add_to_cart_fragments', [ $this, 'wc_refresh_mini_cart_count' ] );
-		}
-
-	}
-
 	/**
 	 * Elementor Init.
 	 *
 	 * @since 0.0.1
 	 */
-	public function elementor_init() {
+	public function elementor_init(): void {
 
 		$this->modules_manager = new Modules_Manager();
 
@@ -157,28 +116,6 @@ public function elementor_init() {
 		do_action( 'header_footer_elementor/init' );    //phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 	}
 
-	/**
-	 * Sections init
-	 *
-	 * @since 0.0.1
-	 *
-	 * @access private
-	 */
-	private function init_category() {
-		$category = defined( 'UAEL_PLUGIN_SHORT_NAME' ) ? UAEL_PLUGIN_SHORT_NAME : __( 'UAE', 'header-footer-elementor' );
-
-		if ( version_compare( ELEMENTOR_VERSION, '2.0.0' ) < 0 ) {
-
-			\Elementor\Plugin::instance()->elements_manager->add_category(
-				'hfe-widgets',
-				[
-					'title' => $category,
-				],
-				1
-			);
-		}
-	}
-
 	/**
 	 * Register Category
 	 *
@@ -207,15 +144,13 @@ public function register_widget_category( $this_cat ) {
 	 * @since 1.3.0
 	 */
 	public static function get_widget_script() {
-		$js_files = [
+		return [
 			'hfe-frontend-js' => [
 				'path'      => 'inc/js/frontend.js',
 				'dep'       => [ 'jquery' ],
 				'in_footer' => true,
 			],
 		];
-
-		return $js_files;
 	}
 
 	/**
@@ -227,7 +162,7 @@ public static function get_widget_script() {
 	 * @access public
 	 * @return void
 	 */
-	public function include_js_files() {
+	public function include_js_files(): void {
 		$js_files = $this->get_widget_script();
 
 		if ( ! empty( $js_files ) ) {
@@ -271,7 +206,7 @@ public function hfe_svg_mime_types( $mimes ) {
 	 * @return array Modified array of uploaded file information.
 	 */
 	public function sanitize_uploaded_svg( $file ) {
-		if ( 'image/svg+xml' === $file['type'] ) {
+		if ( $file['type'] === 'image/svg+xml' ) {
 
 			/**
 			 * SVG Handler instance.
@@ -287,7 +222,7 @@ public function sanitize_uploaded_svg( $file ) {
 		}
 
 		return $file;
-	}  
+	}
 
 	/**
 	 * Register module required js on elementor's action.
@@ -296,7 +231,7 @@ public function sanitize_uploaded_svg( $file ) {
 	 * @access public
 	 * @return void
 	 */
-	public function register_widget_scripts() {
+	public function register_widget_scripts(): void {
 		$this->include_js_files();
 	}
 
@@ -318,9 +253,9 @@ public function wc_refresh_mini_cart_count( $fragments ) {
 			return $fragments;
 		}
 
-		$cart_badge_count = ( null !== WC()->cart ) ? WC()->cart->get_cart_contents_count() : '';
+		$cart_badge_count = WC()->cart !== null ? WC()->cart->get_cart_contents_count() : '';
 
-		if ( null !== WC()->cart ) {
+		if ( WC()->cart !== null ) {
 
 			$fragments['span.hfe-cart-count'] = '<span class="hfe-cart-count">' . WC()->cart->get_cart_contents_count() . '</span>';
 
@@ -345,9 +280,67 @@ public static function validate_html_tag( $tag ) {
 		// Check if Elementor method exists, else we will run custom validation code.
 		if ( method_exists( 'Elementor\Utils', 'validate_html_tag' ) ) {
 			return Utils::validate_html_tag( $tag );
-		} else {
+		}
 			$allowed_tags = [ 'article', 'aside', 'div', 'footer', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'main', 'nav', 'p', 'section', 'span' ];
 			return in_array( strtolower( $tag ), $allowed_tags ) ? $tag : 'div';
+	}
+
+	/**
+	 * Includes.
+	 *
+	 * @since 0.0.1
+	 */
+	private function includes(): void {
+		require HFE_DIR . 'inc/widgets-manager/modules-manager.php';
+	}
+
+	/**
+	 * Setup Actions Filters.
+	 *
+	 * @since 0.0.1
+	 */
+	private function setup_actions_filters(): void {
+
+		add_action( 'elementor/init', [ $this, 'elementor_init' ] );
+
+		// Register category.
+		add_action( 'elementor/elements/categories_registered', [ $this, 'register_widget_category' ] );
+
+		// Register widgets script.
+		add_action( 'elementor/frontend/after_register_scripts', [ $this, 'register_widget_scripts' ] );
+
+		// Add svg support.
+		add_filter( 'upload_mimes', [ $this, 'hfe_svg_mime_types' ] ); // PHPCS:Ignore WordPressVIPMinimum.Hooks.RestrictedHooks.upload_mimes
+
+		// Add filter to sanitize uploaded SVG files.
+		add_filter( 'wp_handle_upload_prefilter', [ $this, 'sanitize_uploaded_svg' ] );
+
+		// Refresh the cart fragments.
+		if ( class_exists( 'woocommerce' ) ) {
+
+			add_filter( 'woocommerce_add_to_cart_fragments', [ $this, 'wc_refresh_mini_cart_count' ] );
+		}
+	}
+
+	/**
+	 * Sections init
+	 *
+	 * @since 0.0.1
+	 *
+	 * @access private
+	 */
+	private function init_category(): void {
+		$category = defined( 'UAEL_PLUGIN_SHORT_NAME' ) ? UAEL_PLUGIN_SHORT_NAME . ' Lite' : __( 'UAE Lite', 'header-footer-elementor' );
+
+		if ( version_compare( ELEMENTOR_VERSION, '2.0.0' ) < 0 ) {
+
+			\Elementor\Plugin::instance()->elements_manager->add_category(
+				'hfe-widgets',
+				[
+					'title' => $category,
+				],
+				1
+			);
 		}
 	}
 }
diff --git a/inc/widgets-manager/extensions/class-scroll-to-top-settings.php b/inc/widgets-manager/extensions/class-scroll-to-top-settings.php
index fcb9fb2ed..a66c4a885 100644
--- a/inc/widgets-manager/extensions/class-scroll-to-top-settings.php
+++ b/inc/widgets-manager/extensions/class-scroll-to-top-settings.php
@@ -9,12 +9,12 @@
 namespace HFE\WidgetsManager\Extensions;
 
 use Elementor\Controls_Manager;
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Core\Kits\Documents\Tabs\Tab_Base;
 use Elementor\Group_Control_Background;
-use Elementor\Group_Control_Typography;
 use Elementor\Group_Control_Border;
 use Elementor\Group_Control_Box_Shadow;
-use Elementor\Core\Kits\Documents\Tabs\Tab_Base;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Group_Control_Typography;
 
 /**
  * HFE Scroll to top extension
@@ -22,7 +22,6 @@
  * @since x.x.x
  */
 class Scroll_To_Top_Settings extends Tab_Base {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -64,7 +63,7 @@ public function get_icon() {
 
 	/**
 	 * Retrieves the help URL.
-	 * 
+	 *
 	 * @since x.x.x
 	 *
 	 * @access public
@@ -77,7 +76,7 @@ public function get_help_url() {
 
 	/**
 	 * Retrieves the widget keywords.
-	 * 
+	 *
 	 * @since x.x.x
 	 *
 	 * @access public
@@ -95,7 +94,7 @@ public function get_group() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_tab_controls() {
+	protected function register_tab_controls(): void {
 		$this->start_controls_section(
 			'hfe_scroll_to_top_section',
 			[
diff --git a/inc/widgets-manager/extensions/class-scroll-to-top.php b/inc/widgets-manager/extensions/class-scroll-to-top.php
index 829dda199..940f1ee9e 100644
--- a/inc/widgets-manager/extensions/class-scroll-to-top.php
+++ b/inc/widgets-manager/extensions/class-scroll-to-top.php
@@ -19,7 +19,6 @@
  * @since x.x.x
  */
 class Scroll_To_Top {
-
 	/**
 	 * Instance of Widgets_Loader.
 	 *
@@ -28,20 +27,6 @@ class Scroll_To_Top {
 	 */
 	private static $_instance = null;
 
-	/**
-	 * Get instance of Widgets_Loader
-	 *
-	 * @since  x.x.x
-	 * @return Widgets_Loader
-	 */
-	public static function instance() {
-		if ( ! isset( self::$_instance ) ) {
-			self::$_instance = new self();
-		}
-
-		return self::$_instance;
-	}
-
 	/**
 	 * Setup actions and filters.
 	 *
@@ -61,6 +46,20 @@ private function __construct() {
 		add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
 	}
 
+	/**
+	 * Get instance of Widgets_Loader
+	 *
+	 * @since  x.x.x
+	 * @return Widgets_Loader
+	 */
+	public static function instance() {
+		if ( ! isset( self::$_instance ) ) {
+			self::$_instance = new self();
+		}
+
+		return self::$_instance;
+	}
+
 	/**
 	 * Enqueues the necessary scripts for the Scroll to Top functionality.
 	 *
@@ -69,7 +68,7 @@ private function __construct() {
 	 *
 	 * @return void
 	 */
-	public function enqueue_scripts() {
+	public function enqueue_scripts(): void {
 		// Ensure jQuery is enqueued.
 		wp_enqueue_script( 'jquery' );
 
@@ -86,7 +85,7 @@ public function enqueue_scripts() {
 	 * @param \Elementor\Core\Kits\Documents\Kit $kit The Elementor Kit document.
 	 * @since x.x.x
 	 */
-	public function register_extension_tab( \Elementor\Core\Kits\Documents\Kit $kit ) {
+	public function register_extension_tab( \Elementor\Core\Kits\Documents\Kit $kit ): void {
 		$kit->register_tab( 'hfe-scroll-to-top-settings', Scroll_To_Top_Settings::class );
 	}
 
@@ -95,7 +94,7 @@ public function register_extension_tab( \Elementor\Core\Kits\Documents\Kit $kit
 	 *
 	 * @since x.x.x
 	 */
-	public function render_scroll_to_top_html() {
+	public function render_scroll_to_top_html(): void {
 
 		$post_id                = get_the_ID();
 		$document               = [];
@@ -115,11 +114,11 @@ public function render_scroll_to_top_html() {
 
 		$scroll_to_top = false;
 
-		if ( 'yes' == $scroll_to_top_global ) {
+		if ( $scroll_to_top_global === 'yes' ) {
 			$scroll_to_top = true;
 		}
 
-		if ( isset( $document_settings_data['hfe_scroll_to_top_single_disable'] ) && 'yes' == $document_settings_data['hfe_scroll_to_top_single_disable'] ) {
+		if ( isset( $document_settings_data['hfe_scroll_to_top_single_disable'] ) && $document_settings_data['hfe_scroll_to_top_single_disable'] === 'yes' ) {
 			$scroll_to_top = false;
 		}
 
@@ -127,40 +126,40 @@ public function render_scroll_to_top_html() {
 
 			$scrolltop_media_type = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_media_type' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_media_type' ) : 'icon';
 			$scrolltop_icon_html  = '';
-			if ( 'icon' == $scrolltop_media_type ) {
+			if ( $scrolltop_media_type === 'icon' ) {
 				$scrolltop_icon      = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_icon' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_icon' )['value'] : 'fas fa-chevron-up';
-				$scrolltop_icon_html = "<i class='$scrolltop_icon'></i>";
-			} elseif ( 'image' == $scrolltop_media_type ) {
+				$scrolltop_icon_html = "<i class='{$scrolltop_icon}'></i>";
+			} elseif ( $scrolltop_media_type === 'image' ) {
 				$scrolltop_image     = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_image' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_image' )['url'] : '';
-				$scrolltop_icon_html = "<img src='$scrolltop_image'>";
-			} elseif ( 'text' == $scrolltop_media_type ) {
+				$scrolltop_icon_html = "<img src='{$scrolltop_image}'>";
+			} elseif ( $scrolltop_media_type === 'text' ) {
 				$scrolltop_text      = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_text' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_text' ) : '';
-				$scrolltop_icon_html = "<span>$scrolltop_text</span>";
+				$scrolltop_icon_html = "<span>{$scrolltop_text}</span>";
 			}
 
-			$scroll_to_top_html = "<div class='hfe-scroll-to-top-wrap hfe-scroll-to-top-hide'><span class='hfe-scroll-to-top-button'>$scrolltop_icon_html</span></div>";
+			$scroll_to_top_html = "<div class='hfe-scroll-to-top-wrap hfe-scroll-to-top-hide'><span class='hfe-scroll-to-top-button'>{$scrolltop_icon_html}</span></div>";
 
 			$elementor_page = get_post_meta( get_the_ID(), '_elementor_edit_mode', true );
 			if ( (bool) $elementor_page ) {
 				printf( '%1$s', wp_kses_post( $scroll_to_top_html ) );
-			}       
+			}
 		}
 
 		if ( \Elementor\Plugin::instance()->preview->is_preview_mode() ) {
 			if ( $scroll_to_top ) {
 				$scrolltop_media_type = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_media_type' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_media_type' ) : 'icon';
 				$scrolltop_icon_html  = '';
-				if ( 'icon' == $scrolltop_media_type ) {
+				if ( $scrolltop_media_type === 'icon' ) {
 					$scrolltop_icon      = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_icon' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_icon' )['value'] : 'fas fa-chevron-up';
-					$scrolltop_icon_html = "<i class='$scrolltop_icon'></i>";
-				} elseif ( 'image' == $scrolltop_media_type ) {
+					$scrolltop_icon_html = "<i class='{$scrolltop_icon}'></i>";
+				} elseif ( $scrolltop_media_type === 'image' ) {
 					$scrolltop_image     = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_image' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_image' )['url'] : '';
-					$scrolltop_icon_html = "<img src='$scrolltop_image'>";
-				} elseif ( 'text' == $scrolltop_media_type ) {
+					$scrolltop_icon_html = "<img src='{$scrolltop_image}'>";
+				} elseif ( $scrolltop_media_type === 'text' ) {
 					$scrolltop_text      = ! empty( $this->get_elementor_settings( 'hfe_scroll_to_top_button_text' ) ) ? $this->get_elementor_settings( 'hfe_scroll_to_top_button_text' ) : '';
-					$scrolltop_icon_html = "<span>$scrolltop_text</span>";
+					$scrolltop_icon_html = "<span>{$scrolltop_text}</span>";
 				}
-				$scroll_to_top_html = "<div class='hfe-scroll-to-top-wrap hfe-scroll-to-top-hide'><span class='hfe-scroll-to-top-button'>$scrolltop_icon_html</span></div>";
+				$scroll_to_top_html = "<div class='hfe-scroll-to-top-wrap hfe-scroll-to-top-hide'><span class='hfe-scroll-to-top-button'>{$scrolltop_icon_html}</span></div>";
 
 				$elementor_page = get_post_meta( get_the_ID(), '_elementor_edit_mode', true );
 				if ( (bool) $elementor_page ) {
@@ -259,12 +258,11 @@ function hfeSanitizeURL(url) {
 			</script>
 			<?php
 		}
-
 	}
 
 	/**
 	 * Get Elementor settings
-	 * 
+	 *
 	 * @param string $setting_id Setting ID.
 	 * @return string
 	 */
@@ -285,7 +283,7 @@ public function get_elementor_settings( $setting_id ) {
 			}
 		}
 
-		if ( isset( $extensions_settings) && isset( $extensions_settings['kit_settings'][ $setting_id ] ) ) {
+		if ( isset( $extensions_settings ) && isset( $extensions_settings['kit_settings'][ $setting_id ] ) ) {
 			$return = $extensions_settings['kit_settings'][ $setting_id ];
 		}
 
@@ -297,10 +295,10 @@ public function get_elementor_settings( $setting_id ) {
 	 *
 	 * @param \Elementor\Widget_Base $element Elementor Widget.
 	 */
-	public function page_scroll_to_top_controls( $element ) {
+	public function page_scroll_to_top_controls( $element ): void {
 
 		$scroll_to_top_global = $this->get_elementor_settings( 'hfe_scroll_to_top_global' );
-		if ( 'yes' !== $scroll_to_top_global ) {
+		if ( $scroll_to_top_global !== 'yes' ) {
 			return;
 		}
 
@@ -327,7 +325,6 @@ public function page_scroll_to_top_controls( $element ) {
 		$element->end_controls_section();
 	}
 
-
 }
 
 Scroll_To_Top::instance();
diff --git a/inc/widgets-manager/modules-manager.php b/inc/widgets-manager/modules-manager.php
index e38661d42..7c17d46d1 100644
--- a/inc/widgets-manager/modules-manager.php
+++ b/inc/widgets-manager/modules-manager.php
@@ -20,7 +20,6 @@
 
 #[\AllowDynamicProperties]
 class Modules_Manager {
-
 	/**
 	 * Member Variable
 	 *
@@ -68,10 +67,10 @@ public function register_modules() {
 			if ( class_exists( $class_name ) && $class_name::is_enable() ) {
 				$this->_modules[ $module_name ] = $class_name::instance();
 
-				if ( 'copyright' === $module_name ) {
+				if ( $module_name === 'copyright' ) {
 					require HFE_DIR . '/inc/widgets-manager/widgets/copyright/copyright-shortcode.php';
 					$copyright_shortcode = new \HFE\WidgetsManager\Widgets\Copyright\Copyright_Shortcode();
-				}           
+				}
 			}
 		}
 	}
@@ -83,7 +82,7 @@ public function register_modules() {
 	 *
 	 * @since 0.0.1
 	 *
-	 * @return Module_Base|Module_Base[]
+	 * @return Module_Base|array<Module_Base>
 	 */
 	public function get_modules( $module_name = null ) {
 		if ( $module_name ) {
@@ -101,7 +100,7 @@ public function get_modules( $module_name = null ) {
 	 *
 	 * @since 0.0.1
 	 */
-	private function require_files() {
+	private function require_files(): void {
 		require HFE_DIR . 'inc/widgets-manager/base/module-base.php';
 	}
 
diff --git a/inc/widgets-manager/widgets/breadcrumbs-widget/breadcrumbs-widget.php b/inc/widgets-manager/widgets/breadcrumbs-widget/breadcrumbs-widget.php
index e01557270..6990da8b7 100644
--- a/inc/widgets-manager/widgets/breadcrumbs-widget/breadcrumbs-widget.php
+++ b/inc/widgets-manager/widgets/breadcrumbs-widget/breadcrumbs-widget.php
@@ -8,14 +8,10 @@
 namespace HFE\WidgetsManager\Widgets\BreadcrumbsWidget;
 
 use Elementor\Controls_Manager;
-use Elementor\Widget_Base;
-use Elementor\Utils;
-use Elementor\Icons_Manager;
 use Elementor\Group_Control_Border;
 use Elementor\Group_Control_Typography;
+use Elementor\Icons_Manager;
 use Elementor\Modules\DynamicTags\Module as TagsModule;
-
-use HFE\WidgetsManager\Widgets_Loader;
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -30,7 +26,6 @@
  * @since x.x.x
  */
 class Breadcrumbs_Widget extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -70,6 +65,23 @@ public function get_icon() {
 		return parent::get_widget_icon( 'Breadcrumbs_Widget' );
 	}
 
+	/**
+	 * Sets the home icon.
+	 *
+	 * @access public
+	 * @param string $home_class home icon class.
+	 * @param string $home_icon home icon.
+	 * @return string
+	 */
+	public function home_icon_html( $home_class = '', $home_icon = [] ) {
+		$home_icon_html = '<span class="' . esc_attr( $home_class ) . '">';
+		ob_start();
+		Icons_Manager::render_icon( $home_icon, [ 'aria-hidden' => 'true' ] );
+		$home_icon_html .= ob_get_clean(); // Store the icon output as delimiter.
+		$home_icon_html .= '</span>';
+		return $home_icon_html;
+	}
+
 	/**
 	 * Indicates if the widget's content is dynamic.
 	 *
@@ -102,8 +114,6 @@ protected function register_controls(): void {
 		$this->register_breadcrumbs_current_style_controls();
 	}
 
-	
-
 	/**
 	 * Register general Controls.
 	 *
@@ -305,9 +315,7 @@ protected function register_breadcrumbs_text_controls(): void {
 				]
 			);
 
-		
 		$this->end_controls_section();
-
 	}
 
 	/**
@@ -538,7 +546,6 @@ protected function register_breadcrumbs_separator_style_controls(): void {
 		);
 
 		$this->end_controls_section();
-
 	}
 
 	/**
@@ -627,7 +634,6 @@ protected function register_breadcrumbs_current_style_controls(): void {
 			);
 
 		$this->end_controls_section();
-
 	}
 
 	/**
@@ -642,30 +648,30 @@ protected function register_breadcrumbs_current_style_controls(): void {
 	 * @return void
 	 */
 	// phpcs:ignore
-	protected function render():void {
+	protected function render(): void {
 		$settings = $this->get_settings_for_display();
-	
-		$delimiter = 'text' === $settings['separator_type'] ? $settings['separator_text'] : '';
-	
-		if ( 'icon' === $settings['separator_type'] ) {
+
+		$delimiter = $settings['separator_type'] === 'text' ? $settings['separator_text'] : '';
+
+		if ( $settings['separator_type'] === 'icon' ) {
 			ob_start();
 			Icons_Manager::render_icon( $settings['separator_icon'], [ 'aria-hidden' => 'true' ] );
 			$delimiter = ob_get_clean(); // Store the icon output as delimiter.
 		}
-	
+
 		// Define breadcrumb defaults.
 		$defaults = [
-			'home'         => isset( $settings['home_text'] ) ? $settings['home_text'] : __( 'Home', 'header-footer-elementor' ),
+			'home'         => $settings['home_text'] ?? __( 'Home', 'header-footer-elementor' ),
 			'delimiter'    => $delimiter,
 			'echo'         => true,
-			'404_title'    => isset( $settings['error_text'] ) ? $settings['error_text'] : __( 'Error 404: Page not found', 'header-footer-elementor' ),
-			'search_title' => isset( $settings['search_text'] ) ? $settings['search_text'] : __( 'Search results for: ', 'header-footer-elementor' ),
+			'404_title'    => $settings['error_text'] ?? __( 'Error 404: Page not found', 'header-footer-elementor' ),
+			'search_title' => $settings['search_text'] ?? __( 'Search results for: ', 'header-footer-elementor' ),
 		];
-	
+
 		// Start the breadcrumbs array.
 		$breadcrumbs = [];
 
-		if ( 'yes' === $settings['show_home'] ) {
+		if ( $settings['show_home'] === 'yes' ) {
 			// Add the Home link to the breadcrumbs.
 			$breadcrumbs[] = [
 				'title' => $defaults['home'],
@@ -673,16 +679,16 @@ protected function render():void {
 				'class' => 'hfe-breadcrumbs-first',
 			];
 		}
-	
+
 		// Add the current page details to breadcrumbs based on conditions.
 		if ( ! is_front_page() ) {
-			if ( is_home() && 'yes' === $settings['show_home'] ) {
+			if ( is_home() && $settings['show_home'] === 'yes' ) {
 				$breadcrumbs[] = [
 					'title' => get_the_title( get_option( 'page_for_posts' ) ),
 					'url'   => '',
 					'class' => '',
 				];
-	
+
 			} elseif ( is_single() ) {
 
 				$category = get_the_category();
@@ -714,7 +720,7 @@ protected function render():void {
 					'url'   => '',              // No URL for the current page.
 					'class' => 'hfe-breadcrumbs-last', // Optional class for styling the last breadcrumb.
 				];
-	
+
 			} elseif ( is_page() && ! is_front_page() ) {
 				$parents = get_post_ancestors( get_the_ID() );
 				foreach ( array_reverse( $parents ) as $parent ) {
@@ -729,42 +735,42 @@ protected function render():void {
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_category() ) {
 				$breadcrumbs[] = [
 					'title' => single_cat_title( '', false ),
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_tag() ) {
 				$breadcrumbs[] = [
 					'title' => single_tag_title( '', false ),
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_author() ) {
 				$breadcrumbs[] = [
 					'title' => get_the_author(),
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_search() ) {
 				$breadcrumbs[] = [
 					'title' => $defaults['search_title'] . get_search_query(),
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_404() ) {
 				$breadcrumbs[] = [
 					'title' => $defaults['404_title'],
 					'url'   => '',
 					'class' => 'hfe-breadcrumbs-last',
 				];
-	
+
 			} elseif ( is_archive() ) {
 				$breadcrumbs[] = [
 					'title' => post_type_archive_title( '', false ),
@@ -774,8 +780,8 @@ protected function render():void {
 			}
 		}
 
-		$home_class = ( 'yes' === $settings['show_home'] ) ? 'hfe-breadcrumbs-show-home' : '';
-	
+		$home_class = $settings['show_home'] === 'yes' ? 'hfe-breadcrumbs-show-home' : '';
+
 		// Build the breadcrumb output.
 		$output = '<ul class="hfe-breadcrumbs ' . esc_attr( $home_class ) . '">';
 
@@ -783,7 +789,7 @@ protected function render():void {
 			// Open the breadcrumb item.
 			$output .= '<li class="hfe-breadcrumbs-item ' . esc_attr( $breadcrumb['class'] ) . '">';
 
-			if ( 'yes' === $settings['show_home'] && 0 === $index ) {
+			if ( $settings['show_home'] === 'yes' && $index === 0 ) {
 				$home_icon = $this->home_icon_html( 'hfe-breadcrumbs-home-icon', $settings['home_icon'] );
 				$output   .= $home_icon;
 			}
@@ -798,7 +804,7 @@ protected function render():void {
 			// Add the separator except for the last item.
 			if ( $index < count( $breadcrumbs ) - 1 ) {
 				$output .= '<li class="hfe-breadcrumbs-separator">';
-				if ( 'icon' === $settings['separator_type'] ) {
+				if ( $settings['separator_type'] === 'icon' ) {
 					// Render the icon.
 					$output .= '<span class="hfe-breadcrumbs-separator-icon">';
 					$output .= $delimiter;
@@ -811,26 +817,8 @@ protected function render():void {
 			}
 		}
 		$output .= '</ul>';
-		
-		echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
-	}
-
-	/**
-	 * Sets the home icon.
-	 *
-	 * @access public
-	 * @param string $home_class home icon class.
-	 * @param string $home_icon home icon.
-	 * @return string
-	 */
-	public function home_icon_html( $home_class = '', $home_icon = [] ) {
-		$home_icon_html = '<span class="' . esc_attr( $home_class ) . '">';
-		ob_start();
-		Icons_Manager::render_icon( $home_icon, [ 'aria-hidden' => 'true' ] );
-		$home_icon_html .= ob_get_clean(); // Store the icon output as delimiter.
-		$home_icon_html .= '</span>';
-		return $home_icon_html;
+		echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
 	/**
@@ -842,6 +830,6 @@ public function home_icon_html( $home_class = '', $home_icon = [] ) {
 	 * @access protected
 	 * @return void
 	 */
-	protected function content_template() {
+	protected function content_template(): void {
 	}
 }
diff --git a/inc/widgets-manager/widgets/breadcrumbs-widget/module.php b/inc/widgets-manager/widgets/breadcrumbs-widget/module.php
index 8075fb92c..da7c6983b 100644
--- a/inc/widgets-manager/widgets/breadcrumbs-widget/module.php
+++ b/inc/widgets-manager/widgets/breadcrumbs-widget/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Breadcrumbs_Widget',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/cart/cart.php b/inc/widgets-manager/widgets/cart/cart.php
index 63d543b0b..8035dc264 100644
--- a/inc/widgets-manager/widgets/cart/cart.php
+++ b/inc/widgets-manager/widgets/cart/cart.php
@@ -8,11 +8,7 @@
 namespace HFE\WidgetsManager\Widgets\Cart;
 
 use Elementor\Controls_Manager;
-use Elementor\Group_Control_Typography;
 use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
-use Elementor\Group_Control_Text_Shadow;
-use Elementor\Group_Control_Border;
-
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -25,7 +21,6 @@
  * @since 1.4.0
  */
 class Cart extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -72,7 +67,7 @@ public function get_icon() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 
 		$this->register_general_content_controls();
 		$this->register_cart_typo_content_controls();
@@ -85,7 +80,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_general_content_controls() {
+	protected function register_general_content_controls(): void {
 
 		$this->start_controls_section(
 			'section_general_fields',
@@ -203,7 +198,6 @@ protected function register_general_content_controls() {
 		$this->end_controls_section();
 	}
 
-
 	/**
 	 * Register Menu Cart Typography Controls.
 	 *
@@ -211,7 +205,7 @@ protected function register_general_content_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_cart_typo_content_controls() {
+	protected function register_cart_typo_content_controls(): void {
 		$this->start_controls_section(
 			'section_heading_typography',
 			[
@@ -595,9 +589,9 @@ protected function register_cart_typo_content_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function render() {
+	protected function render(): void {
 
-		if ( null === \WC()->cart ) {
+		if ( \WC()->cart === null ) {
 			return;
 		}
 
@@ -610,12 +604,12 @@ protected function render() {
 			<div id="hfe-site-header-cart" class="hfe-site-header-cart hfe-menu-cart-with-border">
 				<div class="hfe-site-header-cart-li current-menu-item">
 				<?php
-				if ( 'default' === $cart_type ) {
+				if ( $cart_type === 'default' ) {
 					?>
 
 					<a class="hfe-cart-container" href="<?php echo esc_url( wc_get_cart_url() ); ?>" title="View your shopping cart">
 						<div class="hfe-cart-menu-wrap-default">
-							<?php if ( null !== WC()->cart ) { ?>
+							<?php if ( WC()->cart !== null ) { ?>
 								<span class="hfe-cart-count">
 									<?php echo esc_html( WC()->cart->get_cart_contents_count() ); ?>
 								</span>
@@ -627,12 +621,12 @@ protected function render() {
 					?>
 					<div class="hfe-menu-cart__toggle elementor-button-wrapper">
 						<a id="hfe-menu-cart__toggle_button" href="<?php echo esc_url( wc_get_cart_url() ); ?>" class="elementor-button hfe-cart-container" aria-label="<?php esc_attr_e( 'Cart', 'header-footer-elementor' ); ?>">
-							<?php if ( null !== WC()->cart ) { ?>
+							<?php if ( WC()->cart !== null ) { ?>
 								<span class="elementor-button-text hfe-subtotal">
 									<?php echo wp_kses_post( WC()->cart->get_cart_subtotal() ); ?>
 								</span>
 							<?php } ?>
-							<span class="elementor-button-icon" data-counter="<?php echo ( null !== WC()->cart ) ? esc_attr( WC()->cart->get_cart_contents_count() ) : ''; ?>">
+							<span class="elementor-button-icon" data-counter="<?php echo WC()->cart !== null ? esc_attr( WC()->cart->get_cart_contents_count() ) : ''; ?>">
 								<i class="eicon" aria-hidden="true"></i>
 							</span>
 						</a>	
@@ -653,6 +647,6 @@ protected function render() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function content_template() {
+	protected function content_template(): void {
 	}
 }
diff --git a/inc/widgets-manager/widgets/cart/module.php b/inc/widgets-manager/widgets/cart/module.php
index 79d738773..ed6ffc8ad 100644
--- a/inc/widgets-manager/widgets/cart/module.php
+++ b/inc/widgets-manager/widgets/cart/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Cart',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/copyright/copyright-shortcode.php b/inc/widgets-manager/widgets/copyright/copyright-shortcode.php
index c3d3de785..f6b16978a 100644
--- a/inc/widgets-manager/widgets/copyright/copyright-shortcode.php
+++ b/inc/widgets-manager/widgets/copyright/copyright-shortcode.php
@@ -12,7 +12,7 @@
  * Exit if accessed directly.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit();
+	exit;
 }
 
 /**
@@ -21,7 +21,6 @@
  * @since 1.2.0
  */
 class Copyright_Shortcode {
-
 	/**
 	 * Constructor.
 	 */
diff --git a/inc/widgets-manager/widgets/copyright/copyright.php b/inc/widgets-manager/widgets/copyright/copyright.php
index 52165bd8d..963319440 100644
--- a/inc/widgets-manager/widgets/copyright/copyright.php
+++ b/inc/widgets-manager/widgets/copyright/copyright.php
@@ -8,11 +8,7 @@
 namespace HFE\WidgetsManager\Widgets\Copyright;
 
 use Elementor\Controls_Manager;
-use Elementor\Utils;
-use Elementor\Group_Control_Typography;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -27,7 +23,6 @@
  * @since 1.2.0
  */
 class Copyright extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -65,6 +60,20 @@ public function get_icon() {
 		return parent::get_widget_icon( 'Copyright' );
 	}
 
+	/**
+	 * Render shortcode widget as plain content.
+	 *
+	 * Override the default behavior by printing the shortcode instead of rendering it.
+	 *
+	 * @since 1.2.0
+	 * @access public
+	 * @return void
+	 */
+	public function render_plain_content(): void {
+		// In plain mode, render without shortcode.
+		echo esc_attr( $this->get_settings( 'shortcode' ) );
+	}
+
 	/**
 	 * Indicates if the widget's content is dynamic.
 	 *
@@ -85,7 +94,7 @@ protected function is_dynamic_content(): bool { // phpcs:ignore
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 		$this->register_content_copy_right_controls();
 	}
 	/**
@@ -95,7 +104,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_content_copy_right_controls() {
+	protected function register_content_copy_right_controls(): void {
 		$this->start_controls_section(
 			'section_title',
 			[
@@ -186,9 +195,9 @@ protected function register_content_copy_right_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function render() {
+	protected function render(): void {
 		$settings = $this->get_settings_for_display();
-		$link     = isset( $settings['link']['url'] ) ? $settings['link']['url'] : '';
+		$link     = $settings['link']['url'] ?? '';
 
 		if ( ! empty( $link ) ) {
 			$this->add_link_attributes( 'link', $settings['link'] );
@@ -207,20 +216,6 @@ protected function render() {
 		<?php
 	}
 
-	/**
-	 * Render shortcode widget as plain content.
-	 *
-	 * Override the default behavior by printing the shortcode instead of rendering it.
-	 *
-	 * @since 1.2.0
-	 * @access public
-	 * @return void
-	 */
-	public function render_plain_content() {
-		// In plain mode, render without shortcode.
-		echo esc_attr( $this->get_settings( 'shortcode' ) );
-	}
-
 	/**
 	 * Render shortcode widget output in the editor.
 	 *
@@ -230,5 +225,6 @@ public function render_plain_content() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function content_template() {}
+	protected function content_template(): void {
+	}
 }
diff --git a/inc/widgets-manager/widgets/copyright/module.php b/inc/widgets-manager/widgets/copyright/module.php
index 90ddb5483..ba535c030 100644
--- a/inc/widgets-manager/widgets/copyright/module.php
+++ b/inc/widgets-manager/widgets/copyright/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Copyright',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/navigation-menu/menu-walker.php b/inc/widgets-manager/widgets/navigation-menu/menu-walker.php
index 4d1bacf7f..16f5da88b 100644
--- a/inc/widgets-manager/widgets/navigation-menu/menu-walker.php
+++ b/inc/widgets-manager/widgets/navigation-menu/menu-walker.php
@@ -15,7 +15,6 @@
  * Class Menu_Walker.
  */
 class Menu_Walker extends \Walker_Nav_Menu {
-
 	/**
 	 * Start element
 	 *
@@ -28,9 +27,9 @@ class Menu_Walker extends \Walker_Nav_Menu {
 	 * @access public
 	 * @return void
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ) {
+	public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ): void {
 
-		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+		$indent = $depth ? str_repeat( "\t", $depth ) : '';
 		$args   = (object) $args;
 
 		$class_names = '';
@@ -41,7 +40,7 @@ public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ) {
 		$classes = empty( $item->classes ) ? [] : (array) $item->classes;
 		$submenu = $args->has_children ? ' hfe-has-submenu' : '';
 
-		if ( 0 === $depth ) {
+		if ( $depth === 0 ) {
 			array_push( $classes, 'parent' );
 		}
 		$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
@@ -50,10 +49,10 @@ public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ) {
 
 		$output .= $indent . '<li id="menu-item-' . $item->ID . '"' . $value . $class_names . '>';
 
-		if ( isset( $item->target ) && '_blank' === $item->target && isset( $item->xfn ) && false === strpos( $item->xfn, 'noopener' ) ) {
+		if ( isset( $item->target ) && $item->target === '_blank' && isset( $item->xfn ) && strpos( $item->xfn, 'noopener' ) === false ) {
 			$rel_xfn = ' noopener';
 		}
-		if ( isset( $item->target ) && '_blank' === $item->target && isset( $item->xfn ) && empty( $item->xfn ) ) {
+		if ( isset( $item->target ) && $item->target === '_blank' && isset( $item->xfn ) && empty( $item->xfn ) ) {
 			$rel_blank = 'rel="noopener"';
 		}
 
@@ -67,7 +66,7 @@ public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ) {
 		$item_output  = $args->has_children ? '<div class="hfe-has-submenu-container">' : '';
 		$item_output .= $args->before;
 		$item_output .= '<a' . $atts;
-		if ( 0 === $depth ) {
+		if ( $depth === 0 ) {
 			$item_output .= ' class = "hfe-menu-item"';
 		} else {
 			$item_output .= in_array( 'current-menu-item', $item->classes ) ? ' class = "hfe-sub-menu-item hfe-sub-menu-item-active"' : ' class = "hfe-sub-menu-item"';
diff --git a/inc/widgets-manager/widgets/navigation-menu/module.php b/inc/widgets-manager/widgets/navigation-menu/module.php
index 9db9e2107..e4f6f5fcf 100644
--- a/inc/widgets-manager/widgets/navigation-menu/module.php
+++ b/inc/widgets-manager/widgets/navigation-menu/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Navigation_Menu',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/navigation-menu/navigation-menu.php b/inc/widgets-manager/widgets/navigation-menu/navigation-menu.php
index 27ea5bc9b..26d9d4c79 100644
--- a/inc/widgets-manager/widgets/navigation-menu/navigation-menu.php
+++ b/inc/widgets-manager/widgets/navigation-menu/navigation-menu.php
@@ -9,15 +9,11 @@
 
 // Elementor Classes.
 use Elementor\Controls_Manager;
-use Elementor\Utils;
-use Elementor\Group_Control_Typography;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Group_Control_Background;
 use Elementor\Group_Control_Border;
 use Elementor\Group_Control_Box_Shadow;
-use Elementor\Group_Control_Background;
-use Elementor\Plugin;
-use HFE\WidgetsManager\Widgets\NavigationMenu\MenuWalker;
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -28,8 +24,6 @@
  * Class Nav Menu.
  */
 class Navigation_Menu extends Common_Widget {
-
-
 	/**
 	 * Menu index.
 	 *
@@ -93,55 +87,97 @@ public function get_script_depends() {
 	}
 
 	/**
-	 * Retrieve the menu index.
-	 *
-	 * Used to get index of nav menu.
+	 * Check if the Elementor is updated.
 	 *
 	 * @since 1.3.0
-	 * @access protected
 	 *
-	 * @return int nav index.
+	 * @return bool if Elementor updated.
 	 */
-	protected function get_nav_menu_index() {
-		return $this->nav_menu_index++;
+	public static function is_elementor_updated() {
+		if ( class_exists( 'Elementor\Icons_Manager' ) ) {
+			return true;
+		}
+			return false;
 	}
 
 	/**
-	 * Retrieve the list of available menus.
-	 *
-	 * Used to get the list of available menus.
+	 * Add itemprop for Navigation Schema.
 	 *
-	 * @since 1.3.0
-	 * @access private
+	 * @since 1.5.2
+	 * @param string $atts link attributes.
+	 * @access public
+	 * @return string
+	 */
+	public function handle_link_attrs( $atts ) {
+
+		$atts .= ' itemprop="url"';
+		return $atts;
+	}
+
+	/**
+	 * Add itemprop to the li tag of Navigation Schema.
 	 *
-	 * @return array get WordPress menus list.
+	 * @since 1.6.0
+	 * @param string $value link attributes.
+	 * @access public
+	 * @return string
 	 */
-	private function get_available_menus() {
+	public function handle_li_values( $value ) {
 
-		$menus = wp_get_nav_menus();
+		$value .= ' itemprop="name"';
+		return $value;
+	}
 
-		$options = [];
+	/**
+	 * Get the menu and close icon HTML.
+	 *
+	 * @since 1.5.2
+	 * @param array $settings Widget settings array.
+	 * @access public
+	 * @return array
+	 */
+	public function get_menu_close_icon( $settings ) {
+		$menu_icon     = '';
+		$close_icon    = '';
+		$icons         = [];
+		$icon_settings = [
+			$settings['dropdown_icon'],
+			$settings['dropdown_close_icon'],
+		];
 
-		foreach ( $menus as $menu ) {
-			$options[ $menu->slug ] = $menu->name;
+		foreach ( $icon_settings as $icon ) {
+			if ( $this->is_elementor_updated() ) {
+				ob_start();
+				\Elementor\Icons_Manager::render_icon(
+					$icon,
+					[
+						'aria-hidden' => 'true',
+						'tabindex'    => '0',
+					]
+				);
+				$menu_icon = ob_get_clean();
+			} else {
+				$menu_icon = '<i class="' . esc_attr( $icon ) . '" aria-hidden="true" tabindex="0"></i>';
+			}
+
+			array_push( $icons, $menu_icon );
 		}
 
-		return $options;
+		return $icons;
 	}
 
 	/**
-	 * Check if the Elementor is updated.
+	 * Retrieve the menu index.
+	 *
+	 * Used to get index of nav menu.
 	 *
 	 * @since 1.3.0
+	 * @access protected
 	 *
-	 * @return boolean if Elementor updated.
+	 * @return int nav index.
 	 */
-	public static function is_elementor_updated() {
-		if ( class_exists( 'Elementor\Icons_Manager' ) ) {
-			return true;
-		} else {
-			return false;
-		}
+	protected function get_nav_menu_index() {
+		return $this->nav_menu_index++;
 	}
 
 	/**
@@ -151,7 +187,7 @@ public static function is_elementor_updated() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 
 		$this->register_general_content_controls();
 		$this->register_style_content_controls();
@@ -165,7 +201,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_general_content_controls() {
+	protected function register_general_content_controls(): void {
 
 		$this->start_controls_section(
 			'section_menu',
@@ -233,7 +269,7 @@ protected function register_general_content_controls() {
 
 		$current_theme = wp_get_theme();
 
-		if ( 'Twenty Twenty-One' === $current_theme->get( 'Name' ) ) {
+		if ( $current_theme->get( 'Name' ) === 'Twenty Twenty-One' ) {
 			$this->add_control(
 				'hide_theme_icons',
 				[
@@ -615,7 +651,7 @@ protected function register_general_content_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_style_content_controls() {
+	protected function register_style_content_controls(): void {
 
 		$this->start_controls_section(
 			'section_style_main-menu',
@@ -1094,7 +1130,7 @@ protected function register_style_content_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_dropdown_content_controls() {
+	protected function register_dropdown_content_controls(): void {
 
 		$this->start_controls_section(
 			'section_style_dropdown',
@@ -1817,72 +1853,6 @@ protected function register_dropdown_content_controls() {
 		$this->end_controls_section();
 	}
 
-	/**
-	 * Add itemprop for Navigation Schema.
-	 *
-	 * @since 1.5.2
-	 * @param string $atts link attributes.
-	 * @access public
-	 * @return string
-	 */
-	public function handle_link_attrs( $atts ) {
-
-		$atts .= ' itemprop="url"';
-		return $atts;
-	}
-
-	/**
-	 * Add itemprop to the li tag of Navigation Schema.
-	 *
-	 * @since 1.6.0
-	 * @param string $value link attributes.
-	 * @access public
-	 * @return string
-	 */
-	public function handle_li_values( $value ) {
-
-		$value .= ' itemprop="name"';
-		return $value;
-	}
-
-	/**
-	 * Get the menu and close icon HTML.
-	 *
-	 * @since 1.5.2
-	 * @param array $settings Widget settings array.
-	 * @access public
-	 * @return array
-	 */
-	public function get_menu_close_icon( $settings ) {
-		$menu_icon     = '';
-		$close_icon    = '';
-		$icons         = [];
-		$icon_settings = [
-			$settings['dropdown_icon'],
-			$settings['dropdown_close_icon'],
-		];
-
-		foreach ( $icon_settings as $icon ) {
-			if ( $this->is_elementor_updated() ) {
-				ob_start();
-				\Elementor\Icons_Manager::render_icon(
-					$icon,
-					[
-						'aria-hidden' => 'true',
-						'tabindex'    => '0',
-					]
-				);
-				$menu_icon = ob_get_clean();
-			} else {
-				$menu_icon = '<i class="' . esc_attr( $icon ) . '" aria-hidden="true" tabindex="0"></i>';
-			}
-
-			array_push( $icons, $menu_icon );
-		}
-
-		return $icons;
-	}
-
 	/**
 	 * Render Nav Menu output on the frontend.
 	 *
@@ -1915,7 +1885,7 @@ protected function render() {
 			'walker'      => new Menu_Walker(),
 		];
 
-		if ( 'yes' === $settings['schema_support'] ) {
+		if ( $settings['schema_support'] === 'yes' ) {
 			$this->add_render_attribute( 'hfe-nav-menu', 'itemscope', 'itemscope' );
 			$this->add_render_attribute( 'hfe-nav-menu', 'itemtype', 'https://schema.org/SiteNavigationElement' );
 
@@ -1923,10 +1893,10 @@ protected function render() {
 			add_filter( 'nav_menu_li_values', [ $this, 'handle_li_values' ] );
 		}
 
-		if ( 'flyout' === $settings['layout'] ) {
+		if ( $settings['layout'] === 'flyout' ) {
 
 			$this->add_render_attribute( 'hfe-flyout', 'class', 'hfe-flyout-wrapper' );
-			if ( 'cta' === $settings['menu_last_item'] ) {
+			if ( $settings['menu_last_item'] === 'cta' ) {
 
 				$this->add_render_attribute( 'hfe-flyout', 'data-last-item', $settings['menu_last_item'] );
 			}
@@ -1934,7 +1904,7 @@ protected function render() {
 			?>
 			<div class="hfe-nav-menu__toggle elementor-clickable hfe-flyout-trigger" tabindex="0">
 					<div class="hfe-nav-menu-icon">
-						<?php echo isset( $menu_close_icons[0] ) ? $menu_close_icons[0] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+						<?php echo $menu_close_icons[0] ?? ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 					</div>
 				</div>
 			<div <?php $this->print_render_attribute_string( 'hfe-flyout' ); ?> >
@@ -1946,7 +1916,7 @@ protected function render() {
 								<?php echo wp_nav_menu( $args ); ?>
 							</nav>
 							<div class="elementor-clickable hfe-flyout-close" tabindex="0">
-								<?php echo isset( $menu_close_icons[1] ) ? $menu_close_icons[1] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+								<?php echo $menu_close_icons[1] ?? ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 							</div>
 						</div>
 					</div>
@@ -1969,26 +1939,26 @@ protected function render() {
 
 			$this->add_render_attribute( 'hfe-main-menu', 'data-layout', $settings['layout'] );
 
-			if ( 'cta' === $settings['menu_last_item'] ) {
+			if ( $settings['menu_last_item'] === 'cta' ) {
 
 				$this->add_render_attribute( 'hfe-main-menu', 'data-last-item', $settings['menu_last_item'] );
 			}
 
 			if ( $settings['pointer'] ) {
-				if ( 'horizontal' === $settings['layout'] || 'vertical' === $settings['layout'] ) {
+				if ( $settings['layout'] === 'horizontal' || $settings['layout'] === 'vertical' ) {
 					$this->add_render_attribute( 'hfe-main-menu', 'class', 'hfe-pointer__' . $settings['pointer'] );
 
 					if ( in_array( $settings['pointer'], [ 'double-line', 'underline', 'overline' ], true ) ) {
 						$key = 'animation_line';
 						$this->add_render_attribute( 'hfe-main-menu', 'class', 'hfe-animation__' . $settings[ $key ] );
-					} elseif ( 'framed' === $settings['pointer'] || 'text' === $settings['pointer'] ) {
+					} elseif ( $settings['pointer'] === 'framed' || $settings['pointer'] === 'text' ) {
 						$key = 'animation_' . $settings['pointer'];
 						$this->add_render_attribute( 'hfe-main-menu', 'class', 'hfe-animation__' . $settings[ $key ] );
 					}
 				}
 			}
 
-			if ( 'expandible' === $settings['layout'] ) {
+			if ( $settings['layout'] === 'expandible' ) {
 				$this->add_render_attribute( 'hfe-nav-menu', 'class', 'hfe-dropdown-expandible' );
 			}
 
@@ -2014,7 +1984,7 @@ protected function render() {
 					<div class="hfe-nav-menu-icon">
 						<?php
 						$menu_close_icons[0] = str_replace( 'tabindex="0"', '', $menu_close_icons[0] );
-						echo isset( $menu_close_icons[0] ) ? $menu_close_icons[0] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+						echo $menu_close_icons[0] ?? ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 						?>
 					</div>
 				</div>
@@ -2025,4 +1995,27 @@ protected function render() {
 			<?php
 		}
 	}
+
+	/**
+	 * Retrieve the list of available menus.
+	 *
+	 * Used to get the list of available menus.
+	 *
+	 * @since 1.3.0
+	 * @access private
+	 *
+	 * @return array get WordPress menus list.
+	 */
+	private function get_available_menus() {
+
+		$menus = wp_get_nav_menus();
+
+		$options = [];
+
+		foreach ( $menus as $menu ) {
+			$options[ $menu->slug ] = $menu->name;
+		}
+
+		return $options;
+	}
 }
diff --git a/inc/widgets-manager/widgets/page-title/module.php b/inc/widgets-manager/widgets/page-title/module.php
index da95a511b..5b729e2ca 100644
--- a/inc/widgets-manager/widgets/page-title/module.php
+++ b/inc/widgets-manager/widgets/page-title/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Page_Title',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/page-title/page-title.php b/inc/widgets-manager/widgets/page-title/page-title.php
index 56fc1c08a..465df9437 100644
--- a/inc/widgets-manager/widgets/page-title/page-title.php
+++ b/inc/widgets-manager/widgets/page-title/page-title.php
@@ -8,13 +8,12 @@
 namespace HFE\WidgetsManager\Widgets\PageTitle;
 
 use Elementor\Controls_Manager;
+use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
 use Elementor\Group_Control_Text_Shadow;
 use Elementor\Group_Control_Typography;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
-use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-
-use HFE\WidgetsManager\Widgets_Loader;
 use HFE\WidgetsManager\Base\Common_Widget;
+use HFE\WidgetsManager\Widgets_Loader;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;   // Exit if accessed directly.
@@ -28,8 +27,6 @@
  * @since 1.3.0
  */
 class Page_Title extends Common_Widget {
-
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -89,7 +86,7 @@ protected function is_dynamic_content(): bool { // phpcs:ignore
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 		$this->register_content_page_title_controls();
 		$this->register_page_title_style_controls();
 	}
@@ -101,7 +98,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_content_page_title_controls() {
+	protected function register_content_page_title_controls(): void {
 		$this->start_controls_section(
 			'section_general_fields',
 			[
@@ -275,7 +272,7 @@ protected function register_content_page_title_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_page_title_style_controls() {
+	protected function register_page_title_style_controls(): void {
 		$this->start_controls_section(
 			'section_title_typography',
 			[
@@ -404,7 +401,7 @@ protected function register_page_title_style_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function render() {
+	protected function render(): void {
 
 		$settings = $this->get_settings_for_display();
 
@@ -419,21 +416,21 @@ protected function render() {
 		<div class="hfe-page-title hfe-page-title-wrapper elementor-widget-heading">
 
 		<?php
-		$head_link_url    = isset( $settings['page_heading_link']['url'] ) ? $settings['page_heading_link']['url'] : '';
-		$head_custom_link = isset( $settings['page_custom_link'] ) ? $settings['page_custom_link'] : '';
+		$head_link_url    = $settings['page_heading_link']['url'] ?? '';
+		$head_custom_link = $settings['page_custom_link'] ?? '';
 		?>
-			<?php if ( '' !== $head_link_url && 'custom' === $head_custom_link ) { ?>
+			<?php if ( $head_link_url !== '' && $head_custom_link === 'custom' ) { ?>
 						<a <?php echo wp_kses_post( $this->get_render_attribute_string( 'url' ) ); ?>>
-			<?php } elseif ( 'default' === $head_custom_link ) { ?>
+			<?php } elseif ( $head_custom_link === 'default' ) { ?>
 						<a href="<?php echo esc_url( get_home_url() ); ?>">
 			<?php } ?>
 			<<?php echo esc_attr( $heading_size_tag ); ?> class="elementor-heading-title elementor-size-<?php echo esc_attr( $settings['size'] ); ?>">
-				<?php if ( '' !== $settings['new_page_title_select_icon']['value'] ) { ?>
+				<?php if ( $settings['new_page_title_select_icon']['value'] !== '' ) { ?>
 						<span class="hfe-icon hfe-page-title-icon">
 							<?php \Elementor\Icons_Manager::render_icon( $settings['new_page_title_select_icon'], [ 'aria-hidden' => 'true' ] ); ?>
 						</span>
 				<?php } ?>				
-				<?php if ( '' !== $settings['before'] ) { ?>
+				<?php if ( $settings['before'] !== '' ) { ?>
 					<?php echo wp_kses_post( $settings['before'] ); ?>
 					<?php
 				}
@@ -444,12 +441,12 @@ protected function render() {
 					echo wp_kses_post( get_the_title() );
 				}
 
-				if ( '' !== $settings['after'] ) {
+				if ( $settings['after'] !== '' ) {
 					?>
 					<?php echo wp_kses_post( $settings['after'] ); ?>
 				<?php } ?>  
 			</<?php echo esc_attr( $heading_size_tag ); ?> > 
-			<?php if ( ( '' !== $head_link_url && 'custom' === $head_custom_link ) || 'default' === $head_custom_link ) { ?>
+			<?php if ( ( $head_link_url !== '' && $head_custom_link === 'custom' ) || $head_custom_link === 'default' ) { ?>
 						</a>
 			<?php } ?>
 		</div>
@@ -465,7 +462,7 @@ protected function render() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function content_template() {
+	protected function content_template(): void {
 
 		?>
 		<#
diff --git a/inc/widgets-manager/widgets/post-info/module.php b/inc/widgets-manager/widgets/post-info/module.php
index ead843eac..a2d39d7fb 100644
--- a/inc/widgets-manager/widgets/post-info/module.php
+++ b/inc/widgets-manager/widgets/post-info/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Post_Info',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/post-info/post-info.php b/inc/widgets-manager/widgets/post-info/post-info.php
index 24b5c50bc..f50216e84 100644
--- a/inc/widgets-manager/widgets/post-info/post-info.php
+++ b/inc/widgets-manager/widgets/post-info/post-info.php
@@ -8,15 +8,9 @@
 namespace HFE\WidgetsManager\Widgets\PostInfo;
 
 use Elementor\Controls_Manager;
-use Elementor\Widget_Base;
-use Elementor\Utils;
-use Elementor\Icons_Manager;
-use Elementor\Group_Control_Border;
 use Elementor\Group_Control_Typography;
+use Elementor\Icons_Manager;
 use Elementor\Repeater;
-use Elementor\Modules\DynamicTags\Module as TagsModule;
-
-use HFE\WidgetsManager\Widgets_Loader;
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -85,7 +79,7 @@ protected function register_controls() {
 		$this->register_style_post_info_text_controls();
 	}
 
-	
+
 	/**
 	 * Register general Controls.
 	 *
@@ -123,7 +117,7 @@ protected function register_general_post_info_controls() {
 		);
 
 		$repeater = new Repeater();
-		
+
 		$repeater->add_control(
 			'type',
 			[
@@ -161,7 +155,6 @@ protected function register_general_post_info_controls() {
 			]
 		);
 
-		
 		$repeater->add_control(
 			'custom_date_format',
 			[
@@ -619,7 +612,6 @@ protected function register_style_post_info_meta_controls() {
 				]
 			);
 
-
 		$this->end_controls_section();
 	}
 
@@ -675,7 +667,6 @@ protected function register_style_post_info_icon_controls() {
 		);
 
 		$this->end_controls_section();
-
 	}
 
 	/**
@@ -737,7 +728,6 @@ protected function register_style_post_info_text_controls() {
 			);
 
 		$this->end_controls_section();
-
 	}
 
 	/**
@@ -768,7 +758,7 @@ protected function get_taxonomies() {
 
 	/**
 	 * Render Post meta fields
-	 * 
+	 *
 	 * @since x.x.x
 	 * @access protected
 	 * @param array $repeater_item An array of repeater item options for custom strings and link.
@@ -812,7 +802,6 @@ protected function get_meta_data( $repeater_item ) {
 		}
 
 		return $item_data;
-
 	}
 
 	/**
@@ -849,7 +838,7 @@ function get_post_terms_data( $repeaterItem ) {
 				];
 
 				// Add term link if the option is enabled.
-				if ( isset( $repeaterItem['link'] ) && 'yes' === $repeaterItem['link'] ) {
+				if ( isset( $repeaterItem['link'] ) && $repeaterItem['link'] === 'yes' ) {
 					$term_link = get_term_link( $term );
 					if ( ! is_wp_error( $term_link ) ) {
 						$termsData['terms_list'][ $termId ]['url'] = esc_url( $term_link );
@@ -878,7 +867,7 @@ function get_custom_meta_data( $repeaterItem ) {
 		];
 
 		// Add custom URL if the option is enabled and the URL is not empty.
-		if ( isset( $repeaterItem['link'] ) && 'yes' === $repeaterItem['link'] && ! empty( $repeaterItem['custom_url'] ) ) {
+		if ( isset( $repeaterItem['link'] ) && $repeaterItem['link'] === 'yes' && ! empty( $repeaterItem['custom_url'] ) ) {
 			$customData['url'] = $repeaterItem['custom_url'];
 		}
 
@@ -909,7 +898,7 @@ function get_post_comments_data( $repeaterItem ) {
 		);
 
 		// Check if custom strings are provided.
-		if ( isset( $repeaterItem['comments_custom_strings'] ) && 'yes' === $repeaterItem['comments_custom_strings'] ) {
+		if ( isset( $repeaterItem['comments_custom_strings'] ) && $repeaterItem['comments_custom_strings'] === 'yes' ) {
 			$defaultStrings['stringNoComments'] = ! empty( $repeaterItem['string_no_comments'] ) ? $repeaterItem['string_no_comments'] : $defaultStrings['stringNoComments'];
 			$defaultStrings['stringOneComment'] = ! empty( $repeaterItem['string_one_comment'] ) ? $repeaterItem['string_one_comment'] : $defaultStrings['stringOneComment'];
 			$defaultStrings['stringComments']   = ! empty( $repeaterItem['string_comments'] ) ? $repeaterItem['string_comments'] : $defaultStrings['stringComments'];
@@ -919,12 +908,12 @@ function get_post_comments_data( $repeaterItem ) {
 		$numComments = (int) get_comments_number();
 
 		// Choose appropriate comment text.
-		if ( 0 === $numComments ) {
+		if ( $numComments === 0 ) {
 			$commentsText = $defaultStrings['stringNoComments'];
 		} else {
-			$commentsText = sprintf( 
-				_n( '%s comment', '%s comments', $numComments, 'header-footer-elementor' ), 
-				$numComments 
+			$commentsText = sprintf(
+				_n( '%s comment', '%s comments', $numComments, 'header-footer-elementor' ),
+				$numComments
 			);
 		}
 
@@ -939,7 +928,7 @@ function get_post_comments_data( $repeaterItem ) {
 		];
 
 		// Conditional link to comments.
-		if ( isset( $repeaterItem['link'] ) && 'yes' === $repeaterItem['link'] ) {
+		if ( isset( $repeaterItem['link'] ) && $repeaterItem['link'] === 'yes' ) {
 			$commentsData['url'] = [
 				'url' => get_comments_link(),
 			];
@@ -1025,7 +1014,7 @@ function get_post_date_data( $repeater_item ) {
 		];
 
 		// Optional link to date archive.
-		if ( isset( $repeater_item['link'] ) && 'yes' === $repeater_item['link'] ) {
+		if ( isset( $repeater_item['link'] ) && $repeater_item['link'] === 'yes' ) {
 			$date_data['url'] = [
 				'url' => get_day_link( get_post_time( 'Y' ), get_post_time( 'm' ), get_post_time( 'j' ) ),
 			];
@@ -1055,14 +1044,14 @@ protected function get_author_data( $post_id, $repeater_item ) {
 		];
 
 		// Conditional link to author posts.
-		if ( isset( $repeater_item['link'] ) && 'yes' === $repeater_item['link'] ) {
+		if ( isset( $repeater_item['link'] ) && $repeater_item['link'] === 'yes' ) {
 			$author_data['url'] = [
 				'url' => get_author_posts_url( $user_id ),
 			];
 		}
 
 		// Conditional avatar inclusion.
-		if ( isset( $repeater_item['show_avatar'] ) && 'yes' === $repeater_item['show_avatar'] ) {
+		if ( isset( $repeater_item['show_avatar'] ) && $repeater_item['show_avatar'] === 'yes' ) {
 			$author_data['image'] = get_avatar_url( $user_id, 96 );
 		}
 
@@ -1092,16 +1081,16 @@ protected function render_items( $icon_list ) {
 	protected function render_item( $repeater_item ) {
 		$item_data      = $this->get_meta_data( $repeater_item );
 		$repeater_index = $repeater_item['_id'];
-	
+
 		// Bail early if both text and terms list are empty.
 		if ( empty( $item_data['text'] ) && empty( $item_data['terms_list'] ) ) {
 			return;
 		}
-	
+
 		$item_key = 'item_' . $repeater_index;
 		$link_key = 'link_' . $repeater_index;
 		$has_link = false;
-	
+
 		// Add base classes to the list item.
 		$this->add_render_attribute(
 			$item_key,
@@ -1111,24 +1100,24 @@ protected function render_item( $repeater_item ) {
 				'elementor-repeater-item-' . $repeater_item['_id'],
 			]
 		);
-	
+
 		// Check active settings for inline view.
 		$active_settings = $this->get_active_settings();
-		if ( 'inline' === $active_settings['view'] ) {
+		if ( $active_settings['view'] === 'inline' ) {
 			$this->add_render_attribute( $item_key, 'class', 'hfe-post-info-inline-item' );
 		}
-	
+
 		// Add itemprop attribute if available.
 		if ( ! empty( $item_data['itemprop'] ) ) {
 			$this->add_render_attribute( $item_key, 'itemprop', $item_data['itemprop'] );
 		}
-	
+
 		// Check if the item has a link.
 		if ( ! empty( $item_data['url']['url'] ) ) {
 			$has_link = true;
 			$this->add_link_attributes( $link_key, $item_data['url'] );
 		}
-	
+
 		?>
 		<li <?php echo $this->get_render_attribute_string( $item_key ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> 
 			<?php if ( $has_link ) : ?>
@@ -1157,25 +1146,25 @@ protected function render_item( $repeater_item ) {
 	 */
 	protected function render_item_icon_or_image( $item_data, $repeater_item, $repeater_index ) {
 		// Determine icon or image settings.
-		if ( 'custom' === $repeater_item['show_icon'] && ! empty( $repeater_item['selected_icon'] ) ) {
+		if ( $repeater_item['show_icon'] === 'custom' && ! empty( $repeater_item['selected_icon'] ) ) {
 			$item_data['selected_icon'] = $repeater_item['selected_icon'];
-		} elseif ( 'none' === $repeater_item['show_icon'] ) {
+		} elseif ( $repeater_item['show_icon'] === 'none' ) {
 			$item_data['selected_icon'] = [];
 		}
-			
+
 		if ( empty( $item_data['selected_icon'] ) && empty( $item_data['image'] ) ) {
 			return; // No icon or image to render.
 		}
 
-		$show_icon = 'none' !== $repeater_item['show_icon'];
-	
+		$show_icon = $repeater_item['show_icon'] !== 'none';
+
 		if ( ! empty( $item_data['image'] ) || $show_icon ) {
 			?>
 			<span class="hfe-post-info-icon">
 				<?php if ( ! empty( $item_data['image'] ) ) : ?>
 					<img class="hfe-post-info-avatar" src="<?php echo esc_url( $item_data['image'] ); ?>" alt="<?php echo esc_attr( $item_data['text'] ); ?>">
 				<?php elseif ( $show_icon && ! empty( $item_data['selected_icon'] ) ) : ?>
-					<?php 
+					<?php
 					Icons_Manager::render_icon( $item_data['selected_icon'], [ 'aria-hidden' => 'true' ] );
 					?>
 				<?php endif; ?>
@@ -1183,7 +1172,7 @@ protected function render_item_icon_or_image( $item_data, $repeater_item, $repea
 			<?php
 		}
 	}
-	
+
 	/**
 	 * Render the text for the item in the icon list.
 	 *
@@ -1193,13 +1182,13 @@ protected function render_item_icon_or_image( $item_data, $repeater_item, $repea
 	 */
 	protected function render_item_text( $item_data, $repeater_index ) {
 		$repeater_setting_key = $this->get_repeater_setting_key( 'text', 'icon_list', $repeater_index );
-	
+
 		// Add classes for text attributes.
 		$this->add_render_attribute( $repeater_setting_key, 'class', [ 'hfe-post-info-text', 'hfe-post-info__item', 'hfe-post-info__item--type-' . $item_data['type'] ] );
 		if ( ! empty( $item['terms_list'] ) ) {
 			$this->add_render_attribute( $repeater_setting_key, 'class', 'hfe-terms-list' );
 		}
-	
+
 		?>
 		<span <?php echo $this->get_render_attribute_string( $repeater_setting_key ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
 			<?php if ( ! empty( $item_data['text_prefix'] ) ) : ?>
@@ -1210,7 +1199,7 @@ protected function render_item_text( $item_data, $repeater_index ) {
 				<span class="hfe-post-info__terms-list">
 					<?php
 					$terms_list = array_map(
-						function( $term ) {
+						static function( $term ) {
 							$term_text = esc_html( $term['text'] );
 							return ! empty( $term['url'] ) ? '<a href="' . esc_url( $term['url'] ) . '" class="hfe-post-info__terms-list-item">' . $term_text . '</a>' : '<span class="hfe-post-info__terms-list-item">' . $term_text . '</span>';
 						},
@@ -1236,7 +1225,7 @@ function( $term ) {
 		</span>
 		<?php
 	}
-	
+
 
 	/**
 	 * Render Post Info widget output on the frontend.
@@ -1262,7 +1251,7 @@ protected function render() {
 			return;
 		}
 
-		if ( 'inline' === $settings['view'] ) {
+		if ( $settings['view'] === 'inline' ) {
 			$this->add_render_attribute( 'icon_list', 'class', 'hfe-post-info-inline' );
 		}
 
diff --git a/inc/widgets-manager/widgets/retina/module.php b/inc/widgets-manager/widgets/retina/module.php
index 04587bbbf..9c9a5c32f 100644
--- a/inc/widgets-manager/widgets/retina/module.php
+++ b/inc/widgets-manager/widgets/retina/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Retina',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/retina/retina.php b/inc/widgets-manager/widgets/retina/retina.php
index 1dfd49cd5..4b4de7fde 100644
--- a/inc/widgets-manager/widgets/retina/retina.php
+++ b/inc/widgets-manager/widgets/retina/retina.php
@@ -7,17 +7,15 @@
 
 namespace HFE\WidgetsManager\Widgets\Retina;
 
-use Elementor\Controls_Manager;
 use Elementor\Control_Media;
-use Elementor\Utils;
-use Elementor\Group_Control_Border;
-use Elementor\Group_Control_Typography;
-use Elementor\Group_Control_Box_Shadow;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Controls_Manager;
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-use Elementor\Group_Control_Image_Size;
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Group_Control_Box_Shadow;
 use Elementor\Group_Control_Css_Filter;
+use Elementor\Group_Control_Image_Size;
 use Elementor\Group_Control_Text_Shadow;
+use Elementor\Group_Control_Typography;
 use Elementor\Plugin;
 use HFE\WidgetsManager\Base\Common_Widget;
 
@@ -91,7 +89,7 @@ protected function is_dynamic_content(): bool { // phpcs:ignore
 	 * @since 1.5.7
 	 * @access protected
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 		$this->register_content_retina_image_controls();
 		$this->register_retina_image_styling_controls();
 		$this->register_retina_caption_styling_controls();
@@ -104,7 +102,7 @@ protected function register_controls() {
 	 * @since 1.2.0
 	 * @access protected
 	 */
-	protected function register_content_retina_image_controls() {
+	protected function register_content_retina_image_controls(): void {
 		$this->start_controls_section(
 			'section_retina_image',
 			[
@@ -238,7 +236,7 @@ protected function register_content_retina_image_controls() {
 	 * @since 1.2.0
 	 * @access protected
 	 */
-	protected function register_retina_image_styling_controls() {
+	protected function register_retina_image_styling_controls(): void {
 		$this->start_controls_section(
 			'section_style_retina_image',
 			[
@@ -509,7 +507,7 @@ protected function register_retina_image_styling_controls() {
 	 * @since 1.2.0
 	 * @access protected
 	 */
-	protected function register_retina_caption_styling_controls() {
+	protected function register_retina_caption_styling_controls(): void {
 		$this->start_controls_section(
 			'section_style_caption',
 			[
@@ -609,7 +607,7 @@ protected function register_retina_caption_styling_controls() {
 	 * @since 1.2.0
 	 * @access protected
 	 */
-	protected function register_helpful_information() {
+	protected function register_helpful_information(): void {
 
 			$help_link_1 = HFE_DOMAIN . 'docs/introducing-retina-image-widget';
 
@@ -633,37 +631,6 @@ protected function register_helpful_information() {
 			$this->end_controls_section();
 	}
 
-	/**
-	 * Check if the current widget has caption
-	 *
-	 * @access private
-	 * @since 1.2.0
-	 *
-	 * @param array $settings returns settings.
-	 *
-	 * @return boolean
-	 */
-	private function has_caption( $settings ) {
-		return ( ! empty( $settings['caption_source'] ) && 'none' !== $settings['caption_source'] );
-	}
-
-	/**
-	 * Get the caption for current widget.
-	 *
-	 * @access private
-	 * @since 1.2.0
-	 * @param array $settings returns the caption.
-	 *
-	 * @return string
-	 */
-	private function get_caption( $settings ) {
-		$caption = '';
-		if ( 'custom' === $settings['caption_source'] ) {
-			$caption = ! empty( $settings['caption'] ) ? $settings['caption'] : '';
-		}
-		return $caption;
-	}
-
 	/**
 	 * Render Retina Image output on the frontend.
 	 *
@@ -672,7 +639,7 @@ private function get_caption( $settings ) {
 	 * @since 1.2.0
 	 * @access protected
 	 */
-	protected function render() {
+	protected function render(): void {
 		$settings = $this->get_settings_for_display();
 
 		if ( empty( $settings['retina_image']['url'] ) ) {
@@ -700,17 +667,17 @@ protected function render() {
 
 		?>
 		<div <?php $this->print_render_attribute_string( 'wrapper' ); ?>>
-			<?php if ( $has_caption ) : ?>
+			<?php if ( $has_caption ) { ?>
 				<figure class="wp-caption">
-			<?php endif; ?>
-			<?php if ( $link ) : ?>
+			<?php } ?>
+			<?php if ( $link ) { ?>
 				<a <?php $this->print_render_attribute_string( 'link' ); ?>>
-			<?php endif; ?>
+			<?php } ?>
 			<?php
 			$size = $settings[ 'retina_image' . '_size' ];
 			$demo = '';
 
-			if ( 'custom' !== $size ) {
+			if ( $size !== 'custom' ) {
 				$image_size = $size;
 			} else {
 				require_once ELEMENTOR_PATH . 'includes/libraries/bfi-thumb/bfi-thumb.php';
@@ -779,10 +746,10 @@ protected function render() {
 
 			// PHPCS:Ignore WordPressVIPMinimum.Variables.RestrictedVariables.cache_constraints___SERVER__HTTP_USER_AGENT__
 			if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && strpos( sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] ), 'Chrome' ) !== false ) {
-				$date             = new \DateTime();
-				$timestam         = $date->getTimestamp();
-				$image_url        = $image_url . '?' . $timestam;
-				$retina_image_url = $retina_image_url . '?' . $timestam;
+				$date              = new \DateTime();
+				$timestam          = $date->getTimestamp();
+				$image_url        .= '?' . $timestam;
+				$retina_image_url .= '?' . $timestam;
 			}
 			?>
 				<div class="hfe-retina-image-set">
@@ -790,24 +757,55 @@ protected function render() {
 						<img class="hfe-retina-img <?php echo esc_attr( $class_animation ); ?>"  src="<?php echo esc_url( $image_url ); ?>" alt="<?php echo esc_attr( Control_Media::get_image_alt( $settings['retina_image'] ) ); ?>" srcset="<?php echo esc_url( $image_url ) . ' 1x' . ',' . esc_url( $retina_image_url ) . ' 2x'; ?>"/>
 					</div>
 				</div>
-			<?php if ( $link ) : ?>
+			<?php if ( $link ) { ?>
 					</a>
-			<?php endif; ?>
+			<?php } ?>
 			<?php
-			if ( $has_caption ) :
+			if ( $has_caption ) {
 				$caption_text = $this->get_caption( $settings );
 				?>
-				<?php if ( ! empty( $caption_text ) ) : ?>
+				<?php if ( ! empty( $caption_text ) ) { ?>
 					<div class="hfe-caption-width"> 
 						<figcaption class="widget-image-caption wp-caption-text"><?php echo esc_html( $caption_text ); ?></figcaption>
 					</div>
-				<?php endif; ?>
+				<?php } ?>
 				</figure>
-			<?php endif; ?>
+			<?php } ?>
 		</div> 
 		<?php
 	}
 
+	/**
+	 * Check if the current widget has caption
+	 *
+	 * @access private
+	 * @since 1.2.0
+	 *
+	 * @param array $settings returns settings.
+	 *
+	 * @return bool
+	 */
+	private function has_caption( $settings ) {
+		return ! empty( $settings['caption_source'] ) && $settings['caption_source'] !== 'none';
+	}
+
+	/**
+	 * Get the caption for current widget.
+	 *
+	 * @access private
+	 * @since 1.2.0
+	 * @param array $settings returns the caption.
+	 *
+	 * @return string
+	 */
+	private function get_caption( $settings ) {
+		$caption = '';
+		if ( $settings['caption_source'] === 'custom' ) {
+			$caption = ! empty( $settings['caption'] ) ? $settings['caption'] : '';
+		}
+		return $caption;
+	}
+
 	/**
 	 * Retrieve Retina image widget link URL.
 	 *
@@ -818,11 +816,11 @@ protected function render() {
 	 * @return array|string|false An array/string containing the link URL, or false if no link.
 	 */
 	private function get_link_url( $settings ) {
-		if ( 'none' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'none' ) {
 			return false;
 		}
 
-		if ( 'custom' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'custom' ) {
 			if ( empty( $settings['link']['url'] ) ) {
 				return false;
 			}
diff --git a/inc/widgets-manager/widgets/search-button/module.php b/inc/widgets-manager/widgets/search-button/module.php
index de59513cd..5e4ad948a 100644
--- a/inc/widgets-manager/widgets/search-button/module.php
+++ b/inc/widgets-manager/widgets/search-button/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Search_Button',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/search-button/search-button.php b/inc/widgets-manager/widgets/search-button/search-button.php
index b3067fe50..c8d69600e 100644
--- a/inc/widgets-manager/widgets/search-button/search-button.php
+++ b/inc/widgets-manager/widgets/search-button/search-button.php
@@ -8,14 +8,11 @@
 namespace HFE\WidgetsManager\Widgets\SearchButton;
 
 use Elementor\Controls_Manager;
-use Elementor\Group_Control_Typography;
-use Elementor\Group_Control_Background;
+use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
 use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
-use Elementor\Group_Control_Text_Shadow;
+use Elementor\Group_Control_Background;
 use Elementor\Group_Control_Box_Shadow;
-use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-use Elementor\Group_Control_Border;
-
+use Elementor\Group_Control_Typography;
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -87,19 +84,6 @@ public function get_categories() {
 		return [ 'hfe-widgets' ];
 	}
 
-	/**
-	 * Indicates if the widget's content is dynamic.
-	 *
-	 * This method returns true if the widget's output is dynamic and should not be cached,
-	 * or false if the content is static and can be cached.
-	 *
-	 * @since 1.6.41
-	 * @return bool True for dynamic content, false for static content.
-	 */
-	protected function is_dynamic_content(): bool { // phpcs:ignore
-		return false; 
-	}
-
 	/**
 	 * Retrieve the list of scripts the navigation menu depended on.
 	 *
@@ -114,6 +98,19 @@ public function get_script_depends() {
 		return [ 'hfe-frontend-js' ];
 	}
 
+	/**
+	 * Indicates if the widget's content is dynamic.
+	 *
+	 * This method returns true if the widget's output is dynamic and should not be cached,
+	 * or false if the content is static and can be cached.
+	 *
+	 * @since 1.6.41
+	 * @return bool True for dynamic content, false for static content.
+	 */
+	protected function is_dynamic_content(): bool { // phpcs:ignore
+		return false;
+	}
+
 	/**
 	 * Register Search Button controls.
 	 *
@@ -473,8 +470,7 @@ protected function register_search_style_controls(): void {
 			Group_Control_Box_Shadow::get_type(),
 			[
 				'name'           => 'input_box_shadow_focus',
-				'selector'       =>
-				'{{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus .hfe-search-form__container,
+				'selector'       => '{{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus .hfe-search-form__container,
 				 {{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus input.hfe-search-form__input',
 				'fields_options' => [
 					'box_shadow_type' => [
@@ -540,8 +536,7 @@ protected function register_search_style_controls(): void {
 			Group_Control_Box_Shadow::get_type(),
 			[
 				'name'           => 'icon_box_shadow_focus',
-				'selector'       =>
-				'{{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus .hfe-search-form__container,
+				'selector'       => '{{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus .hfe-search-form__container,
 				 {{WRAPPER}} .hfe-search-button-wrapper.hfe-input-focus input.hfe-search-form__input',
 				'fields_options' => [
 					'box_shadow_type' => [
@@ -1013,14 +1008,14 @@ protected function render(): void {
 		?>
 		<form class="hfe-search-button-wrapper" role="search" action="<?php echo esc_url( $action_url ); ?>" method="get">
 
-			<?php if ( 'icon' === $settings['layout'] ) { ?>
+			<?php if ( $settings['layout'] === 'icon' ) { ?>
 			<div class = "hfe-search-icon-toggle">
 				<input <?php $this->print_render_attribute_string( 'input' ); ?>>
 				<i class="fas fa-search" aria-hidden="true"></i>
 			</div>
 			<?php } else { ?>
 			<div <?php $this->print_render_attribute_string( 'container' ); ?>>
-				<?php if ( 'text' === $settings['layout'] ) { ?>
+				<?php if ( $settings['layout'] === 'text' ) { ?>
 					<input <?php $this->print_render_attribute_string( 'input' ); ?>>
 						<button id="clear" type="reset">
 							<i class="fas fa-times clearable__clear" aria-hidden="true"></i>
@@ -1035,7 +1030,7 @@ protected function render(): void {
 					</button>
 				<?php } ?>
 			</div>
-		<?php } ?>
+			<?php } ?>
 		</form>
 		<?php
 	}
diff --git a/inc/widgets-manager/widgets/site-logo/module.php b/inc/widgets-manager/widgets/site-logo/module.php
index 040c8346e..4ee9a5169 100644
--- a/inc/widgets-manager/widgets/site-logo/module.php
+++ b/inc/widgets-manager/widgets/site-logo/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Site_Logo',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/site-logo/site-logo.php b/inc/widgets-manager/widgets/site-logo/site-logo.php
index f2c8503c8..5ca97a547 100644
--- a/inc/widgets-manager/widgets/site-logo/site-logo.php
+++ b/inc/widgets-manager/widgets/site-logo/site-logo.php
@@ -7,20 +7,16 @@
 
 namespace HFE\WidgetsManager\Widgets\SiteLogo;
 
-use Elementor\Controls_Manager;
 use Elementor\Control_Media;
-use Elementor\Utils;
-use Elementor\Group_Control_Border;
-use Elementor\Group_Control_Typography;
-use Elementor\Group_Control_Box_Shadow;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Controls_Manager;
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-use Elementor\Group_Control_Image_Size;
-use Elementor\Repeater;
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Group_Control_Box_Shadow;
 use Elementor\Group_Control_Css_Filter;
+use Elementor\Group_Control_Image_Size;
 use Elementor\Group_Control_Text_Shadow;
+use Elementor\Group_Control_Typography;
 use Elementor\Plugin;
-
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -35,7 +31,6 @@
  * @since 1.3.0
  */
 class Site_Logo extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -93,6 +88,26 @@ public function get_categories() {
 		return [ 'hfe-widgets' ];
 	}
 
+	/**
+	 * Render Site Image output on the frontend.
+	 *
+	 * Written in PHP and used to generate the final HTML.
+	 *
+	 * @since 1.3.0
+	 * @param array $size returns the size of an image.
+	 * @access public
+	 * @return string
+	 */
+	public function site_image_url( $size ) {
+		$settings = $this->get_settings_for_display();
+		if ( ! empty( $settings['custom_image']['url'] ) ) {
+			$logo = wp_get_attachment_image_src( $settings['custom_image']['id'], $size, true );
+		} else {
+			$logo = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), $size, true );
+		}
+		return $logo[0];
+	}
+
 	/**
 	 * Indicates if the widget's content is dynamic.
 	 *
@@ -113,7 +128,7 @@ protected function is_dynamic_content(): bool { // phpcs:ignore
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 		$this->register_content_site_logo_controls();
 		$this->register_site_logo_styling_controls();
 		$this->register_site_logo_caption_styling_controls();
@@ -126,7 +141,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_content_site_logo_controls() {
+	protected function register_content_site_logo_controls(): void {
 		$this->start_controls_section(
 			'section_site_image',
 			[
@@ -293,7 +308,7 @@ protected function register_content_site_logo_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_site_logo_styling_controls() {
+	protected function register_site_logo_styling_controls(): void {
 		$this->start_controls_section(
 			'section_style_site_logo_image',
 			[
@@ -574,7 +589,7 @@ protected function register_site_logo_styling_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_site_logo_caption_styling_controls() {
+	protected function register_site_logo_caption_styling_controls(): void {
 		$this->start_controls_section(
 			'section_style_caption',
 			[
@@ -668,57 +683,6 @@ protected function register_site_logo_caption_styling_controls() {
 		$this->end_controls_section();
 	}
 
-	/**
-	 * Check if the current widget has caption
-	 *
-	 * @access private
-	 * @since 1.3.0
-	 *
-	 * @param array $settings returns settings.
-	 *
-	 * @return boolean
-	 */
-	private function has_caption( $settings ) {
-		return ( ! empty( $settings['caption_source'] ) && 'no' !== $settings['caption_source'] );
-	}
-
-	/**
-	 * Get the caption for current widget.
-	 *
-	 * @access private
-	 * @since 1.3.0
-	 * @param array $settings returns the caption.
-	 *
-	 * @return string
-	 */
-	private function get_caption( $settings ) {
-		$caption = '';
-		if ( 'yes' === $settings['caption_source'] ) {
-			$caption = ! empty( $settings['caption'] ) ? $settings['caption'] : '';
-		}
-		return $caption;
-	}
-
-	/**
-	 * Render Site Image output on the frontend.
-	 *
-	 * Written in PHP and used to generate the final HTML.
-	 *
-	 * @since 1.3.0
-	 * @param array $size returns the size of an image.
-	 * @access public
-	 * @return string
-	 */
-	public function site_image_url( $size ) {
-		$settings = $this->get_settings_for_display();
-		if ( ! empty( $settings['custom_image']['url'] ) ) {
-			$logo = wp_get_attachment_image_src( $settings['custom_image']['id'], $size, true );
-		} else {
-			$logo = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), $size, true );
-		}
-		return $logo[0];
-	}
-
 	/**
 	 * Render Site Image output on the frontend.
 	 *
@@ -728,7 +692,7 @@ public function site_image_url( $size ) {
 	 * @access protected
 	 * @return void
 	 */
-	protected function render() {
+	protected function render(): void {
 		$link     = '';
 		$settings = $this->get_settings_for_display();
 
@@ -746,10 +710,10 @@ protected function render() {
 			$site_image = $site_image;
 		}
 
-		if ( 'file' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'file' ) {
 				$link = $site_image;
 				$this->add_render_attribute( 'link', 'href', $link );
-		} elseif ( 'default' === $settings['link_to'] ) {
+		} elseif ( $settings['link_to'] === 'default' ) {
 			$link = site_url();
 			$this->add_render_attribute( 'link', 'href', $link );
 		} else {
@@ -767,24 +731,24 @@ protected function render() {
 		}
 		?>
 		<div <?php $this->print_render_attribute_string( 'wrapper' ); ?>>
-		<?php if ( $has_caption ) : ?>
+		<?php if ( $has_caption ) { ?>
 				<figure class="wp-caption">
-		<?php endif; ?>
-		<?php if ( $link ) : ?>
+		<?php } ?>
+		<?php if ( $link ) { ?>
 					<?php
-					if ( 'no' === $settings['open_lightbox'] ) {
+					if ( $settings['open_lightbox'] === 'no' ) {
 						$class = 'elementor-non-clickable';
 					}
 					?>
 				<a data-elementor-open-lightbox="<?php echo esc_attr( $settings['open_lightbox'] ); ?>"  class='<?php echo esc_attr( $class ); ?>' <?php $this->print_render_attribute_string( 'link' ); ?>>
-		<?php endif; ?>
+		<?php } ?>
 		<?php
 		if ( empty( $site_image ) ) {
 			return;
 		}
 		$img_animation = '';
 
-		if ( 'custom' !== $size ) {
+		if ( $size !== 'custom' ) {
 			$image_size = $size;
 		} else {
 			require_once ELEMENTOR_PATH . 'includes/libraries/bfi-thumb/bfi-thumb.php';
@@ -857,24 +821,55 @@ protected function render() {
 					<img class="hfe-site-logo-img <?php echo esc_attr( $class_animation ); ?>"  src="<?php echo esc_url( $image_url ); ?>" alt="<?php echo esc_attr( $alt_text ); ?>"/>
 				</div>
 			</div>
-		<?php if ( $link ) : ?>
+		<?php if ( $link ) { ?>
 					</a>
-		<?php endif; ?>
+		<?php } ?>
 		<?php
-		if ( $has_caption ) :
+		if ( $has_caption ) {
 			$caption_text = $this->get_caption( $settings );
 			?>
-			<?php if ( ! empty( $caption_text ) ) : ?>
+			<?php if ( ! empty( $caption_text ) ) { ?>
 					<div class="hfe-caption-width"> 
 						<figcaption class="widget-image-caption wp-caption-text"><?php echo wp_kses_post( $caption_text ); ?></figcaption>
 					</div>
-			<?php endif; ?>
+			<?php } ?>
 				</figure>
-		<?php endif; ?>
+		<?php } ?>
 		</div>  
 			<?php
 	}
 
+	/**
+	 * Check if the current widget has caption
+	 *
+	 * @access private
+	 * @since 1.3.0
+	 *
+	 * @param array $settings returns settings.
+	 *
+	 * @return bool
+	 */
+	private function has_caption( $settings ) {
+		return ! empty( $settings['caption_source'] ) && $settings['caption_source'] !== 'no';
+	}
+
+	/**
+	 * Get the caption for current widget.
+	 *
+	 * @access private
+	 * @since 1.3.0
+	 * @param array $settings returns the caption.
+	 *
+	 * @return string
+	 */
+	private function get_caption( $settings ) {
+		$caption = '';
+		if ( $settings['caption_source'] === 'yes' ) {
+			$caption = ! empty( $settings['caption'] ) ? $settings['caption'] : '';
+		}
+		return $caption;
+	}
+
 	/**
 	 * Retrieve Site Logo widget link URL.
 	 *
@@ -885,18 +880,18 @@ protected function render() {
 	 * @return array|string|false|void An array/string containing the link URL, or false if no link.
 	 */
 	private function get_link_url( $settings ) {
-		if ( 'none' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'none' ) {
 			return false;
 		}
 
-		if ( 'custom' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'custom' ) {
 			if ( empty( $settings['link']['url'] ) ) {
 				return false;
 			}
 			return $settings['link'];
 		}
 
-		if ( 'default' === $settings['link_to'] ) {
+		if ( $settings['link_to'] === 'default' ) {
 			if ( empty( $settings['link']['url'] ) ) {
 				return false;
 			}
diff --git a/inc/widgets-manager/widgets/site-tagline/module.php b/inc/widgets-manager/widgets/site-tagline/module.php
index 56679404c..f4b45288d 100644
--- a/inc/widgets-manager/widgets/site-tagline/module.php
+++ b/inc/widgets-manager/widgets/site-tagline/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Site_Tagline',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/site-tagline/site-tagline.php b/inc/widgets-manager/widgets/site-tagline/site-tagline.php
index e6f0be6c9..a7cd20ee0 100644
--- a/inc/widgets-manager/widgets/site-tagline/site-tagline.php
+++ b/inc/widgets-manager/widgets/site-tagline/site-tagline.php
@@ -8,11 +8,9 @@
 namespace HFE\WidgetsManager\Widgets\SiteTagline;
 
 use Elementor\Controls_Manager;
-use Elementor\Group_Control_Typography;
-use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
-use Elementor\Group_Control_Text_Shadow;
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-
+use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
+use Elementor\Group_Control_Typography;
 use HFE\WidgetsManager\Base\Common_Widget;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -27,7 +25,6 @@
  * @since 1.3.0
  */
 class Site_Tagline extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -87,7 +84,7 @@ protected function is_dynamic_content(): bool { // phpcs:ignore
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_controls() {
+	protected function register_controls(): void {
 		$this->register_general_content_controls();
 	}
 
@@ -98,7 +95,7 @@ protected function register_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function register_general_content_controls() {
+	protected function register_general_content_controls(): void {
 
 		$this->start_controls_section(
 			'section_general_fields',
@@ -261,24 +258,24 @@ protected function register_general_content_controls() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function render() {
+	protected function render(): void {
 		$settings = $this->get_settings_for_display();
 		?>
 		<div class="hfe-site-tagline hfe-site-tagline-wrapper">
-			<?php if ( '' !== $settings['icon']['value'] ) { ?>
+			<?php if ( $settings['icon']['value'] !== '' ) { ?>
 				<span class="hfe-icon">
 					<?php \Elementor\Icons_Manager::render_icon( $settings['icon'], [ 'aria-hidden' => 'true' ] ); ?>					
 				</span>
 			<?php } ?>
 			<span>
 			<?php
-			if ( '' !== $settings['before'] ) {
+			if ( $settings['before'] !== '' ) {
 				echo wp_kses_post( $settings['before'] );
 			}
 			?>
 			<?php echo wp_kses_post( get_bloginfo( 'description' ) ); ?>
 			<?php
-			if ( '' !== $settings['after'] ) {
+			if ( $settings['after'] !== '' ) {
 				echo ' ' . wp_kses_post( $settings['after'] );
 			}
 			?>
@@ -296,7 +293,7 @@ protected function render() {
 	 * @access protected
 	 * @return void
 	 */
-	protected function content_template() {
+	protected function content_template(): void {
 		?>
 		<# var iconHTML = elementor.helpers.renderIcon( view, settings.icon, { 'aria-hidden': true }, 'i' , 'object' ); #>
 		<div class="hfe-site-tagline hfe-site-tagline-wrapper">
diff --git a/inc/widgets-manager/widgets/site-title/module.php b/inc/widgets-manager/widgets/site-title/module.php
index f94f06654..424d7f0ec 100644
--- a/inc/widgets-manager/widgets/site-title/module.php
+++ b/inc/widgets-manager/widgets/site-title/module.php
@@ -17,7 +17,12 @@
  * Class Module.
  */
 class Module extends Module_Base {
-
+	/**
+	 * Constructor.
+	 */
+	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		parent::__construct();
+	}
 	/**
 	 * Module should load or not.
 	 *
@@ -55,11 +60,4 @@ public function get_widgets() {
 			'Site_Title',
 		];
 	}
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		parent::__construct();
-	}
 }
diff --git a/inc/widgets-manager/widgets/site-title/site-title.php b/inc/widgets-manager/widgets/site-title/site-title.php
index ce2390444..fc57afcec 100644
--- a/inc/widgets-manager/widgets/site-title/site-title.php
+++ b/inc/widgets-manager/widgets/site-title/site-title.php
@@ -8,13 +8,12 @@
 namespace HFE\WidgetsManager\Widgets\SiteTitle;
 
 use Elementor\Controls_Manager;
-use Elementor\Group_Control_Typography;
+use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
 use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
 use Elementor\Group_Control_Text_Shadow;
-use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
-
-use HFE\WidgetsManager\Widgets_Loader;
+use Elementor\Group_Control_Typography;
 use HFE\WidgetsManager\Base\Common_Widget;
+use HFE\WidgetsManager\Widgets_Loader;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;   // Exit if accessed directly.
@@ -28,7 +27,6 @@
  * @since 1.3.0
  */
 class Site_Title extends Common_Widget {
-
 	/**
 	 * Retrieve the widget name.
 	 *
@@ -260,7 +258,6 @@ protected function register_general_content_controls(): void {
 		$this->end_controls_section();
 	}
 
-
 	/**
 	 * Register Advanced Heading Typography Controls.
 	 *
@@ -416,26 +413,26 @@ protected function render(): void {
 		?>
 
 		<div class="hfe-module-content hfe-heading-wrapper elementor-widget-heading">
-		<?php if ( ! empty( $settings['heading_link']['url'] ) && 'custom' === $settings['custom_link'] ) { ?>
+		<?php if ( ! empty( $settings['heading_link']['url'] ) && $settings['custom_link'] === 'custom' ) { ?>
 					<a <?php echo wp_kses_post( $this->get_render_attribute_string( 'url' ) ); ?>>
-				<?php } else { ?>
+		<?php } else { ?>
 					<a href="<?php echo esc_url( get_home_url() ); ?>">
-				<?php } ?>
+		<?php } ?>
 			<<?php echo esc_attr( $heading_size_tag ); ?> class="hfe-heading elementor-heading-title elementor-size-<?php echo esc_attr( $settings['size'] ); ?>">
-				<?php if ( '' !== $settings['icon']['value'] ) { ?>
+				<?php if ( $settings['icon']['value'] !== '' ) { ?>
 					<span class="hfe-icon">
 						<?php \Elementor\Icons_Manager::render_icon( $settings['icon'], [ 'aria-hidden' => 'true' ] ); ?>					
 					</span>
 				<?php } ?>
 					<span class="hfe-heading-text" >
 					<?php
-					if ( '' !== $settings['before'] ) {
+					if ( $settings['before'] !== '' ) {
 						echo wp_kses_post( $settings['before'] );
 					}
 					?>
 					<?php echo wp_kses_post( $title ); ?>
 					<?php
-					if ( '' !== $settings['after'] ) {
+					if ( $settings['after'] !== '' ) {
 						echo wp_kses_post( $settings['after'] );
 					}
 					?>
@@ -445,16 +442,16 @@ protected function render(): void {
 		</div>
 		<?php
 	}
-		/**
-		 * Render site title output in the editor.
-		 *
-		 * Written as a Backbone JavaScript template and used to generate the live preview.
-		 *
-		 * @since 1.3.0
-		 * @access protected
-		 * @return void
-		 */
-	protected function content_template() {
+	/**
+	 * Render site title output in the editor.
+	 *
+	 * Written as a Backbone JavaScript template and used to generate the live preview.
+	 *
+	 * @since 1.3.0
+	 * @access protected
+	 * @return void
+	 */
+	protected function content_template(): void {
 		?>
 		<#
 		if ( '' == settings.heading_title ) {
diff --git a/stubs-generator.php b/stubs-generator.php
index 81e459c95..76abc9a66 100644
--- a/stubs-generator.php
+++ b/stubs-generator.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * 
  * This file contains the implementation of the add function.
  *
  * @package header-footer-elementor
diff --git a/themes/astra/class-hfe-astra-compat.php b/themes/astra/class-hfe-astra-compat.php
index d82336227..bc0d02dd7 100644
--- a/themes/astra/class-hfe-astra-compat.php
+++ b/themes/astra/class-hfe-astra-compat.php
@@ -9,7 +9,6 @@
  * Astra theme compatibility.
  */
 class HFE_Astra_Compat {
-
 	/**
 	 * Instance of HFE_Astra_Compat.
 	 *
@@ -37,7 +36,7 @@ public static function instance() {
 	 *
 	 * @return void
 	 */
-	public function hooks() {
+	public function hooks(): void {
 		if ( hfe_header_enabled() ) {
 			add_action( 'template_redirect', [ $this, 'astra_setup_header' ], 10 );
 			add_action( 'astra_header', 'hfe_render_header' );
@@ -58,7 +57,7 @@ public function hooks() {
 	 *
 	 * @return void
 	 */
-	public function astra_setup_header() {
+	public function astra_setup_header(): void {
 		remove_action( 'astra_header', 'astra_header_markup' );
 
 		// Remove the new header builder action.
@@ -72,7 +71,7 @@ public function astra_setup_header() {
 	 *
 	 * @return void
 	 */
-	public function astra_setup_footer() {
+	public function astra_setup_footer(): void {
 		remove_action( 'astra_footer', 'astra_footer_markup' );
 
 		// Remove the new footer builder action.
diff --git a/themes/bb-theme/class-hfe-bb-theme-compat.php b/themes/bb-theme/class-hfe-bb-theme-compat.php
index e6540d559..0fc5f4e82 100644
--- a/themes/bb-theme/class-hfe-bb-theme-compat.php
+++ b/themes/bb-theme/class-hfe-bb-theme-compat.php
@@ -11,7 +11,6 @@
  * @since 1.0
  */
 class HFE_BB_Theme_Compat {
-
 	/**
 	 * Instance of HFE_BB_Theme_Compat
 	 *
@@ -38,7 +37,7 @@ public static function instance(): self {
 	/**
 	 * Run all the Actions / Filters.
 	 * // phpcs:ignore
-	 * @return void 
+	 * @return void
 	 */
 	// phpcs:ignore
 	public function hooks(): void {
@@ -66,7 +65,7 @@ public function hooks(): void {
 	public function get_header_content(): void {
 		$header_layout = FLTheme::get_setting( 'fl-header-layout' );
 
-		if ( 'none' == $header_layout || is_page_template( 'tpl-no-header-footer.php' ) ) {
+		if ( $header_layout === 'none' || is_page_template( 'tpl-no-header-footer.php' ) ) {
 			return;
 		}
 
diff --git a/themes/default/class-global-theme-compatibility.php b/themes/default/class-global-theme-compatibility.php
index 54da76b50..99843c6ad 100644
--- a/themes/default/class-global-theme-compatibility.php
+++ b/themes/default/class-global-theme-compatibility.php
@@ -11,7 +11,6 @@
  * Global theme compatibility.
  */
 class Global_Theme_Compatibility {
-
 	/**
 	 *  Initiator
 	 */
@@ -65,13 +64,13 @@ public function force_fullwidth(): void {
 			left: 50%;
 		}';
 
-		if ( true === hfe_header_enabled() ) {
+		if ( hfe_header_enabled() === true ) {
 			$css .= 'header#masthead {
 				display: none;
 			}';
 		}
 
-		if ( true === hfe_footer_enabled() ) {
+		if ( hfe_footer_enabled() === true ) {
 			$css .= 'footer#colophon {
 				display: none;
 			}';
diff --git a/themes/default/class-hfe-default-compat.php b/themes/default/class-hfe-default-compat.php
index 242e3a310..5dab92eaf 100644
--- a/themes/default/class-hfe-default-compat.php
+++ b/themes/default/class-hfe-default-compat.php
@@ -11,7 +11,6 @@
  * Astra theme compatibility.
  */
 class HFE_Default_Compat {
-
 	/**
 	 *  Initiator
 	 */
@@ -58,7 +57,7 @@ public function hooks(): void {
 	 *
 	 * // phpcs:ignore
 	 * @return void
-	 */ 
+	 */
 	// phpcs:ignore
 	public function override_header(): void {
 		require HFE_DIR . 'themes/default/hfe-header.php';
@@ -79,7 +78,7 @@ public function override_header(): void {
 	 * @return void
 	 *
 	 * // phpcs:ignore
-	 */ 
+	 */
 	// phpcs:ignore
 	public function override_footer(): void {
 		require HFE_DIR . 'themes/default/hfe-footer.php';
diff --git a/themes/generatepress/class-hfe-generatepress-compat.php b/themes/generatepress/class-hfe-generatepress-compat.php
index 6ecdcb4b2..f98eadf0c 100644
--- a/themes/generatepress/class-hfe-generatepress-compat.php
+++ b/themes/generatepress/class-hfe-generatepress-compat.php
@@ -11,7 +11,6 @@
  * @since 1.0
  */
 class HFE_GeneratePress_Compat {
-
 	/**
 	 * Instance of HFE_GeneratePress_Compat
 	 *
diff --git a/themes/genesis/class-hfe-genesis-compat.php b/themes/genesis/class-hfe-genesis-compat.php
index c8f9f7df7..1a2525116 100644
--- a/themes/genesis/class-hfe-genesis-compat.php
+++ b/themes/genesis/class-hfe-genesis-compat.php
@@ -9,7 +9,6 @@
  * Genesis theme compatibility.
  */
 class HFE_Genesis_Compat {
-
 	/**
 	 * Instance of HFE_Genesis_Compat.
 	 *
@@ -37,7 +36,7 @@ public static function instance() {
 	 *
 	 * @return void
 	 */
-	public function hooks() {
+	public function hooks(): void {
 		if ( hfe_header_enabled() ) {
 			add_action( 'template_redirect', [ $this, 'genesis_setup_header' ] );
 			add_action( 'genesis_header', [ $this, 'genesis_header_markup_open' ], 16 );
@@ -62,7 +61,7 @@ public function hooks() {
 	 *
 	 * @return void
 	 */
-	public function genesis_setup_header() {
+	public function genesis_setup_header(): void {
 		for ( $priority = 0; $priority < 16; $priority++ ) {
 			remove_all_actions( 'genesis_header', $priority );
 		}
@@ -73,7 +72,7 @@ public function genesis_setup_header() {
 	 *
 	 * @return void
 	 */
-	public function genesis_setup_footer() {
+	public function genesis_setup_footer(): void {
 		for ( $priority = 0; $priority < 16; $priority++ ) {
 			remove_all_actions( 'genesis_footer', $priority );
 		}
@@ -84,7 +83,7 @@ public function genesis_setup_footer() {
 	 *
 	 * @return void
 	 */
-	public function genesis_header_markup_open() {
+	public function genesis_header_markup_open(): void {
 		genesis_markup(
 			[
 				'html5'   => '<header %s>',
@@ -101,7 +100,7 @@ public function genesis_header_markup_open() {
 	 *
 	 * @return void
 	 */
-	public function genesis_header_markup_close() {
+	public function genesis_header_markup_close(): void {
 		genesis_structural_wrap( 'header', 'close' );
 		genesis_markup(
 			[
@@ -116,7 +115,7 @@ public function genesis_header_markup_close() {
 	 *
 	 * @return void
 	 */
-	public function genesis_footer_markup_open() {
+	public function genesis_footer_markup_open(): void {
 		genesis_markup(
 			[
 				'html5'   => '<footer %s>',
@@ -132,7 +131,7 @@ public function genesis_footer_markup_open() {
 	 *
 	 * @return void
 	 */
-	public function genesis_footer_markup_close() {
+	public function genesis_footer_markup_close(): void {
 		genesis_structural_wrap( 'footer', 'close' );
 		genesis_markup(
 			[
diff --git a/themes/hello-elementor/class-hfe-hello-elementor-compat.php b/themes/hello-elementor/class-hfe-hello-elementor-compat.php
index 9343db20c..722539930 100644
--- a/themes/hello-elementor/class-hfe-hello-elementor-compat.php
+++ b/themes/hello-elementor/class-hfe-hello-elementor-compat.php
@@ -9,7 +9,6 @@
  * Hello Elementor compatibility.
  */
 class HFE_Hello_Elementor_Compat {
-
 	/**
 	 * Instance of HFE_Hello_Elementor_Compat.
 	 *
diff --git a/themes/oceanwp/class-hfe-oceanwp-compat.php b/themes/oceanwp/class-hfe-oceanwp-compat.php
index 54c030de8..be7f38418 100644
--- a/themes/oceanwp/class-hfe-oceanwp-compat.php
+++ b/themes/oceanwp/class-hfe-oceanwp-compat.php
@@ -9,7 +9,6 @@
  * OceanWP theme compatibility.
  */
 class HFE_OceanWP_Compat {
-
 	/**
 	 * Instance of HFE_OceanWP_Compat.
 	 *
@@ -33,7 +32,7 @@ public static function instance() {
 	/**
 	 * Run all the Actions / Filters.
 	 */
-	public function hooks() {
+	public function hooks(): void {
 		if ( hfe_header_enabled() ) {
 			add_action( 'template_redirect', [ $this, 'setup_header' ], 10 );
 			add_action( 'ocean_header', 'hfe_render_header' );
@@ -52,7 +51,7 @@ public function hooks() {
 	/**
 	 * Disable header from the theme.
 	 */
-	public function setup_header() {
+	public function setup_header(): void {
 		remove_action( 'ocean_top_bar', 'oceanwp_top_bar_template' );
 		remove_action( 'ocean_header', 'oceanwp_header_template' );
 		remove_action( 'ocean_page_header', 'oceanwp_page_header_template' );
@@ -61,7 +60,7 @@ public function setup_header() {
 	/**
 	 * Disable footer from the theme.
 	 */
-	public function setup_footer() {
+	public function setup_footer(): void {
 		remove_action( 'ocean_footer', 'oceanwp_footer_template' );
 	}
 
diff --git a/themes/storefront/class-hfe-storefront-compat.php b/themes/storefront/class-hfe-storefront-compat.php
index 918183744..f7519b91c 100644
--- a/themes/storefront/class-hfe-storefront-compat.php
+++ b/themes/storefront/class-hfe-storefront-compat.php
@@ -9,7 +9,6 @@
  * Astra theme compatibility.
  */
 class HFE_Storefront_Compat {
-
 	/**
 	 * Instance of HFE_Storefront_Compat.
 	 *
@@ -63,7 +62,7 @@ public function hooks(): void {
 	 * Add inline CSS to hide empty divs for header and footer in storefront
 	 *
 	 * @since 1.2.0
-	 * 
+	 *
 	 * // phpcs:ignore
 	 * @return void
 	 */
@@ -71,13 +70,13 @@ public function hooks(): void {
 	public function styles(): void {
 		$css = '';
 
-		if ( true === hfe_header_enabled() ) {
+		if ( hfe_header_enabled() === true ) {
 			$css .= '.site-header {
 				display: none;
 			}';
 		}
 
-		if ( true === hfe_footer_enabled() ) {
+		if ( hfe_footer_enabled() === true ) {
 			$css .= '.site-footer {
 				display: none;
 			}';
@@ -87,9 +86,8 @@ public function styles(): void {
 	}
 
 	/**
-	 * 
 	 * Disable header from the theme.
-	 * 
+	 *
 	 * @return void
 	 *
 	 * // phpcs:ignore