Merge pull request #3 from eoconnell/masterHEADmaster

Some more stuff

185 files changed, 1691 insertions, 3274 deletions

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9a4eda4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+# Bayonet CMS
+
+- Version 0.0.1 Alpha
+
+
+
+## Description
+
+Bayonet is a CMS designed for online gaming units. It comes with the member management module RUDI.
+
+
+## Usage
+
+This project is not actively managed. Use this software at your own risk.
+
+
+## Installation
+
+Initialize your database with this [schema](schema.sql).
+
+#### Admin account
+    Username: admin
+    Password: password
+
+Configure and rename [config.example.php](include/config.example.php) to `config.php`
+
+
+## Contributors
+
+- [Joe Hunkeler](https://github.com/jhunkeler)
+- [Evan O'Connell](https://github.com/eoconnell)
+- [Alan Brault](https://github.com/extrarius)
+- Jesse Larrabee
diff --git a/admin/adjutant/functions.php b/admin/adjutant/functions.php
index 87bc4b4..b38400e 100644
--- a/admin/adjutant/functions.php
+++ b/admin/adjutant/functions.php
@@ -67,6 +67,59 @@
 		echo "<input type=\"submit\" name=\"processed\" value=\"Update Points\" /></form>";
 
 	}
+
+/****** NEW CODE ADDED LARRABEE 11-20-2012 ********/
+        function EditPoints2(){
+
+                global $db;
+
+                $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id < 4  ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
+                $row = $db->Fetch($result);
+
+                if(isset($_POST['processed'])){
+                        echo "Updating data... Please wait.";
+                        foreach($row as $soldier){
+                                $mID = $soldier['member_id'];
+                        $missed = $_POST[$mID.'missed'];
+                        $attended = $_POST[$mID.'attended'];
+                        $points = $_POST[$mID.'points'];
+
+                        if($missed !="" && $points != ""){
+                                $db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed, `attendcount` = $attended WHERE `member_id` = $mID LIMIT 1");
+                        }else{
+                                ReportError("Error updating points for soldier id# '$mID'. Please contact administrator.");
+                        }
+                        }
+                        PageRedirect(1,"?op=adjutant&edit=pointsnew");
+                        return;
+                }
+?>
+                <form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
+                <table style="text-align:center;" width="100%" cellspacing="0">
+                <?php //OpenTable(); ?>
+                <tr><th>Rank</th><th>Soldier</th><th>Status</th><th>Points</th><th>Drills Missed</th><th>Drills Attended</th></tr>
+<?php
+                foreach($row as $soldier){
+                        $memberID = $soldier['member_id'];
+                        if($soldier['status_id'] != 1)
+                                echo "<tr class=\"inactive\">";
+                        else
+                                echo "<tr>";
+                        echo "<td>{$soldier['shortname']}</td>
+          <td>{$soldier['first_name']} {$soldier['last_name']}</td>
+          <td>".getStatus($soldier['status_id'])."</td>
+          <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['points']}\" name=\"{$memberID}points\" size=\"1\" maxlength=\"3\" />/100</td>
+          <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['drillcount']}\" name=\"{$memberID}missed\" size=\"1\" maxlength=\"1\" />/3</td>
+          <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['attendcount']}\" name=\"{$memberID}attended\" size=\"1\" maxlength=\"1\" />/3</td>";
+
+
+                echo "<input type=\"hidden\" value=\"{$memberID}\" name=\"{$memberID}id\" />\n";
+                }
+                CloseTable();
+                echo "<input type=\"submit\" name=\"processed\" value=\"Update Points\" /></form>";
+
+        }
+/****** END NEW CODE ADDED *******/
 	
 	function EditLOAs($status_id = 1){
 	
@@ -160,4 +213,4 @@ $num = 1;
 		
 	return $row['name'];
   }
- ?>
\ No newline at end of file
+ ?>
diff --git a/admin/adjutant/index.php b/admin/adjutant/index.php
index 5149c28..d8491ac 100644
--- a/admin/adjutant/index.php
+++ b/admin/adjutant/index.php
@@ -19,8 +19,10 @@
  
  ?>
  <link rel="stylesheet" type="text/css" href="adjutant/style.css" media="screen"/>
+ <script type="text/javascript" src="scripts/jquery-ui-1.7.1.custom.min.js"></script>
  <div style="text-align:left;"><h2>- Adjutant Control Panel</h2></div>
  <a href="?op=adjutant&edit=points">Edit Points</a>&nbsp;&nbsp;
+ <a href="?op=adjutant&edit=pointsnew">Edit Points *NEW*</a>&nbsp;&nbsp;
  <a href="?op=adjutant&edit=loas">Edit LOAs</a>
  <table class="panel" width="100%">
  	<tr><td style="text-align:center; vertical-align:top;">
@@ -39,6 +41,10 @@
  			echo "<h3>Edit Points</h3>";
  			EditPoints();
  		} 
+    if($_GET['edit'] == "pointsnew"){
+       echo "<h3>Edit Points *NEW*</h3>";
+       EditPoints();
+    }                    
  		if($_GET['edit'] == "loas"){
  			echo "<h3>Edit LOAs</h3>";
  			if(isset($_GET['member'])){
@@ -53,6 +59,11 @@
  			}
  		} 	
  	}
+ 	else if(isset($_GET['drills'])){
+ 		if($_GET['drills'] == "new"){
+ 			
+ 		}
+ 	}
  ?>
  	</td></tr>
- 	</table>
\ No newline at end of file
+ 	</table>
diff --git a/admin/admins/functions.php b/admin/admins/functions.php
index f3da1be..016b7a1 100644
--- a/admin/admins/functions.php
+++ b/admin/admins/functions.php
@@ -101,25 +101,15 @@
 			ReportError("The email and or username you entered is already in use.");
 			return;
 		}
-		
-		
-		$Name = "Rocky the Marne Dog";
-		$subject = "3rd ID Admin Password";
-		$header = "From: ". $Name . " < DO NOT RESPOND >\r\n"; //optional headerfields 
-		$mail_body = "Do not respond to this email.\n\n------------------------------\nUsername: ".$username."\nPassword: ".$password."\n------------------------------\n\nTo login click on this link. http://testbed.3rd-infantry-division.org/cms/admin/ \n\nIt is recommended that you change your password once you login. To do so, click on Account Settings>Change Password.";
-		
-		$sent = mail($email, $subject, $mail_body, $header);
-		if(!$sent){
-			ReportError("Error validating email. This user was not saved.");
-			return;		
-		} 
-				
+
+		EmailPassword($username, $password, $email);
+
 		$db->Query("INSERT INTO `bayonet_users` (`user_id` ,`username` ,`password` ,`lastname` ,`firstname` ,`email` ,`joined` ,`level` ,`all` ,`squadleader` ,`adjutant` ,`quartermaster`) VALUES (NULL, '$username', '$cryptpassword', '$last', '$first', '$email', CURRENT_TIMESTAMP, $level, $all, $squadleader, $adjutant, $quartermaster)");
 									
    		echo "Admin, '$username' level '$level' has been added. An email has been sent to him with his username and password.\n <br /><br /> 
 			Please wait while you are redirected. <br /><br /> 
 			<a href=\"?op=admins\">Click here if you don't feel like waiting.</a>";
-					
+
 	    // 3 second redirect to go back to the edit page
    		PageRedirect(2, "?op=admins");
 	    return;
@@ -158,6 +148,22 @@
 <?php
  }
  
+ function EmailPassword($username, $password, $email)
+ {
+ 		$name = "Bayonet CMS";
+		$subject = "Bayonet CMS Admin Password";
+		$header = "From: ". $name . " < DO NOT RESPOND >\r\n"; //optional headerfields 
+		$mail_body = "Do not respond to this email.\n\n------------------------------\nUsername: ".$username."\nPassword: ".$password."\n------------------------------\n\nTo login click on this link. ".Bayonet_Config::$ini['site']['url']."admin/ \n\nIt is recommended that you change your password once you login. To do so, click on Account Settings>Change Password.";
+
+		$sent = mail($email, $subject, $mail_body, $header);
+		if(!$sent){
+			ReportError("Error validating email. This user was not saved.");
+			return false;		
+		}
+		
+		return true;
+ }
+ 
  function GetPermissions($user = NULL)
  {
  ?>
@@ -217,7 +223,7 @@
     while(strlen($string)<$length) { 
         $string .= substr($possible_charactors, rand()%(strlen($possible_charactors)),1); 
     } 
-    return($string); 
+    return($string);
  }
  
  function EditAdmin($user_id)
@@ -264,7 +270,11 @@
 		Edit the attributes of this administrator.<br />
 		<form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
 		<table>
-			<tr><th>Username:</th><td><input type="text" value="<?php echo $admin['username']; ?>" name="username" /></td></tr>
+			<tr><th>Username:</th><td><input type="text" value="<?php echo $admin['username']; ?>" name="username" />
+		<?php if($maxLevel >= 2): ?>
+			<a href="?op=admins&resetpassword=<?php echo $user_id; ?>"><input type="button" value="Reset Password" /></a>
+		<?php endif; ?>
+			</td></tr>
 			<tr>
 				<th>Level:</th>
 				<td>
@@ -299,8 +309,8 @@
 	global $db;
 	$maxLevel = $_SESSION['level'];
 		  
-	$result = $db->Query("SELECT `username` FROM `bayonet_users` WHERE `user_id` = '$user_id'");
-	$admin = $db->Fetch($result);
+	$result = $db->Query("SELECT `username` FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1");
+	$admin = $db->FetchRow($result);
 		  
 	if(isset($_POST['proceed']))
 	{
@@ -326,4 +336,49 @@
 	</center>
 	<?php
  }
+ 
+ function ResetPassword($user_id)
+ {
+ 	global $db;
+ 	$result = $db->Query("SELECT `username`, `email` FROM `bayonet_users` WHERE `user_id` = '$user_id' LIMIT 1");
+ 	$admin = $db->FetchRow($result);
+ 	decho($admin);
+ 	
+ 	if(isset($_POST['proceed']))
+ 	{
+ 		$password = GeneratePassword(8);		
+		$cryptpassword = crypt(md5($password),'iamnotadirtywhorebitch');
+		
+		$status = EmailPassword($admin['username'], $password, $admin['email']);
+		
+		if($status)
+		{
+			$db->Query("UPDATE `bayonet_users` SET `password` = '$cryptpassword' WHERE `user_id` = '$user_id' LIMIT 1");
+			echo "Password has been reset and emailed to '{$admin['username']}'";
+ 			PageRedirect(3, "?op=admins");
+		}
+		else
+		{
+			ReportError("An error has occured emailing the new password. It will not take effect.");
+		}
+ 		
+ 		return;
+ 	}
+ 	if(isset($_POST['cancel']))
+ 	{
+ 		echo "The password <b>WILL NOT</b> be reset for '{$admin['username']}'";
+ 		PageRedirect(3, "?op=admins");
+ 		return;
+ 	}
+ 	?>
+	<center>
+	<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+	<table>
+	<th>Are you SURE you want to reset this user's password: '<?php echo $admin['username']?>'?</th>
+	<tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
+	</table>
+	</form>
+	</center>
+	<?php
+ }
  ?>
\ No newline at end of file
diff --git a/admin/admins/index.php b/admin/admins/index.php
index a2e71e9..87ce2a0 100644
--- a/admin/admins/index.php
+++ b/admin/admins/index.php
@@ -48,6 +48,10 @@ else if(isset($_GET['delete'])){
 else if(isset($_GET['create'])){
   NewAdmin();
 }
+else if(isset($_GET['resetpassword'])){
+  $user_id = $_GET['resetpassword'];
+  ResetPassword($user_id);
+}
 ?>
 	</td>
 	</tr>
diff --git a/admin/index.php b/admin/index.php
index c1da495..3ae793c 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -21,7 +21,7 @@
 session_start();
 
 define('BAYONET_INCLUDE', '../include');
-define('BAYONET_CONFIG', '../include/config.ini');
+define('BAYONET_CONFIG', '../include/config.php');
 
 include BAYONET_INCLUDE . '/debug.php';
 include BAYONET_INCLUDE . '/sql.class.php';
diff --git a/admin/newsreel/updateDB.php b/admin/newsreel/updateDB.php
index 0e5efda..09516d0 100644
--- a/admin/newsreel/updateDB.php
+++ b/admin/newsreel/updateDB.php
@@ -5,7 +5,7 @@ $dirname = "/path/to/bayonet/here";
 
 define('BAYONET_ROOT', $dirname);
 define('BAYONET_INCLUDE', BAYONET_ROOT . '/include');
-define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.ini');
+define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.php');
 
 require BAYONET_INCLUDE . '/debug.php';
 require BAYONET_INCLUDE . '/sql.class.php';
diff --git a/admin/rudi/includes/functions.members.php b/admin/rudi/includes/functions.members.php
index 86848dc..4a93134 100644
--- a/admin/rudi/includes/functions.members.php
+++ b/admin/rudi/includes/functions.members.php
@@ -37,8 +37,13 @@
  	function GetMembersRoles($member_id){
  		global $db;
 	  	$row = NULL;
-		$query = sprintf("SELECT r.role_id, r.name AS role_name FROM rudi_roles AS r LEFT OUTER JOIN rudi_roles_container AS rl USING(role_id) INNER JOIN rudi_unit_members AS rm USING(member_id) WHERE rm.member_id = %d AND r.name IS NOT NULL ORDER BY r.role_id ASC", 
-		(int)$member_id);	
+		$query = sprintf("SELECT r.role_id, r.name AS role_name 
+		                  FROM rudi_roles AS r 
+		                  LEFT OUTER JOIN rudi_roles_container AS rl USING(role_id) 
+		                  INNER JOIN rudi_unit_members AS rm USING(member_id) 
+		                  WHERE rm.member_id = %d 
+		                  AND r.name IS NOT NULL 
+		                  ORDER BY r.role_id ASC", (int)$member_id);	
 	    
 	    $result = $db->Query($query);
 	    $row = $db->Fetch($result);
@@ -299,4 +304,39 @@
 		CloseTable();
 		$form->__destruct(); 	
  	}
+ 	
+ 	
+ 	
+ 	
+ 	function DeleteMember($member_id)
+ 	{
+ 		// FROM unit_members, service_record, award_record FOR member_id
+ 		global $db;
+ 		
+ 		$db->Query("DELETE FROM `rudi_unit_members`, 
+                              `rudi_service_record`, 
+                              `rudi_award_record`, 
+                              `rudi_combat_record`, 
+                              `rudi_drills_record`
+                 USING `rudi_unit_members`
+                       INNER JOIN `rudi_award_record` USING(member_id)
+                       INNER JOIN `rudi_service_record` USING(member_id)
+                       INNER JOIN `rudi_combat_record` USING(member_id)
+                       INNER JOIN `rudi_drills_record` USING(member_id) 
+                 WHERE `member_id` = $member_id");
+ 		decho("DELETE FROM `rudi_unit_members`, 
+                              `rudi_service_record`, 
+                              `rudi_award_record`, 
+                              `rudi_combat_record`, 
+                              `rudi_drills_record`
+                 USING `rudi_unit_members`
+                       INNER JOIN `rudi_award_record` USING(member_id)
+                       INNER JOIN `rudi_service_record` USING(member_id)
+                       INNER JOIN `rudi_combat_record` USING(member_id)
+                       INNER JOIN `rudi_drills_record` USING(member_id) 
+                 WHERE `member_id` = $member_id");
+ 		decho("Done.");
+ 		return;
+ 	}
+ 	
 ?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.awards.add.php b/admin/rudi/views/view.awards.add.php
index 9c97c54..71f6a91 100644
--- a/admin/rudi/views/view.awards.add.php
+++ b/admin/rudi/views/view.awards.add.php
@@ -6,12 +6,13 @@
 		global $db;
 		$name = $form->request['name'];
 		$text = $form->request['text'];
+		decho("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `description` = '$text'");
 		$db->Query("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `image` = '', `description` = '$text'");
 		
-		PageRedirect(1, "?op=rudi&show=awards&cid={$class_id}");
+		PageRedirect(1, "?op=rudi&show=awards&cid=".$class_id);
 		return;		
 	}
-	echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$class_id}");
+	echo LinkInternal("Cancel","?op=rudi&show=awards&cid=".$class_id);
 	OpenTable();
 ?>
 
diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php
index 3a5729f..4902577 100644
--- a/admin/rudi/views/view.awards.php
+++ b/admin/rudi/views/view.awards.php
@@ -23,7 +23,7 @@
 				$class_id = $_GET['cid'];
 				$awards = getAwardsByClass($class_id);
 				echo "<h3>Awards</h3>";
-				echo LinkInternal('<img src="images/add.png" />&nbsp;Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true');
+				echo LinkInternal('<img src="images/add.png" />&nbsp;Add New Award','?op=rudi&show=awards&cid='.$class_id.'&add=true');
 				OpenTable();
 				foreach($awards as $award){
 					echo "<tr><td>".$award['name']."</td>
diff --git a/admin/rudi/views/view.members.delete.php b/admin/rudi/views/view.members.delete.php
new file mode 100644
index 0000000..e0adf5e
--- /dev/null
+++ b/admin/rudi/views/view.members.delete.php
@@ -0,0 +1,31 @@
+<?php
+  global $db;
+  
+  $result = $db->Query("SELECT CONCAT(last_name,', ',first_name) AS name FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1");
+  $member = $db->FetchRow($result);
+  $form = new BayonetForm("", "POST");
+  
+  if(isset($_POST['proceed']))
+  {
+    //echo "Soldier '{$member['name']}', was deleted.";
+    ReportError("This is not completed yet.");
+    // DELETE unit_members, service_record, award_record FOR member_id
+    //DeleteMember($member_id);
+    PageRedirect(2, "?op=rudi&show=members");
+    return;
+  }
+  if(isset($_POST['cancel']))
+  {
+    echo "User cancelled deletion of soldier: '{$member['name']}'";
+    PageRedirect(2, "?op=rudi&show=members&profile={$member_id}");
+    return;
+  }
+  
+  OpenTable();
+?>
+  <th>Are you <u>SURE</u> you want to delete soldier: '<?php echo $member['name'];?>'?<br />All records for this soldier will be permenantly removed.</th>
+  <tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
+<?php
+	CloseTable();
+	$form->__destruct();
+?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.members.new.php b/admin/rudi/views/view.members.new.php
index cbc086f..ab309ea 100644
--- a/admin/rudi/views/view.members.new.php
+++ b/admin/rudi/views/view.members.new.php
@@ -1,179 +1,204 @@
-<?php

-		 global $db;

-		 

-		 if(isset($_POST['processed'])){

-		 	

-	 		echo "Please wait while the information is processed...";

-		 	

-		 	$rank_id = $_POST['rank'];

-		 	$country_id = $_POST['country'];

-		 	$status_id = $_POST['status'];

-		 	$role_id = $_POST['role'];

-		 	$unit_id = $_POST['unit'];

-			$weapon_id = $_POST['weapon'];

-		 	$first_name = addslashes($_POST['first']);

-		 	$last_name = addslashes($_POST['last']);

-		 	$username = addslashes($_POST['username']);

-		 	$city = addslashes($_POST['city']);

-		 	$province = addslashes($_POST['province']);

-		 	$primary_mos = addslashes($_POST['primmos']);		 	

-		 	$enlisted = addslashes($_POST['enlist']);

-		 	$promoted = addslashes($_POST['promote']);

-		 	$discharged = addslashes($_POST['discharge']);

-		 	$xfire = addslashes($_POST['xfire']);

-		 	$email = addslashes($_POST['email']);

-		 	$bio = addslashes($_POST['bio']);

-		 	

-		 	//$discharged = empty($discharged) ? NULL : "'{$discharged}'";

-

- 			$query = "INSERT INTO `rudi_unit_members` SET"

-			 		." `rank_id` = '$rank_id',"

-			 		." `country_id` = '$country_id',"

-					." `status_id` = '$status_id',"

-					." `cunit_id` = '$unit_id',"

-					." `weapon_id` = '$weapon_id',"

-					." `username` = '$username',"

-					." `email` = '$email',"

-					." `xfire` = '$xfire',"

-					." `first_name` = '$first_name',"

-					." `last_name` = '$last_name',"

-					." `location_city` = '$city',"

-					." `location_province` = '$province',"

-					." `bio` = '$bio',"

-					." `date_enlisted` = '$enlisted',"

-					." `date_promotion` = '$promoted',"

-					." `primary_mos` = '$primary_mos',";

-			if(empty($discharged))

-				$query = $query." `date_discharged` = null";

-			else

-				$query = $query." `date_discharged` = '$discharged'";	

-			decho($query);

-		 	$db->Query($query);

-		 	

-		 	$member_id = $db->InsertID();

-		 	decho($member_id);

-		 	$db->Query("INSERT INTO `rudi_roles_container` SET `role_id` = '$role_id', `member_id` = '$member_id'");

-		 	

-		 	PageRedirect(1, "?op=rudi&show=members");

-		 	return;		 

-		 } 	

-?>

-		<a href="?op=rudi&show=members">Cancel</a><br />

-		<form method="POST" action="">

-		<table width="100%" style="text-align:center;">

-		<tr><th colspan="2" style="background-color:#c4c4c4;">Personnel File of <?php echo $member['first_name']." ".$member['last_name']; ?></th></tr>

-		<tr><td class="right" width="50%">Rank:</td><td class="left">

-			<select name="rank">

-<?php		$ranks = GetRanks();

-			foreach($ranks as $rank){

-				echo "<option value=\"{$rank['rank_id']}\">{$rank['longname']}</option>";			

-			}

-?>

-			</select>

-		</td></tr>

-		<tr><td class="right">Country:</td><td class="left">

-			<select name="country">

-<?php		$countries = GetCountry();

-			foreach($countries as $country){

-				echo "<option value=\"{$country['country_id']}\">{$country['name']}</option>";			

-			}

-?>

-			</select>

-		</td></tr>

-		</table>

-		<table width="100%" style="text-align:center;">

-		<tr><th colspan="2" style="background-color:#c4c4c4;">Vital Statistics</th></tr>

-		<tr>

-			<td class="right" width="50%">First:</td>

-			<td class="left"><input type="text" name="first" value="" /></td>

-		</tr>

-		<tr>

-			<td class="right">Last:</td>

-			<td class="left"><input type="text" name="last" value="" /></td>

-		</tr>

-		<tr><td class="right">Username:</td><td class="left"><input type="text" name="username" value="" /></td></tr>

-		<tr><td class="right">City:</td><td class="left"><input type="text" name="city" value=""/></td></tr>

-		<tr><td class="right">Province:</td><td class="left"><input type="text" name="province" value="" /></td></tr>

-		<tr><td class="right">Status:</td><td class="left">

-			<select name="status">

-<?php		$statuses = GetStatuses();

-			foreach($statuses as $status){

-				echo "<option value=\"{$status['status_id']}\">{$status['name']}</option>";			

-			}

-?>

-		</select>

-		</td></tr>

-		<tr><td class="right">Primary MOS:</td><td class="left"><input type="text" name="primmos" value="" /></td></tr>

-		<tr>

-			<td class="right">Role:</td>

-			<td class="left">

-			<select name="role">

-<?php

-			$roles = GetRoles();	

-			foreach($roles as $role){

-				echo "<option value=\"{$role['role_id']}\">{$role['name']}</option>";			

-			}

-?>

-				</select>

-			</td>

-		</tr>

-		<tr>

-			<td class="right" style="font-weight:bold;">Unit:</td>

-			<td class="left">

-			<select name="unit">

-		    	<option value="0">N/A</option>

-<?php

-					$result = $db->Query("SELECT `unit_id`, `name` FROM `rudi_combat_units` WHERE `detachment` = 0 ");

-	    			$row = $db->Fetch($result);

-	    			foreach($row as $unit){

-	    				$unit_name = $unit['name'];

-	    				$unit_id = $unit['unit_id'];

-						if($member['cunit_id']==$unit_id)

-	    					echo '<option value="'.$unit_id.'" selected>'.$unit_name.'</option>';

-	       				else

- 							echo '<option value="'.$unit_id.'">'.$unit_name.'</option>';

-						selectUnits($unit_id, 0, $member['cunit_id']);

-					}

-?>

-		    	</select>

-			</td>

-		</tr>

-		<tr><td class="right">Weapons:</td><td class="left">

-			<select name="weapon">

-<?php		$weapons = GetWeapons();

-			foreach($weapons as $weapon){

-				echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			

-			}

-?>

-		</select>

-		</td></tr>

-		<tr>

-			<td class="right">Enlisted Date:</td>

-			<td class="left"><input type="text" name="enlist" value="" /></td>

-		</tr>

-		<tr>

-			<td class="right">Promotion Date:</td>

-			<td class="left">

-				<input type="text" name="promote" value="" />

-			</td>

-		</tr>

-		<tr>

-			<td class="right">Discharge Date:</td>

-			<td class="left"><input type="text" name="discharge" value="" /></td>

-		</tr>

-		<tr>	

-			<td class="right">Xfire:</td>

-			<td class="left"><input type="text" name="xfire" value=""/></td>

-		</tr>

-		<tr>

-			<td class="right">E-Mail:</td>

-			<td class="left"><input type="text" name="email" value=""/></td>

-		</tr>

-		</table>

-		<br />

-		<table width="100%" style="text-align:center;">

-		<tr><th colspan="2" style="background-color:#c4c4c4;">Personal Bio</th></tr>

-		<tr><td><textarea rows="7" name="bio" cols="60"></textarea></td></tr>

-		<tr><td colspan="2"><input type="submit" value="Submit" name="processed" /></td>

-		</table>

+<?php
+		 global $db;
+		 
+		 if(isset($_POST['processed'])){
+		 	
+	 		echo "Please wait while the information is processed...";
+		 	
+		 	$rank_id = $_POST['rank'];
+		 	$country_id = $_POST['country'];
+		 	$status_id = $_POST['status'];
+		 	$role_id = $_POST['role'];
+		 	$unit_id = $_POST['unit'];
+			$a2_id = $_POST['a2_id'];
+		 	$oa_id = $_POST['oa_id'];
+			$weapon_id = $_POST['weapon'];
+			$weapon2_id = $_POST['weapon2'];
+		 	$first_name = addslashes($_POST['first']);
+		 	$last_name = addslashes($_POST['last']);
+		 	$username = addslashes($_POST['username']);
+		 	$city = addslashes($_POST['city']);
+		 	$province = addslashes($_POST['province']);
+		 	$primary_mos = addslashes($_POST['primmos']);		 	
+		 	$enlisted = addslashes($_POST['enlist']);
+		 	$promoted = addslashes($_POST['promote']);
+		 	$discharged = addslashes($_POST['discharge']);
+		 	$xfire = addslashes($_POST['xfire']);
+		 	$email = addslashes($_POST['email']);
+		 	$bio = addslashes($_POST['bio']);
+		 	
+		 	//$discharged = empty($discharged) ? NULL : "'{$discharged}'";
+
+ 			$query = "INSERT INTO `rudi_unit_members` SET"
+			 		." `rank_id` = '$rank_id',"
+			 		." `country_id` = '$country_id',"
+			 		." `role_id` = '$role_id', "
+					." `status_id` = '$status_id',"
+					." `cunit_id` = '$unit_id',"
+					." `weapon_id` = '$weapon_id',"
+					." `weapon2_id` = '$weapon2_id',"
+					." `a2_id` = '$a2_id',"
+					." `oa_id` = '$oa_id',"
+					." `username` = '$username',"
+					." `email` = '$email',"
+					." `xfire` = '$xfire',"
+					." `first_name` = '$first_name',"
+					." `last_name` = '$last_name',"
+					." `location_city` = '$city',"
+					." `location_province` = '$province',"
+					." `bio` = '$bio',"
+					." `date_enlisted` = '$enlisted',"
+					." `date_promotion` = '$promoted',"
+					." `primary_mos` = '$primary_mos',";
+			if(empty($discharged))
+				$query = $query." `date_discharged` = null";
+			else
+				$query = $query." `date_discharged` = '$discharged'";	
+			decho($query);
+		 	$db->Query($query);
+		 	
+		 	$member_id = $db->InsertID();
+		 	decho($member_id);
+		 	//$db->Query("INSERT INTO `rudi_roles_container` SET `role_id` = '$role_id', `member_id` = '$member_id'");
+		 	
+		 	PageRedirect(1, "?op=rudi&show=members&profile=$member_id");
+		 	return;		 
+		 } 	
+?>
+		<a href="?op=rudi&show=members">Cancel</a><br />
+		<form method="POST" action="">
+		<table width="100%" style="text-align:center;">
+		<tr><th colspan="2" style="background-color:#c4c4c4;">Personnel File of <?php echo $member['first_name']." ".$member['last_name']; ?></th></tr>
+		<tr><td class="right" width="50%">Rank:</td><td class="left">
+			<select name="rank">
+<?php		$ranks = GetRanks();
+			foreach($ranks as $rank){
+				echo "<option value=\"{$rank['rank_id']}\">{$rank['longname']}</option>";			
+			}
+?>
+			</select>
+		</td></tr>
+		<tr><td class="right">Country:</td><td class="left">
+			<select name="country">
+<?php		$countries = GetCountry();
+			foreach($countries as $country){
+				echo "<option value=\"{$country['country_id']}\">{$country['name']}</option>";			
+			}
+?>
+			</select>
+		</td></tr>
+		<tr><td class="right" width="50%">ArmA2 ID</td><td class="left"><input type="text" name="a2_id" value="<?php echo $member['a2_id']; ?>"/></td></tr>
+		<tr><td class="right" width="50%">ArmA2:OA ID</td><td class="left"><input type="text" name="oa_id" value="<?php echo $member['oa_id']; ?>"/></td></tr>
+		</table>
+		<table width="100%" style="text-align:center;">
+		<tr><th colspan="2" style="background-color:#c4c4c4;">Vital Statistics</th></tr>
+		<tr>
+			<td class="right" width="50%">First:</td>
+			<td class="left"><input type="text" name="first" value="" /></td>
+		</tr>
+		<tr>
+			<td class="right">Last:</td>
+			<td class="left"><input type="text" name="last" value="" /></td>
+		</tr>
+		<tr><td class="right">Username:</td><td class="left"><input type="text" name="username" value="" /></td></tr>
+		<tr><td class="right">City:</td><td class="left"><input type="text" name="city" value=""/></td></tr>
+		<tr><td class="right">Province:</td><td class="left"><input type="text" name="province" value="" /></td></tr>
+		<tr><td class="right">Status:</td><td class="left">
+			<select name="status">
+<?php		$statuses = GetStatuses();
+			foreach($statuses as $status){
+				echo "<option value=\"{$status['status_id']}\">{$status['name']}</option>";			
+			}
+?>
+		</select>
+		</td></tr>
+		<tr><td class="right">Primary MOS:</td><td class="left"><input type="text" name="primmos" value="" /></td></tr>
+		<tr>
+			<td class="right">Role:</td>
+			<td class="left">
+			<select name="role">
+				<option value="0">---SELECT-POSITION---</option>
+<?php
+			$groups = GetRoles();
+			decho($groups);	
+			foreach($groups as $group){	
+				echo "<optgroup label=\"{$group['name']}\">";
+				foreach($group['roles'] as $role){
+					echo "<option value=\"{$role['role_id']}\">{$role['name']}</option>";			
+				}
+				echo "</optgroup>";
+			}
+?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td class="right" style="font-weight:bold;">Unit:</td>
+			<td class="left">
+			<select name="unit">
+		    	<option value="0">N/A</option>
+<?php
+					$result = $db->Query("SELECT `unit_id`, `name` FROM `rudi_combat_units` WHERE `detachment` = 0 ");
+	    			$row = $db->Fetch($result);
+	    			foreach($row as $unit){
+	    				$unit_name = $unit['name'];
+	    				$unit_id = $unit['unit_id'];
+						if($member['cunit_id']==$unit_id)
+	    					echo '<option value="'.$unit_id.'" selected>'.$unit_name.'</option>';
+	       				else
+ 							echo '<option value="'.$unit_id.'">'.$unit_name.'</option>';
+						selectUnits($unit_id, 0, $member['cunit_id']);
+					}
+?>
+		    	</select>
+			</td>
+		</tr>
+		<tr><td class="right">Primary Weapon:</td><td class="left">
+			<select name="weapon">
+<?php		$weapons = GetWeapons();
+			foreach($weapons as $weapon){
+				echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			
+			}
+?>
+		</select>
+		</td></tr>
+		<tr><td class="right">Secondary Weapon:</td><td class="left">
+			<select name="weapon2">
+				<option value="0">None</option>
+<?php
+			foreach($weapons as $weapon){
+				echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			
+			}
+?>
+		</select>
+		</td></tr>
+		<tr>
+			<td class="right">Enlisted Date:</td>
+			<td class="left"><input type="text" name="enlist" value="" /></td>
+		</tr>
+		<tr>
+			<td class="right">Promotion Date:</td>
+			<td class="left">
+				<input type="text" name="promote" value="" />
+			</td>
+		</tr>
+		<tr>
+			<td class="right">Discharge Date:</td>
+			<td class="left"><input type="text" name="discharge" value="" /></td>
+		</tr>
+		<tr>	
+			<td class="right">Xfire:</td>
+			<td class="left"><input type="text" name="xfire" value=""/></td>
+		</tr>
+		<tr>
+			<td class="right">E-Mail:</td>
+			<td class="left"><input type="text" name="email" value=""/></td>
+		</tr>
+		</table>
+		<br />
+		<table width="100%" style="text-align:center;">
+		<tr><th colspan="2" style="background-color:#c4c4c4;">Personal Bio</th></tr>
+		<tr><td><textarea rows="7" name="bio" cols="60"></textarea></td></tr>
+		<tr><td colspan="2"><input type="submit" value="Submit" name="processed" /></td>
+		</table>
 		</form>
\ No newline at end of file
diff --git a/admin/rudi/views/view.members.php b/admin/rudi/views/view.members.php
index 9013b8e..7aabb89 100644
--- a/admin/rudi/views/view.members.php
+++ b/admin/rudi/views/view.members.php
@@ -1,17 +1,31 @@
 <?php
 		include $basedir.'rudi/includes/functions.members.php';
-		if(isset($_GET['profile'])){
+		if(isset($_GET['profile']))
+		{
 			$member_id = $_GET['profile'];
 			include 'view.members.profile.php';	
-		}else if(isset($_GET['service'])){
+		}
+		else if(isset($_GET['delete']))
+		{
+			$member_id = $_GET['delete'];
+			include 'view.members.delete.php';
+		}
+		else if(isset($_GET['service']))
+		{
 			$member_id = $_GET['service'];
 			include 'view.members.service.php';
-		}else if(isset($_GET['award'])){
+		}
+		else if(isset($_GET['award']))
+		{
 			$member_id = $_GET['award'];
 			include 'view.members.award.php';
-		}else if(isset($_GET['create']) && $_GET['create'] == "soldier"){
+		}
+		else if(isset($_GET['create']) && $_GET['create'] == "soldier")
+		{
 			include 'view.members.new.php';
-		}else{
+		}
+		else
+		{
 					
 			 global $db;
 			 
diff --git a/admin/rudi/views/view.members.profile.php b/admin/rudi/views/view.members.profile.php
index 6355d2e..31bbb2d 100644
--- a/admin/rudi/views/view.members.profile.php
+++ b/admin/rudi/views/view.members.profile.php
@@ -219,7 +219,14 @@
 		<br />
 		<table width="100%" style="text-align:center;">
 		<tr><th colspan="2" style="background-color:#c4c4c4;">Personal Bio</th></tr>
-		<tr><td><textarea rows="7" name="bio" cols="60"><?php echo $member['bio'];?></textarea></td></tr>
-		<tr><td colspan="2"><input type="submit" value="Submit" name="processed" /></td>
+		<tr><td colspan="2"><textarea rows="7" name="bio" cols="60"><?php echo $member['bio'];?></textarea></td></tr>
+		<tr>
+			<td class="right" width="55%"><input type="submit" value="Submit" name="processed" /></td>
+			<td class="right">
+				<a href="?op=rudi&show=members&delete=<?php echo $member_id; ?>">
+					<input type="button" value="Delete Soldier" />
+				</a>
+			</td>
+		</tr>
 		</table>
 		</form>
\ No newline at end of file
diff --git a/blocks/forum_login/index.php b/blocks/forum_login/index.php
index c5343d9..ca094f6 100644
--- a/blocks/forum_login/index.php
+++ b/blocks/forum_login/index.php
@@ -25,8 +25,6 @@ if (isset($GLOBALS['ID_MEMBER']) && $GLOBALS['ID_MEMBER'] != 0): ?>
 		<p>
 			<center>
 				<b>Your IP:</b> <?php echo $ip; ?><br />
-				<?php /* fix this, what about avatars that arent saved no our site */ ?>
-				<img src="<?php echo $avatar_path . $avatar; ?>" alt="<?php echo 'No Avatar'; ?>" /><br/>
 				<b>Total posts:</b> <?php echo $posts; ?><br />
 			</center>
 		</p>
diff --git a/blocks/mini_calendar/functions.php b/blocks/mini_calendar/functions.php
index ffc98a6..0aed0d5 100644
--- a/blocks/mini_calendar/functions.php
+++ b/blocks/mini_calendar/functions.php
@@ -29,7 +29,8 @@
 <script type="text/javascript">
 function openEvent(date)
 {
-     myWindow = window.open('http://testbed.3rd-infantry-division.org/cms/blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300')
+<?php echo "myWindow = window.open('". Bayonet_Config::$ini['site']['url'] . "blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300');"; ?>
+     myWindow = window.open('blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300')
      myWindow.focus();
 }
 </script>
diff --git a/blocks/mini_calendar/style.css b/blocks/mini_calendar/style.css
index d34db05..52af08d 100644
--- a/blocks/mini_calendar/style.css
+++ b/blocks/mini_calendar/style.css
@@ -1,114 +1,114 @@
-/* START>> CALENDAR STYLES*/

-		.monthTitle{

-  			color:black;

-            text-align:center;

-            font-size:12px;

-            font-weight:bold;

-			font-family:arial;			

-		}

-		td.weekday {

-			width:40px;

-			height:20px;

-            background-color:#cb2121;

-            color:green;

-            text-align:center;

-            font-size:10px;

-            /* font-weight:bold; */

-		}

-		th.weekday {

-			width:40px;

-			height:29px;

-            background-color:white;

-            color:black;

-            text-align:center;

-            font-size:11px;

-            font-weight:normal; 

-		}

-		.monthday {

-			width:40px; 

-			height:20px; 

-            background-color:#aea2a2;

-            color:white;

-            text-align:left;

-            font-size:10pt;

-            /* font-weight:bold; */

-                        

-		}

-		.monthtoday {

-			width:38px; 

-			height:38px; 

-           /* background-color:#3666ba; */

-            color:#225eac;

-   			text-align:center;

-   			font-size:14px;

-      		font-weight:bold;

-			font-family: arial; 

-            border:1px solid #333333;

-		}

-		.event {

-			width:38px; 

-		 	height:38px; 

-            background-color:#225eac;

-   			text-align:center;

-            border:1px solid #333333;

-			cursor: pointer;					

-		}

-		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {

-			color:white;		

-		}

-		.eventtoday {

-		 	width:38px; 

-			height:38px;  

-            background-color:#225eac;

-            color: white;

-   			text-align:center;

-   			font-size:14px;

-            font-weight:bold;

-            font-family: arial;

-            border:1px solid #333333;			

-		}

-		td.cal_weekday {

-			width:40px;

-			height:40px;

-            background-color:#a1a1a1;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:12px;

-		}

-		td.cal_weekend {

-			width:40px;

-			height:40px;

-            background-color:#8f8f8f;

-            vertical-align:top;

-            color:#eeeeee;

-            font-family:arial;

-            text-align:center;

-            font-size:12px;

-		}

-		td.cal_notmonth {

-			width:40px;

-			height:40px;

-            background-color:#6e6e6e;

-            vertical-align:top;

-            color:#d4d4d4;

-            text-align:left;

-            font-size:11px;

-		}

-		div.event_title {

-			font-family: Geneva, Verdana, Arial;

-			font-size: 14px;

-		}

-		div.event_text {

-			font-family: Geneva, Verdana, Arial;

-			font-size: 12px;

-			padding-top: 3px;

-			padding-left: 10px;

-			padding-right: 5px;		

-		}

-		div.event_time {

-			font-family: Geneva, Verdana, Arial;

-			font-size: 12px;			

-		}

+/* START>> CALENDAR STYLES*/
+		.monthTitle{
+  			color:black;
+            text-align:center;
+            font-size:12px;
+            font-weight:bold;
+			font-family:arial;			
+		}
+		td.weekday {
+			width:40px;
+			height:20px;
+            background-color:#cb2121;
+            color:green;
+            text-align:center;
+            font-size:10px;
+            /* font-weight:bold; */
+		}
+		th.weekday {
+			width:40px;
+			height:29px;
+            background-color:white;
+            color:black;
+            text-align:center;
+            font-size:11px;
+            font-weight:normal; 
+		}
+		.monthday {
+			width:40px; 
+			height:20px; 
+            background-color:#aea2a2;
+            color:white;
+            text-align:left;
+            font-size:10pt;
+            /* font-weight:bold; */
+                        
+		}
+		.monthtoday {
+			width:38px; 
+			height:38px; 
+           /* background-color:#3666ba; */
+            color:#225eac;
+   			text-align:center;
+   			font-size:14px;
+      		font-weight:bold;
+			font-family: arial; 
+            border:1px solid #333333;
+		}
+		.event {
+			width:38px; 
+		 	height:38px; 
+            background-color:#225eac;
+   			text-align:center;
+            border:1px solid #333333;
+			cursor: pointer;					
+		}
+		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {
+			color:white;		
+		}
+		.eventtoday {
+		 	width:38px; 
+			height:38px;  
+            background-color:#225eac;
+            color: white;
+   			text-align:center;
+   			font-size:14px;
+            font-weight:bold;
+            font-family: arial;
+            border:1px solid #333333;			
+		}
+		td.cal_weekday {
+			width:40px;
+			height:40px;
+            background-color:#a1a1a1;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:12px;
+		}
+		td.cal_weekend {
+			width:40px;
+			height:40px;
+            background-color:#8f8f8f;
+            vertical-align:top;
+            color:#eeeeee;
+            font-family:arial;
+            text-align:center;
+            font-size:12px;
+		}
+		td.cal_notmonth {
+			width:40px;
+			height:40px;
+            background-color:#6e6e6e;
+            vertical-align:top;
+            color:#d4d4d4;
+            text-align:left;
+            font-size:11px;
+		}
+		div.event_title {
+			font-family: Geneva, Verdana, Arial;
+			font-size: 14px;
+		}
+		div.event_text {
+			font-family: Geneva, Verdana, Arial;
+			font-size: 12px;
+			padding-top: 3px;
+			padding-left: 10px;
+			padding-right: 5px;		
+		}
+		div.event_time {
+			font-family: Geneva, Verdana, Arial;
+			font-size: 12px;			
+		}
 /* END>> CALENDAR STYLES */
\ No newline at end of file
diff --git a/docs/README b/docs/README
deleted file mode 100644
index 8b13789..0000000
--- a/docs/README
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/images/addnewarticle.png b/images/addnewarticle.png
deleted file mode 100644
index 0e29960..0000000
--- a/images/addnewarticle.png
+++ /dev/null
diff --git a/images/addnewpage.png b/images/addnewpage.png
deleted file mode 100644
index c60c68c..0000000
--- a/images/addnewpage.png
+++ /dev/null
diff --git a/images/annoucement.png b/images/annoucement.png
deleted file mode 100644
index c70591d..0000000
--- a/images/annoucement.png
+++ /dev/null
diff --git a/images/announcement.png b/images/announcement.png
deleted file mode 100644
index c70591d..0000000
--- a/images/announcement.png
+++ /dev/null
diff --git a/images/calendar.png b/images/calendar.png
deleted file mode 100644
index 86b9861..0000000
--- a/images/calendar.png
+++ /dev/null
diff --git a/images/dlaxlogo.png b/images/dlaxlogo.png
deleted file mode 100644
index b4991ae..0000000
--- a/images/dlaxlogo.png
+++ /dev/null
diff --git a/images/file_doc.png b/images/file_doc.png
deleted file mode 100644
index b1da1ef..0000000
--- a/images/file_doc.png
+++ /dev/null
diff --git a/images/file_pdf.png b/images/file_pdf.png
deleted file mode 100644
index 500e206..0000000
--- a/images/file_pdf.png
+++ /dev/null
diff --git a/images/file_rtf.png b/images/file_rtf.png
deleted file mode 100644
index 39304c1..0000000
--- a/images/file_rtf.png
+++ /dev/null
diff --git a/images/file_word.png b/images/file_word.png
deleted file mode 100644
index 3011f00..0000000
--- a/images/file_word.png
+++ /dev/null
diff --git a/images/navigation.png b/images/navigation.png
deleted file mode 100644
index 739c95f..0000000
--- a/images/navigation.png
+++ /dev/null
diff --git a/images/photogallery.png b/images/photogallery.png
deleted file mode 100644
index a161a55..0000000
--- a/images/photogallery.png
+++ /dev/null
diff --git a/images/xoma_logo.jpg b/images/xoma_logo.jpg
deleted file mode 100644
index 36914ff..0000000
--- a/images/xoma_logo.jpg
+++ /dev/null
diff --git a/include/classes.php b/include/classes.php
index 321e063..65017b6 100644
--- a/include/classes.php
+++ b/include/classes.php
@@ -97,13 +97,13 @@ class Bayonet_Theme extends Bayonet_Layout
 class Bayonet_Config
 {
     static $ini;
+
     static function init()
     {
         decho('Parsing configuration data');
         if (file_exists(BAYONET_CONFIG))
         {
-            self::$ini = parse_ini_file(BAYONET_CONFIG, true);
-            decho(self::$ini);
+            self::$ini = require_once 'config.php';
         }
         else  die(BAYONET_CONFIG . ' not found');
     }
diff --git a/include/config.example.php b/include/config.example.php
new file mode 100644
index 0000000..5854828
--- /dev/null
+++ b/include/config.example.php
@@ -0,0 +1,61 @@
+<?php
+/**
+* Bayonet Content Management System
+* Copyright (C) 2008 Joseph Hunkeler & Evan O'Connell
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/ 
+
+return array(
+
+	'sql' => array(
+		'hostname' => 'localhost',
+		'database' => 'bayonet',
+		'username' => 'bayonet',
+		'password' => 'password'
+	),
+
+	'site' => array(
+		'url' => 'http://example.com/', // must have a trailing slash
+		'theme' => 'new',
+		'favicon' => 'favicon.ico'
+	),
+
+	'modules' => array(
+		'default' => 'index',
+	),
+
+	'blocks' => array(
+		'spacer' => true
+	),
+
+	'logs' => array(
+		'enabled' => true,
+		'timezone' => 'EST',
+		'dir' => 'logs/'
+	),
+
+	'debug' => array(
+		'enabled' => true,
+		'show_messages' => true,
+		'repeat_messages' => false
+	),
+
+	'product' => array(
+		'name' => 'Bayonet CMS',
+		'copyright' => 'Copyright &copy; 2007-2010 Joseph Hunkeler &amp; Evan O\'Connell, All rights reserved.',
+		'version' => '0.0.1',
+		'release' => 'Beta'
+	)
+);
\ No newline at end of file
diff --git a/include/config.ini.example b/include/config.ini.example
deleted file mode 100644
index 074fc24..0000000
--- a/include/config.ini.example
+++ /dev/null
@@ -1,50 +0,0 @@
-;

-; Bayonet Content Management System

-; Copyright (C) 2008 Joseph Hunkeler & Evan O'Connell

-;

-; This program is free software: you can redistribute it and/or modify

-; it under the terms of the GNU General Public License as published by

-; the Free Software Foundation, either version 3 of the License, or

-; (at your option) any later version.

-;

-; This program is distributed in the hope that it will be useful,

-; but WITHOUT ANY WARRANTY; without even the implied warranty of

-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-; GNU General Public License for more details.

-;

-; You should have received a copy of the GNU General Public License

-; along with this program.  If not, see <http://www.gnu.org/licenses/>.

-; 

-

-[sql]

-hostname="localhost"

-database="bayonet"

-username="bayonet"

-password="passwd"

-

-[site]

-theme="gttheme"

-favicon="favicon.ico"

-

-[modules]

-default="index"

-

-[blocks]

-spacer=true

-

-[logs]

-enabled=true

-timezone="EST"

-dir="logs/"

-

-[debug]

-enabled=false

-show_messages=true

-repeat_messages=false

-

-[product]

-name="Bayonet CMS"

-copyright="Copyright &copy; 2007-2010 Joseph Hunkeler &amp; Evan O\'Connell, All rights reserved."

-version="2.1"

-release="Alpha"

-

diff --git a/index.php b/index.php
index a811ba4..2cc98bf 100644
--- a/index.php
+++ b/index.php
@@ -22,7 +22,7 @@
  */
 define('BAYONET_ROOT', basename(dirname('.')));
 define('BAYONET_INCLUDE', BAYONET_ROOT . '/include');
-define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.ini');
+define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.php');
 
 require BAYONET_INCLUDE . '/debug.php';
 require BAYONET_INCLUDE . '/sql.class.php';
@@ -31,6 +31,3 @@ require_once BAYONET_INCLUDE . '/classes.php';
 
 /* Initialize Bayonet CMS */
 Bayonet::init();
-
-
-?>
diff --git a/modules/cu3er/config.xml b/modules/cu3er/config.xml
deleted file mode 100644
index 6cfef6e..0000000
--- a/modules/cu3er/config.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<cu3er>
-	<settings>	
-		<auto_play> 
-			<defaults symbol="linear" /> 
-			<tweenIn x="5" y="5" width="630" height="10" tint="0xFFFFFF" alpha="0.5"/> 
-			<tweenOver alpha="1"/> 
-		</auto_play> 
-	
-		<prev_button>				
-			<tweenIn x="20" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</prev_button> 
-		
-		<next_button>			
-			<tweenIn x="610" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</next_button> 
-		
-		<prev_symbol> 
-			<defaults type="2" /> 
-			<tweenIn x="25" y="150" alpha=".5" scaleX="2.0" scaleY="2.0"  /> 
-			<tweenOver time="0.15" x="30" scaleX="2.5" scaleY="2.5" /> 
-		</prev_symbol> 
-			
-		<next_symbol> 
-			<defaults type="2" /> 
-			<tweenIn x="615" y="150" alpha=".5" scaleX="2.0" scaleY="2.0" /> 
-			<tweenOver time="0.15" x="620" scaleX="2.5" scaleY="2.5" /> 
-		</next_symbol>		
- 
-		<description> 
-				<defaults
-					round_corners="0, 0, 0, 0"
-					 
-					heading_font="Verdana"
-					heading_text_size="42"
-					heading_text_color="0xFFFFFF"          
-					heading_text_margin="0, 0, 0,24"  
-					 
-					paragraph_font="Verdana"
-					paragraph_text_size="11"
-					paragraph_text_color="0xFFFFFF"
-					paragraph_text_margin="0, 0, 0, 24"       
-				/>
-			<tweenIn x="0" y="220" width="640" height="100" alpha="0.15" /> 
-			<tweenOver alpha="0.3"/> 
-		</description>	
-	
-		<transitions slicing="vertical" direction="down" duration="1.0" delay="0.2" cube_color="0x000000" /> 
-	
-	</settings> 
- 
- 
-	<slides> 
-	
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png</url>
-		</slide> 
-		
-		<transition direction="left"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png</url>
-			<link target="_self">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link> 
-		</slide> 
-		
-		<transition duration="0.6" delay=".2" direction="down"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png</url> 
-		</slide>	
-		
-		<transition num="3" slicing="horizontal" direction="left" delay="0.05"/>			
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png</url> 
-		</slide> 
-			
-		<transition num="3"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png</url>  
-		</slide>				
-			
-	</slides> 
-</cu3er>
\ No newline at end of file
diff --git a/modules/cu3er/config2.xml b/modules/cu3er/config2.xml
deleted file mode 100644
index 90db48a..0000000
--- a/modules/cu3er/config2.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<cu3er>
-	<settings>	
-	
-		<auto_play> 
-			<defaults symbol="linear" /> 
-			<tweenIn x="5" y="5" width="6" height="1" tint="0xFFFFFF" alpha="0.5"/> 
-			<tweenOver alpha="1"/> 
-		</auto_play> 
-	
-		<prev_button>				
-			<tweenIn x="20" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</prev_button> 
-		
-		<next_button>			
-			<tweenIn x="610" y="150" width="80" height="80" alpha="0" /> 
-			<tweenOver alpha="0" /> 
-		</next_button> 
-		
-	
- 
-		<description> 
-				<defaults
-					round_corners="0, 0, 0, 0"
-					 
-					heading_font="Verdana"
-					heading_text_size="42"
-					heading_text_color="0xFFFFFF"          
-					heading_text_margin="0, 0, 0,24"  
-					 
-					paragraph_font="Verdana"
-					paragraph_text_size="11"
-					paragraph_text_color="0xFFFFFF"
-					paragraph_text_margin="0, 0, 0, 24"       
-				/>
-			<tweenIn x="0" y="220" width="640" height="100" alpha="0.15" /> 
-			<tweenOver alpha="0.3"/> 
-		</description>	
-	
-		<transitions slicing="vertical" direction="down" duration="1.0" delay="0.2" cube_color="0x000000" /> 
-	
-	</settings> 
- 
- 
-	<slides> 
-	
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/team2.png</url>
-		</slide> 
-		
-		<transition direction="left"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2.png</url>
-			<link target="_self">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link> 
-		</slide> 
-		
-		<transition duration="0.6" delay=".2" direction="down"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/agwc3.png</url> 
-			<link target="_blank">http://www.armedglobalwarfare.com</link>
-		</slide>	
-		
-		<transition num="3" slicing="horizontal" direction="left" delay="0.05"/>			
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/recruitmentGT.png</url> 
-		</slide> 
-			
-		<transition num="3"/>		
-		
-		<slide> 
-			<url>http://www.3rd-infantry-division.org/modules/cu3er/images/arma2move.png</url>  
-		</slide>				
-			
-	</slides> 
-</cu3er>
-
diff --git a/modules/cu3er/cu3er.swf b/modules/cu3er/cu3er.swf
deleted file mode 100644
index eac3a9e..0000000
--- a/modules/cu3er/cu3er.swf
+++ /dev/null
diff --git a/modules/cu3er/cuber.html b/modules/cu3er/cuber.html
deleted file mode 100644
index c7eee14..0000000
--- a/modules/cu3er/cuber.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--  STEP ONE: insert path to SWFObject JavaScript -->

-<script type="text/javascript" src="js/swfobject/swfobject.js"></script>

-

-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->

-<script type="text/javascript">

-		var flashvars = {};

-		flashvars.xml = "config2.xml";

-		flashvars.font = "font.swf";

-		var attributes = {};

-		attributes.wmode = "transparent";

-		attributes.id = "slider";

-		swfobject.embedSWF("cu3er.swf", "cu3er-container", "640", "320", "9", "expressInstall.swf", flashvars, attributes);

-</script>

-<style type="text/css">

-<!--

-#cu3er-container {width:640px; outline:0;}

--->

-</style>

-

-<!--  STEP THREE: insert CU3ER div container -->

-<div id="cu3er-container">

-    <a href="http://www.adobe.com/go/getflashplayer">

-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />

-    </a>

-</div>
\ No newline at end of file
diff --git a/modules/cu3er/demo.htm b/modules/cu3er/demo.htm
deleted file mode 100644
index 8ff0064..0000000
--- a/modules/cu3er/demo.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>CU3ER - demo!</title>
-
-<!--  STEP ONE: insert path to SWFObject JavaScript -->
-<script type="text/javascript" src="js/swfobject/swfobject.js"></script>
-
-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->
-<script type="text/javascript">
-		var flashvars = {};
-		flashvars.xml = "config2.xml";
-		flashvars.font = "font.swf";
-		var attributes = {};
-		attributes.wmode = "transparent";
-		attributes.id = "slider";
-		swfobject.embedSWF("cu3er.swf", "cu3er-container", "640", "320", "9", "expressInstall.swf", flashvars, attributes);
-</script>
-<style type="text/css">
-<!--
-body { margin: 5% auto; text-align:center;}
-#cu3er-container {width:600px; outline:0;}
--->
-</style>
-</head>
-<body>
-<!--  STEP THREE: insert CU3ER div container -->
-<div id="cu3er-container">
-    <a href="http://www.adobe.com/go/getflashplayer">
-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
-    </a>
-</div>
-</body>
-</html>
diff --git a/modules/cu3er/images/agwc3.png b/modules/cu3er/images/agwc3.png
deleted file mode 100644
index 7b6f9a7..0000000
--- a/modules/cu3er/images/agwc3.png
+++ /dev/null
diff --git a/modules/cu3er/images/arma2.png b/modules/cu3er/images/arma2.png
deleted file mode 100644
index 94fab4a..0000000
--- a/modules/cu3er/images/arma2.png
+++ /dev/null
diff --git a/modules/cu3er/images/arma2move.png b/modules/cu3er/images/arma2move.png
deleted file mode 100644
index 6bffbae..0000000
--- a/modules/cu3er/images/arma2move.png
+++ /dev/null
diff --git a/modules/cu3er/images/holidays.png b/modules/cu3er/images/holidays.png
deleted file mode 100644
index 48a1c72..0000000
--- a/modules/cu3er/images/holidays.png
+++ /dev/null
diff --git a/modules/cu3er/images/newsite.png b/modules/cu3er/images/newsite.png
deleted file mode 100644
index b2d2b69..0000000
--- a/modules/cu3er/images/newsite.png
+++ /dev/null
diff --git a/modules/cu3er/images/recruitmentGT.png b/modules/cu3er/images/recruitmentGT.png
deleted file mode 100644
index c74ae8c..0000000
--- a/modules/cu3er/images/recruitmentGT.png
+++ /dev/null
diff --git a/modules/cu3er/images/slide_1.jpg b/modules/cu3er/images/slide_1.jpg
deleted file mode 100644
index 77706a2..0000000
--- a/modules/cu3er/images/slide_1.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_2.jpg b/modules/cu3er/images/slide_2.jpg
deleted file mode 100644
index 3707266..0000000
--- a/modules/cu3er/images/slide_2.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_3.jpg b/modules/cu3er/images/slide_3.jpg
deleted file mode 100644
index c633d52..0000000
--- a/modules/cu3er/images/slide_3.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_4.jpg b/modules/cu3er/images/slide_4.jpg
deleted file mode 100644
index 08bc870..0000000
--- a/modules/cu3er/images/slide_4.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/slide_5.jpg b/modules/cu3er/images/slide_5.jpg
deleted file mode 100644
index 2564999..0000000
--- a/modules/cu3er/images/slide_5.jpg
+++ /dev/null
diff --git a/modules/cu3er/images/team.png b/modules/cu3er/images/team.png
deleted file mode 100644
index fe307c1..0000000
--- a/modules/cu3er/images/team.png
+++ /dev/null
diff --git a/modules/cu3er/images/team2.png b/modules/cu3er/images/team2.png
deleted file mode 100644
index 889a266..0000000
--- a/modules/cu3er/images/team2.png
+++ /dev/null
diff --git a/modules/cu3er/images/teamwork.png b/modules/cu3er/images/teamwork.png
deleted file mode 100644
index 99f760b..0000000
--- a/modules/cu3er/images/teamwork.png
+++ /dev/null
diff --git a/modules/cu3er/index.php b/modules/cu3er/index.php
deleted file mode 100644
index ad84154..0000000
--- a/modules/cu3er/index.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php 

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell

- *

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- */

-?>

-<?php  OpenContent();  ?>

-<!--  STEP ONE: insert path to SWFObject JavaScript -->

-<script type="text/javascript" src="modules/cu3er/js/swfobject/swfobject.js"></script>

-

-<!--  STEP TWO: configure SWFObject JavaScript and embed CU3ER slider -->

-<script type="text/javascript">

-		var flashvars = {};

-		flashvars.xml = "modules/cu3er/config2.xml";

-		flashvars.font = "font.swf";

-		var attributes = {};

-		attributes.wmode = "transparent";

-		attributes.id = "slider";

-		swfobject.embedSWF("modules/cu3er/cu3er.swf", "cu3er-container", "640", "320", "9", "modules/cu3er/js/swfobject/expressInstall.swf", flashvars, attributes);

-</script>

-<style type="text/css">

-<!--

-#cu3er-container {width:640px; outline:0;}

--->

-</style>

-

-<!--  STEP THREE: insert CU3ER div container -->

-<div id="cu3er-container" style="background-color:black;">

-    <a href="http://www.adobe.com/go/getflashplayer">

-        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />

-    </a>

-</div>

-<?php CloseContent(); ?>

-

-<?php //include'cuber.html'; ?> 

-

-/* <description> 

-				<link target="_blank">http://www.3rd-infantry-division.org/forums/index.php?board=13.0</link>	

-				<heading>Enlist Today!</heading> 

-				<paragraph>Some text.</paragraph> 

-			</description>	 */		

diff --git a/modules/cu3er/js/swfobject/expressInstall.swf b/modules/cu3er/js/swfobject/expressInstall.swf
deleted file mode 100644
index e972996..0000000
--- a/modules/cu3er/js/swfobject/expressInstall.swf
+++ /dev/null
diff --git a/modules/cu3er/js/swfobject/swfobject.js b/modules/cu3er/js/swfobject/swfobject.js
deleted file mode 100644
index 9378c8f..0000000
--- a/modules/cu3er/js/swfobject/swfobject.js
+++ /dev/null
@@ -1,777 +0,0 @@
-/*!	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
-	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
-*/
-
-var swfobject = function() {
-	
-	var UNDEF = "undefined",
-		OBJECT = "object",
-		SHOCKWAVE_FLASH = "Shockwave Flash",
-		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
-		FLASH_MIME_TYPE = "application/x-shockwave-flash",
-		EXPRESS_INSTALL_ID = "SWFObjectExprInst",
-		ON_READY_STATE_CHANGE = "onreadystatechange",
-		
-		win = window,
-		doc = document,
-		nav = navigator,
-		
-		plugin = false,
-		domLoadFnArr = [main],
-		regObjArr = [],
-		objIdArr = [],
-		listenersArr = [],
-		storedAltContent,
-		storedAltContentId,
-		storedCallbackFn,
-		storedCallbackObj,
-		isDomLoaded = false,
-		isExpressInstallActive = false,
-		dynamicStylesheet,
-		dynamicStylesheetMedia,
-		autoHideShow = true,
-	
-	/* Centralized function for browser feature detection
-		- User agent string detection is only used when no good alternative is possible
-		- Is executed directly for optimal performance
-	*/	
-	ua = function() {
-		var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF,
-			u = nav.userAgent.toLowerCase(),
-			p = nav.platform.toLowerCase(),
-			windows = p ? /win/.test(p) : /win/.test(u),
-			mac = p ? /mac/.test(p) : /mac/.test(u),
-			webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
-			ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
-			playerVersion = [0,0,0],
-			d = null;
-		if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) {
-			d = nav.plugins[SHOCKWAVE_FLASH].description;
-			if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+
-				plugin = true;
-				ie = false; // cascaded feature detection for Internet Explorer
-				d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1");
-				playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10);
-				playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10);
-				playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0;
-			}
-		}
-		else if (typeof win.ActiveXObject != UNDEF) {
-			try {
-				var a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
-				if (a) { // a will return null when ActiveX is disabled
-					d = a.GetVariable("$version");
-					if (d) {
-						ie = true; // cascaded feature detection for Internet Explorer
-						d = d.split(" ")[1].split(",");
-						playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
-					}
-				}
-			}
-			catch(e) {}
-		}
-		return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac };
-	}(),
-	
-	/* Cross-browser onDomLoad
-		- Will fire an event as soon as the DOM of a web page is loaded
-		- Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/
-		- Regular onload serves as fallback
-	*/ 
-	onDomLoad = function() {
-		if (!ua.w3) { return; }
-		if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically 
-			callDomLoadFunctions();
-		}
-		if (!isDomLoaded) {
-			if (typeof doc.addEventListener != UNDEF) {
-				doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false);
-			}		
-			if (ua.ie && ua.win) {
-				doc.attachEvent(ON_READY_STATE_CHANGE, function() {
-					if (doc.readyState == "complete") {
-						doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee);
-						callDomLoadFunctions();
-					}
-				});
-				if (win == top) { // if not inside an iframe
-					(function(){
-						if (isDomLoaded) { return; }
-						try {
-							doc.documentElement.doScroll("left");
-						}
-						catch(e) {
-							setTimeout(arguments.callee, 0);
-							return;
-						}
-						callDomLoadFunctions();
-					})();
-				}
-			}
-			if (ua.wk) {
-				(function(){
-					if (isDomLoaded) { return; }
-					if (!/loaded|complete/.test(doc.readyState)) {
-						setTimeout(arguments.callee, 0);
-						return;
-					}
-					callDomLoadFunctions();
-				})();
-			}
-			addLoadEvent(callDomLoadFunctions);
-		}
-	}();
-	
-	function callDomLoadFunctions() {
-		if (isDomLoaded) { return; }
-		try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early
-			var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span"));
-			t.parentNode.removeChild(t);
-		}
-		catch (e) { return; }
-		isDomLoaded = true;
-		var dl = domLoadFnArr.length;
-		for (var i = 0; i < dl; i++) {
-			domLoadFnArr[i]();
-		}
-	}
-	
-	function addDomLoadEvent(fn) {
-		if (isDomLoaded) {
-			fn();
-		}
-		else { 
-			domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+
-		}
-	}
-	
-	/* Cross-browser onload
-		- Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/
-		- Will fire an event as soon as a web page including all of its assets are loaded 
-	 */
-	function addLoadEvent(fn) {
-		if (typeof win.addEventListener != UNDEF) {
-			win.addEventListener("load", fn, false);
-		}
-		else if (typeof doc.addEventListener != UNDEF) {
-			doc.addEventListener("load", fn, false);
-		}
-		else if (typeof win.attachEvent != UNDEF) {
-			addListener(win, "onload", fn);
-		}
-		else if (typeof win.onload == "function") {
-			var fnOld = win.onload;
-			win.onload = function() {
-				fnOld();
-				fn();
-			};
-		}
-		else {
-			win.onload = fn;
-		}
-	}
-	
-	/* Main function
-		- Will preferably execute onDomLoad, otherwise onload (as a fallback)
-	*/
-	function main() { 
-		if (plugin) {
-			testPlayerVersion();
-		}
-		else {
-			matchVersions();
-		}
-	}
-	
-	/* Detect the Flash Player version for non-Internet Explorer browsers
-		- Detecting the plug-in version via the object element is more precise than using the plugins collection item's description:
-		  a. Both release and build numbers can be detected
-		  b. Avoid wrong descriptions by corrupt installers provided by Adobe
-		  c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports
-		- Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available
-	*/
-	function testPlayerVersion() {
-		var b = doc.getElementsByTagName("body")[0];
-		var o = createElement(OBJECT);
-		o.setAttribute("type", FLASH_MIME_TYPE);
-		var t = b.appendChild(o);
-		if (t) {
-			var counter = 0;
-			(function(){
-				if (typeof t.GetVariable != UNDEF) {
-					var d = t.GetVariable("$version");
-					if (d) {
-						d = d.split(" ")[1].split(",");
-						ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
-					}
-				}
-				else if (counter < 10) {
-					counter++;
-					setTimeout(arguments.callee, 10);
-					return;
-				}
-				b.removeChild(o);
-				t = null;
-				matchVersions();
-			})();
-		}
-		else {
-			matchVersions();
-		}
-	}
-	
-	/* Perform Flash Player and SWF version matching; static publishing only
-	*/
-	function matchVersions() {
-		var rl = regObjArr.length;
-		if (rl > 0) {
-			for (var i = 0; i < rl; i++) { // for each registered object element
-				var id = regObjArr[i].id;
-				var cb = regObjArr[i].callbackFn;
-				var cbObj = {success:false, id:id};
-				if (ua.pv[0] > 0) {
-					var obj = getElementById(id);
-					if (obj) {
-						if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match!
-							setVisibility(id, true);
-							if (cb) {
-								cbObj.success = true;
-								cbObj.ref = getObjectById(id);
-								cb(cbObj);
-							}
-						}
-						else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported
-							var att = {};
-							att.data = regObjArr[i].expressInstall;
-							att.width = obj.getAttribute("width") || "0";
-							att.height = obj.getAttribute("height") || "0";
-							if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); }
-							if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); }
-							// parse HTML object param element's name-value pairs
-							var par = {};
-							var p = obj.getElementsByTagName("param");
-							var pl = p.length;
-							for (var j = 0; j < pl; j++) {
-								if (p[j].getAttribute("name").toLowerCase() != "movie") {
-									par[p[j].getAttribute("name")] = p[j].getAttribute("value");
-								}
-							}
-							showExpressInstall(att, par, id, cb);
-						}
-						else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF
-							displayAltContent(obj);
-							if (cb) { cb(cbObj); }
-						}
-					}
-				}
-				else {	// if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content)
-					setVisibility(id, true);
-					if (cb) {
-						var o = getObjectById(id); // test whether there is an HTML object element or not
-						if (o && typeof o.SetVariable != UNDEF) { 
-							cbObj.success = true;
-							cbObj.ref = o;
-						}
-						cb(cbObj);
-					}
-				}
-			}
-		}
-	}
-	
-	function getObjectById(objectIdStr) {
-		var r = null;
-		var o = getElementById(objectIdStr);
-		if (o && o.nodeName == "OBJECT") {
-			if (typeof o.SetVariable != UNDEF) {
-				r = o;
-			}
-			else {
-				var n = o.getElementsByTagName(OBJECT)[0];
-				if (n) {
-					r = n;
-				}
-			}
-		}
-		return r;
-	}
-	
-	/* Requirements for Adobe Express Install
-		- only one instance can be active at a time
-		- fp 6.0.65 or higher
-		- Win/Mac OS only
-		- no Webkit engines older than version 312
-	*/
-	function canExpressInstall() {
-		return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312);
-	}
-	
-	/* Show the Adobe Express Install dialog
-		- Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75
-	*/
-	function showExpressInstall(att, par, replaceElemIdStr, callbackFn) {
-		isExpressInstallActive = true;
-		storedCallbackFn = callbackFn || null;
-		storedCallbackObj = {success:false, id:replaceElemIdStr};
-		var obj = getElementById(replaceElemIdStr);
-		if (obj) {
-			if (obj.nodeName == "OBJECT") { // static publishing
-				storedAltContent = abstractAltContent(obj);
-				storedAltContentId = null;
-			}
-			else { // dynamic publishing
-				storedAltContent = obj;
-				storedAltContentId = replaceElemIdStr;
-			}
-			att.id = EXPRESS_INSTALL_ID;
-			if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; }
-			if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; }
-			doc.title = doc.title.slice(0, 47) + " - Flash Player Installation";
-			var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn",
-				fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title;
-			if (typeof par.flashvars != UNDEF) {
-				par.flashvars += "&" + fv;
-			}
-			else {
-				par.flashvars = fv;
-			}
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			if (ua.ie && ua.win && obj.readyState != 4) {
-				var newObj = createElement("div");
-				replaceElemIdStr += "SWFObjectNew";
-				newObj.setAttribute("id", replaceElemIdStr);
-				obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf
-				obj.style.display = "none";
-				(function(){
-					if (obj.readyState == 4) {
-						obj.parentNode.removeChild(obj);
-					}
-					else {
-						setTimeout(arguments.callee, 10);
-					}
-				})();
-			}
-			createSWF(att, par, replaceElemIdStr);
-		}
-	}
-	
-	/* Functions to abstract and display alternative content
-	*/
-	function displayAltContent(obj) {
-		if (ua.ie && ua.win && obj.readyState != 4) {
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			var el = createElement("div");
-			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
-			el.parentNode.replaceChild(abstractAltContent(obj), el);
-			obj.style.display = "none";
-			(function(){
-				if (obj.readyState == 4) {
-					obj.parentNode.removeChild(obj);
-				}
-				else {
-					setTimeout(arguments.callee, 10);
-				}
-			})();
-		}
-		else {
-			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
-		}
-	} 
-
-	function abstractAltContent(obj) {
-		var ac = createElement("div");
-		if (ua.win && ua.ie) {
-			ac.innerHTML = obj.innerHTML;
-		}
-		else {
-			var nestedObj = obj.getElementsByTagName(OBJECT)[0];
-			if (nestedObj) {
-				var c = nestedObj.childNodes;
-				if (c) {
-					var cl = c.length;
-					for (var i = 0; i < cl; i++) {
-						if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
-							ac.appendChild(c[i].cloneNode(true));
-						}
-					}
-				}
-			}
-		}
-		return ac;
-	}
-	
-	/* Cross-browser dynamic SWF creation
-	*/
-	function createSWF(attObj, parObj, id) {
-		var r, el = getElementById(id);
-		if (ua.wk && ua.wk < 312) { return r; }
-		if (el) {
-			if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content
-				attObj.id = id;
-			}
-			if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML
-				var att = "";
-				for (var i in attObj) {
-					if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries
-						if (i.toLowerCase() == "data") {
-							parObj.movie = attObj[i];
-						}
-						else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
-							att += ' class="' + attObj[i] + '"';
-						}
-						else if (i.toLowerCase() != "classid") {
-							att += ' ' + i + '="' + attObj[i] + '"';
-						}
-					}
-				}
-				var par = "";
-				for (var j in parObj) {
-					if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries
-						par += '<param name="' + j + '" value="' + parObj[j] + '" />';
-					}
-				}
-				el.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"' + att + '>' + par + '</object>';
-				objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only)
-				r = getElementById(attObj.id);	
-			}
-			else { // well-behaving browsers
-				var o = createElement(OBJECT);
-				o.setAttribute("type", FLASH_MIME_TYPE);
-				for (var m in attObj) {
-					if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries
-						if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
-							o.setAttribute("class", attObj[m]);
-						}
-						else if (m.toLowerCase() != "classid") { // filter out IE specific attribute
-							o.setAttribute(m, attObj[m]);
-						}
-					}
-				}
-				for (var n in parObj) {
-					if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element
-						createObjParam(o, n, parObj[n]);
-					}
-				}
-				el.parentNode.replaceChild(o, el);
-				r = o;
-			}
-		}
-		return r;
-	}
-	
-	function createObjParam(el, pName, pValue) {
-		var p = createElement("param");
-		p.setAttribute("name", pName);	
-		p.setAttribute("value", pValue);
-		el.appendChild(p);
-	}
-	
-	/* Cross-browser SWF removal
-		- Especially needed to safely and completely remove a SWF in Internet Explorer
-	*/
-	function removeSWF(id) {
-		var obj = getElementById(id);
-		if (obj && obj.nodeName == "OBJECT") {
-			if (ua.ie && ua.win) {
-				obj.style.display = "none";
-				(function(){
-					if (obj.readyState == 4) {
-						removeObjectInIE(id);
-					}
-					else {
-						setTimeout(arguments.callee, 10);
-					}
-				})();
-			}
-			else {
-				obj.parentNode.removeChild(obj);
-			}
-		}
-	}
-	
-	function removeObjectInIE(id) {
-		var obj = getElementById(id);
-		if (obj) {
-			for (var i in obj) {
-				if (typeof obj[i] == "function") {
-					obj[i] = null;
-				}
-			}
-			obj.parentNode.removeChild(obj);
-		}
-	}
-	
-	/* Functions to optimize JavaScript compression
-	*/
-	function getElementById(id) {
-		var el = null;
-		try {
-			el = doc.getElementById(id);
-		}
-		catch (e) {}
-		return el;
-	}
-	
-	function createElement(el) {
-		return doc.createElement(el);
-	}
-	
-	/* Updated attachEvent function for Internet Explorer
-		- Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks
-	*/	
-	function addListener(target, eventType, fn) {
-		target.attachEvent(eventType, fn);
-		listenersArr[listenersArr.length] = [target, eventType, fn];
-	}
-	
-	/* Flash Player and SWF content version matching
-	*/
-	function hasPlayerVersion(rv) {
-		var pv = ua.pv, v = rv.split(".");
-		v[0] = parseInt(v[0], 10);
-		v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0"
-		v[2] = parseInt(v[2], 10) || 0;
-		return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false;
-	}
-	
-	/* Cross-browser dynamic CSS creation
-		- Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php
-	*/	
-	function createCSS(sel, decl, media, newStyle) {
-		if (ua.ie && ua.mac) { return; }
-		var h = doc.getElementsByTagName("head")[0];
-		if (!h) { return; } // to also support badly authored HTML pages that lack a head element
-		var m = (media && typeof media == "string") ? media : "screen";
-		if (newStyle) {
-			dynamicStylesheet = null;
-			dynamicStylesheetMedia = null;
-		}
-		if (!dynamicStylesheet || dynamicStylesheetMedia != m) { 
-			// create dynamic stylesheet + get a global reference to it
-			var s = createElement("style");
-			s.setAttribute("type", "text/css");
-			s.setAttribute("media", m);
-			dynamicStylesheet = h.appendChild(s);
-			if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
-				dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1];
-			}
-			dynamicStylesheetMedia = m;
-		}
-		// add style rule
-		if (ua.ie && ua.win) {
-			if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) {
-				dynamicStylesheet.addRule(sel, decl);
-			}
-		}
-		else {
-			if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) {
-				dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
-			}
-		}
-	}
-	
-	function setVisibility(id, isVisible) {
-		if (!autoHideShow) { return; }
-		var v = isVisible ? "visible" : "hidden";
-		if (isDomLoaded && getElementById(id)) {
-			getElementById(id).style.visibility = v;
-		}
-		else {
-			createCSS("#" + id, "visibility:" + v);
-		}
-	}
-
-	/* Filter to avoid XSS attacks
-	*/
-	function urlEncodeIfNecessary(s) {
-		var regex = /[\\\"<>\.;]/;
-		var hasBadChars = regex.exec(s) != null;
-		return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s;
-	}
-	
-	/* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only)
-	*/
-	var cleanup = function() {
-		if (ua.ie && ua.win) {
-			window.attachEvent("onunload", function() {
-				// remove listeners to avoid memory leaks
-				var ll = listenersArr.length;
-				for (var i = 0; i < ll; i++) {
-					listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]);
-				}
-				// cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect
-				var il = objIdArr.length;
-				for (var j = 0; j < il; j++) {
-					removeSWF(objIdArr[j]);
-				}
-				// cleanup library's main closures to avoid memory leaks
-				for (var k in ua) {
-					ua[k] = null;
-				}
-				ua = null;
-				for (var l in swfobject) {
-					swfobject[l] = null;
-				}
-				swfobject = null;
-			});
-		}
-	}();
-	
-	return {
-		/* Public API
-			- Reference: http://code.google.com/p/swfobject/wiki/documentation
-		*/ 
-		registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) {
-			if (ua.w3 && objectIdStr && swfVersionStr) {
-				var regObj = {};
-				regObj.id = objectIdStr;
-				regObj.swfVersion = swfVersionStr;
-				regObj.expressInstall = xiSwfUrlStr;
-				regObj.callbackFn = callbackFn;
-				regObjArr[regObjArr.length] = regObj;
-				setVisibility(objectIdStr, false);
-			}
-			else if (callbackFn) {
-				callbackFn({success:false, id:objectIdStr});
-			}
-		},
-		
-		getObjectById: function(objectIdStr) {
-			if (ua.w3) {
-				return getObjectById(objectIdStr);
-			}
-		},
-		
-		embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) {
-			var callbackObj = {success:false, id:replaceElemIdStr};
-			if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) {
-				setVisibility(replaceElemIdStr, false);
-				addDomLoadEvent(function() {
-					widthStr += ""; // auto-convert to string
-					heightStr += "";
-					var att = {};
-					if (attObj && typeof attObj === OBJECT) {
-						for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs
-							att[i] = attObj[i];
-						}
-					}
-					att.data = swfUrlStr;
-					att.width = widthStr;
-					att.height = heightStr;
-					var par = {}; 
-					if (parObj && typeof parObj === OBJECT) {
-						for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs
-							par[j] = parObj[j];
-						}
-					}
-					if (flashvarsObj && typeof flashvarsObj === OBJECT) {
-						for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs
-							if (typeof par.flashvars != UNDEF) {
-								par.flashvars += "&" + k + "=" + flashvarsObj[k];
-							}
-							else {
-								par.flashvars = k + "=" + flashvarsObj[k];
-							}
-						}
-					}
-					if (hasPlayerVersion(swfVersionStr)) { // create SWF
-						var obj = createSWF(att, par, replaceElemIdStr);
-						if (att.id == replaceElemIdStr) {
-							setVisibility(replaceElemIdStr, true);
-						}
-						callbackObj.success = true;
-						callbackObj.ref = obj;
-					}
-					else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install
-						att.data = xiSwfUrlStr;
-						showExpressInstall(att, par, replaceElemIdStr, callbackFn);
-						return;
-					}
-					else { // show alternative content
-						setVisibility(replaceElemIdStr, true);
-					}
-					if (callbackFn) { callbackFn(callbackObj); }
-				});
-			}
-			else if (callbackFn) { callbackFn(callbackObj);	}
-		},
-		
-		switchOffAutoHideShow: function() {
-			autoHideShow = false;
-		},
-		
-		ua: ua,
-		
-		getFlashPlayerVersion: function() {
-			return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] };
-		},
-		
-		hasFlashPlayerVersion: hasPlayerVersion,
-		
-		createSWF: function(attObj, parObj, replaceElemIdStr) {
-			if (ua.w3) {
-				return createSWF(attObj, parObj, replaceElemIdStr);
-			}
-			else {
-				return undefined;
-			}
-		},
-		
-		showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) {
-			if (ua.w3 && canExpressInstall()) {
-				showExpressInstall(att, par, replaceElemIdStr, callbackFn);
-			}
-		},
-		
-		removeSWF: function(objElemIdStr) {
-			if (ua.w3) {
-				removeSWF(objElemIdStr);
-			}
-		},
-		
-		createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) {
-			if (ua.w3) {
-				createCSS(selStr, declStr, mediaStr, newStyleBoolean);
-			}
-		},
-		
-		addDomLoadEvent: addDomLoadEvent,
-		
-		addLoadEvent: addLoadEvent,
-		
-		getQueryParamValue: function(param) {
-			var q = doc.location.search || doc.location.hash;
-			if (q) {
-				if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark
-				if (param == null) {
-					return urlEncodeIfNecessary(q);
-				}
-				var pairs = q.split("&");
-				for (var i = 0; i < pairs.length; i++) {
-					if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) {
-						return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1)));
-					}
-				}
-			}
-			return "";
-		},
-		
-		// For internal usage only
-		expressInstallCallback: function() {
-			if (isExpressInstallActive) {
-				var obj = getElementById(EXPRESS_INSTALL_ID);
-				if (obj && storedAltContent) {
-					obj.parentNode.replaceChild(storedAltContent, obj);
-					if (storedAltContentId) {
-						setVisibility(storedAltContentId, true);
-						if (ua.ie && ua.win) { storedAltContent.style.display = "block"; }
-					}
-					if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); }
-				}
-				isExpressInstallActive = false;
-			} 
-		}
-	};
-}();
diff --git a/modules/cu3er/license.txt b/modules/cu3er/license.txt
deleted file mode 100644
index 24f51bb..0000000
--- a/modules/cu3er/license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Copyright (c) 2010, Stefan Kovac
-All rights reserved.
-
-By downloading CU3ER v0.9.2 - flash 3D slider, you agree to the following:
-
-Stefan Kovac grants you the non-exclusive, non-transferable license 
-to use CU3ER subject to the restrictions defined below.
-
-    * You may use CU3ER in personal and / or commercial projects.
-
-    * You may implement CU3ER in an unlimited number of websites and 
-      offline presentations, as long as you are acting as the administrator
-      and / or developer for those websites and / or presentations.
-
-    * You may deploy SWFs containing CU3ER as part of hired work for 
-      a third party as long as the SWF is unique to said party and not 
-      replicated / resold / redistributed as part of a template, 
-      application or service to additional parties.
-
-    * SWF containing CU3ER may not be embedded as part of a template, 
-      application, and / or web site where stated template, application, 
-      and/or web site is re-sold and / or re-distributed for independent 
-      use by third parties, without specific prior written permission.
- 
-    * SWFs containing CU3ER may not be embedded in a template, content 
-      management system, and / or online web service in a manner where the 
-      SWF is replicated and used as a slideshow viewer for photos contributed 
-      by more than one party.
-
-    * CU3ER may not be sub-licensed or resold.
-
-    * You agree not to decompile, reverse engineer, disassemble, or otherwise 
-      determine or attempt to determine source code for the executable code 
-      of CU3ER, and agrees not to permit or authorize anyone else to do so.
-
-    * CU3ER redistribution must reproduce the above copyright notice, this 
-      list of conditions and the disclaimer in the documentation and/or 
-      other materials provided with the distribution.
-
-    * Neither the name of CU3ER nor the name of it contributor (Stefan Kovac) 
-      may be used to endorse or promote products associated with CU3ER without 
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY STEFAN KOVAC ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL STEFAN KOVAC BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/modules/news/functions.php b/modules/news/functions.php
index 790a00e..5fd722c 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -181,7 +181,7 @@ function displayNews($data, $short = false){
 						</tr>
 					</table>
 			</div>
-			<div class="content">
+			<div class="content news">
 				<img src="modules/news/categories/<?php echo $news['catimage']; ?>" alt="<?php echo $news['catname']; ?>" align="right" />
 				<?php 
 					if($short) {
diff --git a/modules/news/style.css b/modules/news/style.css
index fe98982..b271757 100644
--- a/modules/news/style.css
+++ b/modules/news/style.css
@@ -81,7 +81,7 @@
 #comments .comment_author {
 	position: absolute;
 	left: -120px;
-	width: 100px;
+	//width: 100px;
 	color: #8d8d8d;
 	font-size: 10px;
 	line-height: 14px;
@@ -109,7 +109,7 @@
 	left: auto;
 	right: 20px;
 	bottom: 10px;
-	width: 200px;
+	//width: 200px;
 	height: 40px;
 }
 #comments .children .comment_author p {
@@ -122,7 +122,7 @@
 	display: block;
 }
 #comments .children .comment_author img {
-	width: 40px;
+	//width: 40px;
 	height: 40px;
 	float: right;
 }
@@ -162,7 +162,7 @@
 	display: none;
 }
 #comments .input {
-	width: 456px;
+	//width: 456px;
 	padding: 4px 5px;
 	background: #fff;
 	border: 1px solid #ced0d0;
@@ -172,12 +172,12 @@
 	margin-bottom: 10px;
 }
 #comments .children .input {
-	width: 431px;
+	//width: 431px;
 }
 #comments .textarea {
 	padding-top: 20px;
 	padding-left: 20px;
-	width: 448px;
+	//width: 448px;
   	max-width: 468px;
 	height: 135px;
 	font-size: 12px;
@@ -185,17 +185,17 @@
 	font-family: Tahoma, Arial, Helvetica, sans-serif;
 }
 #comments .children .textarea {
-	width: 423px;
+	//width: 423px;
 }
 #comments #submit_comment {
-	width: 12.0em;
+	//width: 12.0em;
 	height: 3.0em;
 	float: right;
 	margin-right: 7px;
 	margin-top: 10px;
 }
 #wpUserLinks_form #submit_comment {
-	width: 12.0em;
+	//width: 12.0em;
 	height: 3.0em;
 	margin-top: 10px;
 }
@@ -204,7 +204,7 @@
 }
 #cancel-comment-reply {
 	float: left;
-	width: 120px;
+	//width: 120px;
 	height: 30px;
 	margin-top: 8px;
 }
@@ -215,7 +215,7 @@
 	font-size: 9px;
 	text-transform: uppercase;
 	height: 22px;
-	width: 70px;
+	//width: 70px;
 	text-align: center;
 	padding-bottom: 2px;
 	letter-spacing: -0.05em;
diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php
index d067295..9222dc2 100644
--- a/modules/newsreel/index.php
+++ b/modules/newsreel/index.php
@@ -117,7 +117,7 @@ window.onload = init_Slides;	//starts the reels movement
 	<a href="http://www.3rd-infantry-division.org/forums/index.php?board=13.0"><img src="modules/newsreel/slides/<?php echo $startSRC; ?>" name="myBanner" alt="newsreel" style="padding:0px;" /></a>
 
 </div>
-	<table border="0" cellspacing="0" cellpadding="0" style="height:21px;" width="100%">
+	<table border="0" cellspacing="0" cellpadding="0" style="height:21px;" width="640px">
 	<tr>
 <?php
 $y=0; 
diff --git a/modules/rudi/images/medals/esm.jpg b/modules/rudi/images/medals/esm.jpg
deleted file mode 100644
index 2dbbcca..0000000
--- a/modules/rudi/images/medals/esm.jpg
+++ /dev/null
diff --git a/modules/rudi/images/ranks/large/CW2.gif b/modules/rudi/images/ranks/large/CW2.gif
new file mode 100644
index 0000000..bc7f0fd
--- /dev/null
+++ b/modules/rudi/images/ranks/large/CW2.gif
diff --git a/modules/rudi/images/ranks/large/WO1.gif b/modules/rudi/images/ranks/large/WO1.gif
new file mode 100644
index 0000000..049eaa7
--- /dev/null
+++ b/modules/rudi/images/ranks/large/WO1.gif
diff --git a/images/dicon.png b/modules/rudi/images/ranks/small/CW2.png
index e9323cb..f4e0125 100644
--- a/images/dicon.png
+++ b/modules/rudi/images/ranks/small/CW2.png
diff --git a/schema.sql b/schema.sql
new file mode 100644
index 0000000..af50b7a
--- /dev/null
+++ b/schema.sql
@@ -0,0 +1,940 @@
+-- phpMyAdmin SQL Dump
+-- version 3.3.9.2
+-- http://www.phpmyadmin.net
+--
+-- Generation Time: Aug 18, 2013 at 03:52 PM
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_announcements`
+--
+
+CREATE TABLE `bayonet_announcements` (
+  `announcement_id` int(10) NOT NULL DEFAULT '0',
+  `title` varchar(50) NOT NULL DEFAULT '',
+  `text` text NOT NULL,
+  PRIMARY KEY (`announcement_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `bayonet_announcements`
+--
+
+INSERT INTO `bayonet_announcements` VALUES(0, 'Untitled', '');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_blocks`
+--
+
+CREATE TABLE `bayonet_blocks` (
+  `block_id` int(11) NOT NULL AUTO_INCREMENT,
+  `active` int(11) NOT NULL DEFAULT '1',
+  `weight` int(11) NOT NULL,
+  `position` int(1) NOT NULL,
+  `dir_name` varchar(32) NOT NULL,
+  `title` varchar(30) NOT NULL,
+  PRIMARY KEY (`block_id`),
+  KEY `active` (`active`,`weight`,`position`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_blocks`
+--
+
+INSERT INTO `bayonet_blocks` VALUES(1, 1, 0, 1, 'rudi', 'RUDI');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_downloads`
+--
+
+CREATE TABLE `bayonet_downloads` (
+  `file_id` int(11) NOT NULL AUTO_INCREMENT,
+  `category_id` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `filename` varchar(255) NOT NULL COMMENT 'Can contain a relative path',
+  PRIMARY KEY (`file_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `bayonet_downloads`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_downloads_categories`
+--
+
+CREATE TABLE `bayonet_downloads_categories` (
+  `category_id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(32) NOT NULL,
+  PRIMARY KEY (`category_id`),
+  KEY `title` (`title`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_downloads_categories`
+--
+
+INSERT INTO `bayonet_downloads_categories` VALUES(1, 'General');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_events`
+--
+
+CREATE TABLE `bayonet_events` (
+  `event_id` int(11) NOT NULL AUTO_INCREMENT,
+  `date` date NOT NULL DEFAULT '0000-00-00',
+  `time` time NOT NULL DEFAULT '00:00:00',
+  `title` varchar(15) NOT NULL DEFAULT '',
+  `text` text NOT NULL,
+  `color` varchar(20) NOT NULL,
+  PRIMARY KEY (`event_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `bayonet_events`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_modules`
+--
+
+CREATE TABLE `bayonet_modules` (
+  `module_id` int(11) NOT NULL AUTO_INCREMENT,
+  `weight` int(11) NOT NULL,
+  `dir_name` varchar(32) NOT NULL,
+  `status` enum('Inactive','Active') NOT NULL,
+  PRIMARY KEY (`module_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_modules`
+--
+
+INSERT INTO `bayonet_modules` VALUES(1, 1, 'news', 'Active');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_navigation`
+--
+
+CREATE TABLE `bayonet_navigation` (
+  `nav_id` int(11) NOT NULL AUTO_INCREMENT,
+  `link` varchar(200) NOT NULL DEFAULT '0',
+  `title` varchar(50) NOT NULL DEFAULT '',
+  `weight` int(3) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`nav_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_navigation`
+--
+
+INSERT INTO `bayonet_navigation` VALUES(1, '?load=page&id=1', 'Example page', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_news`
+--
+
+CREATE TABLE `bayonet_news` (
+  `news_id` int(11) NOT NULL AUTO_INCREMENT,
+  `author_id` int(11) NOT NULL,
+  `title` varchar(128) NOT NULL,
+  `message` text NOT NULL,
+  `date` datetime NOT NULL,
+  `edited` datetime DEFAULT NULL,
+  `edited_id` int(10) DEFAULT NULL,
+  `category_id` int(6) NOT NULL,
+  PRIMARY KEY (`news_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_news`
+--
+
+INSERT INTO `bayonet_news` VALUES(1, 1, 'Hello World', 'This is a default news article.', '2013-02-10 15:24:14', NULL, NULL, 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_newsreel`
+--
+
+CREATE TABLE `bayonet_newsreel` (
+  `slide_id` int(6) NOT NULL AUTO_INCREMENT,
+  `src` varchar(150) COLLATE utf8_unicode_ci NOT NULL,
+  `url` varchar(35) COLLATE utf8_unicode_ci NOT NULL,
+  `title` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
+  `visible` int(1) NOT NULL DEFAULT '0',
+  `weight` int(10) NOT NULL,
+  PRIMARY KEY (`slide_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `bayonet_newsreel`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_news_categories`
+--
+
+CREATE TABLE `bayonet_news_categories` (
+  `category_id` int(6) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL,
+  `image` varchar(80) NOT NULL,
+  PRIMARY KEY (`category_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_news_categories`
+--
+
+INSERT INTO `bayonet_news_categories` VALUES(1, 'General News', '');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_news_comments`
+--
+
+CREATE TABLE `bayonet_news_comments` (
+  `comment_id` int(10) NOT NULL AUTO_INCREMENT,
+  `news_id` int(10) NOT NULL,
+  `author_id` int(10) NOT NULL,
+  `date` datetime NOT NULL,
+  `message` varchar(1000) NOT NULL,
+  PRIMARY KEY (`comment_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `bayonet_news_comments`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_pages`
+--
+
+CREATE TABLE `bayonet_pages` (
+  `page_id` int(11) NOT NULL AUTO_INCREMENT,
+  `author_id` int(11) NOT NULL,
+  `page_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `title` varchar(254) NOT NULL,
+  `text` text NOT NULL,
+  PRIMARY KEY (`page_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_pages`
+--
+
+INSERT INTO `bayonet_pages` VALUES(1, 1, '2008-06-24 04:23:56', 'Example Page', 'Lorem ipsum');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_settings`
+--
+
+CREATE TABLE `bayonet_settings` (
+  `setting_id` int(10) NOT NULL AUTO_INCREMENT,
+  `title` varchar(50) NOT NULL,
+  `index_modules` varchar(100) NOT NULL,
+  PRIMARY KEY (`setting_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_settings`
+--
+
+INSERT INTO `bayonet_settings` VALUES(1, 'Default', 'news');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `bayonet_users`
+--
+
+CREATE TABLE `bayonet_users` (
+  `user_id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar(30) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `lastname` varchar(30) NOT NULL,
+  `firstname` varchar(30) NOT NULL,
+  `email` varchar(255) NOT NULL,
+  `joined` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `level` int(2) NOT NULL DEFAULT '1',
+  `all` tinyint(2) NOT NULL,
+  `squadleader` tinyint(2) NOT NULL,
+  `adjutant` tinyint(2) NOT NULL,
+  `quartermaster` tinyint(2) NOT NULL,
+  PRIMARY KEY (`user_id`),
+  UNIQUE KEY `email` (`email`),
+  UNIQUE KEY `username` (`username`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `bayonet_users`
+--
+
+INSERT INTO `bayonet_users` VALUES(1, 'admin', 'iayTBD/gOOmYs', 'Admin', 'Bayonet', 'admin@example.com', '2009-10-04 09:11:50', 3, 1, 0, 0, 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_awards`
+--
+
+CREATE TABLE `rudi_awards` (
+  `award_id` int(11) NOT NULL AUTO_INCREMENT,
+  `class_id` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `image` varchar(255) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `weight` int(5) NOT NULL,
+  PRIMARY KEY (`award_id`),
+  KEY `idx_awards` (`name`,`image`,`description`),
+  KEY `class_id` (`class_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=33 ;
+
+--
+-- Dumping data for table `rudi_awards`
+--
+
+INSERT INTO `rudi_awards` VALUES(1, 1, 'Distinguished Service Cross', 'DSC.jpg', 'Awarded to those who are exceptional in every regard. The highest honor attainable in the 3rd Infantry Division.', 1);
+INSERT INTO `rudi_awards` VALUES(2, 1, 'Silver Star', 'silverstar.jpg', 'Awarded for an act of incredible skill and courage which turns the tide of battle and is inarguably a main factor in our victory in a match.', 3);
+INSERT INTO `rudi_awards` VALUES(3, 1, 'Legion of Merit', 'legionofmerit.jpg', 'Awarded for outstanding work on defense.', 4);
+INSERT INTO `rudi_awards` VALUES(4, 1, 'Soldiers Medal', 'soldiers.jpg', 'Awarded for creating an ingenious plan for a match that ensures our victory.', 6);
+INSERT INTO `rudi_awards` VALUES(5, 1, 'Bronze Star', 'bronzestar.jpg', 'Awarded for an act of incredible skill and courage during a match.', 5);
+INSERT INTO `rudi_awards` VALUES(7, 1, 'Army Good Conduct Medal', 'goodconduct.jpg', 'Awarded for outstanding conduct in and out of game.', 16);
+INSERT INTO `rudi_awards` VALUES(8, 1, 'Exemplary Attendance Medal', 'exempattendance.jpg', 'Awarded for participated in many division functions and showing up on time.', 13);
+INSERT INTO `rudi_awards` VALUES(10, 1, 'Army Service Ribbon', 'armyservice.jpg', 'The Army Service Ribbon is awarded to members of the Army, Army Reserve, and Army National Guard for successful completion of initial-entry training.', 21);
+INSERT INTO `rudi_awards` VALUES(11, 1, 'Global War on Terrorism Service Medal', 'gwotsm.jpg', 'Awarded for participating in the Armed Global Warfare - C2 theater of operations.', 18);
+INSERT INTO `rudi_awards` VALUES(13, 1, 'National Defense Service Medal', 'nationaldefense.jpg', 'Awarded for serving in a successful military campaign in which the 3rd ID actively participated in.', 19);
+INSERT INTO `rudi_awards` VALUES(14, 1, 'Army Commendation Medal', 'armycommendation.jpg', 'Awards may be made for acts of valor performed under a lesser degree than required for award of the Bronze Star or in noncombatant-related heroism.', 14);
+INSERT INTO `rudi_awards` VALUES(15, 1, 'Army Achievement Medal', 'armyachievement.jpg', 'Awarded while serving in any capacity with the Army in a non-combat area, distinguished himself by meritorious service or achievement of a lesser degree than required for award of the Army Commendation Medal.', 15);
+INSERT INTO `rudi_awards` VALUES(16, 3, 'Valor Device', 'valor_device.png', 'The Valor Device or "Combat V" is displayed on a ribbon (in the case of the 3rd Infantry Division, the Bronze Star Medal) to denote that the medal was awarded as a result of combat with another unit rather than for non-combat related activities.', 0);
+INSERT INTO `rudi_awards` VALUES(19, 2, 'Day of Defeat Distinguished Unit Citation', 'MUC.jpg', 'Day of Defeat Distinguished Unit Citation awarded to soldiers who where part of the 3rd ID during the Day of Defeat Campaign.', 0);
+INSERT INTO `rudi_awards` VALUES(20, 2, 'Call of Duty Distinguished Unit Citation', 'codduc.jpg', 'Call of Duty Unit Citation awarded to soldiers who where part of the 3rd ID during the Call of Duty Campaign.', 0);
+INSERT INTO `rudi_awards` VALUES(21, 2, 'Call of Duty 2 Distinguished Unit Citation', 'cod2duc.jpg', 'Call of Duty 2 Unit Citation awarded to soldiers who were part of the 3rd ID during the Call of Duty 2 Campaign.', 0);
+INSERT INTO `rudi_awards` VALUES(22, 2, 'Call of Duty 4 Distinguished Unit Citation', 'cod4duc.jpg', 'Call of Duty 4 Unit Citation awarded to soldiers who were part of the 3rd ID during the Call of Duty 4 Campaign.', 0);
+INSERT INTO `rudi_awards` VALUES(23, 4, 'Combat Infantry Badge - 1st Award', 'cib1.png', 'Participating in 8 engagements on the battlefield during a campaign.', 2);
+INSERT INTO `rudi_awards` VALUES(24, 4, 'Combat Infantry Badge - 2nd Award', 'cib2.png', 'Participating in 12 engagements on the battlefield during a campaign.', 3);
+INSERT INTO `rudi_awards` VALUES(25, 4, 'Combat Infantry Badge - 3rd Award', 'cib3.png', 'Participating in 24 engagements on the battlefield during a campaign.', 4);
+INSERT INTO `rudi_awards` VALUES(26, 4, 'Combat Infantry Badge - 4th Award', 'cib4.png', 'Participating in 30 engagements on the battlefield during a campaign.', 5);
+INSERT INTO `rudi_awards` VALUES(29, 4, 'Expert Infantryman Badge', 'eib.png', 'Participating in 4 engagements on the battlefield during a campaign.', 1);
+INSERT INTO `rudi_awards` VALUES(30, 2, 'ArmA2 Distinguished Unit Citation ', 'arma2duc.jpg', 'ArmA 2 Unit Citation awarded to soldiers who were part of the 3rd ID during the ArmA 2 Campaign. ', 5);
+INSERT INTO `rudi_awards` VALUES(31, 1, 'Armed Forces Expeditionary Medal', 'afem.jpg', 'Awarded for participating in the Armed Global Warfare - Panthera Rising theater of operations.', 17);
+INSERT INTO `rudi_awards` VALUES(32, 4, 'Combat Medical Badge', '', 'This badge is awarded to soldiers who have successfully completed the medical training course.', 6);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_award_classes`
+--
+
+CREATE TABLE `rudi_award_classes` (
+  `class_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL,
+  PRIMARY KEY (`class_id`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
+
+--
+-- Dumping data for table `rudi_award_classes`
+--
+
+INSERT INTO `rudi_award_classes` VALUES(1, 'Medal');
+INSERT INTO `rudi_award_classes` VALUES(2, 'Citation');
+INSERT INTO `rudi_award_classes` VALUES(3, 'Device');
+INSERT INTO `rudi_award_classes` VALUES(4, 'Badge');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_award_record`
+--
+
+CREATE TABLE `rudi_award_record` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `award_id` int(11) NOT NULL,
+  `member_id` int(11) NOT NULL,
+  `date_added` datetime NOT NULL,
+  `record_note` varchar(255) NOT NULL,
+  `added_by` int(11) NOT NULL,
+  PRIMARY KEY (`record_id`),
+  KEY `member_id` (`member_id`,`date_added`,`record_note`,`added_by`,`award_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=159 ;
+
+--
+-- Dumping data for table `rudi_award_record`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_classes`
+--
+
+CREATE TABLE `rudi_classes` (
+  `class_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(40) NOT NULL,
+  PRIMARY KEY (`class_id`),
+  KEY `idx_classes` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `rudi_classes`
+--
+
+INSERT INTO `rudi_classes` VALUES(1, 'Soldier');
+INSERT INTO `rudi_classes` VALUES(2, 'JNCO');
+INSERT INTO `rudi_classes` VALUES(3, 'NCO');
+INSERT INTO `rudi_classes` VALUES(5, 'OIC');
+INSERT INTO `rudi_classes` VALUES(4, 'SNCO');
+INSERT INTO `rudi_classes` VALUES(6, 'SOIC');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_combat_record`
+--
+
+CREATE TABLE `rudi_combat_record` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) NOT NULL,
+  `war_id` int(11) NOT NULL,
+  PRIMARY KEY (`record_id`),
+  KEY `member_id` (`member_id`),
+  KEY `idx_combatrecord` (`war_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_combat_record`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_combat_units`
+--
+
+CREATE TABLE `rudi_combat_units` (
+  `unit_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `detachment` int(11) NOT NULL,
+  `type` enum('Company','Platoon','Squad','Fireteam') NOT NULL,
+  `leader_id` int(11) NOT NULL,
+  `weight` int(10) NOT NULL,
+  `callsign` varchar(25) NOT NULL,
+  PRIMARY KEY (`unit_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `rudi_combat_units`
+--
+
+INSERT INTO `rudi_combat_units` VALUES(1, 'Unit', 0, 'Company', 2, 1, '');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_countries`
+--
+
+CREATE TABLE `rudi_countries` (
+  `country_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(60) NOT NULL,
+  `image` varchar(30) NOT NULL,
+  PRIMARY KEY (`country_id`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='Member country' AUTO_INCREMENT=11 ;
+
+--
+-- Dumping data for table `rudi_countries`
+--
+
+INSERT INTO `rudi_countries` VALUES(1, 'United States', 'usa.gif');
+INSERT INTO `rudi_countries` VALUES(2, 'Austrailia', 'austrailia.gif');
+INSERT INTO `rudi_countries` VALUES(3, 'Canada', 'canada.gif');
+INSERT INTO `rudi_countries` VALUES(4, 'Germany', 'germany.gif');
+INSERT INTO `rudi_countries` VALUES(5, 'Israel', 'israel.gif');
+INSERT INTO `rudi_countries` VALUES(6, 'Japan', 'japan.gif');
+INSERT INTO `rudi_countries` VALUES(7, 'Korea', 'korea.gif');
+INSERT INTO `rudi_countries` VALUES(8, 'Mexico', 'mexico.gif');
+INSERT INTO `rudi_countries` VALUES(9, 'Russia', 'russia.gif');
+INSERT INTO `rudi_countries` VALUES(10, 'United Kingdom', 'uk.gif');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_drills`
+--
+
+CREATE TABLE `rudi_drills` (
+  `drill_id` int(11) NOT NULL AUTO_INCREMENT,
+  `date` date NOT NULL,
+  `news` text,
+  `notes` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`drill_id`),
+  KEY `date` (`date`,`notes`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_drills`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_drills_record`
+--
+
+CREATE TABLE `rudi_drills_record` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `drill_id` int(11) NOT NULL,
+  `member_id` int(11) NOT NULL,
+  `performance` int(11) NOT NULL,
+  `excusal` tinyint(1) NOT NULL,
+  `excusal_reason` text NOT NULL,
+  `initiative` int(11) NOT NULL,
+  PRIMARY KEY (`record_id`),
+  KEY `member_id` (`member_id`,`performance`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_drills_record`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_platoons`
+--
+
+CREATE TABLE `rudi_platoons` (
+  `platoon_id` int(11) NOT NULL AUTO_INCREMENT,
+  `unit_id` int(11) NOT NULL,
+  `leader_id` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `logo` varchar(30) NOT NULL,
+  `creed` varchar(50) NOT NULL,
+  `bio` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`platoon_id`),
+  KEY `idx_platoons` (`unit_id`,`name`,`leader_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_platoons`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_ranks`
+--
+
+CREATE TABLE `rudi_ranks` (
+  `rank_id` int(11) NOT NULL AUTO_INCREMENT,
+  `class_id` int(11) NOT NULL,
+  `active` int(11) NOT NULL,
+  `shortname` varchar(3) NOT NULL,
+  `longname` varchar(255) NOT NULL,
+  `image` varchar(30) NOT NULL,
+  `weight` int(11) NOT NULL,
+  PRIMARY KEY (`rank_id`),
+  KEY `idx_rank` (`class_id`,`shortname`,`longname`,`weight`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=27 ;
+
+--
+-- Dumping data for table `rudi_ranks`
+--
+
+INSERT INTO `rudi_ranks` VALUES(1, 1, 1, 'PVT', 'Private', 'PVT.png', 1);
+INSERT INTO `rudi_ranks` VALUES(2, 1, 1, 'PV2', 'Private Second Class', 'PV2.png', 2);
+INSERT INTO `rudi_ranks` VALUES(3, 1, 1, 'PFC', 'Private First Class', 'PFC.png', 3);
+INSERT INTO `rudi_ranks` VALUES(4, 1, 1, 'SPC', 'Specialist', 'SPC.png', 4);
+INSERT INTO `rudi_ranks` VALUES(5, 2, 1, 'CPL', 'Corporal', 'CPL.png', 5);
+INSERT INTO `rudi_ranks` VALUES(6, 3, 1, 'SGT', 'Sergeant', 'SGT.png', 6);
+INSERT INTO `rudi_ranks` VALUES(7, 3, 1, 'SSG', 'Staff Sergeant', 'SSG.png', 7);
+INSERT INTO `rudi_ranks` VALUES(8, 4, 0, 'SFC', 'Sergeant First Class', 'SFC.png', 8);
+INSERT INTO `rudi_ranks` VALUES(9, 4, 0, 'MSG', 'Master Sergeant', 'MSG.png', 9);
+INSERT INTO `rudi_ranks` VALUES(10, 4, 1, '1SG', '1st Sergeant', '1SG.png', 10);
+INSERT INTO `rudi_ranks` VALUES(11, 4, 0, 'SGM', 'Sergeant Major', 'SGM.png', 11);
+INSERT INTO `rudi_ranks` VALUES(12, 4, 0, 'CSM', 'Command Sergeant Major', 'CSM.png', 12);
+INSERT INTO `rudi_ranks` VALUES(13, 4, 0, 'SMA', 'Sergeant Major of the Army', 'SMA.png', 13);
+INSERT INTO `rudi_ranks` VALUES(14, 5, 1, '2LT', '2nd Lieutenant', '2LT.png', 14);
+INSERT INTO `rudi_ranks` VALUES(15, 5, 1, '1LT', '1st Lieutenant', '1LT.png', 15);
+INSERT INTO `rudi_ranks` VALUES(16, 5, 1, 'CPT', 'Captain', 'CPT.png', 16);
+INSERT INTO `rudi_ranks` VALUES(17, 5, 0, 'MAJ', 'Major', 'MAJ.png', 17);
+INSERT INTO `rudi_ranks` VALUES(18, 6, 0, 'LTC', 'Lieutenant Colonel', 'LTC.png', 18);
+INSERT INTO `rudi_ranks` VALUES(19, 6, 0, 'COL', 'Colonel', 'COL.png', 19);
+INSERT INTO `rudi_ranks` VALUES(20, 6, 0, 'BG', 'Brigadier General', 'BG.png', 20);
+INSERT INTO `rudi_ranks` VALUES(21, 6, 0, 'MJ', 'Major General', 'MJ.png', 21);
+INSERT INTO `rudi_ranks` VALUES(22, 6, 0, 'LTG', 'Lieutenant General', 'LTG.png', 22);
+INSERT INTO `rudi_ranks` VALUES(23, 6, 0, 'GEN', 'General', 'GEN.png', 23);
+INSERT INTO `rudi_ranks` VALUES(24, 1, 1, 'RCT', 'Recruit', 'RCT.png', 0);
+INSERT INTO `rudi_ranks` VALUES(26, 5, 1, 'CW2', 'Chief Warrant Officer', 'CW2.png', 13);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_roles`
+--
+
+CREATE TABLE `rudi_roles` (
+  `role_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `rclass_id` int(10) NOT NULL,
+  `weight` int(10) NOT NULL,
+  PRIMARY KEY (`role_id`),
+  KEY `idx_role_names` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
+
+--
+-- Dumping data for table `rudi_roles`
+--
+
+INSERT INTO `rudi_roles` VALUES(2, 'Senior Sergeant', 1, 3);
+INSERT INTO `rudi_roles` VALUES(3, 'Squad Leader', 2, 1);
+INSERT INTO `rudi_roles` VALUES(4, 'Team Leader', 2, 3);
+INSERT INTO `rudi_roles` VALUES(6, 'Commanding Officer', 1, 1);
+INSERT INTO `rudi_roles` VALUES(7, 'Executive Officer', 1, 2);
+INSERT INTO `rudi_roles` VALUES(9, 'Automatic Rifleman', 2, 4);
+INSERT INTO `rudi_roles` VALUES(10, 'Grenadier', 2, 5);
+INSERT INTO `rudi_roles` VALUES(11, 'Rifleman', 2, 6);
+INSERT INTO `rudi_roles` VALUES(12, 'Machine Gunner', 4, 4);
+INSERT INTO `rudi_roles` VALUES(13, 'Anti-Armor Gunner', 4, 2);
+INSERT INTO `rudi_roles` VALUES(14, 'Marksman', 4, 1);
+INSERT INTO `rudi_roles` VALUES(15, 'Combat Medic', 5, 3);
+INSERT INTO `rudi_roles` VALUES(16, 'Machine Gun Assistant', 4, 5);
+INSERT INTO `rudi_roles` VALUES(17, 'Anti-Armor Assistant', 4, 3);
+INSERT INTO `rudi_roles` VALUES(18, 'Senior Medic', 5, 1);
+INSERT INTO `rudi_roles` VALUES(19, 'Squad Medic', 5, 2);
+INSERT INTO `rudi_roles` VALUES(20, 'Medical Trainee', 5, 4);
+INSERT INTO `rudi_roles` VALUES(21, 'Recruit', 2, 7);
+INSERT INTO `rudi_roles` VALUES(22, 'Assistant Squad Leader', 2, 2);
+INSERT INTO `rudi_roles` VALUES(25, 'Chief Logistics Officer', 1, 4);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_roles_container`
+--
+
+CREATE TABLE `rudi_roles_container` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `role_id` int(11) NOT NULL,
+  `member_id` int(11) NOT NULL,
+  PRIMARY KEY (`record_id`),
+  KEY `role_id` (`role_id`,`member_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_roles_container`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_role_classes`
+--
+
+CREATE TABLE `rudi_role_classes` (
+  `rclass_id` int(10) NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) NOT NULL,
+  `weight` int(10) NOT NULL,
+  PRIMARY KEY (`rclass_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ;
+
+--
+-- Dumping data for table `rudi_role_classes`
+--
+
+INSERT INTO `rudi_role_classes` VALUES(1, 'Command Roles', 1);
+INSERT INTO `rudi_role_classes` VALUES(2, 'Squad Roles', 2);
+INSERT INTO `rudi_role_classes` VALUES(4, 'Specialized', 4);
+INSERT INTO `rudi_role_classes` VALUES(5, 'Medical Roles', 3);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_service_record`
+--
+
+CREATE TABLE `rudi_service_record` (
+  `record_id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) NOT NULL,
+  `date_added` datetime NOT NULL,
+  `record_note` varchar(255) NOT NULL,
+  `added_by` int(11) NOT NULL,
+  PRIMARY KEY (`record_id`),
+  KEY `member_id` (`member_id`,`date_added`,`added_by`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_service_record`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_squads`
+--
+
+CREATE TABLE `rudi_squads` (
+  `squad_id` int(11) NOT NULL AUTO_INCREMENT,
+  `platoon_id` int(11) NOT NULL,
+  `leader_id` int(11) NOT NULL,
+  `name` varchar(32) NOT NULL,
+  `logo` varchar(32) NOT NULL,
+  `creed` varchar(32) NOT NULL,
+  PRIMARY KEY (`squad_id`),
+  UNIQUE KEY `idx_squads` (`name`,`creed`),
+  KEY `idx_squads_ids` (`platoon_id`,`leader_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_squads`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_statuses`
+--
+
+CREATE TABLE `rudi_statuses` (
+  `status_id` int(11) NOT NULL AUTO_INCREMENT,
+  `weight` int(11) NOT NULL,
+  `name` varchar(32) NOT NULL,
+  `desc` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`status_id`),
+  KEY `name` (`name`,`desc`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=8 ;
+
+--
+-- Dumping data for table `rudi_statuses`
+--
+
+INSERT INTO `rudi_statuses` VALUES(1, 1, 'Active', NULL);
+INSERT INTO `rudi_statuses` VALUES(2, 2, 'Leave', 'Soldier has been authorized to put down his duties for a short period of time.');
+INSERT INTO `rudi_statuses` VALUES(3, 3, 'Extended Leave', 'Soldier has been authorized to put down his duties for a long period of time.');
+INSERT INTO `rudi_statuses` VALUES(4, 5, 'General Discharge', 'Soldier''s record does not warrant an Honorable Discharge status.');
+INSERT INTO `rudi_statuses` VALUES(5, 4, 'Honorable Discharge', 'Soldier''s records and conduct were outstanding.');
+INSERT INTO `rudi_statuses` VALUES(6, 6, 'Dishonorable Discharge', NULL);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_units`
+--
+
+CREATE TABLE `rudi_units` (
+  `unit_id` int(11) NOT NULL AUTO_INCREMENT,
+  `leader_id` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `logo` varchar(30) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `creed` varchar(50) NOT NULL,
+  `bio` text,
+  PRIMARY KEY (`unit_id`),
+  UNIQUE KEY `idx_units` (`name`),
+  KEY `idx_units_leader` (`leader_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_units`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_unit_members`
+--
+
+CREATE TABLE `rudi_unit_members` (
+  `member_id` int(11) NOT NULL AUTO_INCREMENT,
+  `unit_id` int(11) NOT NULL,
+  `platoon_id` int(11) NOT NULL,
+  `squad_id` int(11) NOT NULL,
+  `team_id` int(11) NOT NULL,
+  `rank_id` int(11) NOT NULL,
+  `weapon_id` int(11) NOT NULL,
+  `weapon2_id` int(11) NOT NULL,
+  `status_id` int(11) NOT NULL,
+  `country_id` int(11) NOT NULL,
+  `role_id` int(10) NOT NULL,
+  `a2_id` int(10) NOT NULL,
+  `oa_id` int(10) NOT NULL,
+  `image` varchar(30) DEFAULT NULL COMMENT 'member profile image',
+  `username` varchar(32) NOT NULL,
+  `password` varchar(64) NOT NULL,
+  `email` varchar(96) DEFAULT NULL,
+  `xfire` varchar(30) NOT NULL,
+  `first_name` varchar(32) NOT NULL,
+  `last_name` varchar(32) NOT NULL,
+  `location_city` varchar(32) NOT NULL,
+  `location_province` varchar(32) NOT NULL,
+  `bio` text NOT NULL,
+  `date_of_birth` datetime DEFAULT NULL,
+  `date_enlisted` datetime NOT NULL,
+  `date_discharged` datetime DEFAULT NULL,
+  `date_promotion` datetime NOT NULL,
+  `points` int(11) NOT NULL DEFAULT '100',
+  `drillcount` tinyint(3) NOT NULL,
+  `attendcount` tinyint(3) NOT NULL,
+  `cunit_id` int(11) NOT NULL,
+  `primary_mos` varchar(5) NOT NULL,
+  PRIMARY KEY (`member_id`),
+  UNIQUE KEY `idx_unit_member_credentials` (`username`,`email`),
+  KEY `idx_unit_member_units` (`unit_id`,`platoon_id`,`squad_id`,`team_id`,`status_id`,`rank_id`,`country_id`),
+  KEY `idx_unit_member_dates` (`date_of_birth`,`date_enlisted`,`date_discharged`,`date_promotion`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `rudi_unit_members`
+--
+
+INSERT INTO `rudi_unit_members` VALUES(1, 1, 2, 0, 0, 2, 5, 0, 1, 1, 11, 0, 0, '', '', 'nopassword', 'bayonet@example.com', '', 'Bayonet', 'Soldier', '', '', '', '0000-00-00 00:00:00', '1969-12-31 00:00:00', NULL, '1969-12-31 00:00:00', 100, 0, 0, 1, '11B');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_war_maps`
+--
+
+CREATE TABLE `rudi_war_maps` (
+  `map_id` int(11) NOT NULL AUTO_INCREMENT,
+  `mapname` varchar(100) NOT NULL,
+  `mapimage` varchar(100) NOT NULL,
+  `displayname` varchar(255) NOT NULL,
+  PRIMARY KEY (`map_id`),
+  UNIQUE KEY `idx_war_maps` (`mapname`,`mapimage`,`displayname`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_war_maps`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_war_stats`
+--
+
+CREATE TABLE `rudi_war_stats` (
+  `war_id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(20) NOT NULL,
+  `visit_unit_id` int(11) NOT NULL,
+  `map_id` int(11) NOT NULL,
+  `home_score` int(10) NOT NULL,
+  `visit_score` int(10) NOT NULL,
+  `date` date NOT NULL,
+  `status` enum('Won','Loss','Draw') NOT NULL,
+  `aar_link` varchar(100) NOT NULL,
+  PRIMARY KEY (`war_id`),
+  KEY `idx_war_stats` (`visit_unit_id`,`map_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_war_stats`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_war_units`
+--
+
+CREATE TABLE `rudi_war_units` (
+  `visitor_id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `website` varchar(255) DEFAULT NULL,
+  `creation_date` datetime DEFAULT NULL,
+  PRIMARY KEY (`visitor_id`),
+  KEY `name` (`name`,`website`),
+  KEY `creation_date` (`creation_date`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `rudi_war_units`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `rudi_weapons`
+--
+
+CREATE TABLE `rudi_weapons` (
+  `weapon_id` int(11) NOT NULL AUTO_INCREMENT,
+  `manufacturer` varchar(32) NOT NULL,
+  `model` varchar(32) NOT NULL,
+  `role` enum('Assault','Squad Support','Light Support','Heavy Support','Sniper','Anti-Armor','Indirect','Sidearm') NOT NULL,
+  `caliber` varchar(25) NOT NULL,
+  PRIMARY KEY (`weapon_id`),
+  KEY `idx_weapon` (`manufacturer`,`model`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=23 ;
+
+--
+-- Dumping data for table `rudi_weapons`
+--
+
+INSERT INTO `rudi_weapons` VALUES(1, 'Colt', '1911', 'Sidearm', '.45');
+INSERT INTO `rudi_weapons` VALUES(2, 'Berretta', 'M9', 'Sidearm', '9 mm');
+INSERT INTO `rudi_weapons` VALUES(3, 'Colt', 'M4A1', 'Assault', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(4, 'Heckler & Koch', 'USP', 'Sidearm', '');
+INSERT INTO `rudi_weapons` VALUES(5, 'Colt', 'M16A4', 'Assault', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(6, 'Springfield', 'M14', 'Assault', '7.62x51mm NATO');
+INSERT INTO `rudi_weapons` VALUES(7, 'Remington Arms', 'M24 SWS', 'Sniper', '7.62x51mm NATO');
+INSERT INTO `rudi_weapons` VALUES(8, 'FNH USA', 'M249 SAW', 'Light Support', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(9, 'FNH USA', 'M240', 'Heavy Support', '7.62x51mm NATO');
+INSERT INTO `rudi_weapons` VALUES(10, '', 'Mk 12 SPR', 'Sniper', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(11, 'Browning', 'M2', 'Heavy Support', '.50 BMG');
+INSERT INTO `rudi_weapons` VALUES(12, 'Saab Bofors Dynamics', 'AT-4', 'Anti-Armor', '84 mm');
+INSERT INTO `rudi_weapons` VALUES(13, 'Talley Defense Systems', 'SMAW', 'Anti-Armor', '');
+INSERT INTO `rudi_weapons` VALUES(14, 'Colt', 'M16A2', 'Assault', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(15, 'Knight''s Armament Company', 'M110 SASS', 'Sniper', '7.62x51mm NATO');
+INSERT INTO `rudi_weapons` VALUES(16, 'FN Manufacturing Inc', 'Mk 48 mod 0', 'Light Support', '7.62x51mm NATO');
+INSERT INTO `rudi_weapons` VALUES(17, '', 'M203', 'Indirect', '40mm');
+INSERT INTO `rudi_weapons` VALUES(18, '', 'EGLM', 'Indirect', '40mm');
+INSERT INTO `rudi_weapons` VALUES(19, '', 'M252 mortar', 'Indirect', '81 mm');
+INSERT INTO `rudi_weapons` VALUES(20, 'FNH', 'Mk 16 SCAR-L', 'Assault', '5.56x45mm NATO');
+INSERT INTO `rudi_weapons` VALUES(21, 'FNH', 'Mk 17 SCAR-H', 'Assault', '7.62x51mm NATO ');
+INSERT INTO `rudi_weapons` VALUES(22, 'Saab Bofors Dynamics', 'M3 MAAWS', 'Anti-Armor', '84 mm');
diff --git a/themes/default/footer.php b/themes/default/footer.php
index afadce7..db656ce 100644
--- a/themes/default/footer.php
+++ b/themes/default/footer.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 $phpversion = preg_replace('/[a-z-]/', '', phpversion());
 $mtime = explode(' ', microtime());
 $totaltime = $mtime[0] + $mtime[1] - $starttime;
@@ -26,25 +26,19 @@ $debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) p
 
 <div class="footer">
 
-		<br />
-		<span class="footer-text">	
-			All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest &copy; 2001-<?php echo date('Y'); ?> 3rd Infantry Division.</span>
-		
-		<br /><br />
-
-      <a href="admin/">Administrative Control Panel</a><br />
+<a href="admin/">Administrative Control Panel</a><br />
 <?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
 <?php echo stripslashes($config['product']['copyright']); ?><br />
 <?php if($config['debug']['enabled']) echo $debug_output ?><br />
+
 </div>
 
 <?php
- if($config['debug']['enabled']){ 
+if($config['debug']['enabled']){
 	logQueueFlush();
- } 
+}
 ?>
 
 </body>
 </html>
-<?php ob_flush();?>
- 
+<?php ob_flush();?>
\ No newline at end of file
diff --git a/themes/default/header.php b/themes/default/header.php
index a9b043b..0ade800 100644
--- a/themes/default/header.php
+++ b/themes/default/header.php
@@ -23,18 +23,16 @@ $starttime = explode(' ', microtime());
 $starttime = $starttime[1] + $starttime[0];
 ?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US" dir="ltr">
+<!DOCTYPE html>
+<html>
 
 <head>
-<title>3rd Infantry Division - 8 years strong - ArmaII Unit</title>
+<title>Bayonet CMS</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <?php if(isset($config['site']['favicon'])): ?>
-<!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
 <link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
 <?php endif; ?>
 <link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
 </head>
 
-<body>
+<body>
\ No newline at end of file
diff --git a/themes/default/include/functions.php b/themes/default/include/functions.php
index 4aeeb14..4a401fd 100644
--- a/themes/default/include/functions.php
+++ b/themes/default/include/functions.php
@@ -1,22 +1,4 @@
 <?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 
 	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
 	
@@ -55,4 +37,4 @@
 	  CloseContent();
 	}
 
-?>
+?>
\ No newline at end of file
diff --git a/themes/default/include/primary.css b/themes/default/include/primary.css
index 7bed7ce..6a7747a 100644
--- a/themes/default/include/primary.css
+++ b/themes/default/include/primary.css
@@ -1,37 +1,62 @@
+
 	/*********************************
  	 **  	  Layout Styles			**
  	 *********************************/
  	 div.container {
 		width: 990px;
-		/* width: 1000px; */
-		color: #000000;
-		 margin: auto auto;
+		color: black;
+		margin: auto auto;
 		text-align: left; /* IE 5 fix */
 	}
  	div.banner {
-	  	/* width: 990px; */
-	  	text-align:center;
-		/* margin: auto auto; */
+	  	height: 100px;
 	}
-	div.nav {
-		/*width: 990px; */
-		height: 28px;
+		.banner h1 {
+			margin: 0;
+			padding-left: 15px;
+			line-height: 100px;
+			color: white;
+			font-weight: bold;
+		}
+	nav {
+		height: 32px;
 		background: #284c75;
-		background-image:url('../images/navbackground.jpg');
-		color: #000000;
+		background: #41678d; /* Old browsers */
+		background: -moz-linear-gradient(top,  #41678d 0%, #41678d 45%, #224567 55%, #224567 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#41678d), color-stop(45%,#41678d), color-stop(55%,#224567), color-stop(100%,#224567)); /* Chrome,Safari4+ */
+		background: -webkit-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Chrome10+,Safari5.1+ */
+		background: -o-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* Opera 11.10+ */
+		background: -ms-linear-gradient(top,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* IE10+ */
+		background: linear-gradient(to bottom,  #41678d 0%,#41678d 45%,#224567 55%,#224567 100%); /* W3C */
+		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#41678d', endColorstr='#224567',GradientType=0 ); /* IE6-9 */
 		text-align:center;
-		/* margin: auto auto; */
 		font-size:14px;
+		border-radius: 2px;
+	}
+	nav a {
+		color: white !important;
+		font-weight: bold;
+	}
+	nav ul {
+		list-style: none;
+		margin: 0;
+		padding-left: 20px;
+		line-height: 32px;
 	}
+		nav li {
+			float: left;
+			margin-right: 2em;
+		}
 	table.main {
-		background-image:url('../images/sandbackground.jpg');
+		/*background-image:url('../images/sandbackground.jpg');*/
 	 	padding: 0px;
 		color:#ffffff;
 	 	width:990px;
 	 	/*width: 1134px; */
 	 	 /* width: 1234px; */
 	 	margin: auto auto;
-		background-color:#a3a2a0;
+	 	margin-top: 20px;
+		/*background-color:#a3a2a0;*/
 	}
 
 	table.main td {
@@ -56,6 +81,8 @@
 		color:#5e5e5e;
 		background-color:#333333;
 		border-top: 1px solid #5e5e5e;
+		margin-top: 30px;
+		padding: 15px;
 	}	
 	
 	/*********************************
@@ -70,7 +97,7 @@
 		border:1px solid #333333; 
 	}
  	div.contentHeading {
-		background-image:url(../images/blockbackground.jpg);
+		background-image:url('../images/blockbackground.jpg');
 		background-repeat:repeat-x;
 		background-color:#112f50;
 		height:25px;
@@ -85,6 +112,7 @@
 		/*background-color:#383838;
 		color:white; */
 		background-color:#f1f1f1;
+		/*width: 644px !important;*/
 	}	
 	div.content img {
 		padding:10px;	
diff --git a/themes/default/index.php b/themes/default/index.php
index 3da1144..fc2137b 100644
--- a/themes/default/index.php
+++ b/themes/default/index.php
@@ -33,12 +33,12 @@ include self::$header;
 <div class="container">
 
 <!-- banner -->
- <div class="banner"><a href="index.php"><img src="<?php echo self::$image_path . '/logo.jpg'; ?>" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
+ <div class="banner"><h1>Bayonet CMS</h1></div>
 <!-- navigation -->
  <div class="nav"><?php require_once self::$root_path . '/navigation.php'; ?></div>
 
 <!-- content -->
-<table border="0" cellspacing="15px" cellpadding="0"  class="main" width="100%">
+<table border="0" cellspacing="0px" cellpadding="0" class="main" width="100%">
 	<tr>
 		<td class="midcol">
 	    	<?php  require_once 'modules.php'; ?>
@@ -46,7 +46,7 @@ include self::$header;
  		
 	  <!-- block area RIGHT -->
 	  <?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>
-	    <td class="rightcol">
+	    <td class="rightcol" style="padding-left: 15px;">
 	      	<?php GetBlocks(BLOCK_RIGHT); ?>
 	    </td>    
 	  <?php endif; ?>
diff --git a/themes/default/navigation.php b/themes/default/navigation.php
index d90365a..012c95f 100644
--- a/themes/default/navigation.php
+++ b/themes/default/navigation.php
@@ -1,34 +1,20 @@
+<nav>
+	<ul>
+		<li><a href="index.php">HOME</a></li>
+
 <?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 
+	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
+	$nav = $db->Fetch($result);
+
+	foreach ($nav as $link):
+
+		$href = str_replace('&', '&amp;', $link['link']);
+		$title = strtoupper($link['title']);
+		echo "<li><a href=\"{$href}\">{$title}</a></li>";
+
+	endforeach;
 ?>
-<table border="0" cellspacing="0" class="navLinks">
-	<tr>
- 		<td>&nbsp;&nbsp;<a href="index.php">HOME</a>&nbsp;&nbsp;</td>
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
 
-   	foreach ($nav as $link) {
-   	  echo '<td>&nbsp;&nbsp;<a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a>&nbsp;&nbsp;</td>'; 
-   	}
-   	?>
-	</tr>
-</table>
+	</ul>
+</nav>
diff --git a/themes/gttheme/footer.php b/themes/gttheme/footer.php
deleted file mode 100644
index afadce7..0000000
--- a/themes/gttheme/footer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-$phpversion = preg_replace('/[a-z-]/', '', phpversion());
-$mtime = explode(' ', microtime());
-$totaltime = $mtime[0] + $mtime[1] - $starttime;
-$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s<br/>Connections: %d | Queries: %d | Fetches: %d | Frees: %d<br/>\n",
-                $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees);
-?>
-
-<div class="footer">
-
-		<br />
-		<span class="footer-text">	
-			All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest &copy; 2001-<?php echo date('Y'); ?> 3rd Infantry Division.</span>
-		
-		<br /><br />
-
-      <a href="admin/">Administrative Control Panel</a><br />
-<?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
-<?php echo stripslashes($config['product']['copyright']); ?><br />
-<?php if($config['debug']['enabled']) echo $debug_output ?><br />
-</div>
-
-<?php
- if($config['debug']['enabled']){ 
-	logQueueFlush();
- } 
-?>
-
-</body>
-</html>
-<?php ob_flush();?>
- 
diff --git a/themes/gttheme/header.php b/themes/gttheme/header.php
deleted file mode 100644
index a9b043b..0000000
--- a/themes/gttheme/header.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-global $config;
-ob_start();
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US" dir="ltr">
-
-<head>
-<title>3rd Infantry Division - 8 years strong - ArmaII Unit</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<?php if(isset($config['site']['favicon'])): ?>
-<!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
-<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
-<?php endif; ?>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
-</head>
-
-<body>
diff --git a/themes/gttheme/images/Medal.png b/themes/gttheme/images/Medal.png
deleted file mode 100644
index 1d9974b..0000000
--- a/themes/gttheme/images/Medal.png
+++ /dev/null
diff --git a/themes/gttheme/images/add.gif b/themes/gttheme/images/add.gif
deleted file mode 100644
index 836dbf2..0000000
--- a/themes/gttheme/images/add.gif
+++ /dev/null
diff --git a/themes/gttheme/images/addnewarticle.png b/themes/gttheme/images/addnewarticle.png
deleted file mode 100644
index 0e29960..0000000
--- a/themes/gttheme/images/addnewarticle.png
+++ /dev/null
diff --git a/themes/gttheme/images/addnewpage.png b/themes/gttheme/images/addnewpage.png
deleted file mode 100644
index c60c68c..0000000
--- a/themes/gttheme/images/addnewpage.png
+++ /dev/null
diff --git a/themes/gttheme/images/annoucement.png b/themes/gttheme/images/annoucement.png
deleted file mode 100644
index c70591d..0000000
--- a/themes/gttheme/images/annoucement.png
+++ /dev/null
diff --git a/themes/gttheme/images/announcement.png b/themes/gttheme/images/announcement.png
deleted file mode 100644
index c70591d..0000000
--- a/themes/gttheme/images/announcement.png
+++ /dev/null
diff --git a/themes/gttheme/images/arrowleft.png b/themes/gttheme/images/arrowleft.png
deleted file mode 100644
index 502ae41..0000000
--- a/themes/gttheme/images/arrowleft.png
+++ /dev/null
diff --git a/themes/gttheme/images/arrowright.png b/themes/gttheme/images/arrowright.png
deleted file mode 100644
index ddd163b..0000000
--- a/themes/gttheme/images/arrowright.png
+++ /dev/null
diff --git a/themes/gttheme/images/background.jpg b/themes/gttheme/images/background.jpg
deleted file mode 100644
index e96f267..0000000
--- a/themes/gttheme/images/background.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/banner.jpg b/themes/gttheme/images/banner.jpg
deleted file mode 100644
index 854561b..0000000
--- a/themes/gttheme/images/banner.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/bayonetLogo.png b/themes/gttheme/images/bayonetLogo.png
deleted file mode 100644
index 4183a88..0000000
--- a/themes/gttheme/images/bayonetLogo.png
+++ /dev/null
diff --git a/themes/gttheme/images/blockbackground.jpg b/themes/gttheme/images/blockbackground.jpg
deleted file mode 100644
index ea6c7d3..0000000
--- a/themes/gttheme/images/blockbackground.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/calendar.png b/themes/gttheme/images/calendar.png
deleted file mode 100644
index 86b9861..0000000
--- a/themes/gttheme/images/calendar.png
+++ /dev/null
diff --git a/themes/gttheme/images/delete.gif b/themes/gttheme/images/delete.gif
deleted file mode 100644
index 4e2a37f..0000000
--- a/themes/gttheme/images/delete.gif
+++ /dev/null
diff --git a/themes/gttheme/images/editfiles.png b/themes/gttheme/images/editfiles.png
deleted file mode 100644
index 500e206..0000000
--- a/themes/gttheme/images/editfiles.png
+++ /dev/null
diff --git a/themes/gttheme/images/editpage.png b/themes/gttheme/images/editpage.png
deleted file mode 100644
index ab3fd58..0000000
--- a/themes/gttheme/images/editpage.png
+++ /dev/null
diff --git a/themes/gttheme/images/error.gif b/themes/gttheme/images/error.gif
deleted file mode 100644
index cb1fcbe..0000000
--- a/themes/gttheme/images/error.gif
+++ /dev/null
diff --git a/themes/gttheme/images/error.png b/themes/gttheme/images/error.png
deleted file mode 100644
index 5bc1824..0000000
--- a/themes/gttheme/images/error.png
+++ /dev/null
diff --git a/themes/gttheme/images/file_doc.png b/themes/gttheme/images/file_doc.png
deleted file mode 100644
index b1da1ef..0000000
--- a/themes/gttheme/images/file_doc.png
+++ /dev/null
diff --git a/themes/gttheme/images/file_pdf.png b/themes/gttheme/images/file_pdf.png
deleted file mode 100644
index 500e206..0000000
--- a/themes/gttheme/images/file_pdf.png
+++ /dev/null
diff --git a/themes/gttheme/images/file_rtf.png b/themes/gttheme/images/file_rtf.png
deleted file mode 100644
index 39304c1..0000000
--- a/themes/gttheme/images/file_rtf.png
+++ /dev/null
diff --git a/themes/gttheme/images/file_word.png b/themes/gttheme/images/file_word.png
deleted file mode 100644
index 3011f00..0000000
--- a/themes/gttheme/images/file_word.png
+++ /dev/null
diff --git a/themes/gttheme/images/headingbg.jpg b/themes/gttheme/images/headingbg.jpg
deleted file mode 100644
index 3597c21..0000000
--- a/themes/gttheme/images/headingbg.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/hgrad.png b/themes/gttheme/images/hgrad.png
deleted file mode 100644
index 86daf8b..0000000
--- a/themes/gttheme/images/hgrad.png
+++ /dev/null
diff --git a/themes/gttheme/images/larrow.png b/themes/gttheme/images/larrow.png
deleted file mode 100644
index 554b6e9..0000000
--- a/themes/gttheme/images/larrow.png
+++ /dev/null
diff --git a/themes/gttheme/images/leftshadow.png b/themes/gttheme/images/leftshadow.png
deleted file mode 100644
index 1f32159..0000000
--- a/themes/gttheme/images/leftshadow.png
+++ /dev/null
diff --git a/themes/gttheme/images/logo.jpg b/themes/gttheme/images/logo.jpg
deleted file mode 100644
index 8b59067..0000000
--- a/themes/gttheme/images/logo.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/lvgrad.png b/themes/gttheme/images/lvgrad.png
deleted file mode 100644
index 487d7e3..0000000
--- a/themes/gttheme/images/lvgrad.png
+++ /dev/null
diff --git a/themes/gttheme/images/navbackground.jpg b/themes/gttheme/images/navbackground.jpg
deleted file mode 100644
index 93ffece..0000000
--- a/themes/gttheme/images/navbackground.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/navbg.jpg b/themes/gttheme/images/navbg.jpg
deleted file mode 100644
index 9bd90ce..0000000
--- a/themes/gttheme/images/navbg.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/navbg.png b/themes/gttheme/images/navbg.png
deleted file mode 100644
index 00a8f88..0000000
--- a/themes/gttheme/images/navbg.png
+++ /dev/null
diff --git a/themes/gttheme/images/navigation.png b/themes/gttheme/images/navigation.png
deleted file mode 100644
index 739c95f..0000000
--- a/themes/gttheme/images/navigation.png
+++ /dev/null
diff --git a/themes/gttheme/images/navspacer.png b/themes/gttheme/images/navspacer.png
deleted file mode 100644
index cdc8cb4..0000000
--- a/themes/gttheme/images/navspacer.png
+++ /dev/null
diff --git a/themes/gttheme/images/news_header.png b/themes/gttheme/images/news_header.png
deleted file mode 100644
index 00861bf..0000000
--- a/themes/gttheme/images/news_header.png
+++ /dev/null
diff --git a/themes/gttheme/images/nvgrad.png b/themes/gttheme/images/nvgrad.png
deleted file mode 100644
index 5e4c05c..0000000
--- a/themes/gttheme/images/nvgrad.png
+++ /dev/null
diff --git a/themes/gttheme/images/photogallery.png b/themes/gttheme/images/photogallery.png
deleted file mode 100644
index a161a55..0000000
--- a/themes/gttheme/images/photogallery.png
+++ /dev/null
diff --git a/themes/gttheme/images/photoleft.png b/themes/gttheme/images/photoleft.png
deleted file mode 100644
index f4eb3af..0000000
--- a/themes/gttheme/images/photoleft.png
+++ /dev/null
diff --git a/themes/gttheme/images/photoright.png b/themes/gttheme/images/photoright.png
deleted file mode 100644
index 16a251b..0000000
--- a/themes/gttheme/images/photoright.png
+++ /dev/null
diff --git a/themes/gttheme/images/rarrow.png b/themes/gttheme/images/rarrow.png
deleted file mode 100644
index 9a272d9..0000000
--- a/themes/gttheme/images/rarrow.png
+++ /dev/null
diff --git a/themes/gttheme/images/rightshadow.png b/themes/gttheme/images/rightshadow.png
deleted file mode 100644
index bc970f0..0000000
--- a/themes/gttheme/images/rightshadow.png
+++ /dev/null
diff --git a/themes/gttheme/images/sandbackground.jpg b/themes/gttheme/images/sandbackground.jpg
deleted file mode 100644
index 2a2d800..0000000
--- a/themes/gttheme/images/sandbackground.jpg
+++ /dev/null
diff --git a/themes/gttheme/images/spacer.png b/themes/gttheme/images/spacer.png
deleted file mode 100644
index f187f4a..0000000
--- a/themes/gttheme/images/spacer.png
+++ /dev/null
diff --git a/themes/gttheme/images/vgrad.png b/themes/gttheme/images/vgrad.png
deleted file mode 100644
index e7a96e8..0000000
--- a/themes/gttheme/images/vgrad.png
+++ /dev/null
diff --git a/themes/gttheme/images/view.gif b/themes/gttheme/images/view.gif
deleted file mode 100644
index 52cbddb..0000000
--- a/themes/gttheme/images/view.gif
+++ /dev/null
diff --git a/themes/gttheme/include/functions.php b/themes/gttheme/include/functions.php
deleted file mode 100644
index 6856262..0000000
--- a/themes/gttheme/include/functions.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
-	
-	/**
-	* OpenContent()
-	* Opens a Bayonet site content block.
-	* @return
-	*/
-	function OpenContent()
-	{
-		echo "<div class=\"contentBorder1\">";
-		echo "<div class=\"contentBorder2\">";
-	}
-	  
-	/**
-	* CloseContent()
-	* Closes a Bayonet site content block.
-	* @return
-	*/
-	function CloseContent()
-	{
-		echo "</div>";
-		echo "</div>";
-	}
-	  
-	function OpenBlock($title = 'New Block')
-	{
-	  OpenContent();
-	  echo "<div class=\"contentHeading\">{$title}</div>";
-	  echo "<div class=\"content\">";
-	}
-	
-	function CloseBlock()
-	{
-	  echo "</div>";
-	  CloseContent();
-	}
-
-?>
diff --git a/themes/gttheme/include/primary.css b/themes/gttheme/include/primary.css
deleted file mode 100644
index 025b0fc..0000000
--- a/themes/gttheme/include/primary.css
+++ /dev/null
@@ -1,286 +0,0 @@
-	/*********************************
- 	 **  	  Layout Styles			**
- 	 *********************************/
- 	 div.container {
-		width: 990px;
-		position: relative;
-		/* width: 1000px; */
-		color: #000000;
-		 margin: auto auto;
-		text-align: left; /* IE 5 fix */
-	}
- 	div.banner {
-	  	/* width: 990px; */
-	  	text-align:center;
-		/* margin: auto auto; */
-	}
-	img.head_medal {
-		position: absolute;
-		left: 26px;
-		top: -42px;
-	}
-	div.nav {
-		/*width: 990px; */
-		height: 24px;
-		background: #284c75;
-		background-image:url('../images/navbg.jpg');
-		color: #000000;
-		text-align:center;
-		/* margin: auto auto; */
-		font-size:14px;
-		line-height: 24px;
-		border: 3px solid black;
-		border-top: 1px solid black;
-	}
-	table.main {
-		/*background-image:url('../images/sandbackground.jpg'); */
-	 	padding: 0px;
-		color:#ffffff;
-	 	width:990px;
-	 	/*width: 1134px; */
-	 	 /* width: 1234px; */
-	 	margin: auto auto;
-	/*	background-color:#a3a2a0; */
-	}
-
-	table.main td {
-	/*	color:white; */
-	}
-	td.midcol {
- 	   	width: 644px;
-		background-color:transparent;
-		vertical-align:top;
-	}
-	td.rightcol {
-		vertical-align:top;
-	}
-	td.leftcol {
- 		width: 275px;
-		vertical-align:top;
-	}
-	div.footer {
-		text-align:center; 
-		font-family:verdana; 
-		font-size:10pt; 
-		color:#5e5e5e;
-		background-color:#333333;
-		border-top: 1px solid #5e5e5e;
-	}	
-	
-	/*********************************
- 	 **  	  Content Styles		**
- 	 *********************************/	
-	div.contentBorder1 {
-		background-color:white;
-		border: 1px solid #000; /*#3666ba;*/
-	}
-	div.contentBorder2 {
-		background-color:white;
-		border:1px solid #000; /* 333 */
-	}
- 	div.contentHeading {
-		background-image:url(../images/headingbg.jpg);
-		background-repeat:repeat-x;
-		background-color:#112f50;
-		border: 0px solid black;
-		border-bottom: 2px solid black;
-		height:25px;
-		line-height: 25px;
-		padding-left:10px;
-		padding-right:10px;
-		color:white;
-	}
-	div.content {
-		padding:10px;
-		color:#333333;
-		/*background-color:#383838;
-		color:white; */
-		background-color:#f1f1f1;
-	}	
-	div.content img {
-		padding:10px;	
-	}
-	div.contentFooter {
-	    border-top:1px solid #333333; 
-		background-color:#a4a4a4;
-		color:white;
-		padding-left:5px;
-		padding-right:5px;	
-	}
-	span.footer-text {
-		font-size: 10px;	
-	}
-	
-	.clear {
-		clear: both;	
-	}
-	
-	/*********************************
- 	 **  	  Nav Links Styles		**
- 	 *********************************/	
-	table.navLinks a, table.navLinks a:visited, table.navLinks a:active {
-		background-color:transparent;
-		color:white;
-		font-family:verdana;
-		font-size:11px;
-		font-weight:bold;
-		text-decoration:none;
-	}
-	
-	table.navLinks a:hover, table.navLinks a:visited:hover {
-		background-color:transparent;
-		color:#d2d2d2;
-		font-size:11px;
-		font-weight:bold;
-		text-decoration:none;
-	}
-	
-	table.navLinks {
-		height:25px;
-	}
-	
-	table.navLinks td {
-		border-right: 1px solid #213f61;
-		vertical-align:middle;
-	} 
-	
-	/*********************************
- 	 **  	  Misc.		 Styles		**
- 	 *********************************/	
- 	 
- 	 h1, h2, h3, h4, h5, h6 {
- 	 	font-family: Helvetica, Arial, sans-serif; 
-		font-weight: normal;	 
- 	 }
-	table, tr, td {
-		padding:0px;
-		border:0px;
-		margin:0px
-	}
-	body, td, div {
-		font-size:10pt;
-		/* color:black; */
-		font-family:verdana;
-		font-weight:normal;		
-	}
-	a, a:visited, a:active {
-		background-color:transparent;
-		color:#3666ba;
-		font-family:verdana;
-		font-size:12px;
-		text-decoration:none;
-	}
-	
-	a:hover, a:visited:hover {
-		background-color:transparent;
-		color:#3666ba;
-		font-family:verdana;
-		font-size:12px;
-		text-decoration:underline;
-	}
-	a.rudi_roster, a.rudi_roster:visited, a.rudi_roster:active, a.rudi_roster:hover {
-		color:#2b5bae;
-	}
-	body {
-		background-color:#091a34;
-		background-image: url('../images/Background.jpg');
-		background-position: top center;
-		background-attachment: fixed;
-		margin:0;
-		margin-top: 15px;
-		padding:0;
-		text-align:left;
-	}
-	a img {
-		border:0px;
-	}
-	form {
-		margin:0;
-	}
-	tr.rownorm{
-		background-color:white;
-
-	} 
-	tr.rowhigh{
-		background-color:#e0e0e0;
-	}
-	/* photo gallery styles */
-    .photoleft{
-    	background-image:url("../images/photoleft.png");
-    	background-repeat:repeat-y;
-     	text-align:center;
-    	width:49px;
-   	}
-	.photoright{
-		background-image:url("../images/photoright.png");
-		background-repeat:repeat-y;
-		text-align:center;
-		width:49px;
-    }
-    /* end photo gallery styles */
-    
-    /* stuff we might need in order to add drop shadows */
-    
-    	div.topbar {
-		height:25px; 
-		text-align:center; 
-		background-color:black;
-		font-family:verdana; 
-		font-size:10pt; 
-		color:#797e4f;
-	}
-	div.botbar { 
-		height:50px;
-		padding:5px;
-		text-align:center; 
-		background-color:black;
-		font-family:verdana; 
-		font-size:10pt; 
-	}
-		/* may need these two when we add the background images back */  	 
-	.leftbar {
-	 /*	background-image:url("../images/leftshadow.png");   */
-		background-repeat: 
-		repeat-y; 
-		width:50px;
-	}		
-	.rightbar {
-		/* background-image:url("../images/rightshadow.png");  */
-		background-repeat: 
-		repeat-y; 
-		width:15px;
-	}
-	
-	.fl-left{
-		float:left;	
-	}
-	
-	.fl-right{
-		float:right;	
-	}
-	
-	.clear {
-		clear:both;	
-	}
-	
-	.inline {
-		display: inline;	
-	}
-	
-    .left{
-            text-align:left;
-    }
-    .right{
-            text-align:right;
-    }
-    .center{
-            text-align:center;
-    }
-    .title{
-            font-size:14px;
-            font-weight:bold;
-            font-family:arial;
-    }
-
-@import "style_bbcode.css"
-
diff --git a/themes/gttheme/include/style_bbcode.css b/themes/gttheme/include/style_bbcode.css
deleted file mode 100644
index 05333f9..0000000
--- a/themes/gttheme/include/style_bbcode.css
+++ /dev/null
@@ -1,71 +0,0 @@
-.bold {
-   font-weight: bold;
-}
-
-.italics {
-   font-style: italic;
-}
-
-.underline {
-   text-decoration: underline;
-}
-
-.strikethrough {
-   text-decoration: line-through;
-}
-
-.overline {
-   text-decoration: overline;
-}
-
-.quotecodeheader {
-   font-family: Verdana, arial, helvetica, sans-serif;
-   font-size: 12px;
-   font-weight: bold;
-}
-
-.codebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #006600;
-    border: 1px solid #BFBFBF;
-}
-
-.quotebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #660002;
-   border: 1px solid #BFBFBF;
-}
-
-.listbullet {
-   list-style-type: disc;
-   list-style-position: inside;
-}
-
-.listdecimal {
-   list-style-type: decimal;
-   list-style-position: inside;
-}
-
-.listlowerroman {
-   list-style-type: lower-roman;
-   list-style-position: inside;
-}
-
-.listupperroman {
-   list-style-type: upper-roman;
-   list-style-position: inside;
-}
-
-.listloweralpha {
-   list-style-type: lower-alpha;
-   list-style-position: inside;
-}
-
-.listupperalpha {
-   list-style-type: upper-alpha;
-   list-style-position: inside;
-}
diff --git a/themes/gttheme/include/theme.ini b/themes/gttheme/include/theme.ini
deleted file mode 100644
index 223cd14..0000000
--- a/themes/gttheme/include/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[author]

-name = "Joseph Hunkeler"
\ No newline at end of file
diff --git a/themes/gttheme/index.php b/themes/gttheme/index.php
deleted file mode 100644
index 5ed718f..0000000
--- a/themes/gttheme/index.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Begin try/catch block */
-try {
-
-/* Setup error handing callbacks */
-ob_start("fatal_error_handler");
-set_error_handler("handle_error");
-
-require_once self::$root_path . '/include/functions.php';
-
-include self::$header;
-//session_start(); 
-?>
-
-<div class="container">
-
-<!-- banner -->
- <div class="banner"><img src="<?php echo self::$image_path . '/Medal.png'; ?>" class="head_medal" /><a href="index.php"><img src="<?php echo self::$image_path . '/banner.jpg'; ?>" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
-<!-- navigation -->
- <div class="nav"><?php require_once self::$root_path . '/navigation.php'; ?></div>
-
-<!-- content -->
-<table border="0" cellspacing="15px" cellpadding="0"  class="main" width="100%">
-	<tr>
-		<td class="midcol">
-	    	<?php  require_once 'modules.php'; ?>
- 		</td>
- 		
-	  <!-- block area RIGHT -->
-	  <?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>
-	    <td class="rightcol">
-	      	<?php GetBlocks(BLOCK_RIGHT); ?>
-	    </td>    
-	  <?php endif; ?>
-  		
-	</tr>
-</table>
-
-</div>
-<?php include self::$footer; ?>
-<?php
-/* Flushing is needed by the error handler */
-ob_end_flush();
-
-} //try ^^    
-catch(Exception $e)
-{
-  ReportError( 
-    "<style>td.short{width:100%;}</style><table style=\"width:0;\"><tr><th>Code</th>" . "<td class=\"short\">" . $e->getCode() . "</td>" . "</tr><tr><th>In File</th>" . "<td class=\"short\">" . $e->getFile() . "</td>" . "</tr></table>" . $e->getLine() . " - " . $e->getMessage() . "<br/>" 
-  );        
-}
-?> 
diff --git a/themes/gttheme/navigation.php b/themes/gttheme/navigation.php
deleted file mode 100644
index 69c660c..0000000
--- a/themes/gttheme/navigation.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-?>
-<table border="0" cellspacing="0" class="navLinks">
-	<tr>
- 		<td>&nbsp;&nbsp;<a href="index.php">HOME</a>&nbsp;&nbsp;</td>
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
-
-   	foreach ($nav as $link) {
-   	  echo '<td>&nbsp;&nbsp;<a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a>&nbsp;&nbsp;</td>'; 
-   	}
-   	?>
-	</tr>
-</table>
diff --git a/themes/new/footer.php b/themes/new/footer.php
deleted file mode 100644
index c628cca..0000000
--- a/themes/new/footer.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-$phpversion = preg_replace('/[a-z-]/', '', phpversion());
-$mtime = explode(' ', microtime());
-$totaltime = $mtime[0] + $mtime[1] - $starttime;
-$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s<br/>Connections: %d | Queries: %d | Fetches: %d | Frees: %d<br/>\n",
-                $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees);
-?>
-
-<div id="footerContainer"> 
-<div id="footer">  
-
-
-<?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
-<?php echo $config['product']['copyright']; ?><span style="float:right;"><a href="admin/">Admin</a></span><br />
-<?php if($config['debug']['enabled']) echo $debug_output ?><br />
-
-
-<div class="clear"></div> 
-</div><!--end footer--> 
-</div><!--end footerContainer--> 
- 
-<div id="bottomBarContainer"> 
-	<div id="bottomBar"> 
-		<div id="copyright">All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest &copy; 2001-<?php echo date('Y'); ?> 3rd Infantry Division. &nbsp;&nbsp;</div> 
-	</div><!--end bottomBar--> 
-</div><!--end bottomBarContainer--> 
-
-<?php
- if($config['debug']['enabled']){ 
-	logQueueFlush();
- } 
-?>
-
-
-
-</body>
-</html>
-<?php ob_flush();?>
- 
diff --git a/themes/new/header.php b/themes/new/header.php
deleted file mode 100644
index f1e9f0c..0000000
--- a/themes/new/header.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-global $config;
-ob_start();
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US" dir="ltr">
-
-<head>
-<title>Bayonet CMS Default Theme</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<?php if(isset($config['site']['favicon'])): ?>
-<!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
-<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
-<?php endif; ?>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
-
-
-<script type="text/javascript" src="functions.js"></script>
-
-<!-- jQuery -->
-<script type="text/javascript" src="markitup/jquery.pack.js"></script>
-<!-- markItUp! -->
-<script type="text/javascript" src="markitup/markitup/jquery.markitup.pack.js"></script>
-<!-- markItUp! toolbar settings -->
-<script type="text/javascript" src="markitup/markitup/sets/bbcode/set.js"></script>
-<!-- markItUp! skin -->
-<link rel="stylesheet" type="text/css" href="markitup/markitup/skins/markitup/style.css" />
-<!--  markItUp! toolbar skin -->
-<link rel="stylesheet" type="text/css" href="markitup/markitup/sets/bbcode/style.css" />       
-
-</head>
-
-<body>
diff --git a/themes/new/images/active_nav_bg.jpg b/themes/new/images/active_nav_bg.jpg
deleted file mode 100644
index 402bbe7..0000000
--- a/themes/new/images/active_nav_bg.jpg
+++ /dev/null
diff --git a/themes/new/images/btn_collapse.gif b/themes/new/images/btn_collapse.gif
deleted file mode 100644
index 4f875e8..0000000
--- a/themes/new/images/btn_collapse.gif
+++ /dev/null
diff --git a/themes/new/images/content_tile.jpg b/themes/new/images/content_tile.jpg
deleted file mode 100644
index 3d292c5..0000000
--- a/themes/new/images/content_tile.jpg
+++ /dev/null
diff --git a/themes/new/images/footer_tile.jpg b/themes/new/images/footer_tile.jpg
deleted file mode 100644
index 6e3f2ba..0000000
--- a/themes/new/images/footer_tile.jpg
+++ /dev/null
diff --git a/themes/new/images/footerwidget_bg.jpg b/themes/new/images/footerwidget_bg.jpg
deleted file mode 100644
index 3f4da4a..0000000
--- a/themes/new/images/footerwidget_bg.jpg
+++ /dev/null
diff --git a/themes/new/images/footerwidget_border.jpg b/themes/new/images/footerwidget_border.jpg
deleted file mode 100644
index 5b3bcfb..0000000
--- a/themes/new/images/footerwidget_border.jpg
+++ /dev/null
diff --git a/themes/new/images/header_tile.png b/themes/new/images/header_tile.png
deleted file mode 100644
index be956a5..0000000
--- a/themes/new/images/header_tile.png
+++ /dev/null
diff --git a/themes/new/images/header_tile_ie6.gif b/themes/new/images/header_tile_ie6.gif
deleted file mode 100644
index 9b15b1a..0000000
--- a/themes/new/images/header_tile_ie6.gif
+++ /dev/null
diff --git a/themes/new/images/logo-trans.png b/themes/new/images/logo-trans.png
deleted file mode 100644
index 87b6cf9..0000000
--- a/themes/new/images/logo-trans.png
+++ /dev/null
diff --git a/themes/new/images/nav_a.gif b/themes/new/images/nav_a.gif
deleted file mode 100644
index 531cced..0000000
--- a/themes/new/images/nav_a.gif
+++ /dev/null
diff --git a/themes/new/images/search_btn.jpg b/themes/new/images/search_btn.jpg
deleted file mode 100644
index 3f8ba67..0000000
--- a/themes/new/images/search_btn.jpg
+++ /dev/null
diff --git a/themes/new/images/w (1).png b/themes/new/images/w (1).png
deleted file mode 100644
index 2dae5d3..0000000
--- a/themes/new/images/w (1).png
+++ /dev/null
diff --git a/themes/new/images/w.png b/themes/new/images/w.png
deleted file mode 100644
index e0bf686..0000000
--- a/themes/new/images/w.png
+++ /dev/null
diff --git a/themes/new/images/widget_bg.jpg b/themes/new/images/widget_bg.jpg
deleted file mode 100644
index c704d59..0000000
--- a/themes/new/images/widget_bg.jpg
+++ /dev/null
diff --git a/themes/new/include/functions.php b/themes/new/include/functions.php
deleted file mode 100644
index 1a1abbc..0000000
--- a/themes/new/include/functions.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
-	
-	/**
-	* OpenContent()
-	* Opens a Bayonet site content block.
-	* @return
-	*/
-	function OpenContent()
-	{
-		echo "OPEN CONTENT<br />";
-	}
-	  
-	/**
-	* CloseContent()
-	* Closes a Bayonet site content block.
-	* @return
-	*/
-	function CloseContent()
-	{
-		echo "CLOSE CONTENT<br />";
-	}
-	
-	function OpenBlock($title = 'New Block')
-	{
-		echo "<h2 class=\"widgettitle\"><span>{$title}</span></h2>";
-	}
-	
-	function CloseBlock()
-	{
-	}
-
-?>
diff --git a/themes/new/include/primary.css b/themes/new/include/primary.css
deleted file mode 100644
index 94a4c28..0000000
--- a/themes/new/include/primary.css
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -----BODY STUFF----- */
-body {height:auto; width:auto; font-family:'Arial', Sans-Serif; color:#333; margin:0; padding:0; background: #b8b8b8;
-line-height:1.7em; padding:0; margin:0; font-size: 13px;}
-
-/*--- P TAG STUFF ---*/
-p {font-size: 12px; line-height: 1.7em;}
-.entry{ }
-
-
-#sidebar h2.widgettitle {padding: 0; margin: 0; font-size: 12px; text-transform: uppercase; color: #555; border: 1px solid #ebebeb; font-weight: normal;}
-#sidebar h2.widgettitle span {padding: 8px; display: block; border: 1px solid #fff; font-weight: normal; background: url('../images/widget_bg.jpg') repeat-x center;}
-
-
-
-/* -----A TAG STUFF----- */
-a {text-decoration:none;}
-a:hover {text-decoration:underline;}
-
-
-/* -----PAGE STUFF----- */
-#contentContainer {width: 100%; background: #f5f5f5 url('../images/content_tile.jpg') repeat-y center; border: 1px solid #fff; border-width:0 0 1px;}
-#content {padding:30px 0 0; margin:0 auto;  width:960px; background: #f8f8f8;}
-#main {width:640px; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;}
-#main-full {width:100%; float: left; padding:0; margin: 0; overflow: hidden; line-height: 1.5em;}
-#sidebar {float: right; margin: 0; overflow: hidden; width: 290px;}
-
-/*---------HEADER STUFF-----------*/
-#headerContainer {width: 100%; background: #4B72A6 url('../images/header_tile.png') repeat-x;}
-#header {height:259px; margin:0 auto;  width:960px; position: relative; color:white;}
-#topBarContainer {width: 100%; background-color:black;}
-#topBar {width:960px; height: 42px; color: #eee; font-size: 10px; margin:0 auto;}
-#topBar #today {padding: 13px 0 0;}
-#logo {margin: 0; padding: 41px 0 0;}
-#logo a {margin: 0; padding: 0; display: block; height: 86px; width: 601px; overflow: hidden; background: url('../images/logo-trans.png') no-repeat; text-indent: -999px;}
-#navigation {padding:0;margin:0; width: 100%; height: 42px; position: absolute; bottom: 0; _bottom:-1px; left:0; z-index:6000;}
-
-/*--------FOOTER STUFF--------*/
-#footerContainer {width: 100%; background: #b8b8b8 url('../images/footer_tile.jpg') repeat-y center; border: 1px solid #9c9c9c; border-width: 1px 0 0;}
-#footer {padding:20px 0 0; margin:0 auto;  width:960px; clear:both;}
-#footer a {color:#fff;}
-#bottomBarContainer {width: 100%; background: #1a1a1a;}
-#bottomBar {width:960px; margin: 0 auto; height: 53px; color: #eee;}
-#bottomBar #copyright {font-size: 10px; margin:0; padding:20px 0 0;}
-#bottomBar #socialbuttons {float: right; font-size: 10px; padding:20px 0 0; text-transform: uppercase; letter-spacing: 1px;}
-#bottomBar #socialbuttons a {color: #fff;}
-
-/*-------MAIN NAVIGATION STUFF--------*/
-#menu {padding: 0; margin:0; list-style:none; position:relative; width:100%; z-index: 4000;}
-#menu li {list-style:none; padding:0; margin:0; position:relative; float: left; line-height: 42px;}
-#menu li a {margin: 0; padding: 0 13px; display: block; line-height: 42px; color: #fff; text-transform: uppercase; font-size: 12px;}
-#menu li a:hover {text-decoration: none; background: url('../images/active_nav_bg.jpg') repeat-x; color: #999;}
-#menu li ul {margin:0; padding:0; list-style:none; display:none; position:absolute; width:200px; z-index:3000; top:41px; _top:42px;/*IE6 fix*/ left: -1px; background: #F8F8F8; border: 1px solid #ddd; border-width: 0 1px 1px;}
-#menu li ul li {margin:0; position:relative; border: 1px solid #fff; border-width: 0 1px 1px; border-top:1px solid #ebebeb; line-height: 20px; padding:0;}
-#menu li ul li a {padding:0 10px; margin:0; width:178px; color: #999; font-size: 12px; line-height: 30px;}
-#menu li ul li a:hover {background: none; color: #555;}
-#menu li ul li ul {position:absolute;top:-1px; left:199px; margin:0; z-index: 2000;}
-#menu li:hover ul ul, 
-#menu li:hover ul ul ul, 
-#menu li:hover ul ul ul ul {display:none;}
-#menu li:hover ul, 
-#menu li li:hover ul, 
-#menu li li li:hover ul, 
-#menu li li li li:hover ul {display:block;}
-#menu li.current_page_item, #menu li.current-cat {background: url('../images/active_nav_bg.jpg') repeat-x;}
-#menu li li.current_page_item, #menu li li.current-cat {background:none;}
-#menu li.current_page_item a, #menu li.current-cat a {color: #555;}
-
-/* -----SEARCH STUFF----- */
-#searchform #s {width:200px; padding: 5px;}
-#searchform #searchsubmit {cursor: pointer; padding:5px;} 
-#searchform #searchsubmit:hover {text-decoration: none;}
-
-#searcher {float: right; padding:2px 0 0;}
-#searcher #searchform #s {font-size:9px; width:200px; padding: 3px; background: #1f1f1f; border: 1px solid #3b3b3b; color: #bbb; text-transform: uppercase; margin: 0 4px 0 0;}
-#searcher #searchform #searchsubmit {
-cursor: pointer; 
-padding:0px; 
-width: 38px; 
-height: 22px; 
-background: transparent url('../images/search_btn.jpg') no-repeat 0 2px !important; 
-border: none; 
-overflow: hidden; 
-text-indent: -999px;
-line-height: 0;
-} 
-
-
-/*---FORM STUFF---*/
-input, textarea {padding: 5px;}
-input {width:170px; margin:5px 0 0 0; }
-textarea {width:100%;}
-input[type="submit"] {padding:5px 0; cursor: pointer;}
-
-/* -----UNIVERSAL STUFF----- */
-code {font:1.1em 'Courier New', Courier, Fixed;}
-acronym,abbr,span.caps {font-size:.9em;letter-spacing:.07em;cursor:help;}
-p img {max-width:100%;padding:0;}
-img.centered {display:block;margin:0 auto;}
-img.alignright {display:inline;margin:0 0 10px 10px;}
-img.alignleft {display:inline;margin:0 10px 10px 0;}
-.alignright {float:right;}
-.alignleft {float:left;}
-acronym.abbr {border-bottom:1px dashed #999;}
-blockquote {padding-left:20px;margin:15px;}
-blockquote cite {display:block;margin:5px 0 0;}
-.center {text-align:center;}
-hr {display:none;}
-a img {border:none;}
-img#wpstats {width:0;height:0;border:none;overflow:hidden;padding:0;}
-#hideme {visibility:hidden;}
-.hidden {visibility: hidden; display: none;}
-.rssSummary {padding-bottom:15px;}
-.clear {clear: both;}
-p.clear {height:1px; width:1px; margin:0; padding:0;}
-.hide {display: none;} 
\ No newline at end of file
diff --git a/themes/new/include/style_bbcode.css b/themes/new/include/style_bbcode.css
deleted file mode 100644
index 05333f9..0000000
--- a/themes/new/include/style_bbcode.css
+++ /dev/null
@@ -1,71 +0,0 @@
-.bold {
-   font-weight: bold;
-}
-
-.italics {
-   font-style: italic;
-}
-
-.underline {
-   text-decoration: underline;
-}
-
-.strikethrough {
-   text-decoration: line-through;
-}
-
-.overline {
-   text-decoration: overline;
-}
-
-.quotecodeheader {
-   font-family: Verdana, arial, helvetica, sans-serif;
-   font-size: 12px;
-   font-weight: bold;
-}
-
-.codebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #006600;
-    border: 1px solid #BFBFBF;
-}
-
-.quotebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #660002;
-   border: 1px solid #BFBFBF;
-}
-
-.listbullet {
-   list-style-type: disc;
-   list-style-position: inside;
-}
-
-.listdecimal {
-   list-style-type: decimal;
-   list-style-position: inside;
-}
-
-.listlowerroman {
-   list-style-type: lower-roman;
-   list-style-position: inside;
-}
-
-.listupperroman {
-   list-style-type: upper-roman;
-   list-style-position: inside;
-}
-
-.listloweralpha {
-   list-style-type: lower-alpha;
-   list-style-position: inside;
-}
-
-.listupperalpha {
-   list-style-type: upper-alpha;
-   list-style-position: inside;
-}
diff --git a/themes/new/include/theme.ini b/themes/new/include/theme.ini
deleted file mode 100644
index 34bd055..0000000
--- a/themes/new/include/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[author]

-name = "Evan O'Connell"
\ No newline at end of file
diff --git a/themes/new/index.php b/themes/new/index.php
deleted file mode 100644
index 750cc1f..0000000
--- a/themes/new/index.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Begin try/catch block */
-try {
-
-/* Setup error handing callbacks */
-ob_start("fatal_error_handler");
-set_error_handler("handle_error");
-
-require_once self::$root_path . '/include/functions.php';
-
-include self::$header;
-//session_start(); 
-?>
-<div id="headerContainer">
-
-	<div id="header"> 
-		<div id="topBar">
-			<div id="searcher"><form method="get" id="searchform" action=""> 
-			<label class="hidden" for="s">Search for:</label> 
-			<input type="text" value="Search Site" onfocus="this.value=''; this.onfocus=null;" name="s" id="s" /> 
-	        <input type="submit" id="searchsubmit" value="GO!" /> 
-	        
-			</form></div> 
-				<div id="today"><?php //echo date('l | F jS, Y'); ?></div>
-		</div><!--end topBar-->	
-		<h1>Bayonet CMS</h1><!--end logo-->    
- 
-	
-		<div id="navigation">
-			<?php require_once self::$root_path . '/navigation.php'; ?>
-		</div><!--end navigation--> 
-	
-	</div><!--end header--> 
-</div><!--end headerContainer--> 
-	
-<div id="contentContainer"> 
-	<div id="content"> 
-
-<?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>		
-	<div id="main"> 
- 		<?php  require_once 'modules.php'; ?>
-	</div><!--end main--> 
- 
-		<!-- block area RIGHT -->
-		
-	<div id="sidebar"> 
-		<?php GetBlocks(BLOCK_RIGHT); ?>
-		
-	</div><!--end sidebar--> 
-<?php endif; ?>
-<?php if(defined('BLOCK_RIGHT_DISABLE')): ?>
-	<div id="main-full"> 
-	THIS IS SOME MAIN TEXT
- 		<?php  require_once 'modules.php'; ?>
-	</div><!--end main--> 
-<?php endif; ?>
- 
-
-<div class="clear"></div> 
-</div><!--end content--> 
-</div><!--end contentContainer--> 
-
-<?php include self::$footer; ?>
-<?php
-/* Flushing is needed by the error handler */
-ob_end_flush();
-
-} //try ^^    
-catch(Exception $e)
-{
-  ReportError( 
-    "<style>td.short{width:100%;}</style><table style=\"width:0;\"><tr><th>Code</th>" . "<td class=\"short\">" . $e->getCode() . "</td>" . "</tr><tr><th>In File</th>" . "<td class=\"short\">" . $e->getFile() . "</td>" . "</tr></table>" . $e->getLine() . " - " . $e->getMessage() . "<br/>" 
-  );        
-}
-?> 
diff --git a/themes/new/navigation.php b/themes/new/navigation.php
deleted file mode 100644
index 6a99e5a..0000000
--- a/themes/new/navigation.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-?>
-	<ul id="menu"> 
- 		<li class="current_page_item"><a href="index.php">HOME</a></li>
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
-
-   	foreach ($nav as $link) {
-   	  echo '<li class="page_item"><a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a></li>'; 
-   	}
-   	?> 
-	</ul><!--end dropmenu--> 
diff --git a/themes/throwback/footer.php b/themes/throwback/footer.php
deleted file mode 100644
index afadce7..0000000
--- a/themes/throwback/footer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-$phpversion = preg_replace('/[a-z-]/', '', phpversion());
-$mtime = explode(' ', microtime());
-$totaltime = $mtime[0] + $mtime[1] - $starttime;
-$debug_output = sprintf("Page generated in %.3f seconds | Memory: real(%.3fmb) peak(%.3fmb) | PHP: %s<br/>Connections: %d | Queries: %d | Fetches: %d | Frees: %d<br/>\n",
-                $totaltime, ((float)memory_get_usage()/1024/1024), ((float)memory_get_peak_usage()/1024/1024), $phpversion, $db_connections, $db_queries, $db_fetches, $db_frees);
-?>
-
-<div class="footer">
-
-		<br />
-		<span class="footer-text">	
-			All logos and trademarks on this site are property of their respective owner. The comments are property of their posters, all the rest &copy; 2001-<?php echo date('Y'); ?> 3rd Infantry Division.</span>
-		
-		<br /><br />
-
-      <a href="admin/">Administrative Control Panel</a><br />
-<?php echo $config['product']['name'] . ' ' . $config['product']['version'] . ' ' . $config['product']['release'] ?><br />
-<?php echo stripslashes($config['product']['copyright']); ?><br />
-<?php if($config['debug']['enabled']) echo $debug_output ?><br />
-</div>
-
-<?php
- if($config['debug']['enabled']){ 
-	logQueueFlush();
- } 
-?>
-
-</body>
-</html>
-<?php ob_flush();?>
- 
diff --git a/themes/throwback/header.php b/themes/throwback/header.php
deleted file mode 100644
index a9b043b..0000000
--- a/themes/throwback/header.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-global $config;
-ob_start();
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US" dir="ltr">
-
-<head>
-<title>3rd Infantry Division - 8 years strong - ArmaII Unit</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<?php if(isset($config['site']['favicon'])): ?>
-<!--<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/x-icon" />-->
-<link rel="shortcut icon" href="<?php echo $config['site']['favicon']; ?>" type="image/png" />
-<?php endif; ?>
-<link rel="stylesheet" type="text/css" href="<?php echo self::$primary_css; ?>" media="screen"/>
-</head>
-
-<body>
diff --git a/themes/throwback/images/Medal.png b/themes/throwback/images/Medal.png
deleted file mode 100644
index 1d9974b..0000000
--- a/themes/throwback/images/Medal.png
+++ /dev/null
diff --git a/themes/throwback/images/acu_bg.jpg b/themes/throwback/images/acu_bg.jpg
deleted file mode 100644
index 550cd82..0000000
--- a/themes/throwback/images/acu_bg.jpg
+++ /dev/null
diff --git a/themes/throwback/images/add.gif b/themes/throwback/images/add.gif
deleted file mode 100644
index 836dbf2..0000000
--- a/themes/throwback/images/add.gif
+++ /dev/null
diff --git a/themes/throwback/images/arrowleft.png b/themes/throwback/images/arrowleft.png
deleted file mode 100644
index 502ae41..0000000
--- a/themes/throwback/images/arrowleft.png
+++ /dev/null
diff --git a/themes/throwback/images/arrowright.png b/themes/throwback/images/arrowright.png
deleted file mode 100644
index ddd163b..0000000
--- a/themes/throwback/images/arrowright.png
+++ /dev/null
diff --git a/themes/throwback/images/background.jpg b/themes/throwback/images/background.jpg
deleted file mode 100644
index e96f267..0000000
--- a/themes/throwback/images/background.jpg
+++ /dev/null
diff --git a/themes/throwback/images/banner.jpg b/themes/throwback/images/banner.jpg
deleted file mode 100644
index 702a361..0000000
--- a/themes/throwback/images/banner.jpg
+++ /dev/null
diff --git a/themes/throwback/images/blockbackground.jpg b/themes/throwback/images/blockbackground.jpg
deleted file mode 100644
index ea6c7d3..0000000
--- a/themes/throwback/images/blockbackground.jpg
+++ /dev/null
diff --git a/themes/throwback/images/contentbg.png b/themes/throwback/images/contentbg.png
deleted file mode 100644
index 2c13089..0000000
--- a/themes/throwback/images/contentbg.png
+++ /dev/null
diff --git a/themes/throwback/images/delete.gif b/themes/throwback/images/delete.gif
deleted file mode 100644
index 4e2a37f..0000000
--- a/themes/throwback/images/delete.gif
+++ /dev/null
diff --git a/themes/throwback/images/error.gif b/themes/throwback/images/error.gif
deleted file mode 100644
index cb1fcbe..0000000
--- a/themes/throwback/images/error.gif
+++ /dev/null
diff --git a/themes/throwback/images/error.png b/themes/throwback/images/error.png
deleted file mode 100644
index 5bc1824..0000000
--- a/themes/throwback/images/error.png
+++ /dev/null
diff --git a/themes/throwback/images/headingbg.jpg b/themes/throwback/images/headingbg.jpg
deleted file mode 100644
index 3fdc664..0000000
--- a/themes/throwback/images/headingbg.jpg
+++ /dev/null
diff --git a/themes/throwback/images/hgrad.png b/themes/throwback/images/hgrad.png
deleted file mode 100644
index 86daf8b..0000000
--- a/themes/throwback/images/hgrad.png
+++ /dev/null
diff --git a/themes/throwback/images/larrow.png b/themes/throwback/images/larrow.png
deleted file mode 100644
index 554b6e9..0000000
--- a/themes/throwback/images/larrow.png
+++ /dev/null
diff --git a/themes/throwback/images/leftshadow.png b/themes/throwback/images/leftshadow.png
deleted file mode 100644
index 1f32159..0000000
--- a/themes/throwback/images/leftshadow.png
+++ /dev/null
diff --git a/themes/throwback/images/logo.jpg b/themes/throwback/images/logo.jpg
deleted file mode 100644
index 8b59067..0000000
--- a/themes/throwback/images/logo.jpg
+++ /dev/null
diff --git a/themes/throwback/images/lvgrad.png b/themes/throwback/images/lvgrad.png
deleted file mode 100644
index 487d7e3..0000000
--- a/themes/throwback/images/lvgrad.png
+++ /dev/null
diff --git a/themes/throwback/images/navbackground.jpg b/themes/throwback/images/navbackground.jpg
deleted file mode 100644
index 93ffece..0000000
--- a/themes/throwback/images/navbackground.jpg
+++ /dev/null
diff --git a/themes/throwback/images/navbg.jpg b/themes/throwback/images/navbg.jpg
deleted file mode 100644
index 04bf7a8..0000000
--- a/themes/throwback/images/navbg.jpg
+++ /dev/null
diff --git a/themes/throwback/images/navspacer.jpg b/themes/throwback/images/navspacer.jpg
deleted file mode 100644
index cc6d8fa..0000000
--- a/themes/throwback/images/navspacer.jpg
+++ /dev/null
diff --git a/themes/throwback/images/navspacer.png b/themes/throwback/images/navspacer.png
deleted file mode 100644
index 01b0ac9..0000000
--- a/themes/throwback/images/navspacer.png
+++ /dev/null
diff --git a/themes/throwback/images/news_header.png b/themes/throwback/images/news_header.png
deleted file mode 100644
index 00861bf..0000000
--- a/themes/throwback/images/news_header.png
+++ /dev/null
diff --git a/themes/throwback/images/nvgrad.png b/themes/throwback/images/nvgrad.png
deleted file mode 100644
index 5e4c05c..0000000
--- a/themes/throwback/images/nvgrad.png
+++ /dev/null
diff --git a/themes/throwback/images/photoleft.png b/themes/throwback/images/photoleft.png
deleted file mode 100644
index f4eb3af..0000000
--- a/themes/throwback/images/photoleft.png
+++ /dev/null
diff --git a/themes/throwback/images/photoright.png b/themes/throwback/images/photoright.png
deleted file mode 100644
index 16a251b..0000000
--- a/themes/throwback/images/photoright.png
+++ /dev/null
diff --git a/themes/throwback/images/rightshadow.png b/themes/throwback/images/rightshadow.png
deleted file mode 100644
index bc970f0..0000000
--- a/themes/throwback/images/rightshadow.png
+++ /dev/null
diff --git a/themes/throwback/images/sandbackground.jpg b/themes/throwback/images/sandbackground.jpg
deleted file mode 100644
index 2a2d800..0000000
--- a/themes/throwback/images/sandbackground.jpg
+++ /dev/null
diff --git a/themes/throwback/images/spacer.png b/themes/throwback/images/spacer.png
deleted file mode 100644
index f187f4a..0000000
--- a/themes/throwback/images/spacer.png
+++ /dev/null
diff --git a/themes/throwback/images/vgrad.png b/themes/throwback/images/vgrad.png
deleted file mode 100644
index e7a96e8..0000000
--- a/themes/throwback/images/vgrad.png
+++ /dev/null
diff --git a/themes/throwback/images/view.gif b/themes/throwback/images/view.gif
deleted file mode 100644
index 52cbddb..0000000
--- a/themes/throwback/images/view.gif
+++ /dev/null
diff --git a/themes/throwback/include/functions.php b/themes/throwback/include/functions.php
deleted file mode 100644
index ead9d16..0000000
--- a/themes/throwback/include/functions.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-	/* EVERY THEME SHOULD HAVE THIS FILE WITH THE FUNCTIONS OPENCONTENT() & CLOSECONTENT() */
-	
-	/**
-	* OpenContent()
-	* Opens a Bayonet site content block.
-	* @return
-	*/
-	function OpenContent()
-	{
-		echo "<div class=\"contentBorder\">";
-	}
-	  
-	/**
-	* CloseContent()
-	* Closes a Bayonet site content block.
-	* @return
-	*/
-	function CloseContent()
-	{
-		echo "</div>";
-	}
-	  
-	function OpenBlock($title = 'New Block')
-	{
-	  OpenContent();
-	  echo "<div class=\"contentHeading\">{$title}</div>";
-	  echo "<div class=\"content\">";
-	}
-	
-	function CloseBlock()
-	{
-	  echo "</div>";
-	  CloseContent();
-	}
-
-?>
diff --git a/themes/throwback/include/primary.css b/themes/throwback/include/primary.css
deleted file mode 100644
index c02a3ff..0000000
--- a/themes/throwback/include/primary.css
+++ /dev/null
@@ -1,278 +0,0 @@
-	/*********************************
- 	 **  	  Layout Styles			**
- 	 *********************************/
- 	 div.container {
-		width: 990px;
-		position: relative;
-		/* width: 1000px; */
-		color: #000000;
-	 	margin: auto auto;
-		text-align: left; /* IE 5 fix */
-	}
- 	div.banner {
-	  	/* width: 990px; */
-	  	text-align:center;
-		/* margin: auto auto; */
-	}
-	div.nav {
-		/*width: 990px; */
-		height: 25px;
-		line-height: 23px;
-		background-color: #284c75;
-		background-image:url('../images/navbg.jpg');
-		color: #000000;
-		text-align:center;
-		/* margin: auto auto; */
-		font-size:14px;
-		border-top: 1px solid black;
-	}
-	table.main {
-		background-image:url('../images/acu_bg.jpg');
-	 	padding: 0px;
-		color:#ffffff;
-	 	width:990px;
-	 	/*width: 1134px; */
-	 	 /* width: 1234px; */
-	 	margin: auto auto;
-	/*	background-color:#a3a2a0; */
-	}
-
-	table.main td {
-	/*	color:white; */
-	}
-	td.midcol {
- 	   	width: 644px;
-		background-color:transparent;
-		vertical-align:top;
-	}
-	td.rightcol {
-		vertical-align:top;
-	}
-	td.leftcol {
- 		width: 275px;
-		vertical-align:top;
-	}
-	div.footer {
-		text-align:center; 
-		font-family:verdana; 
-		font-size:10pt; 
-		color:#5e5e5e;
-		background-color:#333333;
-		border-top: 1px solid #5e5e5e;
-	}	
-	
-	/*********************************
- 	 **  	  Content Styles		**
- 	 *********************************/	
-	div.contentBorder {
-		border: 1px solid #070707; /*#3666ba;*/
-	}
-	div.contentBorder2 {
-		background-color:white;
-		/*border:1px solid #000; /* 333 */
-	}
- 	div.contentHeading {
-		background-image:url(../images/headingbg.jpg);
-		background-repeat:repeat-x;
-		background-color:#112f50;
-		border: 0px solid black;
-		height:25px;
-		line-height: 25px;
-		padding-left:10px;
-		padding-right:10px;
-		color:white;
-	}
-	div.content {
-		padding:10px;
-		color: #CCC;
-		/*background-color:#383838;
-		color:white; */
-		/*background-color:#f1f1f1;*/
-		background-image: url(../images/contentbg.png);
-		border: 1px solid #3b3b3b;
-	}	
-	div.content img {
-		padding:10px;	
-	}
-	div.contentFooter {
-	    border-top:1px solid #333333; 
-		background-color:#a4a4a4;
-		color:white;
-		padding-left:5px;
-		padding-right:5px;	
-	}
-	span.footer-text {
-		font-size: 10px;	
-	}
-	
-	.clear {
-		clear: both;	
-	}
-	
-	/*********************************
- 	 **  	  Nav Links Styles		**
- 	 *********************************/	
-	div.nav a, div.nav a:visited, div.nav a:active {
-		background-color:transparent;
-		color:white;
-		font-family:verdana;
-		font-size:11px;
-		font-weight:bold;
-		text-decoration:none;
-	}
-	
-	div.nav a:hover, div.nav a:visited:hover {
-		background-color:transparent;
-		color:#d2d2d2;
-		font-size:11px;
-		font-weight:bold;
-		text-decoration:none;
-	}
-	
-	table.navLinks {
-		height:25px;
-	}
-	
-	table.navLinks td {
-		/*border-left: 1px solid #404040;
-		border-right: 1px solid #000000;*/
-		vertical-align:middle;
-	} 
-	
-	/*********************************
- 	 **  	  Misc.		 Styles		**
- 	 *********************************/	
- 	 
- 	 h1, h2, h3, h4, h5, h6 {
- 	 	font-family: Helvetica, Arial, sans-serif; 
-		font-weight: normal;	 
- 	 }
-	table, tr, td {
-		padding:0px;
-		border:0px;
-		margin:0px
-	}
-	body, td, div {
-		font-size:11px;
-		/* color:black; */
-		font-family: Tahoma, Verdana, Arial;
-		font-weight: normal;		
-	}
-	a, a:visited, a:active {
-		background-color:transparent;
-		/*color:#3666ba;*/
-		color:#CCC;
-		text-decoration:none;
-	}
-	
-	a:hover, a:visited:hover {
-		background-color:transparent;
-		/*color:#3666ba;*/
-		color:#CCC;
-		text-decoration:underline;
-	}
-	a.rudi_roster, a.rudi_roster:visited, a.rudi_roster:active, a.rudi_roster:hover {
-		color:#2b5bae;
-	}
-	body {
-		background-color: black;
-		/*background-image: url('../images/Background.jpg');*/
-		background-position: top center;
-		background-attachment: fixed;
-		margin:0;
-		padding:0;
-		text-align:left;
-	}
-	a img {
-		border:0px;
-	}
-	form {
-		margin:0;
-	}
-	tr.rownorm{
-		background-color:white;
-
-	} 
-	tr.rowhigh{
-		background-color:#e0e0e0;
-	}
-	/* photo gallery styles */
-    .photoleft{
-    	background-image:url("../images/photoleft.png");
-    	background-repeat:repeat-y;
-     	text-align:center;
-    	width:49px;
-   	}
-	.photoright{
-		background-image:url("../images/photoright.png");
-		background-repeat:repeat-y;
-		text-align:center;
-		width:49px;
-    }
-    /* end photo gallery styles */
-    
-    /* stuff we might need in order to add drop shadows */
-    
-    	div.topbar {
-		height:25px; 
-		text-align:center; 
-		background-color:black;
-		font-family:verdana; 
-		font-size:10pt; 
-		color:#797e4f;
-	}
-	div.botbar { 
-		height:50px;
-		padding:5px;
-		text-align:center; 
-		background-color:black;
-		font-family:verdana; 
-		font-size:10pt; 
-	}
-		/* may need these two when we add the background images back */  	 
-	.leftbar {
-	 /*	background-image:url("../images/leftshadow.png");   */
-		background-repeat: 
-		repeat-y; 
-		width:50px;
-	}		
-	.rightbar {
-		/* background-image:url("../images/rightshadow.png");  */
-		background-repeat: 
-		repeat-y; 
-		width:15px;
-	}
-	
-	.fl-left{
-		float:left;	
-	}
-	
-	.fl-right{
-		float:right;	
-	}
-	
-	.clear {
-		clear:both;	
-	}
-	
-	.inline {
-		display: inline;	
-	}
-	
-    .left{
-            text-align:left;
-    }
-    .right{
-            text-align:right;
-    }
-    .center{
-            text-align:center;
-    }
-    .title{
-            font-size:14px;
-            font-weight:bold;
-            font-family:arial;
-    }
-
-@import "style_bbcode.css"
-
diff --git a/themes/throwback/include/style_bbcode.css b/themes/throwback/include/style_bbcode.css
deleted file mode 100644
index 05333f9..0000000
--- a/themes/throwback/include/style_bbcode.css
+++ /dev/null
@@ -1,71 +0,0 @@
-.bold {
-   font-weight: bold;
-}
-
-.italics {
-   font-style: italic;
-}
-
-.underline {
-   text-decoration: underline;
-}
-
-.strikethrough {
-   text-decoration: line-through;
-}
-
-.overline {
-   text-decoration: overline;
-}
-
-.quotecodeheader {
-   font-family: Verdana, arial, helvetica, sans-serif;
-   font-size: 12px;
-   font-weight: bold;
-}
-
-.codebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #006600;
-    border: 1px solid #BFBFBF;
-}
-
-.quotebody {
-   background-color: #FFFFFF;
-    font-family: Courier new, courier, mono;
-    font-size: 12px;
-    color: #660002;
-   border: 1px solid #BFBFBF;
-}
-
-.listbullet {
-   list-style-type: disc;
-   list-style-position: inside;
-}
-
-.listdecimal {
-   list-style-type: decimal;
-   list-style-position: inside;
-}
-
-.listlowerroman {
-   list-style-type: lower-roman;
-   list-style-position: inside;
-}
-
-.listupperroman {
-   list-style-type: upper-roman;
-   list-style-position: inside;
-}
-
-.listloweralpha {
-   list-style-type: lower-alpha;
-   list-style-position: inside;
-}
-
-.listupperalpha {
-   list-style-type: upper-alpha;
-   list-style-position: inside;
-}
diff --git a/themes/throwback/include/theme.ini b/themes/throwback/include/theme.ini
deleted file mode 100644
index 34bd055..0000000
--- a/themes/throwback/include/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[author]

-name = "Evan O'Connell"
\ No newline at end of file
diff --git a/themes/throwback/index.php b/themes/throwback/index.php
deleted file mode 100644
index 90e6a6d..0000000
--- a/themes/throwback/index.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Begin try/catch block */
-try {
-
-/* Setup error handing callbacks */
-ob_start("fatal_error_handler");
-set_error_handler("handle_error");
-
-require_once self::$root_path . '/include/functions.php';
-
-include self::$header;
-//session_start(); 
-?>
-
-<div class="container">
-
-<!-- banner -->
- <div class="banner"><a href="index.php"><img src="<?php echo self::$image_path . '/banner.jpg'; ?>" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
-<!-- navigation -->
- <div class="nav"><?php require_once self::$root_path . '/navigation.php'; ?></div>
-
-<!-- content -->
-<table border="0" cellspacing="15px" cellpadding="0"  class="main" width="100%">
-	<tr>
-		<td class="midcol">
-	    	<?php  require_once 'modules.php'; ?>
- 		</td>
- 		
-	  <!-- block area RIGHT -->
-	  <?php  if(!defined('BLOCK_RIGHT_DISABLE')): ?>
-	    <td class="rightcol">
-	      	<?php GetBlocks(BLOCK_RIGHT); ?>
-	    </td>    
-	  <?php endif; ?>
-  		
-	</tr>
-</table>
-
-</div>
-<?php include self::$footer; ?>
-<?php
-/* Flushing is needed by the error handler */
-ob_end_flush();
-
-} //try ^^    
-catch(Exception $e)
-{
-  ReportError( 
-    "<style>td.short{width:100%;}</style><table style=\"width:0;\"><tr><th>Code</th>" . "<td class=\"short\">" . $e->getCode() . "</td>" . "</tr><tr><th>In File</th>" . "<td class=\"short\">" . $e->getFile() . "</td>" . "</tr></table>" . $e->getLine() . " - " . $e->getMessage() . "<br/>" 
-  );        
-}
-?> 
diff --git a/themes/throwback/navigation.php b/themes/throwback/navigation.php
deleted file mode 100644
index 03c0376..0000000
--- a/themes/throwback/navigation.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Bayonet Content Management System
- * Copyright (C) 2008-2011  Joseph Hunkeler & Evan O'Connell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-?>
-&nbsp;&nbsp;&nbsp;<a href="index.php">HOME</a>&nbsp;&nbsp;&nbsp;
-<?php
-  
-   	$result = $db->Query("SELECT * FROM `bayonet_navigation` ORDER BY `weight`");
-   	$nav = $db->Fetch($result);
-
-   	foreach ($nav as $link) {
-   	  echo '&nbsp;&nbsp;&nbsp;<a href="' . str_replace('&', '&amp;', $link['link']) . '">' . strtoupper($link['title']) . '</a>&nbsp;&nbsp;&nbsp;';
-   	  //echo '<img src="'.self::$image_path.'/navspacer.png" />';
-   	}
-?>