diff --git a/e107_core/templates/admin_template.php b/e107_core/templates/admin_template.php
index ef6d939af..f28ce1160 100644
--- a/e107_core/templates/admin_template.php
+++ b/e107_core/templates/admin_template.php
@@ -51,4 +51,4 @@ $ADMIN_FOOTER = "</td>
 {ADMIN_CREDITS}
 ";
 
-?>
+
diff --git a/e107_core/templates/bbcode_template.php b/e107_core/templates/bbcode_template.php
index d1e7666a7..bbdf71e28 100644
--- a/e107_core/templates/bbcode_template.php
+++ b/e107_core/templates/bbcode_template.php
@@ -88,4 +88,5 @@ $BBCODE_TEMPLATE_CPAGE = "
 	<div class='btn-group'>{BB=preimage}{BB=prefile}{BB=youtube}</div>
 	</div>
 ";
-?>
\ No newline at end of file
+
+
diff --git a/e107_core/templates/comment_template.php b/e107_core/templates/comment_template.php
index b857d3de9..12cca6e4d 100644
--- a/e107_core/templates/comment_template.php
+++ b/e107_core/templates/comment_template.php
@@ -155,4 +155,3 @@ $COMMENT_TEMPLATE['item'] = '
 $COMMENT_TEMPLATE['layout'] 		= '{COMMENTFORM}{COMMENTS} <div style="padding:10px 0px">{MODERATE}</div>';
 										
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index c81a7e749..f7971fca5 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -124,4 +124,4 @@ $CONTACT_TEMPLATE['menu'] =  '
 
 	
 
-?>
+
diff --git a/e107_core/templates/fpw_template.php b/e107_core/templates/fpw_template.php
index 40a4a67ce..b6ea18143 100644
--- a/e107_core/templates/fpw_template.php
+++ b/e107_core/templates/fpw_template.php
@@ -101,4 +101,3 @@ $FPW_TEMPLATE['footer'] = '</div>';
 
 
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/login_template.php b/e107_core/templates/login_template.php
index f1ec8ad36..dc374a13e 100644
--- a/e107_core/templates/login_template.php
+++ b/e107_core/templates/login_template.php
@@ -135,4 +135,3 @@ $LOGIN_TEMPLATE['page']['footer'] =  "
 
 
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/membersonly_template.php b/e107_core/templates/membersonly_template.php
index 408495e7e..8b34075be 100755
--- a/e107_core/templates/membersonly_template.php
+++ b/e107_core/templates/membersonly_template.php
@@ -45,4 +45,3 @@ $MEMBERSONLY_END = "<div>";
 
 
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/menu_template.php b/e107_core/templates/menu_template.php
index dd1efd2a9..b6d4eccb3 100644
--- a/e107_core/templates/menu_template.php
+++ b/e107_core/templates/menu_template.php
@@ -23,4 +23,5 @@ if (!defined('e107_INIT')) { exit; }
 	$MENU_TEMPLATE['image-text-button']['start'] 		= '<div class="cpage-menu {CMENUNAME}">{SETIMAGE: w=360}';
 	$MENU_TEMPLATE['image-text-button']['body'] 		= '{CMENUIMAGE}{CMENUBODY}{CPAGEBUTTON}';
 	$MENU_TEMPLATE['image-text-button']['end'] 			= '</div>';
-?>
\ No newline at end of file
+
+
diff --git a/e107_core/templates/navigation_template.php b/e107_core/templates/navigation_template.php
index f3df20cb7..bb4213c13 100644
--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -6,7 +6,7 @@
 * Navigation Template 
 */
 
- 
+
 // TEMPLATE FOR {NAVIGATION=main}
 $NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav nav-main ml-auto">';
 
@@ -183,4 +183,3 @@ $NAVIGATION_TEMPLATE['alt6']['start'] 				= '<ul class="nav nav-list nav-alt6">'
 
 
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php
index 3cf31d1b2..923b7e254 100644
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -201,4 +201,4 @@ $NEXTPREV_TEMPLATE['page_items_end'] = '';
 
 //$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
 $NEXTPREV_TEMPLATE['page_separator'] = '<br />';
-?>
\ No newline at end of file
+
diff --git a/e107_core/templates/online_template.php b/e107_core/templates/online_template.php
index 8a166fefe..b7ceee1d4 100644
--- a/e107_core/templates/online_template.php
+++ b/e107_core/templates/online_template.php
@@ -42,4 +42,3 @@ if (!isset($ONLINE_TABLE_MISC))
 // ##### ------------------------------------------------------------------------------------------
 
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/page_template.php b/e107_core/templates/page_template.php
index 129984267..25cf5b1e2 100644
--- a/e107_core/templates/page_template.php
+++ b/e107_core/templates/page_template.php
@@ -152,4 +152,3 @@ $sc_style['CPAGENAV|default']['post'] = '</div>';
 	
 	
 	
-?>
\ No newline at end of file
diff --git a/e107_core/templates/search_template.php b/e107_core/templates/search_template.php
index 0e0829254..a68eeb575 100644
--- a/e107_core/templates/search_template.php
+++ b/e107_core/templates/search_template.php
@@ -206,4 +206,3 @@ $SEARCH_TEMPLATE['form']['advanced-combo'] = '<div>{SEARCH_ADV_TEXT}</div>';
 	</td>
 	</tr>";
 */
-?>
\ No newline at end of file
diff --git a/e107_core/templates/sitedown_template.php b/e107_core/templates/sitedown_template.php
index 8878834a3..37e4631b0 100644
--- a/e107_core/templates/sitedown_template.php
+++ b/e107_core/templates/sitedown_template.php
@@ -54,4 +54,3 @@ if(!isset($SITEDOWN_TABLE))
 }
 // ##### ------------------------------------------------------------------------------------------
 
-?>
\ No newline at end of file
diff --git a/e107_core/templates/trackback_template.php b/e107_core/templates/trackback_template.php
index 51ba050d7..b26cad960 100644
--- a/e107_core/templates/trackback_template.php
+++ b/e107_core/templates/trackback_template.php
@@ -9,4 +9,3 @@ $TRACKBACK = "
 
 $TRACKBACK_RENDER_METHOD = TRUE;			/* TRUE=tablerender, FALSE=echo */
 
-?>
\ No newline at end of file