diff --git a/README.txt b/README.txt
index cbf9f0e..13a8ad3 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@ Donate link: https://themesgrove.com/
 Tags: elementor, add-ons, elementor addons, elementor widgets, woocommerce, learndash, learnpress, widgets, woocommerce addons, learndash addons, sensei, sensei addons, countdown, timer, slider, team, testimonial, social-share, carousel, portfolio, pricing, widgetkit
 Requires at least: 5.0
 Tested up to: 6.5.2
-Stable tag: 2.5.0
+Stable tag: 2.5.1
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/notices/admin-notices.php b/admin/notices/admin-notices.php
index b7f4836..5b15fab 100644
--- a/admin/notices/admin-notices.php
+++ b/admin/notices/admin-notices.php
@@ -13,7 +13,8 @@ function wk_td_admin_ads()
     <img style="max-width:200px"
         src="<?php echo esc_attr(plugin_dir_url(__FILE__) . '../assets/images/thrivedesk-logo.png'); ?>">
     <p style="font-size:16px">
-        <?php esc_html_e('Your customers deserve better customer support and You deserve the peace of mind. <a href="https://www.thrivedesk.com/?ref=widgetkit"><strong>Try ThriveDesk</strong></a>', 'widgetkit'); ?>
+        <?php esc_html_e('Your customers deserve better customer support and You deserve the peace of mind.', 'widgetkit');?>
+		 <a href="<?php echo esc_url('https://www.thrivedesk.com');?>"><strong>Try ThriveDesk</strong></a>
     </p>
 </div>
 <?php
diff --git a/admin/notices/notice.php b/admin/notices/notice.php
index 5284265..7b41b0f 100644
--- a/admin/notices/notice.php
+++ b/admin/notices/notice.php
@@ -7,4 +7,4 @@
 	Thank you!',
 
 );
-echo json_encode($notice);
\ No newline at end of file
+echo wp_json_encode($notice);
\ No newline at end of file
diff --git a/elements/advanced-tab/template/view.php b/elements/advanced-tab/template/view.php
index ee6501d..9f454d3 100644
--- a/elements/advanced-tab/template/view.php
+++ b/elements/advanced-tab/template/view.php
@@ -69,7 +69,7 @@
                     } ?>
                 <?php elseif ('image' == $tab['tabs_content_type']) : ?>
                     <?php if (!empty($tab['tab_image'])) {?>
-                        <img src="<?php esc_url($tab['tab_image']['url']);?>" alt="">
+                        <img src="<?php echo esc_url($tab['tab_image']['url']);?>" alt="">
                         <?php
                     } ?>
                 <?php endif; ?>
diff --git a/elements/animation-text/template/view.php b/elements/animation-text/template/view.php
index a5916dd..2bf7c70 100644
--- a/elements/animation-text/template/view.php
+++ b/elements/animation-text/template/view.php
@@ -1,12 +1,6 @@
 <?php
-// Silence is golden.
-
     $settings = $this->get_settings();
-
-
 ?>
-
-
     <div class="animation-text">
         <div class="text-slide">
             <h2 class="cd-headline <?php if ($settings['choose_animation_text'] == 'rotate') {
diff --git a/elements/carousel/template/view.php b/elements/carousel/template/view.php
index 76b5495..9ca32a4 100644
--- a/elements/carousel/template/view.php
+++ b/elements/carousel/template/view.php
@@ -15,8 +15,8 @@
                     <figure class="project-wrap">
                         <div class="project-image" >
                             <?php if($project['project_thumb_image']):?>
-                                <a href="<?php echo esc_attr($project['project_demo_link']); ?>">
-                                    <img src="<?php echo esc_attr($project['project_thumb_image']['url']);?>" alt="<?php echo esc_attr($project['project_title']); ?>">  
+                                <a href="<?php echo esc_url($project['project_demo_link']); ?>">
+                                    <img src="<?php echo esc_url($project['project_thumb_image']['url']);?>" alt="<?php echo esc_attr($project['project_title']); ?>">  
                                 </a>
                                   
                             <?php endif; ?> 
@@ -24,7 +24,7 @@
                         <figcaption class="text-center">
                             <?php if ($project['project_title']): ?>
                                 <h5 class="title">
-                                    <a target="_blank" href="<?php echo esc_attr($project['project_demo_link']); ?>"><?php echo esc_html($project['project_title']); ?>
+                                    <a target="_blank" href="<?php echo esc_url($project['project_demo_link']); ?>"><?php echo esc_html($project['project_title']); ?>
                                     </a> 
                                 </h5>       
                             <?php endif ?>    
diff --git a/elements/content-carousel/template/view.php b/elements/content-carousel/template/view.php
index 485adca..412201f 100644
--- a/elements/content-carousel/template/view.php
+++ b/elements/content-carousel/template/view.php
@@ -1,153 +1,179 @@
 <?php
-    $contents = $settings = $this->get_settings(); 
-    $id = $this->get_id();
-    $header_tag_arr_for_content_carousel = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-    $content_carousel_custom_header_tag = esc_html(wp_kses($contents['custom_header_tag'], $header_tag_arr_for_content_carousel));
-    $content_carousel_post_header_tag = esc_html(wp_kses($contents['post_header_tag'], $header_tag_arr_for_content_carousel));
-    use Elementor\Group_Control_Image_Size;
-    ?>
 
-        <div class="content-carousel" wk-slider="center:<?php echo esc_attr($contents['center_mode_enable']) == 'yes'? 'true' :'false'; ?>; sets:<?php echo esc_attr($contents['set_mode_enable']) == 'yes'? 'true' :'false'; ?>; autoplay:<?php echo esc_attr($contents['autoplay_mode_enable']) == 'yes'? 'true' :'false'; ?>; autoplay-interval:<?php echo esc_attr($contents['content_interval_option']);?>;">
-            <div class="wk-visible-toggle wk-light <?php echo esc_attr($contents['arrow_position']) == 'in'? 'wk-position-relative' : ' '; ?> " tabindex="-1">
-                <?php if ($contents['center_mode_enable'] == 'yes'): ?>
-                    <ul class="wk-grid-<?php echo esc_attr($contents['column_gap']);?> wk-slider-items wk-child-width-1-2@s" wk-grid>
-                <?php else: ?>
-                      <ul class="wk-grid-<?php echo esc_attr($contents['column_gap']);?> 
+use Elementor\Utils;
+use Elementor\Group_Control_Image_Size;
+
+$contents = $settings = $this->get_settings();
+$id = $this->get_id();
+?>
+
+<div class="content-carousel" wk-slider="center:<?php echo esc_attr($contents['center_mode_enable']) == 'yes' ? 'true' : 'false'; ?>; sets:<?php echo esc_attr($contents['set_mode_enable']) == 'yes' ? 'true' : 'false'; ?>; autoplay:<?php echo esc_attr($contents['autoplay_mode_enable']) == 'yes' ? 'true' : 'false'; ?>; autoplay-interval:<?php echo esc_attr($contents['content_interval_option']); ?>;">
+    <div class="wk-visible-toggle wk-light <?php echo esc_attr($contents['arrow_position']) == 'in' ? 'wk-position-relative' : ' '; ?> " tabindex="-1">
+        <?php if ($contents['center_mode_enable'] == 'yes') : ?>
+            <ul class="wk-grid-<?php echo esc_attr($contents['column_gap']); ?> wk-slider-items wk-child-width-1-2@s" wk-grid>
+            <?php else : ?>
+                <ul class="wk-grid-<?php echo esc_attr($contents['column_gap']); ?> 
                       wk-slider-items 
-                      wk-child-width-1-<?php echo esc_attr($contents['item_column']);?>@l
-                      wk-child-width-1-<?php echo esc_attr(is_int($contents['item_column_tablet'])) ? esc_attr($contents['item_column_tablet']) : 2 ;?>@m 
-                      wk-child-width-1-<?php echo esc_attr(is_int($contents['item_column_mobile'])) ? esc_attr($contents['item_column_mobile']) : 1 ;?>@s" 
-                      wk-grid>
+                      wk-child-width-1-<?php echo esc_attr($contents['item_column']); ?>@l
+                      wk-child-width-1-<?php echo esc_attr(is_int($contents['item_column_tablet'])) ? esc_attr($contents['item_column_tablet']) : 2; ?>@m 
+                      wk-child-width-1-<?php echo esc_attr(is_int($contents['item_column_mobile'])) ? esc_attr($contents['item_column_mobile']) : 1; ?>@s" wk-grid>
                 <?php endif; ?>
-                    <?php if ($contents['item_option'] == 'custom_post'): ?>
-                        <?php foreach ( $contents['custom_content'] as $content ) : ?>
-                             <li class="wk-flex wk-flex-center wk-grid-match">
-                                <div class="wk-card <?php echo esc_attr($content['content_meta']) || $content['content_title'] || $content['content_content']? 'wk-card-default' : '';?> wk-margin-small-bottom">
-                                    <?php if($content['content_thumb_image']['url']):?>
-                                        <?php if($contents['thumbnail_position'] == 'top'): ;?>
-                                            <div class="wk-card-media-top wk-overflow-hidden">
-                                                <a class="wk-display-block" href="<?php echo esc_attr($content['content_demo_link']['url']); ?>" <?php echo esc_attr($content['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                                    <?php if($content['content_thumb_image']['id']): ?>
-                                                        <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src($content['content_thumb_image']['id'], 'cc_image', $contents )); ?>" alt="<?php echo esc_attr($content['content_title']); ?>">
-                                                    <?php else:?>
-                                                        <img src="<?php echo esc_attr($content['content_thumb_image']['url']);?>" alt="<?php echo esc_attr($content['content_title']); ?>">  
-                                                    <?php endif;?> 
-                                                </a> 
-                                            </div>
-                                        <?php endif; ?> 
-                                    <?php endif; ?> 
-                                    <?php if( $content['content_meta'] || $content['content_title'] || $content['content_content']):?>
+                <?php if ($contents['item_option'] == 'custom_post') : ?>
+                    <?php foreach ($contents['custom_content'] as $content) : ?>
+                        <li class="wk-flex wk-flex-center wk-grid-match">
+                            <div class="wk-card <?php echo esc_attr($content['content_meta']) || $content['content_title'] || $content['content_content'] ? 'wk-card-default' : ''; ?> wk-margin-small-bottom">
+                                <?php if ($content['content_thumb_image']['url']) : ?>
+                                    <?php if ($contents['thumbnail_position'] == 'top') :; ?>
+                                        <div class="wk-card-media-top wk-overflow-hidden">
+                                            <a class="wk-display-block" href="<?php echo esc_url($content['content_demo_link']['url']); ?>" <?php echo esc_attr($content['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
+                                                <?php if ($content['content_thumb_image']['id']) : ?>
+                                                    <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src($content['content_thumb_image']['id'], 'cc_image', $contents)); ?>" alt="<?php echo esc_attr($content['content_title']); ?>">
+                                                <?php else : ?>
+                                                    <img src="<?php echo esc_url($content['content_thumb_image']['url']); ?>" alt="<?php echo esc_attr($content['content_title']); ?>">
+                                                <?php endif; ?>
+                                            </a>
+                                        </div>
+                                    <?php endif; ?>
+                                <?php endif; ?>
+                                <?php if ($content['content_meta'] || $content['content_title'] || $content['content_content']) : ?>
                                     <div class="wk-card-body">
-                                        <?php if ($content['content_meta']): ?>
+                                        <?php if ($content['content_meta']) : ?>
                                             <span class="wk-text-meta wk-inline-block"><?php echo esc_html($content['content_meta']); ?></span>
                                         <?php endif; ?>
-                                        <?php if ($content['content_title']): ?>
-                                            
-                                            <<?php echo esc_attr($content_carousel_custom_header_tag);?>  class="wk-card-title wk-margin-remove">
-                                                <?php if ($content['content_demo_link']): ?>
-                                                     <a href="<?php echo esc_url($content['content_demo_link']['url']); ?>" <?php echo esc_attr($content['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($content['content_title']); ?></a>
-                                                <?php else: ?>
-                                                        <?php echo esc_html($content['content_title']); ?>
-                                                <?php endif; ?>  
-                                            </<?php echo esc_attr($content_carousel_custom_header_tag);?>>  
-                                        <?php endif; ?>
-                                        <?php if ($content['content_content']): ?>
+                                        <?php
+                                        if ($content['content_title']) {
+                                            $this->add_render_attribute('content_title', 'class', 'wk-card-title wk-margin-remove');
+                                            $this->add_inline_editing_attributes('content_title', 'none');
+
+                                            $title_html = esc_html($content['content_title']);
+                                            if (!empty($content['content_demo_link']['url'])) {
+                                                $title_html = '<a ' . $this->get_render_attribute_string(' link') . '>' . $title_html . '</a>';
+                                            }
+                                            $html = sprintf(
+                                                '<%1$s %2$s>%3$s</%1$s>',
+                                                Utils::validate_html_tag($settings['custom_header_tag']),
+                                                $this->get_render_attribute_string('content_title'),
+                                                $title_html
+                                            );
+
+                                            Utils::print_unescaped_internal_string($html);
+                                        }
+                                        ?>
+
+                                        <?php if ($content['content_content']) : ?>
                                             <p class=" wk-margin-small-bottom"><?php echo esc_html($content['content_content']); ?></p>
                                         <?php endif; ?>
                                     </div>
-                                    <?php endif; ?> 
-                                    <?php if($contents['thumbnail_position'] == 'bottom'):?>
-                                        <div class="wk-card-media-bottom wk-overflow-hidden">
-                                            <a class="wk-display-block" href="<?php echo esc_url($content['content_demo_link']['url']); ?>" <?php echo esc_attr($content['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                                <?php if($content['content_thumb_image']['id']): ?>
-                                                    <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src($content['content_thumb_image']['id'], 'cc_image', $contents )); ?>" alt="<?php echo esc_attr($content['content_title']); ?>">
-                                                <?php else:?>
-                                                    <img src="<?php echo esc_url($content['content_thumb_image']['url']);?>" alt="<?php echo esc_html($content['content_title']); ?>">  
-                                                <?php endif;?> 
-                                            </a> 
-                                        </div>
-                                    <?php endif; ?> 
-                                
-                                </div>
-                            </li>
-                        <?php endforeach; ?>
-                    <?php else: ?>
-                            <?php
-                                $content = array(
-                                    'post_type' => 'post',
-                                    'category__in' => $contents['cat_multiple_id'],
-                                    'order' => $contents['items_order'],
-                                    'orderby' => $contents['items_orderby'],
-                                    'post_status'       => 'publish',
-                                    'posts_per_page'    =>$contents['post_show'],
-                                    'ignore_sticky_posts' => 1
-                                );
-                                $content_query = new WP_Query( $content );
-                                if($content_query->have_posts()):
-                                    while($content_query->have_posts()): 
-                                        $content_query->the_post(); 
-                            ?>
+                                <?php endif; ?>
+                                <?php if ($contents['thumbnail_position'] == 'bottom') : ?>
+                                    <div class="wk-card-media-bottom wk-overflow-hidden">
+                                        <a class="wk-display-block" href="<?php echo esc_url($content['content_demo_link']['url']); ?>" <?php echo esc_attr($content['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
+                                            <?php if ($content['content_thumb_image']['id']) : ?>
+                                                <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src($content['content_thumb_image']['id'], 'cc_image', $contents)); ?>" alt="<?php echo esc_attr($content['content_title']); ?>">
+                                            <?php else : ?>
+                                                <img src="<?php echo esc_url($content['content_thumb_image']['url']); ?>" alt="<?php echo esc_html($content['content_title']); ?>">
+                                            <?php endif; ?>
+                                        </a>
+                                    </div>
+                                <?php endif; ?>
+
+                            </div>
+                        </li>
+                    <?php endforeach; ?>
+                <?php else : ?>
+                    <?php
+                    $content = array(
+                        'post_type' => 'post',
+                        'category__in' => $contents['cat_multiple_id'],
+                        'order' => $contents['items_order'],
+                        'orderby' => $contents['items_orderby'],
+                        'post_status'       => 'publish',
+                        'posts_per_page'    => $contents['post_show'],
+                        'ignore_sticky_posts' => 1
+                    );
+                    $content_query = new WP_Query($content);
+                    if ($content_query->have_posts()) :
+                        while ($content_query->have_posts()) :
+                            $content_query->the_post();
+                    ?>
                             <li class="wk-flex wk-flex-center wk-grid-match">
                                 <div class="wk-card wk-card-default wk-margin-small-bottom">
-                                  <?php if ( has_post_thumbnail() ): ?>
-                                        <?php if($contents['thumbnail_position'] == 'top'): ;?>
+                                    <?php if (has_post_thumbnail()) : ?>
+                                        <?php if ($contents['thumbnail_position'] == 'top') :; ?>
                                             <div class="wk-card-media-top wk-overflow-hidden">
-                                                <a class="wk-display-block" href="<?php the_permalink();?>">
-                                                    <?php //the_post_thumbnail($contents['thumbnail_size']);?> 
-                                                    <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src(get_post_thumbnail_id(), 'cc_image', $contents ));?>" alt="<?php the_title(); ?>">
+                                                <a class="wk-display-block" href="<?php the_permalink(); ?>">
+                                                    <?php //the_post_thumbnail($contents['thumbnail_size']);
+                                                    ?>
+                                                    <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src(get_post_thumbnail_id(), 'cc_image', $contents)); ?>" alt="<?php the_title(); ?>">
                                                 </a>
                                             </div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                     <div class="wk-card-body">
-                                        <?php if ($contents['meta_enable'] == 'yes'): ?>
-                                            <?php if (has_category()):?>
+                                        <?php if ($contents['meta_enable'] == 'yes') : ?>
+                                            <?php if (has_category()) : ?>
                                                 <span class="wk-text-meta wk-inline-block"><?php the_category(', ') ?></span>
                                             <?php endif; ?>
-                                            
+
                                         <?php endif; ?>
-                                       
-                                        <<?php echo esc_attr($content_carousel_post_header_tag);?>  class="wk-card-title wk-margin-remove">    
-                                            <a href="<?php the_permalink();?>"><?php echo esc_html(wp_trim_words( get_the_title(), $contents['title_word'], ' ' ));?>    
-                                            </a>
 
-                                        </<?php echo esc_attr($content_carousel_post_header_tag);?>>
-                                        <?php if ( $contents['content_enable'] == 'yes' ): ?>
+                                        <?php
+                                        if ($contents['title_word']) {
+                                            $this->add_render_attribute('title_word', 'class', 'wk-card-title wk-margin-remove');
+                                            $this->add_inline_editing_attributes('title_word', 'none');
+
+                                            $title_html = esc_html($contents['title_word']);
+                                            if (!empty($contents['content_demo_link']['url'])) {
+                                                $title_html = '<a ' . $this->get_render_attribute_string(' link') . '>' . $title_html . '</a>';
+                                            }
+                                            $html = sprintf(
+                                                '<%1$s %2$s>%3$s</%1$s>',
+                                                Utils::validate_html_tag($settings['post_header_tag']),
+                                                $this->get_render_attribute_string('title_word'),
+                                                $title_html
+                                            );
+
+                                            Utils::print_unescaped_internal_string($html);
+                                        }
+                                        ?>
+                                        <?php if ($contents['content_enable'] == 'yes') : ?>
                                             <p class="wk-margin-small-bottom">
-                                                <?php echo esc_html(wp_trim_words( get_the_content(), $contents['content_word'], ' ' ));?>
+                                                <?php echo esc_html(wp_trim_words(get_the_content(), $contents['content_word'], ' ')); ?>
                                             </p>
                                         <?php endif; ?>
                                     </div>
-                                    <?php if($contents['thumbnail_position'] == 'bottom'): ;?>
+                                    <?php if ($contents['thumbnail_position'] == 'bottom') :; ?>
                                         <div class="wk-card-media-bottom wk-overflow-hidden">
-                                            <a class="wk-display-block" href="<?php the_permalink();?>">
-                                                <?php //the_post_thumbnail($contents['thumbnail_size']);?> 
-                                                <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src(get_post_thumbnail_id(), 'cc_image', $contents ));?>" alt="<?php the_title(); ?>">
+                                            <a class="wk-display-block" href="<?php the_permalink(); ?>">
+                                                <?php //the_post_thumbnail($contents['thumbnail_size']);
+                                                ?>
+                                                <img src="<?php echo esc_url(Group_Control_Image_Size::get_attachment_image_src(get_post_thumbnail_id(), 'cc_image', $contents)); ?>" alt="<?php the_title(); ?>">
                                             </a>
                                         </div>
                                     <?php endif; ?>
                                 </div>
                             </li>
-                     <?php  endwhile; endif; wp_reset_postdata(); ?>
-                    <?php endif; ?>
-                </ul>
-                <?php if ($contents['arrow_enable'] == 'yes'):?>
-                    <a class=" <?php echo esc_attr($contents['arrow_position']) == 'out'? 'wk-position-center-left-out' : 'wk-position-center-left'; ?> wk-position-medium wk-slidenav-small <?php echo esc_attr($contents['arrow_on_hover']) == 'yes'? 'wk-hidden-hover' : ''; ?> " href="#" wk-slidenav-previous wk-slider-item="previous"></a>
-                    <a class="<?php echo esc_attr($contents['arrow_position']) == 'out'? 'wk-position-center-right-out' : 'wk-position-center-right'; ?> wk-position-medium  wk-slidenav-small <?php echo esc_attr($contents['arrow_on_hover']) == 'yes'? 'wk-hidden-hover' : ''; ?>  " href="#" wk-slidenav-next wk-slider-item="next"></a>
+                    <?php endwhile;
+                    endif;
+                    wp_reset_postdata(); ?>
                 <?php endif; ?>
-
-            </div>
-                <?php if ($contents['dot_enable'] == 'yes'):?>
-                    <ul class="wk-slider-nav wk-dotnav wk-flex-<?php echo esc_attr($contents['dot_nav_align']);?> wk-margin-medium-top"></ul>
+                </ul>
+                <?php if ($contents['arrow_enable'] == 'yes') : ?>
+                    <a class=" <?php echo esc_attr($contents['arrow_position']) == 'out' ? 'wk-position-center-left-out' : 'wk-position-center-left'; ?> wk-position-medium wk-slidenav-small <?php echo esc_attr($contents['arrow_on_hover']) == 'yes' ? 'wk-hidden-hover' : ''; ?> " href="#" wk-slidenav-previous wk-slider-item="previous"></a>
+                    <a class="<?php echo esc_attr($contents['arrow_position']) == 'out' ? 'wk-position-center-right-out' : 'wk-position-center-right'; ?> wk-position-medium  wk-slidenav-small <?php echo esc_attr($contents['arrow_on_hover']) == 'yes' ? 'wk-hidden-hover' : ''; ?>  " href="#" wk-slidenav-next wk-slider-item="next"></a>
                 <?php endif; ?>
 
-        </div>
+    </div>
+    <?php if ($contents['dot_enable'] == 'yes') : ?>
+        <ul class="wk-slider-nav wk-dotnav wk-flex-<?php echo esc_attr($contents['dot_nav_align']); ?> wk-margin-medium-top"></ul>
+    <?php endif; ?>
 
-        <script>
-            jQuery(function($){
-                if(!$('body').hasClass('wk-content-carousel')){
-                    $('body').addClass('wk-content-carousel');
-                }
-            });
-        </script>
+</div>
 
+<script>
+    jQuery(function($) {
+        if (!$('body').hasClass('wk-content-carousel')) {
+            $('body').addClass('wk-content-carousel');
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/elements/countdown/template/config.php b/elements/countdown/template/config.php
index 7080e0a..a96472e 100644
--- a/elements/countdown/template/config.php
+++ b/elements/countdown/template/config.php
@@ -84,7 +84,7 @@ protected function register_controls() {
 		     	'picker_options'	=> [
 		     		'format' => 'Ym/d H:m:s'
 		     	],
-		     	'default' => date( "Y/m/d H:m:s", strtotime("+ 1 Day") ),
+		     	'default' => gmdate( "Y/m/d H:m:s", strtotime("+ 1 Day") ),
 				'description' => esc_html__( 'Date format is (yyyy/mm/dd). Time format is (hh:mm:ss). Example: 2020-01-01 09:30.', 'widgetkit-for-elementor' )
 		  	]
 		);
diff --git a/elements/gallery/template/view.php b/elements/gallery/template/view.php
index 91fecf0..5302acd 100644
--- a/elements/gallery/template/view.php
+++ b/elements/gallery/template/view.php
@@ -58,12 +58,12 @@
 							<?php if ($galleries['content_position'] == 'overlay'): ?>
 
 					            <?php if ($gallery['gallery_thumb_image']['url']): ?>
-					            	<img src="<?php echo esc_attr($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
+					            	<img src="<?php echo esc_url($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
 					            <?php endif ;?>
 
 					            <div class="wk-padding-small wk-position-absolute wk-position-center wk-text-center wk-gallery-body">
 						               <?php if ($gallery['demo_link']['url']): ?>
-						           		<a href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
+						           		<a href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 						            		<h5 class="wk-text-medium wk-margin-small wk-card-title"> <?php echo esc_html($gallery['gallery_title']);?>
 						            		</h5>
 										</a>
@@ -80,7 +80,7 @@
 						            	<?php if ($galleries['lightcase_enable'] == 'yes' || $galleries['link_enable'] == 'yes'):?>
 							            	<div class="gallery-lightbox wk-text-center">
 							            		<?php if ($galleries['link_enable'] == 'yes'):?>
-									            	<a class="icon" href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
+									            	<a class="icon" href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 									            		<span class="fa fa-link"></span>
 									            	</a>
 								            	<?php endif; ?>
@@ -98,10 +98,10 @@
 									    <?php if ($gallery['gallery_thumb_image']['url']): ?>
 							            	<?php if ($gallery['demo_link']['url']): ?>
 								            	<a class="img-link" href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
-								            		<img src="<?php echo esc_attr($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
+								            		<img src="<?php echo esc_url($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
 								            	</a>
 							            	<?php else: ?>
-							            		<img class="img-link" src="<?php echo esc_attr($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
+							            		<img class="img-link" src="<?php echo esc_url($gallery['gallery_thumb_image']['url']);?>" alt="<?php echo esc_attr($gallery['gallery_title']);?>">
 							            	<?php endif;?>
 							            <?php endif ;?>
 
@@ -109,11 +109,11 @@
 							            	<div class="gallery-lightbox wk-text-center wk-position-absolute wk-position-center">
 							            		<?php if ($galleries['link_enable'] == 'yes'): ?>
 							            			 <?php if ($galleries['button_text']): ?>
-										            	<a class="button-text" href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
+										            	<a class="button-text" href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 										            	 	<?php echo esc_html($galleries['button_text']); ?>
 										            	</a>
 										            <?php else: ?>
-										            	<a class="top-icon" href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
+										            	<a class="top-icon" href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 										            	<a class="top-icon" href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 										            	 	<span class="fa fa-link"></span>
 										            	</a>		
@@ -121,7 +121,7 @@
 							            		<?php endif; ?>
 
 								            	<?php if ($galleries['lightcase_enable'] == 'yes'):?>
-													<a class="top-icon" href="<?php echo esc_attr($gallery['gallery_thumb_image']['url']);?>" <?php echo esc_attr($galleries['lightcase_enable']) == 'yes'? ' wk-lightbox="animation:' . esc_attr($light_case_animation) . '"' : '';?>><span class="fa fa-search"></span></a>
+													<a class="top-icon" href="<?php echo esc_url($gallery['gallery_thumb_image']['url']);?>" <?php echo esc_attr($galleries['lightcase_enable']) == 'yes'? ' wk-lightbox="animation:' . esc_attr($light_case_animation) . '"' : '';?>><span class="fa fa-search"></span></a>
 												<?php endif; ?>
 							            	</div>
 						            	<?php endif; ?>
@@ -129,7 +129,7 @@
 
 						            <div class="wk-padding-small wk-text-<?php echo esc_attr($galleries['caption_align']);?> wk-gallery-body">
 						               <?php if ($gallery['demo_link']['url']): ?>
-						           		<a href="<?php echo esc_attr($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
+						           		<a href="<?php echo esc_url($gallery['demo_link']['url']); ?>" <?php echo esc_attr($gallery['demo_link']['is_external']) ? 'target="_blank"' : 'nofollow="nofollow"'; ?>>
 						            		<h5 class="wk-text-medium wk-margin-small wk-card-title wk-margin-remove-top"> <?php echo esc_html($gallery['gallery_title']);?>
 						            		</h5>
 										</a>
diff --git a/elements/hover-image/template/view.php b/elements/hover-image/template/view.php
index 8a1ef3a..8731197 100644
--- a/elements/hover-image/template/view.php
+++ b/elements/hover-image/template/view.php
@@ -1,8 +1,6 @@
 <?php
     $settings = $this->get_settings();
 ?>
-
-
     <div class="tgx-hover-image">
         <figure class="<?php echo esc_attr($settings['hover_image_hover_animation']); ?>">
 
@@ -10,8 +8,8 @@
                 
                 <div class="hover-image">
                     <?php if ( $settings['select_link_to'] == 'url' ):?>
-                        <a target="<?php  echo esc_attr($settings['hover_image_link']['is_external']) ? '_blank' : '_self'?>" href="<?php echo esc_attr($settings['hover_image_link']['url']);?>">
-                            <img src="<?php echo esc_attr($settings['hover_image']['url']); ?>" alt="hover-image">
+                        <a target="<?php  echo esc_attr($settings['hover_image_link']['is_external']) ? '_blank' : '_self'?>" href="<?php echo esc_url($settings['hover_image_link']['url']);?>">
+                            <img src="<?php echo esc_url($settings['hover_image']['url']); ?>" alt="hover-image">
                             <?php if ($settings['hover_image_caption_title']):?>
 
                                 <figcaption class="image-caption">
@@ -27,8 +25,8 @@
                             <?php endif; ?>
                         </a>
                     <?php else: ?>
-                        <a href="<?php echo esc_attr($settings['hover_image']['url']); ?>" data-elementor-open-lightbox="<?php echo esc_attr($settings['hover_image_lightbox']);?>">
-                            <img src="<?php echo esc_attr($settings['hover_image']['url']); ?>" alt="hover-image">
+                        <a href="<?php echo esc_url($settings['hover_image']['url']); ?>" data-elementor-open-lightbox="<?php echo esc_attr($settings['hover_image_lightbox']);?>">
+                            <img src="<?php echo esc_url($settings['hover_image']['url']); ?>" alt="hover-image">
                             <?php if ($settings['hover_image_caption_title']):?>
 
                                 <figcaption class="image-caption">
diff --git a/elements/image-compare/template/view.php b/elements/image-compare/template/view.php
index 6ca093d..2400387 100755
--- a/elements/image-compare/template/view.php
+++ b/elements/image-compare/template/view.php
@@ -6,8 +6,8 @@
          <div class="row">
             <div id="image-compare-<?php echo esc_attr($id); ?>" class="image-compare-container">
                 
-                <img src="<?php echo esc_attr($image_compare['before_image']['url']); ?>" alt="before">
-                <img src="<?php echo esc_attr($image_compare['after_image']['url']); ?>" alt="After">
+                <img src="<?php echo esc_url($image_compare['before_image']['url']); ?>" alt="before">
+                <img src="<?php echo esc_url($image_compare['after_image']['url']); ?>" alt="After">
             </div>
         </div>
     </div>
diff --git a/elements/image-feature/template/view.php b/elements/image-feature/template/view.php
index b26debc..4abb75e 100644
--- a/elements/image-feature/template/view.php
+++ b/elements/image-feature/template/view.php
@@ -1,13 +1,8 @@
 <?php
 // Silence is golden.
     use Elementor\Icons_Manager;
-
     $settings = $this->get_settings();
-
 ?>
-
-
-
     <div class="tgx-image-feature">               
         <!-- feature Start -->
         <div class="block drop-shadow ">
@@ -22,7 +17,7 @@
                             rel="nofollow" 
                         <?php endif; ?>
 
-                        href="<?php echo esc_attr($settings['feature_link']['url']);?>"> 
+                        href="<?php echo esc_url($settings['feature_link']['url']);?>"> 
                             <h4 class="feature-title"><?php echo esc_html($settings['feature_title']); ?></h4>
                         </a>
                     <?php else: ?>
@@ -36,7 +31,7 @@
 
                     <?php if ($settings['choose_media'] == 'image'): ?>
                         <?php if( $settings['feature_image']['url']):?>
-                            <img src="<?php echo esc_attr($settings['feature_image']['url']); ?>" alt="<?php the_title(); ?>"> 
+                            <img src="<?php echo esc_url($settings['feature_image']['url']); ?>" alt="<?php the_title(); ?>"> 
                         <?php endif; ?>
 
                     <?php else: ?>
@@ -56,7 +51,7 @@
                     <?php if ($settings['choose_media'] == 'image'): ?>
                         
                         <?php if( $settings['feature_image']['url']):?>
-                            <img class= "tgx-media" src="<?php echo esc_attr($settings['feature_image']['url']); ?>" alt="<?php the_title(); ?>"> 
+                            <img class= "tgx-media" src="<?php echo esc_url($settings['feature_image']['url']); ?>" alt="<?php the_title(); ?>"> 
                         <?php endif; ?>
 
                     <?php else: ?>
@@ -82,7 +77,7 @@
                         <?php else: ?>
                             rel="nofollow" 
                         <?php endif; ?>
-                        href="<?php echo esc_attr($settings['feature_link']['url']);?>"> 
+                        href="<?php echo esc_url($settings['feature_link']['url']);?>"> 
                             <h4 class="feature-title"><?php echo esc_html($settings['feature_title']); ?></h4>
                         </a>
                     <?php else: ?>
diff --git a/elements/portfolio/template/view.php b/elements/portfolio/template/view.php
index 329681a..3214424 100644
--- a/elements/portfolio/template/view.php
+++ b/elements/portfolio/template/view.php
@@ -178,7 +178,7 @@
                                     <div class="portfolio-btn text-center">
                                         <?php if($portfolio['portfolio_full_image']):?>
                                             <a class="icon-search" 
-                                                href="<?php echo esc_html($portfolio['portfolio_full_image']['url']);?>">
+                                                href="<?php echo esc_url($portfolio['portfolio_full_image']['url']);?>">
                                                 <i class='fa fa-plus'></i>
                                             </a>
                                         <?php endif; ?>
diff --git a/elements/pricing-1/template/view.php b/elements/pricing-1/template/view.php
index dd653df..c99020b 100644
--- a/elements/pricing-1/template/view.php
+++ b/elements/pricing-1/template/view.php
@@ -50,7 +50,7 @@
              
                 <?php if ($settings['discount_price_switcher'] == 'yes'): ?>
                     <?php if ($settings['discount_price'] && $settings['currency_position'] == 'before') : ?>
-                        <del><span class="tgx-price-table__discount-currency"><span><?php echo esc_attr($symbol); ?></span></span><span class="tgx-price-table__discount-part"><span><?php echo esc_attr($settings['discount_price']); ?></span></span></del>
+                        <del><span class="tgx-price-table__discount-currency"><span><?php echo esc_attr($symbol); ?></span></span><span class="tgx-price-table__discount-part"><span><?php echo esc_html($settings['discount_price']); ?></span></span></del>
                     <?php endif; ?>
                 
                 <?php endif ;?>
@@ -61,21 +61,20 @@
                 <?php endif; ?>
 
                 <?php if ( ! empty( $settings['price'] ) ) : ?>
-                    <span class="tgx-price-table__integer-part"><span><?php echo esc_attr($settings['price']); ?></span></span>
+                    <span class="tgx-price-table__integer-part"><span><?php echo esc_html($settings['price']); ?></span></span>
                 <?php endif; ?>
 
                 <?php if ($settings['discount_price_switcher'] == 'yes'): ?>
                     <?php if ($settings['discount_price'] && $settings['currency_position'] == 'after') : ?>
-                        <del><span class="tgx-price-table__discount-currency"><span><?php echo esc_attr($symbol); ?></span></span><span class="tgx-price-table__discount-part"><span><?php echo esc_attr($settings['discount_price']); ?></span></span></del>
+                        <del><span class="tgx-price-table__discount-currency"><span><?php echo esc_attr($symbol); ?></span></span><span class="tgx-price-table__discount-part"><span><?php echo esc_html($settings['discount_price']); ?></span></span></del>
                     <?php endif; ?>
                 
                 <?php endif ;?>
 
 
                 <?php if ( ! empty( $settings['period'] ) ) : ?>
-                    <span class="tgx-price-table__period"><span><?php echo esc_attr($settings['period']); ?></span></span>
+                    <span class="tgx-price-table__period"><span><?php echo esc_html($settings['period']); ?></span></span>
                 <?php endif; ?>
-             
             </div>
 
             <?php if ( $settings['title_position'] == 'bottom' ) : ?>
diff --git a/elements/pricing-2/template/view.php b/elements/pricing-2/template/view.php
index e7f4cd6..349ef07 100644
--- a/elements/pricing-2/template/view.php
+++ b/elements/pricing-2/template/view.php
@@ -29,7 +29,7 @@
 
                       <?php if ( ! empty( $settings['pricing_2_icon_image']['url'] ) ) : ?>
                           <div class="tgx-single-image">
-                            <img src="<?php echo esc_attr($settings['pricing_2_icon_image']['url']); ?>" alt="<?php echo esc_attr($settings['pricing_2_pricing_title']); ?>" />
+                            <img src="<?php echo esc_url($settings['pricing_2_icon_image']['url']); ?>" alt="<?php echo esc_attr($settings['pricing_2_pricing_title']); ?>" />
                           </div><!-- .table-image -->
                       <?php endif; ?>
                 </div> <!-- .tx-table-heading -->
@@ -72,7 +72,7 @@
 
         <?php if ( ! empty( $settings['single_button_text'] ) ) : ?>
             <div class="tgx-single-footer"> 
-                <a class="tgx-single-btn" href="<?php echo esc_attr($settings['single_link']['url']); ?>">
+                <a class="tgx-single-btn" href="<?php echo esc_url($settings['single_link']['url']); ?>">
                     <?php echo esc_html($settings['single_button_text']); ?>
                 </a> 
             </div><!-- .tgx-single-footer -->
diff --git a/elements/pricing-tab/template/view.php b/elements/pricing-tab/template/view.php
index 6db73fe..d38e595 100644
--- a/elements/pricing-tab/template/view.php
+++ b/elements/pricing-tab/template/view.php
@@ -8,7 +8,6 @@
 ?>
 
     <div class="pricing-tab">
-
         <?php $count = 0; if ( ! empty( $settings['pricing_tabs'] ) ) : ?>
             <?php foreach( $settings['pricing_tabs'] as $item ) : $count++; ?>
                 <input class="<?php echo esc_attr($count);?>" type="radio" id="<?php echo esc_attr($counter); ?>" name="tab" <?php echo (0 == $counter) ? 'checked' : ''; ?>>
@@ -30,8 +29,6 @@
                     </span><!-- pricing-subtitle-->
                 </label><!--  Pricing-button -->
 
-
-                  
             <div class="pricing-content row">
                 <div class="pricing-content-wrapper">
 
@@ -75,7 +72,7 @@
 
                             <?php if ( ! empty( $item['tab_image']['url'] ) ) : ?>
                                 <div class="tgx-pricing-tab-image">
-                                    <img src="<?php echo esc_attr($item['tab_image']['url']); ?>" alt="
+                                    <img src="<?php echo esc_url($item['tab_image']['url']); ?>" alt="
                                     <?php echo esc_html($item['pricing_title']); ?>" />
                                 </div>
                             <?php endif; ?>
@@ -107,7 +104,7 @@
 
                         <?php if ( ! empty( $item['button_text'] ) ) : ?>
                             <div class="tgx-pricing-tab-footer"> 
-                                <a class="tgx-pricing-tab-btn" href="<?php echo esc_attr($item['link']['url']); ?>">
+                                <a class="tgx-pricing-tab-btn" href="<?php echo esc_url($item['link']['url']); ?>">
                                     <?php echo esc_html($item['button_text']); ?>   
                                 </a> 
                             </div><!-- pricing-tab-footer -->
@@ -116,9 +113,6 @@
                </div><!-- col-md-3 -->
             <?php endif; ?>
 
-
-
-              
             <?php if ($item['pricing_tab_enable_2'] == 'yes'): ?>
                 <div class="
                      <?php if ($item['pricing_tab_enable_3'] == 'yes' & $item['pricing_tab_enable_2'] == 'yes' & $item['pricing_tab_enable_1'] == 'yes'): ?>
@@ -150,20 +144,18 @@
 
                                   <?php if ( ! empty( $item['period_2'] ) ) : ?>
                                         <span class="period"> 
-                                            <?php echo esc_attr($item['period_2']); ?>
+                                            <?php echo esc_html($item['period_2']); ?>
                                         </span>
                                   <?php endif; ?>
                             </div><!-- pricing-tab-cost -->
 
                             <?php if ( ! empty( $item['tab_image_2']['url'] ) ) : ?>
                                 <div class="tgx-pricing-tab-image">
-                                    <img src="<?php echo esc_attr($item['tab_image_2']['url']); ?>" alt="<?php echo esc_attr($item['pricing_title_2']); ?>" />
+                                    <img src="<?php echo esc_url($item['tab_image_2']['url']); ?>" alt="<?php echo esc_attr($item['pricing_title_2']); ?>" />
                                 </div>
                             <?php endif; ?>
-
                             </div><!-- pricing-tab-headeing -->
 
-
                             <div class="tgx-pricing-tab-about">
                                 <?php if ( ! empty( $item['pricing_title_2'] ) ) : ?>
                                     <h3 class="tgx-pricing-tab-title"> 
@@ -178,8 +170,6 @@
                                 <?php endif; ?>
                             </div><!-- pricing-tab-about -->
 
-                      
-
                         <?php if ( ! empty( $item['pricing_details_2'] ) ) : ?>
                              <div class="tgx-pricing-tab-feature">
                                  <?php echo wp_kses_post($item['pricing_details_2']); ?>
@@ -187,23 +177,19 @@
                         <?php endif; ?>
                     </div><!-- pricing-tab-wrapper -->
 
-
                     <?php if ( ! empty( $item['button_text_2'] ) ) : ?>
                         <div class="tgx-pricing-tab-footer"> 
-                            <a class="tgx-pricing-tab-btn" href="<?php echo esc_attr($item['link_2']['url']); ?>">
+                            <a class="tgx-pricing-tab-btn" href="<?php echo esc_url($item['link_2']['url']); ?>">
                                  <?php echo esc_html($item['button_text_2']); ?>   
                             </a> 
                         </div><!-- pricing-tab-footer -->
                     <?php endif; ?>
                 </div><!-- pricing-tab -->
             </div><!-- col-md-4 -->
-
         <?php endif; ?>
 
-
         <?php if ($item['pricing_tab_enable_3'] == 'yes'): ?>
             <div class="
-
                 <?php if ($item['pricing_tab_enable_3'] == 'yes' & $item['pricing_tab_enable_2'] == 'yes' & $item['pricing_tab_enable_1'] == 'yes'): ?>
                     <?php echo esc_attr("col-xs-12 col-md-6 col-lg-4"); ?>
 
@@ -237,11 +223,9 @@
                                 <?php endif; ?>
                             </div><!-- pricing-tab-cost -->
 
-                          
-
                             <?php if ( ! empty( $item['tab_image_3']['url'] ) ) : ?>
                                 <div class="tgx-pricing-tab-image">
-                                    <img src="<?php echo esc_attr($item['tab_image_3']['url']); ?>" alt="<?php echo esc_attr($item['pricing_title_3']); ?>" />
+                                    <img src="<?php echo esc_url($item['tab_image_3']['url']); ?>" alt="<?php echo esc_attr($item['pricing_title_3']); ?>" />
                                 </div>
                             <?php endif; ?>
                         </div><!-- pricing-tab-headeing -->
@@ -268,7 +252,7 @@
                     </div><!-- pricing-tab-wrapper -->
                     <?php if ( ! empty( $item['button_text_3'] ) ) : ?>
                         <div class="tgx-pricing-tab-footer"> 
-                            <a class="tgx-pricing-tab-btn" href="<?php echo esc_attr($item['link_3']['url']); ?>">
+                            <a class="tgx-pricing-tab-btn" href="<?php echo esc_url($item['link_3']['url']); ?>">
                                 <?php echo esc_html($item['button_text_3']);?>
                             </a> 
                         </div><!-- pricing-tab-footer -->
diff --git a/elements/site-social/template/view.php b/elements/site-social/template/view.php
index a80991c..d15905e 100644
--- a/elements/site-social/template/view.php
+++ b/elements/site-social/template/view.php
@@ -20,7 +20,7 @@
                         foreach($site_social_default_list as $site_social):
                             $site_social_hover_color = $site_social["site_social_platform_hover_color"];
                             ?>
-                                <a style="color: <?php echo esc_attr($site_social_platform_icon_color); ?>" onMouseOver="this.style.color='<?php echo esc_attr($site_social_hover_color); ?>'" onMouseOut="this.style.color='<?php echo esc_attr($site_social_platform_icon_color); ?>'" href="<?php echo esc_attr($site_social['social_link']);?>"><i class="<?php echo esc_attr($site_social['social_icon_picker']);?>"></i></a>
+                                <a style="color: <?php echo esc_attr($site_social_platform_icon_color); ?>" onMouseOver="this.style.color='<?php echo esc_attr($site_social_hover_color); ?>'" onMouseOut="this.style.color='<?php echo esc_attr($site_social_platform_icon_color); ?>'" href="<?php echo esc_url($site_social['social_link']);?>"><i class="<?php echo esc_attr($site_social['social_icon_picker']);?>"></i></a>
                             <?php 
                         endforeach;
                     ?>
diff --git a/elements/slider-1/template/config.php b/elements/slider-1/template/config.php
index 3c7954d..212d1b7 100644
--- a/elements/slider-1/template/config.php
+++ b/elements/slider-1/template/config.php
@@ -1,6 +1,4 @@
 <?php
-
-
 use Elementor\Widget_Base;
 use Elementor\Utils;
 use Elementor\Controls_Manager;
diff --git a/elements/slider-1/template/view.php b/elements/slider-1/template/view.php
index 3b1885e..5c033ff 100644
--- a/elements/slider-1/template/view.php
+++ b/elements/slider-1/template/view.php
@@ -1,86 +1,88 @@
 <?php
-   // Silence pro 1
-
-    $settings = $this->get_settings();
-    $id = $this->get_id();
-
-    $header_tag_arr_for_slider_1 = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-    $slider_1_header_tag = esc_html(wp_kses($settings['heading_tag'], $header_tag_arr_for_slider_1));
+// Silence pro 1
+use Elementor\Utils;
+$settings = $this->get_settings();
+$id = $this->get_id();
 
 ?>
+<div id="tgx-hero-unit" class="tgx-slider-1">
+    <div id="<?php echo esc_attr($id); ?>" class="carousel slide" data-ride="carousel" data-interval="
+             <?php if ($settings['slider_interval']) :
+                    echo esc_attr($settings['slider_interval']);
+                endif; ?>" <?php echo esc_attr($settings['slider_data_pause'] == 'yes') ? '' : 'data-pause="false"'; ?>>
+        <?php if ($settings['dot_enable_1']) : ?>
+            <!-- Indicators -->
+            <ol class="carousel-indicators">
+                <?php for ($i = 0; $i < count($settings['slider_option']); $i++) :
+                    $active = $i == 0 ? 'active' : ''; ?>
+                    <li data-target="#<?php echo esc_attr($id); ?>" data-slide-to="<?php echo esc_attr($i); ?>" class="<?php echo esc_attr($active); ?>"></li>
+                <?php endfor; ?>
+            </ol>
+        <?php endif; ?>
+        <!-- Wrapper for slides -->
+        <div class="carousel-inner ">
+            <?php $i = 0; ?>
+            <?php foreach ($settings['slider_option'] as $slider) : ?>
+                <?php $active = $i == 0 ? 'active' : ''; ?>
+                <div class="item <?php echo esc_attr($active); ?> slider-<?php echo esc_attr($i); ?>" style="background-image: url('<?php echo esc_url($slider['slider_image']['url']); ?>');">
 
+                    <div class="carousel-caption ">
+                        <?php if ($slider['title']) :
+                            $this->add_render_attribute("title", "class", "slider-title animated animate-delay-1 {$slider['title_animation']}");
 
-    <div id="tgx-hero-unit" class="tgx-slider-1">
-        <div id="<?php echo esc_attr($id); ?>" class="carousel slide" data-ride="carousel" data-interval="
-             <?php if ($settings['slider_interval']):
-                 echo esc_attr($settings['slider_interval']);
-             endif; ?>" <?php echo esc_attr($settings['slider_data_pause'] == 'yes') ? '' : 'data-pause="false"'; ?>>
-             <?php if ($settings['dot_enable_1']):?>
-                <!-- Indicators -->
-                <ol class="carousel-indicators">
-                    <?php for($i = 0; $i < count($settings['slider_option']); $i++):
-                        $active = $i == 0 ? 'active' : '';?>
-                    <li data-target="#<?php echo esc_attr($id); ?>" data-slide-to="<?php echo esc_attr($i);?>" class="<?php echo esc_attr($active);?>"></li>
-                    <?php endfor; ?>
-                </ol>
-            <?php endif; ?>
-            <!-- Wrapper for slides -->
-            <div class="carousel-inner ">
-                <?php  $i = 0;?>
-                <?php foreach ( $settings['slider_option'] as $slider ) : ?>
-                    <?php $active = $i == 0 ? 'active' : ''; ?>
-                    <div class="item <?php echo esc_attr($active);?> slider-<?php echo esc_attr($i);?>" style="background-image: url('<?php echo esc_url($slider['slider_image']['url']);?>');">
-
-                        <div class="carousel-caption ">
-                            <?php if ($slider['title']):?>
-                                <<?php echo esc_attr($slider_1_header_tag);?> class="slider-title animated animate-delay-1 <?php echo esc_attr($slider['title_animation']); ?>">
-                                        <?php echo esc_html($slider['title']); ?>                    
-                                </<?php echo esc_attr($slider_1_header_tag);?>>
-                            <?php endif; ?>
+                            $title_html = esc_html($slider['title']);
+                            $html = sprintf(
+                                '<%1$s %2$s>%3$s</%1$s>',
+                                Utils::validate_html_tag($settings['heading_tag']),
+                                $this->get_render_attribute_string('title'),
+                                $title_html
+                            );
 
+                            Utils::print_unescaped_internal_string($html);
+                        endif;
+                        ?>
 
-                            <?php if ($slider['slider_content']):?>
-                                <p class="slider-description animated animate-delay-2
+                        <?php if ($slider['slider_content']) : ?>
+                            <p class="slider-description animated animate-delay-2
                                     <?php echo esc_attr($slider['content_animation']); ?> ">
-                                    <?php echo esc_html($slider['slider_content']); ?>
-                                </p>
-                                        <?php 
-                             //$shortcode = $slider['slider_content'];
-                             //echo do_shortcode($shortcode);
+                                <?php echo esc_html($slider['slider_content']); ?>
+                            </p>
+                            <?php
+                            //$shortcode = $slider['slider_content'];
+                            //echo do_shortcode($shortcode);
 
-                             ?>
-                            <?php endif; ?>
-                            
-                            <?php if ($slider['btn_text']):?>
-                                <span class="slider-action">
-                                    <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
-                                    </a>
-                                </span>
-                            <?php endif; ?>
-             
-                        </div>
-                    </div><!-- /.item -->
+                            ?>
+                        <?php endif; ?>
 
-                <?php  $i++; endforeach; ?>
+                        <?php if ($slider['btn_text']) : ?>
+                            <span class="slider-action">
+                                <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
+                                </a>
+                            </span>
+                        <?php endif; ?>
 
-                </div> <!-- /.inner -->
-                <?php if ($settings['arrow_enable_1']):?>
-                    <a class="hidden-xs left carousel-control" href="#<?php echo esc_attr($id); ?>" data-slide="prev">
-                        <i class="fas fa-long-arrow-alt-left"></i>
-                    </a>
-                    <a class="hidden-xs right carousel-control" href="#<?php echo esc_attr($id); ?>" data-slide="next">
-                        <i class="fas fa-long-arrow-alt-right "></i>
-                    </a>
-                <?php endif; ?>
-        </div><!-- /.id -->
-    </div> <!-- /#hero-unit -->
+                    </div>
+                </div><!-- /.item -->
 
-        <script type="text/javascript">
-            jQuery(function($){
-                if(!$('body').hasClass('wk-slider-1')){
-                    $('body').addClass('wk-slider-1');
-                }
-            });
+            <?php $i++;
+            endforeach; ?>
 
-        </script>
+        </div> <!-- /.inner -->
+        <?php if ($settings['arrow_enable_1']) : ?>
+            <a class="hidden-xs left carousel-control" href="#<?php echo esc_attr($id); ?>" data-slide="prev">
+                <i class="fas fa-long-arrow-alt-left"></i>
+            </a>
+            <a class="hidden-xs right carousel-control" href="#<?php echo esc_attr($id); ?>" data-slide="next">
+                <i class="fas fa-long-arrow-alt-right "></i>
+            </a>
+        <?php endif; ?>
+    </div><!-- /.id -->
+</div> <!-- /#hero-unit -->
 
+<script type="text/javascript">
+    jQuery(function($) {
+        if (!$('body').hasClass('wk-slider-1')) {
+            $('body').addClass('wk-slider-1');
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/elements/slider-2/template/view.php b/elements/slider-2/template/view.php
index a43674d..431dad0 100644
--- a/elements/slider-2/template/view.php
+++ b/elements/slider-2/template/view.php
@@ -1,142 +1,145 @@
 <?php
 // Silence is golden.
-    $settings = $this->get_settings();
-    $id = $this->get_id();
-    $header_tag_arr_for_slider_2 = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-    $slider_2_header_tag = esc_html(wp_kses($settings['heading_tag'], $header_tag_arr_for_slider_2));
+use Elementor\Utils;
+$settings = $this->get_settings();
+$id = $this->get_id();
 ?>
-    <!-- Animation Slider start -->
-    <section id="tgx-hero-unit" class="tgx-slider-2">
-        <div class="row">
-            <div id="<?php echo esc_attr($id); ?>" class="carousel slide" data-ride="carousel" data-interval="
-                 <?php if ($settings['slider_interval']):
-                     echo esc_attr($settings['slider_interval']);
-                 endif; ?>
+<!-- Animation Slider start -->
+<section id="tgx-hero-unit" class="tgx-slider-2">
+    <div class="row">
+        <div id="<?php echo esc_attr($id); ?>" class="carousel slide" data-ride="carousel" data-interval="
+                 <?php if ($settings['slider_interval']) :
+                        echo esc_attr($settings['slider_interval']);
+                    endif; ?>
                 " <?php echo esc_attr($settings['slider_data_pause'] == 'yes') ? '' : 'data-pause="false"'; ?>>
-                 <?php if ($settings['dot_enable']):?>
-                    <!-- Indicators -->
-                    <ol class="carousel-indicators">
-                        <?php for($i = 0; $i < count($settings['slider_option']); $i++):
-                            $active = $i == 0 ? 'active' : '';?>
-                        <li data-target="#<?php echo esc_attr($id); ?>" data-slide-to="<?php echo esc_attr($i);?>" class="<?php echo esc_attr($active);?>"></li>
-                        <?php endfor; ?>
-                    </ol>
-                <?php endif; ?>
-
-                <!-- Wrapper for slides -->
-                <div class="carousel-inner ">
-                    <?php  $i = 0;?>
-                    <?php foreach ( $settings['slider_option'] as $slider ) : ?>
-                        <?php $active = $i == 0 ? 'active' : ''; ?>
-                        <div class="item <?php echo esc_attr($active);?> slider-<?php echo esc_attr($i);?>" style="background-image: url('<?php echo esc_url($slider['slider_image_2']['url']);?>');">
-
-                        <?php if ($settings['layout_align'] == 'left'): ?>
-                            <?php if ($slider['slider_animation_image']['url']): ?> 
-                                <div class="col-md-8 col-xs-12 col-sm-12">
-                            <?php else: ?>
-                                <div class="col-md-12 col-xs-12 col-sm-12">
-                            <?php endif; ?>
-                                <div class="carousel-caption ">
-                                    <?php if ($slider['title']):?>
-                                        <<?php echo esc_attr($slider_2_header_tag);?> class="slider-title animated animate-delay-1 <?php echo esc_attr($slider['title_animation']); ?>">
-                                            <?php echo esc_html($slider['title']); ?>
-                                        </<?php echo esc_attr($slider_2_header_tag);?>>
-                                    <?php endif; ?>
+            <?php if ($settings['dot_enable']) : ?>
+                <!-- Indicators -->
+                <ol class="carousel-indicators">
+                    <?php for ($i = 0; $i < count($settings['slider_option']); $i++) :
+                        $active = $i == 0 ? 'active' : ''; ?>
+                        <li data-target="#<?php echo esc_attr($id); ?>" data-slide-to="<?php echo esc_attr($i); ?>" class="<?php echo esc_attr($active); ?>"></li>
+                    <?php endfor; ?>
+                </ol>
+            <?php endif; ?>
 
+            <!-- Wrapper for slides -->
+            <div class="carousel-inner ">
+                <?php $i = 0; ?>
+                <?php foreach ($settings['slider_option'] as $slider) : ?>
+                    <?php $active = $i == 0 ? 'active' : ''; ?>
+                    <div class="item <?php echo esc_attr($active); ?> slider-<?php echo esc_attr($i); ?>" style="background-image: url('<?php echo esc_url($slider['slider_image_2']['url']); ?>');">
 
-                                    <?php if ($slider['slider_content']):?>
-                                        <p class="slider-description animated animate-delay-2
-                                           <?php echo esc_attr($slider['content_animation']); ?> ">
-                                            <?php echo esc_html($slider['slider_content']); ?>
-                                        </p>
+                        <?php if ($settings['layout_align'] == 'left') : ?>
+                            <?php if ($slider['slider_animation_image']['url']) : ?>
+                                <div class="col-md-8 col-xs-12 col-sm-12">
+                                <?php else : ?>
+                                    <div class="col-md-12 col-xs-12 col-sm-12">
                                     <?php endif; ?>
-                                    
-                                    <?php if($slider['btn_text']): ?>
-                                    <span class="slider-action">
-                                        <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
-                                        </a>
-                                    </span>
-                                    <?php endif; ?>    
-                                </div>
-                            </div>
-
-                            <?php if ($slider['slider_animation_image']['url']): ?>        
-                                <div class="col-md-4 col-xs-12 col-sm-12">
-                                    <div class="carousel-image animated animate-delay-4 <?php echo esc_attr($slider['image_animation']); ?>">
-                                        <img src="<?php echo esc_url($slider['slider_animation_image']['url']);?>" alt="animation-image" class="img-responsive">
+                                    <div class="carousel-caption ">
+                                        <?php if ($slider['title']) :
+                                            $this->add_render_attribute("title", "class", "slider-title animated animate-delay-1 {$slider['title_animation']}");
+
+                                            $title_html = esc_html($slider['title']);
+                                            $html = sprintf(
+                                                '<%1$s %2$s>%3$s</%1$s>',
+                                                Utils::validate_html_tag($settings['heading_tag']),
+                                                $this->get_render_attribute_string('title'),
+                                                $title_html
+                                            );
+
+                                            Utils::print_unescaped_internal_string($html);
+                                        endif;
+                                         ?>
+
+                                        <?php if ($slider['btn_text']) : ?>
+                                            <span class="slider-action">
+                                                <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
+                                                </a>
+                                            </span>
+                                        <?php endif; ?>
                                     </div>
-                                </div>
-                            <?php endif ?>
-
-                        <?php else: ?>
-
-                            <?php if ($slider['slider_animation_image']['url']): ?>        
-                                <div class="col-md-4 col-xs-12 col-sm-12">
-                                    <div class="carousel-image animated animate-delay-4 <?php echo esc_attr($slider['image_animation']); ?>">
-                                        <img src="<?php echo esc_url($slider['slider_animation_image']['url']);?>" alt="animation-image" class="img-responsive">
                                     </div>
-                                </div>
-                            <?php endif ?>
 
-                            <?php if ($slider['slider_animation_image']['url']): ?> 
-                                <div class="col-md-8 col-xs-12 col-sm-12">
-                            <?php else: ?>
-                                <div class="col-md-12 col-xs-12 col-sm-12">
-                            <?php endif; ?>
-                                <div class="carousel-caption ">
-                                    <?php if ($slider['title']):?>
-                                        <h2 class="slider-title animated animate-delay-1 <?php echo esc_attr($slider['title_animation']); ?>">
-                                            <?php echo esc_html($slider['title']); ?>
-                                        </h2>
-                                    <?php endif; ?>
-
-                                    <?php if ($slider['slider_content']):?>
-                                        <p class="slider-description animated animate-delay-2
+                                    <?php if ($slider['slider_animation_image']['url']) : ?>
+                                        <div class="col-md-4 col-xs-12 col-sm-12">
+                                            <div class="carousel-image animated animate-delay-4 <?php echo esc_attr($slider['image_animation']); ?>">
+                                                <img src="<?php echo esc_url($slider['slider_animation_image']['url']); ?>" alt="animation-image" class="img-responsive">
+                                            </div>
+                                        </div>
+                                    <?php endif ?>
+
+                                <?php else : ?>
+
+                                    <?php if ($slider['slider_animation_image']['url']) : ?>
+                                        <div class="col-md-4 col-xs-12 col-sm-12">
+                                            <div class="carousel-image animated animate-delay-4 <?php echo esc_attr($slider['image_animation']); ?>">
+                                                <img src="<?php echo esc_url($slider['slider_animation_image']['url']); ?>" alt="animation-image" class="img-responsive">
+                                            </div>
+                                        </div>
+                                    <?php endif ?>
+
+                                    <?php if ($slider['slider_animation_image']['url']) : ?>
+                                        <div class="col-md-8 col-xs-12 col-sm-12">
+                                        <?php else : ?>
+                                            <div class="col-md-12 col-xs-12 col-sm-12">
+                                            <?php endif; ?>
+                                            <div class="carousel-caption ">
+                                                <?php if ($slider['title']) : ?>
+                                                    <h2 class="slider-title animated animate-delay-1 <?php echo esc_attr($slider['title_animation']); ?>">
+                                                        <?php echo esc_html($slider['title']); ?>
+                                                    </h2>
+                                                <?php endif; ?>
+
+                                                <?php if ($slider['slider_content']) : ?>
+                                                    <p class="slider-description animated animate-delay-2
                                            <?php echo esc_attr($slider['content_animation']); ?> ">
-                                            <?php echo esc_html($slider['slider_content']); ?>
-                                        </p>
-                                    <?php endif; ?>
-
-                                    <span class="slider-action">
-                                        <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
-                                        </a>
-                                    </span>
-                     
+                                                        <?php echo esc_html($slider['slider_content']); ?>
+                                                    </p>
+                                                <?php endif; ?>
+
+                                                <span class="slider-action">
+                                                    <a class="btn btn-slider animated animate-delay-3 <?php echo esc_attr($slider['btn_animation']); ?>" href="<?php echo esc_url($slider['btn_link']['url']); ?>"> <?php echo esc_html($slider['btn_text']); ?>
+                                                    </a>
+                                                </span>
+
+                                            </div>
+                                            </div>
+                                        <?php endif ?>
+                                        </div>
+                                    <?php $i++;
+                                endforeach; ?>
                                 </div>
-                            </div>                
-                        <?php endif ?>                
-                    </div>
-                <?php $i++;  endforeach; ?>
-            </div>
 
 
-            <?php if ($settings['arrow_enable']):?>
-                <!-- Left and right controls -->
-                <a class="left carousel-control hidden-xs" href="#<?php echo esc_attr($id); ?>" role="button" data-slide="prev">
-                    <span class="fa fa-angle-left" aria-hidden="true"></span>
-                    <!-- <span class="sr-only"><?php esc_html_e('Previous', 'widgetkit-for-elementor');?></span> -->
-                </a>
-                <a class="right carousel-control hidden-xs" href="#<?php echo esc_attr($id); ?>" role="button" data-slide="next">
-                    <span class="fa fa-angle-right" aria-hidden="true"></span>
-                   <!--  <span class="sr-only"><?php esc_html_e('Next', 'widgetkit-for-elementor');?></span> -->
-                </a>
-            <?php endif; ?>
-        </div>
-    </div>
+                                <?php if ($settings['arrow_enable']) : ?>
+                                    <!-- Left and right controls -->
+                                    <a class="left carousel-control hidden-xs" href="#<?php echo esc_attr($id); ?>" role="button" data-slide="prev">
+                                        <span class="fa fa-angle-left" aria-hidden="true"></span>
+                                        <!-- <span class="sr-only"><?php esc_html_e('Previous', 'widgetkit-for-elementor'); ?></span> -->
+                                    </a>
+                                    <a class="right carousel-control hidden-xs" href="#<?php echo esc_attr($id); ?>" role="button" data-slide="next">
+                                        <span class="fa fa-angle-right" aria-hidden="true"></span>
+                                        <!--  <span class="sr-only"><?php esc_html_e('Next', 'widgetkit-for-elementor'); ?></span> -->
+                                    </a>
+                                <?php endif; ?>
+                    </div>
+            </div>
 </section>
 
 
 <script type="text/javascript">
-   jQuery(document).ready(function($) {
+    jQuery(document).ready(function($) {
         // Hero area auto height adjustment
-     jQuery('#tgx-slider .carousel-inner .item') .css({'height': (($(window).height()))+'px'});
-     jQuery(window).resize(function(){
-        $('#tgx-slider .carousel-inner .item') .css({'height': (($(window).height()))+'px'});
-    });
-            if(!$('body').hasClass('wk-slider-2')){
+        jQuery('#tgx-slider .carousel-inner .item').css({
+            'height': (($(window).height())) + 'px'
+        });
+        jQuery(window).resize(function() {
+            $('#tgx-slider .carousel-inner .item').css({
+                'height': (($(window).height())) + 'px'
+            });
+        });
+        if (!$('body').hasClass('wk-slider-2')) {
             $('body').addClass('wk-slider-2');
         };
-       });
-</script>
-
-
+    });
+</script>
\ No newline at end of file
diff --git a/elements/slider-3/template/view.php b/elements/slider-3/template/view.php
index fe1c3fb..f4ddc8e 100644
--- a/elements/slider-3/template/view.php
+++ b/elements/slider-3/template/view.php
@@ -1,48 +1,61 @@
 <?php
-    $settings = $this->get_settings();
-    $header_tag_arr_for_slider_3 = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-    $slider_3_header_tag = esc_html(wp_kses($settings['heading_tag'], $header_tag_arr_for_slider_3));
+
+use Elementor\Utils;
+$settings = $this->get_settings();
 ?>
-        <div class="tgx-slider-3">
-            <div class="slideshow">
-                <div class="slides">
+<div class="tgx-slider-3">
+    <div class="slideshow">
+        <div class="slides">
 
-                    <?php $a = 0;?>
-                    <?php foreach($settings['tgx_slider_3_sliders'] as $sliders): ?>
-                        <div class="text-center slider <?php echo esc_attr($a == 0) ? 'slide--current': ''; ?>">
-                            <div class="slide__img" style="background-image: url(<?php echo esc_url( $sliders['tgx_slider_3_image']['url']); ?>)"></div>
+            <?php $a = 0; ?>
+            <?php foreach ($settings['tgx_slider_3_sliders'] as $sliders) : ?>
+                <div class="text-center slider <?php echo esc_attr($a == 0) ? 'slide--current' : ''; ?>">
+                    <div class="slide__img" style="background-image: url(<?php echo esc_url($sliders['tgx_slider_3_image']['url']); ?>)"></div>
 
-                                <?php if($sliders['tgx_slider_3_title']): ?>
-                                    <<?php echo esc_attr($slider_3_header_tag);?> class="slide__title"><?php echo  esc_html($sliders['tgx_slider_3_title']); ?></<?php echo esc_attr($slider_3_header_tag);?>>
-                                <?php endif; ?>
+                            <?php
+                            if ($sliders['tgx_slider_3_title']) :
+                                $this->add_render_attribute('tgx_slider_3_title', 'class', 'slide__title');
+
+                                $title_html = esc_html($sliders['tgx_slider_3_title']);
+                                $html = sprintf(
+                                '<%1$s %2$s>%3$s</%1$s>',
+                                Utils::validate_html_tag($settings['heading_tag']),
+                                $this->get_render_attribute_string('tgx_slider_3_title'),
+                                $title_html
+                                );
+
+                                Utils::print_unescaped_internal_string($html);
+                            endif; 
+                            ?>
 
-                                <?php if($sliders['tgx_slider_3_subtitle']): ?>
+                                <?php if ($sliders['tgx_slider_3_subtitle']) : ?>
                                     <p class="slide__desc"><?php echo esc_html($sliders['tgx_slider_3_subtitle']); ?></p>
                                 <?php endif; ?>
 
-                                <?php if($sliders['tgx_slider_3_button_text']): ?>
+                                <?php if ($sliders['tgx_slider_3_button_text']) : ?>
                                     <a class="slide__link" href="<?php echo esc_url($sliders['tgx_slider_3_button_link']['url']); ?>">
                                         <?php echo  esc_html($sliders['tgx_slider_3_button_text']); ?>
                                     </a>
                                 <?php endif; ?>
 
                         </div> <!-- slider -->
-                    <?php $a++; endforeach; ?>
+                    <?php $a++;
+                endforeach; ?>
                 </div><!-- Slides --> 
 
 
                 <nav class="slidenav">
-                    <?php if ($settings['tgx_slider_3_nav_previous']): ?>
+                    <?php if ($settings['tgx_slider_3_nav_previous']) : ?>
                         <button class="slidenav__item slidenav__item--prev"><?php echo esc_html($settings['tgx_slider_3_nav_previous']); ?></button>
                     <?php endif; ?>
 
-                    <?php if ($settings['tgx_slider_3_nav_divider']): ?>
+                    <?php if ($settings['tgx_slider_3_nav_divider']) : ?>
                         <span class="divider">
                             <?php echo esc_html($settings['tgx_slider_3_nav_divider']); ?>
                         </span>
                     <?php endif; ?>
 
-                    <?php if ($settings['tgx_slider_3_nav_next']): ?>
+                    <?php if ($settings['tgx_slider_3_nav_next']) : ?>
                         <button class="slidenav__item slidenav__item--next"><?php echo esc_html($settings['tgx_slider_3_nav_next']); ?></button>
                     <?php endif; ?>
 
@@ -58,4 +71,4 @@
                 }
             });
 
-        </script>
+        </script>
\ No newline at end of file
diff --git a/elements/social-share-1/template/view.php b/elements/social-share-1/template/view.php
index c6da82e..ebd8f8a 100644
--- a/elements/social-share-1/template/view.php
+++ b/elements/social-share-1/template/view.php
@@ -10,7 +10,7 @@
         <div class="contact">
             <div class="contact-wrapper">
                 <div class="content">
-                    <img src="<?php echo esc_attr($settings['social_share_1_image']['url']);?>" alt="<?php echo esc_attr($settings['social_share_1_name']);?>"> 
+                    <img src="<?php echo esc_url($settings['social_share_1_image']['url']);?>" alt="<?php echo esc_attr($settings['social_share_1_name']);?>"> 
 
                     <aside>
                         <h2 class="person-name"><?php echo esc_html($settings['social_share_1_name']);?></h2>
@@ -30,7 +30,7 @@
                 <?php if ( ! empty( $settings['social_share_1_social_share'] ) ) : ?>
                     <?php foreach ( $settings['social_share_1_social_share'] as $social ) : ?>
                         <?php if ( ! empty( $social['social_share_1_social_link'] ) ) : ?>
-                            <a target="_blank" href="<?php  echo esc_attr($social['social_share_1_social_link']);?>" class="<?php  echo esc_attr(strtolower($social['social_share_1_title']));?>">
+                            <a target="_blank" href="<?php  echo esc_url($social['social_share_1_social_link']);?>" class="<?php  echo esc_attr(strtolower($social['social_share_1_title']));?>">
                                 <div class="social-content">
                                     <h2 class="social-name">
                                         <?php echo esc_html($social['social_share_1_title']);?>
diff --git a/elements/social-share-2/template/view.php b/elements/social-share-2/template/view.php
index f0806f5..1e6e10b 100644
--- a/elements/social-share-2/template/view.php
+++ b/elements/social-share-2/template/view.php
@@ -3,15 +3,12 @@
 
     $settings = $this->get_settings();
     $id = $this->get_id();
-
 ?>
-
-
     <div id="<?php echo esc_attr($id);?>" class="tgx-social-share-2 profile">
 
         <?php if ($settings['social_share_2_image']):?> 
             <div class="photo">
-                <img src="<?php echo esc_attr($settings['social_share_2_image']['url']);?>" alt="<?php echo esc_attr($settings['social_share_2_name']);?>">
+                <img src="<?php echo esc_url($settings['social_share_2_image']['url']);?>" alt="<?php echo esc_attr($settings['social_share_2_name']);?>">
             </div>
         <?php endif;?>
 
@@ -28,7 +25,7 @@
             <?php if ( ! empty( $settings['social_share_2_social_share'] ) ) : ?>
                 <?php foreach ( $settings['social_share_2_social_share'] as $social ) : ?>
                     <?php if ( ! empty( $social['social_share_2_social_link'] ) ) : ?>
-                        <a target="_blank" href="<?php  echo esc_attr($social['social_share_2_social_link']);?>" class="<?php  echo esc_attr(strtolower($social['social_share_2_title']));?>">
+                        <a target="_blank" href="<?php  echo esc_url($social['social_share_2_social_link']);?>" class="<?php  echo esc_attr(strtolower($social['social_share_2_title']));?>">
                                 <i class="<?php echo esc_attr( $social['social_share_2_social_icon']); ?>"></i>
                         </a><!-- social-wrapper -->
                     <?php endif; ?>
diff --git a/elements/team-1/template/view.php b/elements/team-1/template/view.php
index 3bf5890..df3c060 100644
--- a/elements/team-1/template/view.php
+++ b/elements/team-1/template/view.php
@@ -9,7 +9,7 @@
             <!-- First Team Block -->
             <div class="team-each-wrap">
                 <div class="team-block">
-                    <img src="<?php echo esc_attr($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>">   
+                    <img src="<?php echo esc_url($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>">   
                     <?php if ( ! empty( $settings['content'] ) ) : ?>
                         <div class="team-content">
                             <p><?php echo esc_html($settings['content']); ?></p>
@@ -24,7 +24,7 @@
                             <?php if ( ! empty( $settings['image_external_link'] ) ) : ?>        
                                 <a <?php if( $settings['image_external_link'] ['is_external'])
                                         { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>  
-                                        href="<?php  echo esc_attr($settings['image_external_link']['url']);?>">
+                                        href="<?php  echo esc_url($settings['image_external_link']['url']);?>">
                                 <h4 class="team-title"><?php echo esc_html($settings['team_name']);?></h4>
                                 </a>
                             <?php endif; ?>
@@ -41,7 +41,7 @@
                                 <?php if ( ! empty( $social['social_link'] ) ) : ?>
                                     <a <?php if($social['social_link'] ['is_external'])
                                     { echo esc_attr('target="_blank"'); }else{ echo esc_attr('rel="nofollow"');}?> 
-                                            href="<?php  echo esc_attr($social['social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['title']));?>">
+                                            href="<?php  echo esc_url($social['social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['title']));?>">
                                          <i class="<?php echo esc_attr( $social['social_icon']); ?>"></i>
                                     </a>
                                 <?php endif; ?>
diff --git a/elements/team-2/template/view.php b/elements/team-2/template/view.php
index e8e8114..6a22106 100644
--- a/elements/team-2/template/view.php
+++ b/elements/team-2/template/view.php
@@ -10,7 +10,7 @@
             <div class="team-each-wrap">
                 <div class="team-block">
                     <div class="team-image">            
-                            <img src="<?php echo esc_attr($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>"> 
+                            <img src="<?php echo esc_url($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>"> 
    
                     </div>
                     <?php if ( ! empty( $settings['social_share_2'] ) ) : ?>
@@ -34,7 +34,7 @@
                             <?php if ( ! empty( $settings['image_external_link'] ) ) : ?>        
                                 <a <?php if( $settings['image_external_link'] ['is_external'])
                                         { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>  
-                                        href="<?php  echo esc_attr($settings['image_external_link']['url']);?>">
+                                        href="<?php  echo esc_url($settings['image_external_link']['url']);?>">
                                 <h4 class="team-title"><?php echo esc_html($settings['team_name']);?></h4>
                                 </a>
                             <?php endif; ?>  
diff --git a/elements/team-3/template/view.php b/elements/team-3/template/view.php
index dae912f..aad7029 100644
--- a/elements/team-3/template/view.php
+++ b/elements/team-3/template/view.php
@@ -10,18 +10,17 @@
             <div class="team-each-wrap">
                
                 <div class="team-block">
-                    <img src="<?php echo esc_attr($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>">  
+                    <img src="<?php echo esc_url($settings['team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_name']);?>">  
                     <div class="spin"></div>             
                 </div>
 
-
                 <div class="team-info">
                     <div class="name">
                         <?php if ( ! empty( $settings['team_name'] ) ) : ?>
                             <?php if ( ! empty( $settings['image_external_link'] ) ) : ?>        
                                 <a <?php if( $settings['image_external_link'] ['is_external'])
                                         { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>  
-                                        href="<?php  echo esc_attr($settings['image_external_link']['url']);?>">
+                                        href="<?php  echo esc_url($settings['image_external_link']['url']);?>">
                                 <h4 class="team-title"><?php echo esc_html($settings['team_name']);?></h4>
                                 </a>
                             <?php endif; ?>
@@ -44,7 +43,7 @@
                                 <?php if ( ! empty( $social['social_link'] ) ) : ?>
                                     <a <?php if($social['social_link'] ['is_external'])
                                     { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>
-                                    href="<?php  echo esc_attr($social['social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['title']));?>">
+                                    href="<?php  echo esc_url($social['social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['title']));?>">
                                          <i class="<?php echo esc_attr( $social['social_icon']); ?>"></i>
                                     </a>
                                 <?php endif; ?>
diff --git a/elements/team-4/template/view.php b/elements/team-4/template/view.php
index ef05f7e..8325148 100644
--- a/elements/team-4/template/view.php
+++ b/elements/team-4/template/view.php
@@ -11,7 +11,7 @@
                     <?php if ( ! empty( $settings['image_external_link'] ) ) : ?>        
                         <a <?php if( $settings['image_external_link'] ['is_external'])
                                 { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>  
-                                href="<?php  echo esc_attr($settings['image_external_link']['url']);?>">
+                                href="<?php  echo esc_url($settings['image_external_link']['url']);?>">
                         <h2 class="title-wrapper">
                         <span class="team-title"><?php echo esc_html($settings['team_4_team_name']);?></span>
                             <strong>
@@ -26,7 +26,7 @@
                 <?php endif; ?>
         <div class="mc-content">
             <div class="img-container">
-                 <img src="<?php echo esc_attr($settings['team_4_team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_4_team_name']);?>"> 
+                 <img src="<?php echo esc_url($settings['team_4_team_image']['url']);?>" alt="<?php echo esc_attr($settings['team_4_team_name']);?>"> 
             </div>
             <?php if ( ! empty( $settings['team_4_content'] ) ) : ?>
                 <div class="mc-description">
@@ -46,7 +46,7 @@
                         <?php if ( ! empty( $social['team_4_social_link'] ) ) : ?>
                             <a <?php if($social['team_4_social_link'] ['is_external'])
                                     { echo 'target="_blank"'; }else{ echo 'rel="nofollow"';}?>
-                            href="<?php  echo esc_attr($social['team_4_social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['team_4_title']));?>">
+                            href="<?php  echo esc_url($social['team_4_social_link']['url']);?>" class="<?php  echo esc_attr(strtolower($social['team_4_title']));?>">
                                  <i class="<?php echo esc_attr( $social['team_4_social_icon']); ?>"></i>
                             </a>
                         <?php endif; ?>
diff --git a/elements/team/template/config.php b/elements/team/template/config.php
index 6da3278..01e34d3 100644
--- a/elements/team/template/config.php
+++ b/elements/team/template/config.php
@@ -38,6 +38,28 @@ public function get_categories() {
 		return [ 'widgetkit_elementor' ];
 	}
 
+	protected function wk_render_team_title($team)
+	{
+		if ($team['single_title']) {
+			$this->add_render_attribute('single_title', 'class', 'wk-card-title wk-margin-remove');
+			$this->add_inline_editing_attributes('single_title', 'none');
+
+			$title_html = esc_html($team['single_title']);
+			if (!empty($team['single_content_link']['url'])) {
+				$title_html = '<a ' . $this->get_render_attribute_string('link') . '>' . $title_html . '</a>';
+			}
+
+			$html = sprintf(
+				'<%1$s %2$s>%3$s</%1$s>',
+				Utils::validate_html_tag($team['header_tag']),
+				$this->get_render_attribute_string('single_title'),
+				$title_html
+			);
+
+			Utils::print_unescaped_internal_string($html);
+		}
+	}
+
 	/**
 	 * A list of style that the widgets is depended in
 	 **/
diff --git a/elements/team/template/view.php b/elements/team/template/view.php
index 3d22ad0..e9dc6c8 100644
--- a/elements/team/template/view.php
+++ b/elements/team/template/view.php
@@ -1,14 +1,10 @@
 <?php
 // Silence is golden.
 use Elementor\Icons_Manager;
+use Elementor\Group_Control_Image_Size;
 
 $team = $this->get_settings();
 $id = $this->get_id();
-$header_tag_arr_for_team = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-$team_header_tag = esc_html(wp_kses($team['header_tag'], $header_tag_arr_for_team));
-
-use Elementor\Group_Control_Image_Size;
-
 ?>
 
 <div class="wk-team">
@@ -28,15 +24,7 @@
                 <div class="wk-grid-small wk-flex-top" wk-grid>
                     <?php if ($team['single_title']) : ?>
                         <div class="wk-width-expand">
-                            <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                                <?php if ($team['single_content_link']) : ?>
-                                    <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                        <?php echo esc_html($team['single_title']); ?>
-                                    </a>
-                                <?php else : ?>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                <?php endif; ?>
-                            </<?php echo esc_attr($team_header_tag); ?>>
+                            <?php $this->wk_render_team_title($team); ?>
                         </div> <!-- wk-width-expand-->
                     <?php endif; ?>
 
@@ -81,15 +69,7 @@
 
             <div class="wk-card-body">
                 <?php if ($team['single_title']) : ?>
-                    <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                        <?php if ($team['single_content_link']) : ?>
-                            <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                <?php echo esc_html($team['single_title']); ?>
-                            </a>
-                        <?php else : ?>
-                            <?php echo esc_html($team['single_title']); ?>
-                        <?php endif; ?>
-                    </<?php echo esc_attr($team_header_tag); ?>>
+                    <?php $this->wk_render_team_title($team); ?>
                 <?php endif; ?>
 
                 <?php if ($team['single_designation']) : ?>
@@ -135,15 +115,7 @@
             <div class="wk-width-1-2@m">
                 <div class="wk-card-body">
                     <?php if ($team['single_title']) : ?>
-                        <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                            <?php if ($team['single_content_link']) : ?>
-                                <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                </a>
-                            <?php else : ?>
-                                <?php echo esc_html($team['single_title']); ?>
-                            <?php endif; ?>
-                        </<?php echo esc_attr($team_header_tag); ?>>
+                        <?php $this->wk_render_team_title($team); ?>
                     <?php endif; ?>
 
                     <?php if ($team['single_designation']) : ?>
@@ -197,15 +169,7 @@
                 <div class="wk-card-body wk-padding-remove wk-position-bottom wk-background-muted">
                     <div class="info-wrapper wk-position-relative wk-padding-small">
                         <?php if ($team['single_title']) : ?>
-                            <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                                <?php if ($team['single_content_link']) : ?>
-                                    <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                        <?php echo esc_html($team['single_title']); ?>
-                                    </a>
-                                <?php else : ?>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                <?php endif; ?>
-                            </<?php echo esc_attr($team_header_tag); ?>>
+                            <?php $this->wk_render_team_title($team); ?>
                         <?php endif; ?>
 
                         <?php if ($team['single_designation']) : ?>
@@ -251,15 +215,7 @@
                 <div class="wk-card-body wk-padding-remove wk-position-bottom wk-background-muted">
                     <div class="info-wrapper wk-position-relative wk-padding-small">
                         <?php if ($team['single_title']) : ?>
-                            <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                                <?php if ($team['single_content_link']) : ?>
-                                    <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                        <?php echo esc_html($team['single_title']); ?>
-                                    </a>
-                                <?php else : ?>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                <?php endif; ?>
-                            </<?php echo esc_attr($team_header_tag); ?>>
+                            <?php $this->wk_render_team_title($team); ?>
                         <?php endif; ?>
 
                         <?php if ($team['single_designation']) : ?>
@@ -300,15 +256,7 @@
                 <div class="wk-card-media"></div>
                 <div class="wk-card-body wk-position-relative">
                     <?php if ($team['single_title']) : ?>
-                        <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                            <?php if ($team['single_content_link']) : ?>
-                                <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                </a>
-                            <?php else : ?>
-                                <?php echo esc_html($team['single_title']); ?>
-                            <?php endif; ?>
-                        </<?php echo esc_attr($team_header_tag); ?>>
+                        <?php $this->wk_render_team_title($team); ?>
                     <?php endif; ?>
 
                     <?php if ($team['single_designation']) : ?>
@@ -353,15 +301,7 @@
                 <div class="wk-grid-small wk-flex-middle" wk-grid>
                     <?php if ($team['single_title']) : ?>
                         <div class="wk-width-expand">
-                            <<?php echo esc_attr($team_header_tag); ?> class="wk-card-title wk-margin-remove">
-                                <?php if ($team['single_content_link']) : ?>
-                                    <a class="wk-display-block" href="<?php echo esc_attr($team['single_content_link']['url']); ?>" <?php echo esc_attr($team['single_content_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>>
-                                        <?php echo esc_html($team['single_title']); ?>
-                                    </a>
-                                <?php else : ?>
-                                    <?php echo esc_html($team['single_title']); ?>
-                                <?php endif; ?>
-                            </<?php echo esc_attr($team_header_tag); ?>>
+                            <?php $this->wk_render_team_title($team); ?>
                         </div> <!-- wk-width-expand-->
                     <?php endif; ?>
 
diff --git a/elements/testimonial/template/config.php b/elements/testimonial/template/config.php
index 283b61c..d0037dc 100644
--- a/elements/testimonial/template/config.php
+++ b/elements/testimonial/template/config.php
@@ -27,7 +27,7 @@ public function get_name() {
 	}
 
 	public function get_title() {
-		return esc_html__( 'Testimonial', 'widgetkit-for-elementor' );
+		return esc_html__( 'Testimonial Test', 'widgetkit-for-elementor' );
 	}
 
 	public function get_icon() {
@@ -284,25 +284,6 @@ protected function register_controls() {
 				'title_field' => '{{{testimonial_title}}}',
 			]
 		);
-	        $this->add_control(
-				'custom_header_tag',
-				[
-					'label' => __( 'Title HTML Tag', 'widgetkit-for-elementor' ),
-					'type'  => Controls_Manager::SELECT,
-					'options' => [
-						'h1' => 'H1',
-						'h2' => 'H2',
-						'h3' => 'H3',
-						'h4' => 'H4',
-						'h5' => 'H5',
-						'h6' => 'H6',
-						'div' => 'div',
-						'span' => 'span',
-						'p' => 'p',
-					],
-					'default' => 'h4',
-				]
-			);
         $this->end_controls_section();
 #	end of content
 
diff --git a/elements/testimonial/template/layout/default.php b/elements/testimonial/template/layout/default.php
index b339235..0f155f7 100644
--- a/elements/testimonial/template/layout/default.php
+++ b/elements/testimonial/template/layout/default.php
@@ -25,7 +25,7 @@
                 <?php endif; ?>
         <?php endif; ?>
         <?php if ($testimonial['testimonial_title']): ?>
-            <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+            <h4 class="wk-card-title wk-margin-remove">
                 <?php if ($testimonial['content_demo_link']): ?>
                         <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                 <?php else: ?>
@@ -36,7 +36,7 @@
                         <span class="wk-text-meta wk-inline-block right"><?php echo esc_html($testimonial['testimonial_designation']); ?></span>
                     <?php endif; ?>
                 <?php endif; ?>
-        </<?php echo esc_attr($testimonial_header_tag);?>>  
+            </h4>  
         <?php endif; ?>
 
         <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/layout/layout-1.php b/elements/testimonial/template/layout/layout-1.php
index 5afa941..5ef00fa 100644
--- a/elements/testimonial/template/layout/layout-1.php
+++ b/elements/testimonial/template/layout/layout-1.php
@@ -40,7 +40,7 @@
                 <?php endif; ?>
 
             <?php if ($testimonial['testimonial_title']): ?>
-                <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+                <h4 class="wk-card-title wk-margin-remove">
                     <?php if ($testimonial['content_demo_link']): ?>
                             <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                     <?php else: ?>
@@ -53,7 +53,7 @@
                         <?php endif; ?>
                     <?php endif; ?>
             
-                </<?php echo esc_attr($testimonial_header_tag);?>>  
+                </h4>  
             <?php endif; ?>
 
             <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/layout/layout-2.php b/elements/testimonial/template/layout/layout-2.php
index 0819835..9f0f375 100644
--- a/elements/testimonial/template/layout/layout-2.php
+++ b/elements/testimonial/template/layout/layout-2.php
@@ -40,7 +40,7 @@
                 <?php endif; ?>
         <?php endif; ?>
         <?php if ($testimonial['testimonial_title']): ?>
-            <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+            <h4 class="wk-card-title wk-margin-remove">
                 <?php if ($testimonial['content_demo_link']): ?>
                         <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                 <?php else: ?>
@@ -51,8 +51,7 @@
                         <span class="wk-text-meta wk-inline-block right"><?php echo esc_html($testimonial['testimonial_designation']); ?></span>
                     <?php endif; ?>
                 <?php endif; ?>
-
-            </<?php echo esc_attr($testimonial_header_tag);?>>  
+            </h4>  
             <?php endif; ?>
 
             <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/layout/layout-3.php b/elements/testimonial/template/layout/layout-3.php
index 13e6945..d2e6057 100644
--- a/elements/testimonial/template/layout/layout-3.php
+++ b/elements/testimonial/template/layout/layout-3.php
@@ -31,7 +31,7 @@
             <?php endif; ?>
 
             <?php if ($testimonial['testimonial_title']): ?>
-            <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+            <h4 class="wk-card-title wk-margin-remove">
                 <?php if ($testimonial['content_demo_link']): ?>
                         <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                 <?php else: ?>
@@ -42,7 +42,7 @@
                         <span class="wk-text-meta wk-inline-block right"><?php echo esc_html($testimonial['testimonial_designation']); ?></span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </<?php echo esc_attr($testimonial_header_tag);?>>  
+            </h4>  
         <?php endif; ?>
 
             <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/layout/layout-4.php b/elements/testimonial/template/layout/layout-4.php
index 612c2c6..a4feee7 100644
--- a/elements/testimonial/template/layout/layout-4.php
+++ b/elements/testimonial/template/layout/layout-4.php
@@ -48,7 +48,7 @@
             <?php endif; ?>
 
             <?php if ($testimonial['testimonial_title']): ?>
-                <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+                <h4 class="wk-card-title wk-margin-remove">
                     <?php if ($testimonial['content_demo_link']): ?>
                         <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                     <?php else: ?>
@@ -60,8 +60,7 @@
                             <span class="wk-text-meta wk-inline-block right"><?php echo esc_html($testimonial['testimonial_designation']); ?></span>
                         <?php endif; ?>
                     <?php endif; ?>
-        
-            </<?php echo esc_attr($testimonial_header_tag);?>>  
+                </h4>  
             <?php endif; ?>
 
             <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/layout/layout-5.php b/elements/testimonial/template/layout/layout-5.php
index fe68eb1..e9e558e 100644
--- a/elements/testimonial/template/layout/layout-5.php
+++ b/elements/testimonial/template/layout/layout-5.php
@@ -36,7 +36,7 @@
                     <?php endif; ?>
 
                     <?php if ($testimonial['testimonial_title']): ?>
-                        <<?php echo esc_attr($testimonial_header_tag);?>  class="wk-card-title wk-margin-remove">
+                        <h4 class="wk-card-title wk-margin-remove">
                             <?php if ($testimonial['content_demo_link']): ?>
                                 <a href="<?php echo esc_url($testimonial['content_demo_link']['url']); ?>" <?php echo esc_attr($testimonial['content_demo_link']['is_external']) ? 'target="_blank"' : '"rel="nofollow"'; ?>><?php echo esc_html($testimonial['testimonial_title']); ?></a>
                             <?php else: ?>
@@ -48,8 +48,7 @@
                                     <span class="wk-text-meta wk-inline-block right"><?php echo esc_html($testimonial['testimonial_designation']); ?></span>
                                 <?php endif; ?>
                             <?php endif; ?>
-                
-                    </<?php echo esc_attr($testimonial_header_tag);?>>  
+                        </h4>  
                     <?php endif; ?>
 
                     <?php if ($testimonial['testimonial_designation']): ?>
diff --git a/elements/testimonial/template/view.php b/elements/testimonial/template/view.php
index cc622af..6e49b78 100644
--- a/elements/testimonial/template/view.php
+++ b/elements/testimonial/template/view.php
@@ -1,9 +1,9 @@
 <?php
-    $testimonials = $settings = $this->get_settings(); 
-    $id = $this->get_id();
-    $header_tag_arr_for_testimonial = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
-    $testimonial_header_tag = esc_html(wp_kses($testimonials['custom_header_tag'], $header_tag_arr_for_testimonial));
-    use Elementor\Group_Control_Image_Size;
+use Elementor\Group_Control_Image_Size;
+$testimonials = $settings = $this->get_settings(); 
+$id = $this->get_id();
+$header_tag_arr_for_testimonial = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'];
+$testimonial_header_tag = esc_html(wp_kses($testimonials['custom_header_tag'], $header_tag_arr_for_testimonial));
 ?>
 
 <div class="wk-testimonial" wk-slider="center:<?php echo esc_attr($testimonials['center_mode_enable']) == 'yes'? 'true' :'false'; ?>; sets:<?php echo esc_attr($testimonials['set_mode_enable']) == 'yes'? 'true' :'false'; ?>; autoplay:<?php echo esc_attr($testimonials['autoplay_mode_enable']) == 'yes'? 'true' :'false'; ?>; autoplay-interval:<?php echo esc_attr($testimonials['content_interval_option']);?>;">
diff --git a/elements/tilt-box/template/view.php b/elements/tilt-box/template/view.php
index 6798bd9..ee25721 100755
--- a/elements/tilt-box/template/view.php
+++ b/elements/tilt-box/template/view.php
@@ -5,7 +5,7 @@
     use Elementor\Icons_Manager;
 ?>
     <div class="wk-tilt-box">
-        <div id="wk-tilt-<?php echo esc_attr($id);?>" class="tilt-element <?php echo esc_attr($tilt_box['content_position']== 'overlay')? 'wk-flex wk-flex-' .esc_attr($content_overlay_position) : '';?>" data-tilt  <?php echo esc_attr(esc_attr($tilt_box['select_effect']) == 'glare')? 'data-tilt-glare data-tilt-max-glare="0.8"' : '';?>  <?php echo ($tilt_box['select_effect'] == 'reverse')? 'data-tilt-reverse="true"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'floating')? 'data-tilt-reset="true"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'listening')? 'data-tilt-full-page-listening' : '';?>  <?php echo esc_attr($tilt_box['select_effect'] == 'x')? 'data-tilt-axis="y"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'y')? 'data-tilt-axis="x"' : '';?> >
+        <div id="wk-tilt-<?php echo esc_attr($id);?>" class="tilt-element <?php echo esc_attr($tilt_box['content_position']== 'overlay')? 'wk-flex wk-flex-' .esc_attr($content_overlay_position) : '';?>" data-tilt  <?php echo esc_attr($tilt_box['select_effect'] == 'glare')? 'data-tilt-glare data-tilt-max-glare="0.8"' : '';?>  <?php echo esc_attr($tilt_box['select_effect'] == 'reverse')? 'data-tilt-reverse="true"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'floating')? 'data-tilt-reset="true"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'listening')? 'data-tilt-full-page-listening' : '';?>  <?php echo esc_attr($tilt_box['select_effect'] == 'x')? 'data-tilt-axis="y"' : '';?> <?php echo esc_attr($tilt_box['select_effect'] == 'y')? 'data-tilt-axis="x"' : '';?> >
 
             <?php if ($tilt_box['content_position']== 'overlay'):?>
                 <?php if ($tilt_box['content_icon'] || $tilt_box['content_title'] || $tilt_box['content_description'] || $tilt_box['content_button']):?>
@@ -22,7 +22,7 @@
                             <?php if ($tilt_box['content_title']):?>
                                 <h3 class="wk-tilt-card-title">
                                     <a href="<?php echo esc_url($tilt_box['content_link']['url']); ?>" 
-                                        <?php echo esc_url($tilt_box['content_link']['is_external']) ? 'target="_blank"' : ''; ?>>
+                                        <?php echo esc_attr($tilt_box['content_link']['is_external']) ? 'target="_blank"' : ''; ?>>
                                         <?php echo esc_html($tilt_box['content_title']); ?>
                                     </a>
                                 </h3>
diff --git a/includes/dependency.php b/includes/dependency.php
index 2362402..017e3f4 100644
--- a/includes/dependency.php
+++ b/includes/dependency.php
@@ -28,8 +28,13 @@ public function check_dependend_plugin_elementor(){
              * if plugin not found
              */
             $activation_url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=elementor'), 'install-plugin_elementor');
-            $message = sprintf(__('<strong>Widgetkit for Elementor</strong> requires <strong>Elementor</strong> plugin to be installed and activated. Please install <strong>Elementor</strong> to continue.', 'widgetkit-for-elementor'), '<strong>', '</strong>');
+            $message = sprintf(
+                __('<strong>Widgetkit for Elementor</strong> requires <strong>Elementor</strong> plugin to be installed and activated. Please install <strong>Elementor</strong> to continue.', 'widgetkit-for-elementor'),
+                '<strong>',
+                '</strong>'
+            );
             $button_text = __('Install Elementor Now', 'widgetkit-for-elementor');
+
         }else{
             /**
              * if found
@@ -38,8 +43,8 @@ public function check_dependend_plugin_elementor(){
             $message = __('<strong>Widgetkit for Elementor</strong> requires <strong>Elementor</strong> plugin to be active. Please activate Elementor to continue.', 'widgetkit-for-elementor');
             $button_text = __('Activate Elementor Now', 'widgetkit-for-elementor');
         }
-        $button = '<p><a href="' . $activation_url . '" class="button-primary">' . $button_text . '</a></p>';
-        printf('<div class="error"><p>%1$s</p>%2$s</div>', esc_html__($message, 'widgetkit'), esc_html__($button, 'widgetkit'));
+        $button = '<p><a href="' . esc_url($activation_url) . '" class="button-primary">' . esc_html($button_text) . '</a></p>';
+        printf('<div class="error"><p>%1$s</p>%2$s</div>', wp_kses_post($message), $button);
     }
 
     public function get_all_plugin_in_my_site($plugin_base_name){
diff --git a/widgetkit-for-elementor.php b/widgetkit-for-elementor.php
index 48b4ff5..be97f94 100644
--- a/widgetkit-for-elementor.php
+++ b/widgetkit-for-elementor.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: All-in-One Addons for Elementor - WidgetKit
 Description: Everything you need to create a stunning website with <strong>Elementor, WooCommerce, LearnDash, Sensei & LearnPress</strong> and more.
-Version: 2.5.0
+Version: 2.5.1
 Text Domain: widgetkit-for-elementor
 Author: Themesgrove
 Author URI: https://themesgrove.com
@@ -21,7 +21,7 @@
  */
 if (!defined('ABSPATH')) exit;
 
-define('WK_VERSION', '2.5.0');
+define('WK_VERSION', '2.5.1');
 define('WK_FILE', __FILE__);
 define('WK_URL', plugins_url('/', __FILE__));
 define('WK_PATH', plugin_dir_path(__FILE__));