diff --git a/templates/content-single-calendar.php b/templates/content-single-calendar.php
index 9cceb931..7c970c8c 100644
--- a/templates/content-single-calendar.php
+++ b/templates/content-single-calendar.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_calendar hook
-	 */
-	 do_action( 'sportspress_before_single_calendar' );
+/**
+ * sportspress_before_single_calendar hook
+ */
+do_action( 'sportspress_before_single_calendar' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_calendar_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_calendar_content' );
+
+do_action( 'sportspress_after_single_calendar' );
diff --git a/templates/content-single-event.php b/templates/content-single-event.php
index 516efb91..37acde86 100644
--- a/templates/content-single-event.php
+++ b/templates/content-single-event.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_event hook
-	 */
-	 do_action( 'sportspress_before_single_event' );
+/**
+ * sportspress_before_single_event hook
+ */
+do_action( 'sportspress_before_single_event' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_event_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_event_content' );
+
+do_action( 'sportspress_after_single_event' );
diff --git a/templates/content-single-list.php b/templates/content-single-list.php
index 0b9809a7..df5e5e01 100644
--- a/templates/content-single-list.php
+++ b/templates/content-single-list.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_list hook
-	 */
-	 do_action( 'sportspress_before_single_list' );
+/**
+ * sportspress_before_single_list hook
+ */
+do_action( 'sportspress_before_single_list' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_list_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_list_content' );
+
+do_action( 'sportspress_after_single_list' );
diff --git a/templates/content-single-player.php b/templates/content-single-player.php
index d6c78102..2a56fb13 100644
--- a/templates/content-single-player.php
+++ b/templates/content-single-player.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_player hook
-	 */
-	 do_action( 'sportspress_before_single_player' );
+/**
+ * sportspress_before_single_player hook
+ */
+do_action( 'sportspress_before_single_player' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_player_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_player_content' );
+
+do_action( 'sportspress_after_single_player' );
diff --git a/templates/content-single-staff.php b/templates/content-single-staff.php
index 4154f450..54083653 100644
--- a/templates/content-single-staff.php
+++ b/templates/content-single-staff.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_staff hook
-	 */
-	 do_action( 'sportspress_before_single_staff' );
+/**
+ * sportspress_before_single_staff hook
+ */
+do_action( 'sportspress_before_single_staff' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_staff_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_staff_content' );
+
+do_action( 'sportspress_after_single_staff' );
diff --git a/templates/content-single-table.php b/templates/content-single-table.php
index f6052abc..c3c278d7 100644
--- a/templates/content-single-table.php
+++ b/templates/content-single-table.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_table hook
-	 */
-	 do_action( 'sportspress_before_single_table' );
+/**
+ * sportspress_before_single_table hook
+ */
+do_action( 'sportspress_before_single_table' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_table_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_table_content' );
+
+do_action( 'sportspress_after_single_table' );
diff --git a/templates/content-single-team.php b/templates/content-single-team.php
index 0fcf738f..1120af48 100644
--- a/templates/content-single-team.php
+++ b/templates/content-single-team.php
@@ -6,23 +6,22 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     0.8.1
+ * @version     0.9
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 if ( ! in_the_loop() ) return; // Return if not in main loop
-?>
 
-<?php
-	/**
-	 * sportspress_before_single_team hook
-	 */
-	 do_action( 'sportspress_before_single_team' );
+/**
+ * sportspress_before_single_team hook
+ */
+do_action( 'sportspress_before_single_team' );
 
-	 if ( post_password_required() ) {
-	 	echo get_the_password_form();
-	 	return;
-	 }
-?>
+if ( post_password_required() ) {
+	echo get_the_password_form();
+	return;
+}
 
-<?php do_action( 'sportspress_single_team_content' ); ?>
\ No newline at end of file
+do_action( 'sportspress_single_team_content' );
+
+do_action( 'sportspress_after_single_team' );