diff --git a/core/templates/acarsmap.php b/core/templates/acarsmap.php
index 965ff687..f42de4c1 100644
--- a/core/templates/acarsmap.php
+++ b/core/templates/acarsmap.php
@@ -1,4 +1,5 @@
-<?php 
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<?php
 /**
  * These are some options for the ACARS map, you can change here
  * 
diff --git a/core/templates/activity_list.php b/core/templates/activity_list.php
index 62190546..8bde91c2 100644
--- a/core/templates/activity_list.php
+++ b/core/templates/activity_list.php
@@ -1,73 +1,74 @@
-<h3>Activity Feed</h3>
-<?php
-
-foreach($allactivities as $activity) {
-    
-    /*  Use the activity->type to determine the type of activity (duh?)
-        Constants are in app.config.php 
-        
-        Like here, I put a specific link to the PIREP at the end of the message
-        You can use the if/else's to add specific images?
-        
-        $activity->refid is the ID of the thing it's referring to, so if it's a
-        new PIREP, the refid will be the ID of the PIREP
-        
-        $activity-> also contains all the fields about the pilot who this notice
-        is about        
-     */
-           
-    $link_title = '';
-    $link_href = '';
-    if($activity->type == ACTIVITY_NEW_PIREP) {
-        
-        $link_href = url('/pireps/view/'.$activity->refid);
-        $link_title = 'View Flight Report';
-        
-    } elseif($activity->type == ACTIVITY_TWITTER) {
-        
-        $link_href = 'http://twitter.com/#!/'.Config::get('TWITTER_AIRLINE_ACCOUNT').'/status/'.$activity->refid;
-        $link_title = 'View Tweet';
-        
-    } elseif($activity->type == ACTIVITY_NEW_PILOT) {
-        $link_href = url('/profile/view/'.$activity->pilotid);
-        $link_title = 'View Profile';
-    }
-?>
-    <p>
-        <?php
-        /*  Example, if it's a twitter status update (ACTIVITY_TWITTER),
-            then show an image (in this case, a small Twitter icon) */
-        if($activity->type == ACTIVITY_TWITTER) {
-            echo '<img src="'.fileurl('/lib/images/twitter.png').'" alt="twitter update" />';
-        }
-        
-        ?>
-        <?php
-        /*  If there is a pilot associated with this feed update, show their name
-            and a link to their profile page */ 
-        if($activity->pilotid != 0) { 
-            $pilotCode = PilotData::getPilotCode($activity->code, $activity->pilotid);
-            ?>
-        
-            <a href="<?php echo url('/profile/view/'.$activity->pilotid);?>">
-            <?php echo $pilotCode.' '.$activity->firstname.' '.$activity->lastname?>
-            </a> 
-    
-        <?php 
-        } /* End if pilot ID != 0 */ 
-        ?>
-        
-        <?php 
-            /* Show the activity message itself */
-            echo stripslashes($activity->message); 
-        ?>
-        
-        <?php
-        if($link_href != '') {
-            echo ' <a href="'.$link_href.'">'.$link_title.'</a>';
-        }
-        ?>
-    </p>
-<?php
-}
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<h3>Activity Feed</h3>
+<?php
+
+foreach($allactivities as $activity) {
+    
+    /*  Use the activity->type to determine the type of activity (duh?)
+        Constants are in app.config.php 
+        
+        Like here, I put a specific link to the PIREP at the end of the message
+        You can use the if/else's to add specific images?
+        
+        $activity->refid is the ID of the thing it's referring to, so if it's a
+        new PIREP, the refid will be the ID of the PIREP
+        
+        $activity-> also contains all the fields about the pilot who this notice
+        is about        
+     */
+           
+    $link_title = '';
+    $link_href = '';
+    if($activity->type == ACTIVITY_NEW_PIREP) {
+        
+        $link_href = url('/pireps/view/'.$activity->refid);
+        $link_title = 'View Flight Report';
+        
+    } elseif($activity->type == ACTIVITY_TWITTER) {
+        
+        $link_href = 'http://twitter.com/#!/'.Config::get('TWITTER_AIRLINE_ACCOUNT').'/status/'.$activity->refid;
+        $link_title = 'View Tweet';
+        
+    } elseif($activity->type == ACTIVITY_NEW_PILOT) {
+        $link_href = url('/profile/view/'.$activity->pilotid);
+        $link_title = 'View Profile';
+    }
+?>
+    <p>
+        <?php
+        /*  Example, if it's a twitter status update (ACTIVITY_TWITTER),
+            then show an image (in this case, a small Twitter icon) */
+        if($activity->type == ACTIVITY_TWITTER) {
+            echo '<img src="'.fileurl('/lib/images/twitter.png').'" alt="twitter update" />';
+        }
+        
+        ?>
+        <?php
+        /*  If there is a pilot associated with this feed update, show their name
+            and a link to their profile page */ 
+        if($activity->pilotid != 0) { 
+            $pilotCode = PilotData::getPilotCode($activity->code, $activity->pilotid);
+            ?>
+        
+            <a href="<?php echo url('/profile/view/'.$activity->pilotid);?>">
+            <?php echo $pilotCode.' '.$activity->firstname.' '.$activity->lastname?>
+            </a> 
+    
+        <?php 
+        } /* End if pilot ID != 0 */ 
+        ?>
+        
+        <?php 
+            /* Show the activity message itself */
+            echo stripslashes($activity->message); 
+        ?>
+        
+        <?php
+        if($link_href != '') {
+            echo ' <a href="'.$link_href.'">'.$link_title.'</a>';
+        }
+        ?>
+    </p>
+<?php
+}
 ?>
\ No newline at end of file
diff --git a/core/templates/contact_form.php b/core/templates/contact_form.php
index fba600b4..419b8fa2 100644
--- a/core/templates/contact_form.php
+++ b/core/templates/contact_form.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Contact Us</h3>
 <form method="post" action="<?php echo url('/contact'); ?>">
   <table width='100%' border='0'>
diff --git a/core/templates/contact_sent.php b/core/templates/contact_sent.php
index 40ef7077..489ed13a 100644
--- a/core/templates/contact_sent.php
+++ b/core/templates/contact_sent.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Thanks!</h3>
 <p>Your request has been submitted, we will be in touch shortly.</p>
\ No newline at end of file
diff --git a/core/templates/core_error.php b/core/templates/core_error.php
index 95ad81f3..b1c2cf2b 100644
--- a/core/templates/core_error.php
+++ b/core/templates/core_error.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 echo '<div id="error" class="'.$class.'">'.$message.'</div>';
 ?>
\ No newline at end of file
diff --git a/core/templates/core_htmlhead.php b/core/templates/core_htmlhead.php
index 9a7b8dda..28943bf3 100644
--- a/core/templates/core_htmlhead.php
+++ b/core/templates/core_htmlhead.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 /**
  * 	STOP! HAMMER TIME!
diff --git a/core/templates/core_htmlreq.php b/core/templates/core_htmlreq.php
index 47a0543b..f91cfacf 100644
--- a/core/templates/core_htmlreq.php
+++ b/core/templates/core_htmlreq.php
@@ -1 +1,2 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div class="jqmWindow" id="jqmdialog"></div>
\ No newline at end of file
diff --git a/core/templates/core_message.php b/core/templates/core_message.php
index 26f8222c..e914d1e7 100644
--- a/core/templates/core_message.php
+++ b/core/templates/core_message.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div id="messagebox">
 <?php echo $message;?>
 </div>
\ No newline at end of file
diff --git a/core/templates/core_navigation.php b/core/templates/core_navigation.php
index 83cd4d04..716219bf 100644
--- a/core/templates/core_navigation.php
+++ b/core/templates/core_navigation.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <li><a href="<?php echo url('/'); ?>">home</a></li>
 <?php
 if(!Auth::LoggedIn())
diff --git a/core/templates/core_success.php b/core/templates/core_success.php
index 5f8dfb55..5715a64e 100644
--- a/core/templates/core_success.php
+++ b/core/templates/core_success.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 echo '<div id="success">'.$message.'</div>';
 ?>
\ No newline at end of file
diff --git a/core/templates/download_item.php b/core/templates/download_item.php
index d8861d61..5791b692 100644
--- a/core/templates/download_item.php
+++ b/core/templates/download_item.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div align="center">
 <p>Your download will start in a few seconds, or <a href="<?php echo $download->link;?>">click here to manually start.</a></p>
 </div>
diff --git a/core/templates/downloads_list.php b/core/templates/downloads_list.php
index dc433f54..3b114f31 100644
--- a/core/templates/downloads_list.php
+++ b/core/templates/downloads_list.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h1>Downloads</h1>
 
 <?php 
diff --git a/core/templates/email_lostpassword.php b/core/templates/email_lostpassword.php
index 69d53303..6df675b9 100644
--- a/core/templates/email_lostpassword.php
+++ b/core/templates/email_lostpassword.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 Dear <?php echo $firstname .' '. $lastname; ?>,
 
 Your password was reset, it is: <?php echo $newpw?>
diff --git a/core/templates/email_pilot_retired.php b/core/templates/email_pilot_retired.php
index 89accbff..6d2bfd48 100644
--- a/core/templates/email_pilot_retired.php
+++ b/core/templates/email_pilot_retired.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 Hi <?php echo $pilot->firstname.' '.$pilot->lastname?>,
 
 You have been marked as retired because you have been inactive for more than <?php echo Config::Get('PILOT_INACTIVE_TIME')?> days. To be un-retired, you must file a PIREP.
diff --git a/core/templates/email_registered.php b/core/templates/email_registered.php
index 6e4ceebc..74aacb20 100644
--- a/core/templates/email_registered.php
+++ b/core/templates/email_registered.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 Dear <?php echo $firstname .' '. $lastname; ?>,
 
 Your account have been made at <?php echo SITE_NAME?>, but your account has not yet been activated. You will receive an email when your registration has been activated by someone on our staff.
diff --git a/core/templates/email_registrationaccepted.php b/core/templates/email_registrationaccepted.php
index e8ebb51e..12fda948 100644
--- a/core/templates/email_registrationaccepted.php
+++ b/core/templates/email_registrationaccepted.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 Dear <?php echo $pilot->firstname.' '.$pilot->lastname ?>,
 Your registration for <?php echo SITE_NAME?> was accepted! Please visit us 
 at <a href="<?php echo SITE_URL?>"><?php echo SITE_NAME?></a> to login and complete your registration
diff --git a/core/templates/email_registrationdenied.php b/core/templates/email_registrationdenied.php
index 7e879095..fad2e174 100644
--- a/core/templates/email_registrationdenied.php
+++ b/core/templates/email_registrationdenied.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 Dear <?php echo $pilot->firstname.' '.$pilot->lastname?>,
 Your registration for <?php echo SITE_NAME; ?> was denied. Please contact an admin at <a href="<?php echo url('/');?>"><?php echo url('/');?></a> to dispute this. 
 				
diff --git a/core/templates/finance_balancesheet.php b/core/templates/finance_balancesheet.php
index 00fc7973..160d46ef 100644
--- a/core/templates/finance_balancesheet.php
+++ b/core/templates/finance_balancesheet.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 Template::Show('finance_header.tpl'); 
 ?>
diff --git a/core/templates/finance_header.php b/core/templates/finance_header.php
index 6a37c8b0..deb42b14 100644
--- a/core/templates/finance_header.php
+++ b/core/templates/finance_header.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <br /><div style="float: right;">
 <form action="<?php echo url('/finances/viewreport'); ?>" method="get">
 <strong>Select Report: </strong>
diff --git a/core/templates/finance_summarysheet.php b/core/templates/finance_summarysheet.php
index 6ebcf6d4..493c0b45 100644
--- a/core/templates/finance_summarysheet.php
+++ b/core/templates/finance_summarysheet.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 /*
  * DO NOT EDIT THIS TEMPLATE UNLESS:
diff --git a/core/templates/flown_routes_map.php b/core/templates/flown_routes_map.php
index f0e990c9..6a997176 100644
--- a/core/templates/flown_routes_map.php
+++ b/core/templates/flown_routes_map.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 /**
  * 
diff --git a/core/templates/frontpage_main.php b/core/templates/frontpage_main.php
index 2feb8e38..8c2a5f10 100644
--- a/core/templates/frontpage_main.php
+++ b/core/templates/frontpage_main.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div id="mainbox">
 <?php
 
diff --git a/core/templates/frontpage_recentbids.php b/core/templates/frontpage_recentbids.php
index 12442c68..1fceab32 100644
--- a/core/templates/frontpage_recentbids.php
+++ b/core/templates/frontpage_recentbids.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 if(!$lastbids)
 {
diff --git a/core/templates/frontpage_recentpilots.php b/core/templates/frontpage_recentpilots.php
index f6be944a..657c2f4d 100644
--- a/core/templates/frontpage_recentpilots.php
+++ b/core/templates/frontpage_recentpilots.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 foreach($pilot_list as $pilot) {
 ?>
diff --git a/core/templates/frontpage_reports.php b/core/templates/frontpage_reports.php
index a50f3ae7..105c10ec 100644
--- a/core/templates/frontpage_reports.php
+++ b/core/templates/frontpage_reports.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 if(!$pirep_list) {
 	echo 'No reports have been filed';
diff --git a/core/templates/fsacars_config.php b/core/templates/fsacars_config.php
index 40a842df..4fe1910c 100644
--- a/core/templates/fsacars_config.php
+++ b/core/templates/fsacars_config.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 [Log]
 Log=<?php echo SITE_URL?>/action.php/acars/fsacars/pirep
 Mail=
diff --git a/core/templates/fsfk_liveacars_config.php b/core/templates/fsfk_liveacars_config.php
index 9d4731b7..6f759601 100644
--- a/core/templates/fsfk_liveacars_config.php
+++ b/core/templates/fsfk_liveacars_config.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 [ACARS_CONFIG]
 ADDRESS=<?php echo actionurl('/fsfk/acars'); ?>
 
diff --git a/core/templates/fsfk_log_flightcritique.php b/core/templates/fsfk_log_flightcritique.php
index d39934d2..2ddedcc1 100644
--- a/core/templates/fsfk_log_flightcritique.php
+++ b/core/templates/fsfk_log_flightcritique.php
@@ -1,4 +1,5 @@
-<?php 
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<?php
 /* This template is for FSFK log for the flight critique.
 	Be careful, it's a bit fragile
 	*/
diff --git a/core/templates/fsfk_log_flightdata.php b/core/templates/fsfk_log_flightdata.php
index a63678b7..4408b9c6 100644
--- a/core/templates/fsfk_log_flightdata.php
+++ b/core/templates/fsfk_log_flightdata.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div class="fsfk_section_title" >Flight Details</div>
 <table class="fsfk_flightplan">
 <thead>
diff --git a/core/templates/fsfk_log_flightimages.php b/core/templates/fsfk_log_flightimages.php
index c256ff95..214fb799 100644
--- a/core/templates/fsfk_log_flightimages.php
+++ b/core/templates/fsfk_log_flightimages.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div class="fsfk_section_title">Flight Images</div>
 <?php
 /*
diff --git a/core/templates/fsfk_log_flig.phpan.tpl b/core/templates/fsfk_log_flightplan.php
similarity index 100%
rename from core/templates/fsfk_log_flig.phpan.tpl
rename to core/templates/fsfk_log_flightplan.php
diff --git a/core/templates/fsfk_pirep_config.php b/core/templates/fsfk_pirep_config.php
index 4baf1966..eab1d83a 100644
--- a/core/templates/fsfk_pirep_config.php
+++ b/core/templates/fsfk_pirep_config.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 [WEB_CONFIG]
 ADDRESS=<?php echo actionurl('/fsfk/pirep'); ?>
 
diff --git a/core/templates/fsfk_vaconfig.php b/core/templates/fsfk_vaconfig.php
index f84410bf..8b309166 100644
--- a/core/templates/fsfk_vaconfig.php
+++ b/core/templates/fsfk_vaconfig.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 [VA_CONFIG]
 DOWNLOADURL = <?php echo actionurl('/fsfk/vaconfig_template'); ?>
 
diff --git a/core/templates/fspax_config.php b/core/templates/fspax_config.php
index 2d818016..2d8f0e2d 100644
--- a/core/templates/fspax_config.php
+++ b/core/templates/fspax_config.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 menu_name=<?php echo substr(SITE_NAME, 0, 49);?>;
 base_url=<?php echo SITE_URL; ?>; 
 path_stats=index.php/acars;  		
diff --git a/core/templates/login_already.php b/core/templates/login_already.php
index 12f90162..b6d097ca 100644
--- a/core/templates/login_already.php
+++ b/core/templates/login_already.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Error!</h3>
 <p>You are already logged in!</p>
\ No newline at end of file
diff --git a/core/templates/login_complete.php b/core/templates/login_complete.php
index fc2a9a94..68dc25ec 100644
--- a/core/templates/login_complete.php
+++ b/core/templates/login_complete.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 	if($redir == '')
 		$redir = SITE_URL;
diff --git a/core/templates/login_forgotpassword.php b/core/templates/login_forgotpassword.php
index 5cbc638e..dd9267b9 100644
--- a/core/templates/login_forgotpassword.php
+++ b/core/templates/login_forgotpassword.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <form action="<?php echo url('/login/forgotpassword');?>" method="post">
 <p><strong>Enter your email address to get a new password: </strong>
 	<input type="text" name="email" />
diff --git a/core/templates/login_form.php b/core/templates/login_form.php
index 674455e0..a1c4c250 100644
--- a/core/templates/login_form.php
+++ b/core/templates/login_form.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h1>Login</h1>
 <form name="loginform" action="<?php echo url('/login');?>" method="post">
 <?php echo "<?xml version='1.0'?>"; ?>
diff --git a/core/templates/login_notfound.php b/core/templates/login_notfound.php
index 9fd924c4..a18515ad 100644
--- a/core/templates/login_notfound.php
+++ b/core/templates/login_notfound.php
@@ -1 +1,2 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <p>This email address was not found in our database. If you feel this was an error, please contact an administrator.</p>
\ No newline at end of file
diff --git a/core/templates/login_passwordreset.php b/core/templates/login_passwordreset.php
index 8c258497..4694b5be 100644
--- a/core/templates/login_passwordreset.php
+++ b/core/templates/login_passwordreset.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Password Reset</h3>
 <p>Your new password has been sent to your email!</p>
\ No newline at end of file
diff --git a/core/templates/login_rejected.php b/core/templates/login_rejected.php
index d356fcb5..8139f176 100644
--- a/core/templates/login_rejected.php
+++ b/core/templates/login_rejected.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Sorry!</h3>
 <p>Your registration was not accepted. Please contact the administrator for additional details.</p>
\ No newline at end of file
diff --git a/core/templates/login_unconfirmed.php b/core/templates/login_unconfirmed.php
index 57c55e41..3b3746ce 100644
--- a/core/templates/login_unconfirmed.php
+++ b/core/templates/login_unconfirmed.php
@@ -1,3 +1,5 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Unconfirmed</h3>
 
 <p>Sorry! Your registration has not yet been checked by an administrator. Please try again later. You will receive an email when your registration has been accepted</p>
\ No newline at end of file
diff --git a/core/templates/maintenance.php b/core/templates/maintenance.php
index bd4cbe84..0ebfda26 100644
--- a/core/templates/maintenance.php
+++ b/core/templates/maintenance.php
@@ -1,19 +1,20 @@
-<?php
-    /* This page should be a complete HTML page */
-?>
-<html>
-<head>
-<title>Down for maintenance - phpVMS Virtual Airline</title>
-<style type="text/css">
-body { font-family: verdana;  font-size: 16px; color: #001B6B }
-h1 { font-weight:16px;font-size:18px;color:#6B001B;margin:0 0 4px 0; }
-div#codon_crit_error { border:#999 1px solid;background-color:#fff;padding:20px 20px 12px 20px;}
-</style>
-</head>
-<body>		
-    <div id="codon_crit_error" >
-        <h1>Down for maintenance</h1>
-        <p>We are currently down for maintenance, please check back soon.</p>
-    </div>
-</body>
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<?php
+    /* This page should be a complete HTML page */
+?>
+<html>
+<head>
+<title>Down for maintenance - phpVMS Virtual Airline</title>
+<style type="text/css">
+body { font-family: verdana;  font-size: 16px; color: #001B6B }
+h1 { font-weight:16px;font-size:18px;color:#6B001B;margin:0 0 4px 0; }
+div#codon_crit_error { border:#999 1px solid;background-color:#fff;padding:20px 20px 12px 20px;}
+</style>
+</head>
+<body>		
+    <div id="codon_crit_error" >
+        <h1>Down for maintenance</h1>
+        <p>We are currently down for maintenance, please check back soon.</p>
+    </div>
+</body>
 </html>
\ No newline at end of file
diff --git a/core/templates/news_newsitem.php b/core/templates/news_newsitem.php
index 0858c868..12b2c046 100644
--- a/core/templates/news_newsitem.php
+++ b/core/templates/news_newsitem.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3><?php echo $subject;?></strong></h3>
 <p>Posted by <?php echo $postedby;?> on <?php echo $postdate;?></p>
 <p><?php echo html_entity_decode($body);?></p>
diff --git a/core/templates/pages_content.php b/core/templates/pages_content.php
index c9ef8ac3..fd4a9c4e 100644
--- a/core/templates/pages_content.php
+++ b/core/templates/pages_content.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h1><?php echo $pagename;?></h1>
 <div>
 <?php echo html_entity_decode($content);?>
diff --git a/core/templates/pages_items.php b/core/templates/pages_items.php
index a99e169d..a78bb553 100644
--- a/core/templates/pages_items.php
+++ b/core/templates/pages_items.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 if(!$allpages)
 	return;
diff --git a/core/templates/pages_nopermission.php b/core/templates/pages_nopermission.php
index 40cb12b5..76467d93 100644
--- a/core/templates/pages_nopermission.php
+++ b/core/templates/pages_nopermission.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Not Allowed</h3>
 <p>You are not allowed permission to access this page<p>
\ No newline at end of file
diff --git a/core/templates/pages_notfound.php b/core/templates/pages_notfound.php
index f6336a5f..e4dc899f 100644
--- a/core/templates/pages_notfound.php
+++ b/core/templates/pages_notfound.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>You broke it!</h3>
 <p>Just kidding. The page you were looking for has run away. Contact the site admin if you think this is an error.<p>
\ No newline at end of file
diff --git a/core/templates/pilot_public_profile.php b/core/templates/pilot_public_profile.php
index 80a0a92f..893fc525 100644
--- a/core/templates/pilot_public_profile.php
+++ b/core/templates/pilot_public_profile.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 if(!$pilot) {
 	echo '<h3>This pilot does not exist!</h3>';
diff --git a/core/templates/pilots_list.php b/core/templates/pilots_list.php
index 730c61b1..8868f8d5 100644
--- a/core/templates/pilots_list.php
+++ b/core/templates/pilots_list.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3><?php echo $title?></h3>
 
 <?php
diff --git a/core/templates/pirep_editform.php b/core/templates/pirep_editform.php
index 874fdf23..59ab1774 100644
--- a/core/templates/pirep_editform.php
+++ b/core/templates/pirep_editform.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Add Comment to PIREP</h3>
 <form action="<?php echo url('/pireps/viewpireps');?>" method="post">
 <?php
diff --git a/core/templates/pirep_new.php b/core/templates/pirep_new.php
index c4ced49d..13a888ce 100644
--- a/core/templates/pirep_new.php
+++ b/core/templates/pirep_new.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>File a Flight Report</h3>
 <?php
 if(isset($message))
diff --git a/core/templates/pirep_viewreport.php b/core/templates/pirep_viewreport.php
index 3db4461d..6c7c6001 100644
--- a/core/templates/pirep_viewreport.php
+++ b/core/templates/pirep_viewreport.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 
 <h3>Flight <?php echo $pirep->code . $pirep->flightnum; ?></h3>
 
diff --git a/core/templates/pireps_addcomment.php b/core/templates/pireps_addcomment.php
index 3431e6e8..47a3b6dc 100644
--- a/core/templates/pireps_addcomment.php
+++ b/core/templates/pireps_addcomment.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Add Comment to PIREP</h3>
 <form action="<?php echo url('/pireps/viewpireps');?>" method="post">
 <strong>Comment: </strong><br />
diff --git a/core/templates/pireps_airportdropdown.php b/core/templates/pireps_airportdropdown.php
index 547d42a0..ebc9467c 100644
--- a/core/templates/pireps_airportdropdown.php
+++ b/core/templates/pireps_airportdropdown.php
@@ -1,16 +1,17 @@
-<?php
-if (!$airport_list) {
-    echo 'There are no routes for this airline<br />';
-    return;
-}
-?>
-<select id="<?php echo $name; ?>" name="<?php echo $name;?>">
-    <option value="">Select an airport</option>
-
-<?php
-foreach ($airport_list as $airport) {
-    echo '<option value="' . $airport->icao . '">' . $airport->icao . ' - ' . $airport->name . '</option>';
-}
-?>
-
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
+<?php
+if (!$airport_list) {
+    echo 'There are no routes for this airline<br />';
+    return;
+}
+?>
+<select id="<?php echo $name; ?>" name="<?php echo $name;?>">
+    <option value="">Select an airport</option>
+
+<?php
+foreach ($airport_list as $airport) {
+    echo '<option value="' . $airport->icao . '">' . $airport->icao . ' - ' . $airport->name . '</option>';
+}
+?>
+
 </select>
\ No newline at end of file
diff --git a/core/templates/pireps_viewall.php b/core/templates/pireps_viewall.php
index dfb5235b..7985da90 100644
--- a/core/templates/pireps_viewall.php
+++ b/core/templates/pireps_viewall.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>PIREPs List</h3>
 <p><?php if(isset($descrip)) { echo $descrip; }?></p>
 <?php
diff --git a/core/templates/profile_badge.php b/core/templates/profile_badge.php
index 5e7dbe06..eddd7233 100644
--- a/core/templates/profile_badge.php
+++ b/core/templates/profile_badge.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Pilot Badge</h3>
 <p align="center">
 	<img src="<?php echo $badge_url ?>" />
diff --git a/core/templates/profile_changepassword.php b/core/templates/profile_changepassword.php
index 5704e3ef..6b364e20 100644
--- a/core/templates/profile_changepassword.php
+++ b/core/templates/profile_changepassword.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Change Password</h3>
 <form action="<?php echo url('/profile');?>" method="post">
 <dl>
diff --git a/core/templates/profile_edit.php b/core/templates/profile_edit.php
index 40c55ea6..452dbf56 100644
--- a/core/templates/profile_edit.php
+++ b/core/templates/profile_edit.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Edit Profile</h3>
 <form action="<?php echo url('/profile');?>" method="post" enctype="multipart/form-data">
 <dl>
diff --git a/core/templates/profile_main.php b/core/templates/profile_main.php
index a7923ef7..8024ad39 100644
--- a/core/templates/profile_main.php
+++ b/core/templates/profile_main.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div id="mainbox">
 <h3>Pilot Center</h3>
 <div class="indent">
diff --git a/core/templates/profile_myroutesmap.php b/core/templates/profile_myroutesmap.php
index e69de29b..36be6f4e 100644
--- a/core/templates/profile_myroutesmap.php
+++ b/core/templates/profile_myroutesmap.php
@@ -0,0 +1 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
diff --git a/core/templates/profile_stats.php b/core/templates/profile_stats.php
index 90bdc139..fd95f2f6 100644
--- a/core/templates/profile_stats.php
+++ b/core/templates/profile_stats.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Your Stats</h3>
 
 <?php
diff --git a/core/templates/registration_autoconfirm.php b/core/templates/registration_autoconfirm.php
index 6f675cd9..082f1414 100644
--- a/core/templates/registration_autoconfirm.php
+++ b/core/templates/registration_autoconfirm.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Registration Confirmation</h3>
 <p>Thanks for joining us! Your registration has been completed! You can login using your pilot ID (<?php echo PilotData::GetPilotCode($pilot->code, $pilot->pilotid);?>), and the password you used during registration.</p>
\ No newline at end of file
diff --git a/core/templates/registration_complete.php b/core/templates/registration_complete.php
index f3b3b6c6..a12058a3 100644
--- a/core/templates/registration_complete.php
+++ b/core/templates/registration_complete.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Thank you!</h3>
 <p>Your registration is now complete! You may log-in now</p>
\ No newline at end of file
diff --git a/core/templates/registration_customfields.php b/core/templates/registration_customfields.php
index dada5c88..5827c217 100644
--- a/core/templates/registration_customfields.php
+++ b/core/templates/registration_customfields.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 /* Show any extra fields
  */
diff --git a/core/templates/registration_error.php b/core/templates/registration_error.php
index 61bca929..57ece6a1 100644
--- a/core/templates/registration_error.php
+++ b/core/templates/registration_error.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Error Registering</h3>
 <p><?php echo $error; ?></p>
\ No newline at end of file
diff --git a/core/templates/registration_javascript.php b/core/templates/registration_javascript.php
index 40f2fca1..00499321 100644
--- a/core/templates/registration_javascript.php
+++ b/core/templates/registration_javascript.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <script type="text/javascript" src="<?php echo fileurl('/lib/js/jquery.pstrength.js'); ?>"></script>
 			
 <script type="text/javascript">
diff --git a/core/templates/registration_mainform.php b/core/templates/registration_mainform.php
index b5d7c332..f294d47a 100644
--- a/core/templates/registration_mainform.php
+++ b/core/templates/registration_mainform.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Registration</h3>
 <p>Welcome to the registration form for <?php echo SITE_NAME; ?>. After you register, you will be notified by a staff member about your membership.</p>
 <form method="post" action="<?php echo url('/registration');?>">
diff --git a/core/templates/registration_sentconfirmation.php b/core/templates/registration_sentconfirmation.php
index 59561bb9..f4872cd0 100644
--- a/core/templates/registration_sentconfirmation.php
+++ b/core/templates/registration_sentconfirmation.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Confirmation Sent</h3>
 
 <p>Thanks for registering for <?php echo SITE_NAME; ?>, you will be notified via email of your registration status.</p>
\ No newline at end of file
diff --git a/core/templates/reqlogin.php b/core/templates/reqlogin.php
index 4f34e7f9..a0d164ae 100644
--- a/core/templates/reqlogin.php
+++ b/core/templates/reqlogin.php
@@ -1,2 +1,3 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Login required!</h3>
 <p>You must be logged in to access this area! <a href="<?php echo url('/login'); ?>">Click here to login</a></p>
\ No newline at end of file
diff --git a/core/templates/route_map.php b/core/templates/route_map.php
index 32198a91..875edcff 100644
--- a/core/templates/route_map.php
+++ b/core/templates/route_map.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Route Map</h3>
 <div class="mapcenter" align="center">
 	<div id="routemap" style="width:<?php echo  Config::Get('MAP_WIDTH');?>; height: <?php echo Config::Get('MAP_HEIGHT')?>"></div>
diff --git a/core/templates/schedule_bids.php b/core/templates/schedule_bids.php
index 4e4512e9..c5da74cd 100644
--- a/core/templates/schedule_bids.php
+++ b/core/templates/schedule_bids.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>My Flight Bids</h3>
 <?php
 if(!$bids)
diff --git a/core/templates/schedule_boarding_pass.php b/core/templates/schedule_boarding_pass.php
index 266cf777..52c82eca 100644
--- a/core/templates/schedule_boarding_pass.php
+++ b/core/templates/schedule_boarding_pass.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 # This will only show this message if it's not a popup window
 # Ends on line 13-15
diff --git a/core/templates/schedule_briefing.php b/core/templates/schedule_briefing.php
index d1c03a10..ae0a6be6 100644
--- a/core/templates/schedule_briefing.php
+++ b/core/templates/schedule_briefing.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Flight Briefing</h3>
 <script src="http://skyvector.com/linkchart.js"></script>
 <table width="98%" align="center" cellpadding="4">
diff --git a/core/templates/schedule_details.php b/core/templates/schedule_details.php
index d0e0b2e9..f9e49d87 100644
--- a/core/templates/schedule_details.php
+++ b/core/templates/schedule_details.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Schedule Details</h3>
 <div class="indent">
 <strong>Flight Number: </strong> <?php echo $schedule->code.$schedule->flightnum ?><br />
diff --git a/core/templates/schedule_list.php b/core/templates/schedule_list.php
index 061e38b1..e054eb4b 100644
--- a/core/templates/schedule_list.php
+++ b/core/templates/schedule_list.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <div id="scheduleresults">
 <?php
 if($schedule_list) {
diff --git a/core/templates/schedule_results.php b/core/templates/schedule_results.php
index aff3e9d9..0e6d6d76 100644
--- a/core/templates/schedule_results.php
+++ b/core/templates/schedule_results.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <?php
 if(!$schedule_list)
 {
diff --git a/core/templates/schedule_searchform.php b/core/templates/schedule_searchform.php
index d7401c85..94761e7d 100644
--- a/core/templates/schedule_searchform.php
+++ b/core/templates/schedule_searchform.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 <h3>Search Schedules</h3>
 <form id="form" action="<?php echo actionurl('/schedules/view');?>" method="post">
 
diff --git a/core/templates/xacars_config.php b/core/templates/xacars_config.php
index be981ea3..43c2a6c4 100644
--- a/core/templates/xacars_config.php
+++ b/core/templates/xacars_config.php
@@ -1,3 +1,4 @@
+<?php if(!defined('IN_PHPVMS') && IN_PHPVMS !== true) { die(); } ?>
 [Server]
 Address = <?php echo SITE_URL?>/action.php/acars/xacars/acars