diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php
index 626d35d4..5db21566 100644
--- a/includes/admin/class-admin.php
+++ b/includes/admin/class-admin.php
@@ -1870,6 +1870,11 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
 		}
 
 
+		/**
+		 * Manual check templates versions
+		 *
+		 * @param $action
+		 */
 		public function check_version( $action ) {
 			$templates = UM()->admin_settings()->get_override_templates( true );
 			$out_date  = false;
diff --git a/includes/admin/core/class-admin-notices.php b/includes/admin/core/class-admin-notices.php
index 34745cd8..dd4277d3 100644
--- a/includes/admin/core/class-admin-notices.php
+++ b/includes/admin/core/class-admin-notices.php
@@ -716,6 +716,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
 		}
 
 
+		/**
+		 * Check Templates Versions notice
+		 */
 		public function template_version() {
 			if ( true === (bool) get_option( 'um_template_version' ) ) {
 				$link = get_admin_url( null, 'admin.php?page=um_options&tab=override_templates' );
@@ -723,7 +726,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
 				?>
 
 				<p>
-					<?php printf( __( 'Your templates are out of date. Please visit <a href="%s">override templates status page</a> and update templates', 'ultimate-member' ), $link ); ?>
+					<?php
+					// translators: %s override templates page link.
+					echo wp_kses( sprintf( __( 'Your templates are out of date. Please visit <a href="%s">override templates status page</a> and update templates', 'ultimate-member' ), $link ), UM()->get_allowed_html( 'admin_notice' ) );
+					?>
 				</p>
 
 				<?php
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index e72982e2..c1f3f4cd 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -3028,6 +3028,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 		}
 
 
+		/**
+		 * @param $html
+		 * @param $section_fields
+		 *
+		 * @return string
+		 */
 		public function settings_override_templates_tab( $html, $section_fields ) {
 			$um_check_version = get_transient( 'um_check_template_versions' );
 			?>
@@ -3055,11 +3061,16 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 		}
 
 
+		/**
+		 * @param $get_list boolean
+		 *
+		 * @return array
+		 */
 		public function get_override_templates( $get_list = false ) {
 			$outdated_files = array();
 			$scan_files     = $this->scan_template_files( um_path . '/templates/' );
 			$out_date       = false;
-			set_transient( 'um_check_template_versions', current_time('d/m/Y H:i' ), 12 * HOUR_IN_SECONDS );
+			set_transient( 'um_check_template_versions', current_time( 'd/m/Y H:i' ), 12 * HOUR_IN_SECONDS );
 			foreach ( $scan_files as $key => $file ) {
 				if ( ! str_contains( $file, 'email/' ) ) {
 					if ( file_exists( get_stylesheet_directory() . '/ultimate-member/templates/' . $file ) ) {
@@ -3139,6 +3150,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 		}
 
 
+		/**
+		 * @param $file string
+		 *
+		 * @return string
+		 */
 		public static function get_file_version( $file ) {
 
 			// Avoid notices if file does not exist.
diff --git a/templates/account.php b/templates/account.php
index f252d580..48e77697 100644
--- a/templates/account.php
+++ b/templates/account.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the account page
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/account.php
+ *
+ * Page: "Account"
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( $form_id ); ?>">
 
diff --git a/templates/gdpr-register.php b/templates/gdpr-register.php
index 11248b6b..aab7f89e 100644
--- a/templates/gdpr-register.php
+++ b/templates/gdpr-register.php
@@ -1,6 +1,16 @@
 <?php
 /**
+ * Template for the GDPR checkbox in register form
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/gdpr-register.php
+ *
+ * Page: "Register"
+ * Call: function display_option()
+ *
  * @version 1.0.0
+ *
+ * @var object $um_content_query
+ * @var array  $args
  */
 if ( ! defined( 'ABSPATH' ) ) exit; ?>
 
diff --git a/templates/login-to-view.php b/templates/login-to-view.php
index ad253dad..2d335469 100644
--- a/templates/login-to-view.php
+++ b/templates/login-to-view.php
@@ -1,8 +1,18 @@
 <?php
 /**
+ * Template for the login only content, locked message
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/login-to-view.php
+ *
+ * Call: function um_loggedin()
+ *
  * @version 1.0.0
+ *
+ * @var string $lock_text
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um-locked-content">
 
diff --git a/templates/login.php b/templates/login.php
index a03f9e78..74d6a293 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the login form
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/login.php
+ *
+ * Page: "Login"
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( $form_id ); ?>">
 
diff --git a/templates/logout.php b/templates/logout.php
index f51bb105..df1eda6a 100644
--- a/templates/logout.php
+++ b/templates/logout.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the logout
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/logout.php
+ *
+ * Page: "Logout"
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode, $args ) ); ?> um-<?php echo esc_attr( $form_id ); ?>">
 
diff --git a/templates/members-grid.php b/templates/members-grid.php
index 8f55be79..f2eb27e3 100644
--- a/templates/members-grid.php
+++ b/templates/members-grid.php
@@ -1,8 +1,27 @@
 <?php
 /**
+ * Template for the members directory grid
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/members-grid.php
+ *
+ * Page: "Members"
+ *
  * @version 1.0.0
+ *
+ * @var array  $args
+ * @var bool   $cover_photos
+ * @var bool   $profile_photo
+ * @var bool   $show_name
+ * @var bool   $show_tagline
+ * @var bool   $show_userinfo
+ * @var bool   $userinfo_animate
+ * @var bool   $show_social
+ * @var array  $reveal_fields
+ * @var string $no_users
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 $unique_hash = substr( md5( $args['form_id'] ), 10, 5 ); ?>
 
diff --git a/templates/members-header.php b/templates/members-header.php
index 8e5506cb..e83c40f1 100644
--- a/templates/members-header.php
+++ b/templates/members-header.php
@@ -1,8 +1,16 @@
 <?php
 /**
+ * Template for the members directory header JS-template
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/members-header.php
+ *
+ * Page: "Members"
+ *
  * @version 1.0.0
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 
 <script type="text/template" id="tmpl-um-members-header">
diff --git a/templates/members-list.php b/templates/members-list.php
index 67541620..163d035e 100644
--- a/templates/members-list.php
+++ b/templates/members-list.php
@@ -1,6 +1,23 @@
 <?php
 /**
+ * Template for the members directory list
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/members-list.php
+ *
+ * Page: "Members"
+ *
  * @version 1.0.0
+ *
+ * @var array  $args
+ * @var bool   $cover_photos
+ * @var bool   $profile_photo
+ * @var bool   $show_name
+ * @var bool   $show_tagline
+ * @var bool   $show_userinfo
+ * @var bool   $userinfo_animate
+ * @var bool   $show_social
+ * @var array  $reveal_fields
+ * @var string $no_users
  */
 if ( ! defined( 'ABSPATH' ) ) exit;
 
diff --git a/templates/members-pagination.php b/templates/members-pagination.php
index 217feebc..ba035c62 100644
--- a/templates/members-pagination.php
+++ b/templates/members-pagination.php
@@ -1,8 +1,16 @@
 <?php
 /**
+ * Template for the members directory pagination JS template
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/members-pagination.php
+ *
+ * Page: "Members"
+ *
  * @version 1.0.0
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 
 <script type="text/template" id="tmpl-um-members-pagination">
diff --git a/templates/members.php b/templates/members.php
index f1bdb161..fe2e7470 100644
--- a/templates/members.php
+++ b/templates/members.php
@@ -1,8 +1,18 @@
 <?php
 /**
+ * Template for the members directory
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/members.php
+ *
+ * Page: "Members"
+ *
  * @version 1.0.0
+ *
+ * @var array $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 global $post;
 
diff --git a/templates/message.php b/templates/message.php
index 4d6bae71..1cdb15da 100644
--- a/templates/message.php
+++ b/templates/message.php
@@ -1,8 +1,19 @@
 <?php
 /**
+ * Template for the message after registration process
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/message.php
+ *
+ * Call: function parse_shortcode_args()
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( $form_id ); ?>">
 
diff --git a/templates/modal/um_upload_single.php b/templates/modal/um_upload_single.php
index 8692c1e0..093effdc 100644
--- a/templates/modal/um_upload_single.php
+++ b/templates/modal/um_upload_single.php
@@ -1,7 +1,13 @@
 <?php
 /**
+ * Template for the modal form
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/modal/um_upload_single.php
+ *
  * @version 1.0.0
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div id="um_upload_single" style="display:none"></div>
diff --git a/templates/modal/um_view_photo.php b/templates/modal/um_view_photo.php
index ee373df1..e11b33a7 100644
--- a/templates/modal/um_view_photo.php
+++ b/templates/modal/um_view_photo.php
@@ -1,8 +1,14 @@
 <?php
 /**
+ * Template for the modal photo
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/modal/um_view_photo.php
+ *
  * @version 1.0.0
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div id="um_view_photo" style="display:none">
 
diff --git a/templates/password-change.php b/templates/password-change.php
index 90e85034..7d53c107 100644
--- a/templates/password-change.php
+++ b/templates/password-change.php
@@ -1,8 +1,21 @@
 <?php
 /**
+ * Template for the password change
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/password-change.php
+ *
+ * Call: function ultimatemember_password()
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var string $rp_key
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( $form_id ); ?>">
 
diff --git a/templates/password-reset.php b/templates/password-reset.php
index 62d222cb..a2e99f25 100644
--- a/templates/password-reset.php
+++ b/templates/password-reset.php
@@ -1,6 +1,16 @@
 <?php
 /**
+ * Template for the password reset
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/password-reset.php
+ *
+ * Call: function ultimatemember_password()
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
diff --git a/templates/profile.php b/templates/profile.php
index 333359bd..53b586e3 100644
--- a/templates/profile.php
+++ b/templates/profile.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the profile page
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/profile.php
+ *
+ * Page: "Profile"
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um <?php echo esc_attr( $this->get_class( $mode ) ); ?> um-<?php echo esc_attr( $form_id ); ?> um-role-<?php echo esc_attr( um_user( 'role' ) ); ?> ">
 
diff --git a/templates/profile/comments-single.php b/templates/profile/comments-single.php
index 31bf1ef5..a0bdf49c 100644
--- a/templates/profile/comments-single.php
+++ b/templates/profile/comments-single.php
@@ -1,8 +1,18 @@
 <?php
 /**
+ * Template for the profile single comments
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/profile/comments-single.php
+ *
+ * Page: "Profile"
+ *
  * @version 1.0.0
+ *
+ * @var object $comment
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 $comment_title = apply_filters( 'um_user_profile_comment_title', get_the_title( $comment->comment_post_ID ), $comment );
 $link = apply_filters( 'um_user_profile_comment_url', get_permalink( $comment->comment_post_ID ), $comment ); ?>
diff --git a/templates/profile/comments.php b/templates/profile/comments.php
index d73d5366..62b5879e 100644
--- a/templates/profile/comments.php
+++ b/templates/profile/comments.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the profile comments
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/profile/comments.php
+ *
+ * Page: "Profile"
+ * Call: function add_comments(), function load_comments()
+ *
  * @version 1.0.0
+ *
+ * @var int    $count_comments
+ * @var object $comments
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 
 if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
diff --git a/templates/profile/posts-single.php b/templates/profile/posts-single.php
index c49615a6..e284f9e1 100644
--- a/templates/profile/posts-single.php
+++ b/templates/profile/posts-single.php
@@ -1,8 +1,18 @@
 <?php
 /**
+ * Template for the profile single post
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/profile/posts-single.php
+ *
+ * Page: "Profile"
+ *
  * @version 1.0.0
+ *
+ * @var object $post
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="um-item">
 	<div class="um-item-link">
diff --git a/templates/profile/posts.php b/templates/profile/posts.php
index 110a2ef0..a09c1b60 100644
--- a/templates/profile/posts.php
+++ b/templates/profile/posts.php
@@ -1,8 +1,19 @@
 <?php
 /**
+ * Template for the profile posts
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/profile/posts.php
+ *
+ * Page: "Profile"
+ *
  * @version 1.0.0
+ *
+ * @var object $posts
+ * @var int    $count_posts
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 	//Only for AJAX loading posts
diff --git a/templates/register.php b/templates/register.php
index cd353739..fc6847ec 100644
--- a/templates/register.php
+++ b/templates/register.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the register page
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/register.php
+ *
+ * Page: "Register"
+ *
  * @version 1.0.0
+ *
+ * @var string $mode
+ * @var int    $form_id
+ * @var array  $args
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! is_user_logged_in() ) {
 	um_reset_user();
diff --git a/templates/restricted-blog.php b/templates/restricted-blog.php
index afa1c9b4..b646dcab 100644
--- a/templates/restricted-blog.php
+++ b/templates/restricted-blog.php
@@ -1,5 +1,11 @@
 <?php
 /**
+ * Template for the blog restricted message
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/restricted-blog.php
+ *
+ * Call: function blog_message()
+ *
  * @version 1.0.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/templates/restricted-taxonomy.php b/templates/restricted-taxonomy.php
index b6d52814..607653f4 100644
--- a/templates/restricted-taxonomy.php
+++ b/templates/restricted-taxonomy.php
@@ -1,8 +1,16 @@
 <?php
 /**
+ * Template for the taxonomy restricted message
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/restricted-taxonomy.php
+ *
+ * Call: function taxonomy_message()
+ *
  * @version 1.0.0
  */
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 get_header(); ?>
 
diff --git a/templates/searchform.php b/templates/searchform.php
index 3c47f297..1b978dca 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,8 +1,20 @@
 <?php
 /**
+ * Template for the search form
+ *
+ * This template can be overridden by copying it to yourtheme/ultimate-member/searchform.php
+ *
+ * Call: function ultimatemember_searchform()
+ *
  * @version 1.0.0
+ *
+ * @var string $members_page
+ * @var string $search_value
+ * @var array  $query
  */
-if ( ! defined( 'ABSPATH' ) ) exit; ?>
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div class="search-form um-search-form" data-members_page="<?php echo esc_url( $members_page ); ?>">
 	<?php foreach ( array_keys( $query ) as $key ) { ?>
diff --git a/ultimate-member.php b/ultimate-member.php
index 28d9b9c7..3cdb44cb 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.6.0
+Version: 2.6.1
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member