diff --git a/help.php b/help.php
index da21196..2070613 100644
--- a/help.php
+++ b/help.php
@@ -12,7 +12,7 @@ ob_start("ob_gzhandler");
 <title><? echo $controlrow["gamename"]; ?> Help</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
diff --git a/help_items.php b/help_items.php
index f981b6a..25a79c1 100644
--- a/help_items.php
+++ b/help_items.php
@@ -12,7 +12,7 @@ ob_start("ob_gzhandler");
 <title><? echo $controlrow["gamename"]; ?> Help</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
@@ -99,7 +99,7 @@ while ($itemsrow = mysqli_fetch_array($itemsquery)) {
         if ($special[1] > 0) { $stat = "+" . $special[1]; } else { $stat = $special[1]; }
         $bigspecial = "$attr $stat";
     } else { $bigspecial = "<span class=\"light\">None</span>"; }
-    echo "<tr><td $color width=\"5%\"><img src=\"images/icon_$image.gif\" alt=\"$image\"></td><td $color width=\"30%\">".$itemsrow["name"]."</td><td $color width=\"20%\">".$itemsrow["buycost"]." Gold</td><td $color width=\"20%\">".$itemsrow["attribute"]." $power Power</td><td $color width=\"25%\">$bigspecial</td></tr>\n";
+    echo "<tr><td $color width=\"5%\"><img src=\"templates/assets/img/icon_$image.gif\" alt=\"$image\"></td><td $color width=\"30%\">".$itemsrow["name"]."</td><td $color width=\"20%\">".$itemsrow["buycost"]." Gold</td><td $color width=\"20%\">".$itemsrow["attribute"]." $power Power</td><td $color width=\"25%\">$bigspecial</td></tr>\n";
 }
 ?>
 </table>
diff --git a/help_levels.php b/help_levels.php
index c260ba6..dcd02fa 100644
--- a/help_levels.php
+++ b/help_levels.php
@@ -12,7 +12,7 @@ ob_start("ob_gzhandler");
 <title><? echo $controlrow["gamename"]; ?> Help</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
diff --git a/help_monsters.php b/help_monsters.php
index 9b23c3a..5037ac6 100644
--- a/help_monsters.php
+++ b/help_monsters.php
@@ -12,7 +12,7 @@ ob_start("ob_gzhandler");
 <title><? echo $controlrow["gamename"]; ?> Help</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
diff --git a/help_spells.php b/help_spells.php
index 39d783f..a5ec868 100644
--- a/help_spells.php
+++ b/help_spells.php
@@ -12,7 +12,7 @@ ob_start("ob_gzhandler");
 <title><? echo $controlrow["gamename"]; ?> Help</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
diff --git a/index.php b/index.php
index 41b7889..2bd050b 100644
--- a/index.php
+++ b/index.php
@@ -121,7 +121,7 @@ function doexplore() { // Just spit out a blank exploring page.
     
 $page = <<<END
 <table width="100%">
-<tr><td class="title"><img src="images/title_exploring.gif" alt="Exploring" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/title_exploring.gif" alt="Exploring" /></td></tr>
 <tr><td>
 You are exploring the map, and nothing has happened. Continue exploring using the direction buttons or the Travel To menus.
 </td></tr>
@@ -243,7 +243,7 @@ function showmap() {
     . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n";
     
     $page = $xml . gettemplate("minimal");
-    $array = array("content"=>"<center><img src=\"images/map.gif\" alt=\"Map\" /></center>", "title"=>"Map");
+    $array = array("content"=>"<center><img src=\"templates/assets/img/map.gif\" alt=\"Map\" /></center>", "title"=>"Map");
     echo parsetemplate($page, $array);
     die();
     
diff --git a/lib.php b/lib.php
index b7b33b5..5f74875 100644
--- a/lib.php
+++ b/lib.php
@@ -177,9 +177,9 @@ function display($content, $title, $topnav=true, $leftnav=true, $rightnav=true,
     if ($rightnav == true) { $rightnav = gettemplate("rightnav"); } else { $rightnav = ""; }
     if ($leftnav == true) { $leftnav = gettemplate("leftnav"); } else { $leftnav = ""; }
     if ($topnav == true) {
-        $topnav = "<a href=\"login.php?do=logout\"><img src=\"images/button_logout.gif\" alt=\"Log Out\" title=\"Log Out\" border=\"0\" /></a> <a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" title=\"Help\" border=\"0\" /></a>";
+        $topnav = "<a href=\"login.php?do=logout\"><img src=\"templates/assets/img/button_logout.gif\" alt=\"Log Out\" title=\"Log Out\" border=\"0\" /></a> <a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" title=\"Help\" border=\"0\" /></a>";
     } else {
-        $topnav = "<a href=\"login.php?do=login\"><img src=\"images/button_login.gif\" alt=\"Log In\" title=\"Log In\" border=\"0\" /></a> <a href=\"users.php?do=register\"><img src=\"images/button_register.gif\" alt=\"Register\" title=\"Register\" border=\"0\" /></a> <a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" title=\"Help\" border=\"0\" /></a>";
+        $topnav = "<a href=\"login.php?do=login\"><img src=\"templates/assets/img/button_login.gif\" alt=\"Log In\" title=\"Log In\" border=\"0\" /></a> <a href=\"users.php?do=register\"><img src=\"templates/assets/img/button_register.gif\" alt=\"Register\" title=\"Register\" border=\"0\" /></a> <a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" title=\"Help\" border=\"0\" /></a>";
     }
     
     if (isset($userrow)) {
@@ -215,19 +215,19 @@ function display($content, $title, $topnav=true, $leftnav=true, $rightnav=true,
         $stattp = ceil($userrow["currenttp"] / $userrow["maxtp"] * 100);
         $stattable = "<table width=\"100\"><tr><td width=\"33%\">\n";
         $stattable .= "<table cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"padding:0px; width:15px; height:100px; border:solid 1px black; vertical-align:bottom;\">\n";
-        if ($stathp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(images/bars_green.gif);\"><img src=\"images/bars_green.gif\" alt=\"\" /></div>"; }
-        if ($stathp < 66 && $stathp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(images/bars_yellow.gif);\"><img src=\"images/bars_yellow.gif\" alt=\"\" /></div>"; }
-        if ($stathp < 33) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(images/bars_red.gif);\"><img src=\"images/bars_red.gif\" alt=\"\" /></div>"; }
+        if ($stathp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_green.gif);\"><img src=\"templates/assets/img/bars_green.gif\" alt=\"\" /></div>"; }
+        if ($stathp < 66 && $stathp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_yellow.gif);\"><img src=\"templates/assets/img/bars_yellow.gif\" alt=\"\" /></div>"; }
+        if ($stathp < 33) { $stattable .= "<div style=\"padding:0px; height:".$stathp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_red.gif);\"><img src=\"templates/assets/img/bars_red.gif\" alt=\"\" /></div>"; }
         $stattable .= "</td></tr></table></td><td width=\"33%\">\n";
         $stattable .= "<table cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"padding:0px; width:15px; height:100px; border:solid 1px black; vertical-align:bottom;\">\n";
-        if ($statmp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(images/bars_green.gif);\"><img src=\"images/bars_green.gif\" alt=\"\" /></div>"; }
-        if ($statmp < 66 && $statmp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(images/bars_yellow.gif);\"><img src=\"images/bars_yellow.gif\" alt=\"\" /></div>"; }
-        if ($statmp < 33) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(images/bars_red.gif);\"><img src=\"images/bars_red.gif\" alt=\"\" /></div>"; }
+        if ($statmp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_green.gif);\"><img src=\"templates/assets/img/bars_green.gif\" alt=\"\" /></div>"; }
+        if ($statmp < 66 && $statmp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_yellow.gif);\"><img src=\"templates/assets/img/bars_yellow.gif\" alt=\"\" /></div>"; }
+        if ($statmp < 33) { $stattable .= "<div style=\"padding:0px; height:".$statmp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_red.gif);\"><img src=\"templates/assets/img/bars_red.gif\" alt=\"\" /></div>"; }
         $stattable .= "</td></tr></table></td><td width=\"33%\">\n";
         $stattable .= "<table cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"padding:0px; width:15px; height:100px; border:solid 1px black; vertical-align:bottom;\">\n";
-        if ($stattp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(images/bars_green.gif);\"><img src=\"images/bars_green.gif\" alt=\"\" /></div>"; }
-        if ($stattp < 66 && $stattp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(images/bars_yellow.gif);\"><img src=\"images/bars_yellow.gif\" alt=\"\" /></div>"; }
-        if ($stattp < 33) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(images/bars_red.gif);\"><img src=\"images/bars_red.gif\" alt=\"\" /></div>"; }
+        if ($stattp >= 66) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_green.gif);\"><img src=\"templates/assets/img/bars_green.gif\" alt=\"\" /></div>"; }
+        if ($stattp < 66 && $stattp >= 33) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_yellow.gif);\"><img src=\"templates/assets/img/bars_yellow.gif\" alt=\"\" /></div>"; }
+        if ($stattp < 33) { $stattable .= "<div style=\"padding:0px; height:".$stattp."px; border-top:solid 1px black; background-image:url(templates/assets/img/bars_red.gif);\"><img src=\"templates/assets/img/bars_red.gif\" alt=\"\" /></div>"; }
         $stattable .= "</td></tr></table></td>\n";
         $stattable .= "</tr><tr><td>HP</td><td>MP</td><td>TP</td></tr></table>\n";
         $userrow["statbars"] = $stattable;
diff --git a/images/background.gif b/templates/assets/img/background.gif
similarity index 100%
rename from images/background.gif
rename to templates/assets/img/background.gif
diff --git a/images/background.jpg b/templates/assets/img/background.jpg
similarity index 100%
rename from images/background.jpg
rename to templates/assets/img/background.jpg
diff --git a/images/bars_green.gif b/templates/assets/img/bars_green.gif
similarity index 100%
rename from images/bars_green.gif
rename to templates/assets/img/bars_green.gif
diff --git a/images/bars_red.gif b/templates/assets/img/bars_red.gif
similarity index 100%
rename from images/bars_red.gif
rename to templates/assets/img/bars_red.gif
diff --git a/images/bars_yellow.gif b/templates/assets/img/bars_yellow.gif
similarity index 100%
rename from images/bars_yellow.gif
rename to templates/assets/img/bars_yellow.gif
diff --git a/images/button_character.gif b/templates/assets/img/button_character.gif
similarity index 100%
rename from images/button_character.gif
rename to templates/assets/img/button_character.gif
diff --git a/images/button_fastspells.gif b/templates/assets/img/button_fastspells.gif
similarity index 100%
rename from images/button_fastspells.gif
rename to templates/assets/img/button_fastspells.gif
diff --git a/images/button_functions.gif b/templates/assets/img/button_functions.gif
similarity index 100%
rename from images/button_functions.gif
rename to templates/assets/img/button_functions.gif
diff --git a/images/button_help.gif b/templates/assets/img/button_help.gif
similarity index 100%
rename from images/button_help.gif
rename to templates/assets/img/button_help.gif
diff --git a/images/button_inventory.gif b/templates/assets/img/button_inventory.gif
similarity index 100%
rename from images/button_inventory.gif
rename to templates/assets/img/button_inventory.gif
diff --git a/images/button_location.gif b/templates/assets/img/button_location.gif
similarity index 100%
rename from images/button_location.gif
rename to templates/assets/img/button_location.gif
diff --git a/images/button_login.gif b/templates/assets/img/button_login.gif
similarity index 100%
rename from images/button_login.gif
rename to templates/assets/img/button_login.gif
diff --git a/images/button_logout.gif b/templates/assets/img/button_logout.gif
similarity index 100%
rename from images/button_logout.gif
rename to templates/assets/img/button_logout.gif
diff --git a/images/button_register.gif b/templates/assets/img/button_register.gif
similarity index 100%
rename from images/button_register.gif
rename to templates/assets/img/button_register.gif
diff --git a/images/button_shoutbox.gif b/templates/assets/img/button_shoutbox.gif
similarity index 100%
rename from images/button_shoutbox.gif
rename to templates/assets/img/button_shoutbox.gif
diff --git a/images/button_spells.gif b/templates/assets/img/button_spells.gif
similarity index 100%
rename from images/button_spells.gif
rename to templates/assets/img/button_spells.gif
diff --git a/images/button_status.gif b/templates/assets/img/button_status.gif
similarity index 100%
rename from images/button_status.gif
rename to templates/assets/img/button_status.gif
diff --git a/images/button_towns.gif b/templates/assets/img/button_towns.gif
similarity index 100%
rename from images/button_towns.gif
rename to templates/assets/img/button_towns.gif
diff --git a/images/compass_01.gif b/templates/assets/img/compass_01.gif
similarity index 100%
rename from images/compass_01.gif
rename to templates/assets/img/compass_01.gif
diff --git a/images/compass_02.gif b/templates/assets/img/compass_02.gif
similarity index 100%
rename from images/compass_02.gif
rename to templates/assets/img/compass_02.gif
diff --git a/images/compass_03.gif b/templates/assets/img/compass_03.gif
similarity index 100%
rename from images/compass_03.gif
rename to templates/assets/img/compass_03.gif
diff --git a/images/compass_04.gif b/templates/assets/img/compass_04.gif
similarity index 100%
rename from images/compass_04.gif
rename to templates/assets/img/compass_04.gif
diff --git a/images/dkforumsbutton.gif b/templates/assets/img/dkforumsbutton.gif
similarity index 100%
rename from images/dkforumsbutton.gif
rename to templates/assets/img/dkforumsbutton.gif
diff --git a/images/help_exploring.jpg b/templates/assets/img/help_exploring.jpg
similarity index 100%
rename from images/help_exploring.jpg
rename to templates/assets/img/help_exploring.jpg
diff --git a/images/help_fighting.jpg b/templates/assets/img/help_fighting.jpg
similarity index 100%
rename from images/help_fighting.jpg
rename to templates/assets/img/help_fighting.jpg
diff --git a/images/icon_armor.gif b/templates/assets/img/icon_armor.gif
similarity index 100%
rename from images/icon_armor.gif
rename to templates/assets/img/icon_armor.gif
diff --git a/images/icon_shield.gif b/templates/assets/img/icon_shield.gif
similarity index 100%
rename from images/icon_shield.gif
rename to templates/assets/img/icon_shield.gif
diff --git a/images/icon_weapon.gif b/templates/assets/img/icon_weapon.gif
similarity index 100%
rename from images/icon_weapon.gif
rename to templates/assets/img/icon_weapon.gif
diff --git a/images/logo.gif b/templates/assets/img/logo.gif
similarity index 100%
rename from images/logo.gif
rename to templates/assets/img/logo.gif
diff --git a/images/map.gif b/templates/assets/img/map.gif
similarity index 100%
rename from images/map.gif
rename to templates/assets/img/map.gif
diff --git a/images/title_exploring.gif b/templates/assets/img/title_exploring.gif
similarity index 100%
rename from images/title_exploring.gif
rename to templates/assets/img/title_exploring.gif
diff --git a/images/title_fighting.gif b/templates/assets/img/title_fighting.gif
similarity index 100%
rename from images/title_fighting.gif
rename to templates/assets/img/title_fighting.gif
diff --git a/images/town_1.gif b/templates/assets/img/town_1.gif
similarity index 100%
rename from images/town_1.gif
rename to templates/assets/img/town_1.gif
diff --git a/images/town_2.gif b/templates/assets/img/town_2.gif
similarity index 100%
rename from images/town_2.gif
rename to templates/assets/img/town_2.gif
diff --git a/images/town_3.gif b/templates/assets/img/town_3.gif
similarity index 100%
rename from images/town_3.gif
rename to templates/assets/img/town_3.gif
diff --git a/images/town_4.gif b/templates/assets/img/town_4.gif
similarity index 100%
rename from images/town_4.gif
rename to templates/assets/img/town_4.gif
diff --git a/images/town_5.gif b/templates/assets/img/town_5.gif
similarity index 100%
rename from images/town_5.gif
rename to templates/assets/img/town_5.gif
diff --git a/images/town_6.gif b/templates/assets/img/town_6.gif
similarity index 100%
rename from images/town_6.gif
rename to templates/assets/img/town_6.gif
diff --git a/images/town_7.gif b/templates/assets/img/town_7.gif
similarity index 100%
rename from images/town_7.gif
rename to templates/assets/img/town_7.gif
diff --git a/images/town_8.gif b/templates/assets/img/town_8.gif
similarity index 100%
rename from images/town_8.gif
rename to templates/assets/img/town_8.gif
diff --git a/templates/babblebox.php b/templates/babblebox.php
index b0d5df1..6f8e332 100644
--- a/templates/babblebox.php
+++ b/templates/babblebox.php
@@ -4,7 +4,7 @@ $template = <<<THEVERYENDOFYOU
 <title>shoutbox</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
   margins: 0px;
diff --git a/templates/fight.php b/templates/fight.php
index ac049be..62954f6 100644
--- a/templates/fight.php
+++ b/templates/fight.php
@@ -1,7 +1,7 @@
 <?php
 $template = <<<THEVERYENDOFYOU
 <table width="100%">
-<tr><td class="title"><img src="images/title_fighting.gif" alt="Fighting" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/title_fighting.gif" alt="Fighting" /></td></tr>
 <tr><td>
 You are fighting a <b>{{monstername}}</b><br /><br />
 {{monsterhp}}
diff --git a/templates/leftnav.php b/templates/leftnav.php
index 8bd3d6b..29f3ec8 100644
--- a/templates/leftnav.php
+++ b/templates/leftnav.php
@@ -1,7 +1,7 @@
 <?php
 $template = <<<THEVERYENDOFYOU
 <table width="100%">
-<tr><td class="title"><img src="images/button_location.gif" alt="Location" title="Location" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_location.gif" alt="Location" title="Location" /></td></tr>
 <tr><td>
 Currently: {{currentaction}}<br />
 Latitude: {{latitude}}<br />
@@ -18,7 +18,7 @@ Longitude: {{longitude}}<br />
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_towns.gif" alt="Towns" title="Towns" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_towns.gif" alt="Towns" title="Towns" /></td></tr>
 <tr><td>
 {{currenttown}}
 Travel To:<br />
@@ -27,7 +27,7 @@ Travel To:<br />
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_functions.gif" alt="Functions" title="Functions" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_functions.gif" alt="Functions" title="Functions" /></td></tr>
 <tr><td>
 {{forumslink}}
 {{adminlink}}
diff --git a/templates/minimal.php b/templates/minimal.php
index 520e44f..8d8996c 100644
--- a/templates/minimal.php
+++ b/templates/minimal.php
@@ -4,7 +4,7 @@ $template = <<<THEVERYENDOFYOU
 <title>{{title}}</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
diff --git a/templates/onlinechar.php b/templates/onlinechar.php
index e9763ca..ed37a00 100644
--- a/templates/onlinechar.php
+++ b/templates/onlinechar.php
@@ -3,7 +3,7 @@ $template = <<<THEVERYENDOFYOU
 Here is the character profile for <b>{{charname}}</b>.<br /><br />
 When you're finished, you may <a href="index.php">return to town</a>.<br /><br />
 <table width="200">
-<tr><td class="title"><img src="images/button_character.gif" alt="Character" title="Character" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_character.gif" alt="Character" title="Character" /></td></tr>
 <tr><td>
 <b>{{charname}}</b><br /><br />
 
@@ -25,12 +25,12 @@ Defense Power: {{defensepower}}<br />
 </table><br />
 
 <table width="200">
-<tr><td class="title"><img src="images/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
 <tr><td>
 <table width="100%">
-<tr><td><img src="images/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
-<tr><td><img src="images/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
-<tr><td><img src="images/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
 </table>
 Slot 1: {{slot1name}}<br />
 Slot 2: {{slot2name}}<br />
diff --git a/templates/primary.php b/templates/primary.php
index 025c14c..7010475 100644
--- a/templates/primary.php
+++ b/templates/primary.php
@@ -4,7 +4,7 @@ $template = <<<THEVERYENDOFYOU
 <title>{{title}}</title>
 <style type="text/css">
 body {
-  background-image: url(images/background.jpg);
+  background-image: url(templates/assets/img/background.jpg);
   color: black;
   font: 11px verdana;
 }
@@ -73,7 +73,7 @@ winpops=window.open(popurl,"","width=520,height=520,scrollbars")
 <body><center>
 <table cellspacing="0" width="90%"><tr>
 <td class="top" colspan="3">
-  <table width="100%"><tr><td><img src="images/logo.gif" alt="{{dkgamename}}" title="{{dkgamename}}" border="0" /></td><td style="text-align:right; vertical-align:middle;">{{topnav}}</td></tr></table>
+  <table width="100%"><tr><td><img src="templates/assets/img/logo.gif" alt="{{dkgamename}}" title="{{dkgamename}}" border="0" /></td><td style="text-align:right; vertical-align:middle;">{{topnav}}</td></tr></table>
 </td>
 </tr><tr>
 <td class="left">{{leftnav}}</td>
diff --git a/templates/rightnav.php b/templates/rightnav.php
index f6f422b..089fc6a 100644
--- a/templates/rightnav.php
+++ b/templates/rightnav.php
@@ -1,7 +1,7 @@
 <?php
 $template = <<<THEVERYENDOFYOU
 <table width="100%">
-<tr><td class="title"><img src="images/button_character.gif" alt="Character" title="Character" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_character.gif" alt="Character" title="Character" /></td></tr>
 <tr><td>
 <b>{{charname}}</b><br />
 Level: {{level}}<br />
@@ -16,12 +16,12 @@ TP: {{currenttp}}<br />
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
 <tr><td>
 <table width="100%">
-<tr><td><img src="images/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
-<tr><td><img src="images/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
-<tr><td><img src="images/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
 </table>
 Slot 1: {{slot1name}}<br />
 Slot 2: {{slot2name}}<br />
@@ -30,7 +30,7 @@ Slot 3: {{slot3name}}
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_fastspells.gif" alt="Fast Spells" title="Fast Spells" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_fastspells.gif" alt="Fast Spells" title="Fast Spells" /></td></tr>
 <tr><td>
 {{magiclist}}
 </td></tr>
diff --git a/templates/showchar.php b/templates/showchar.php
index 8eb4418..c2a542e 100644
--- a/templates/showchar.php
+++ b/templates/showchar.php
@@ -1,7 +1,7 @@
 <?php
 $template = <<<THEVERYENDOFYOU
 <table width="100%">
-<tr><td class="title"><img src="images/button_character.gif" alt="Character" title="Character" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_character.gif" alt="Character" title="Character" /></td></tr>
 <tr><td>
 <b>{{charname}}</b><br /><br />
 
@@ -24,12 +24,12 @@ Defense Power: {{defensepower}}<br />
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
 <tr><td>
 <table width="100%">
-<tr><td><img src="images/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
-<tr><td><img src="images/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
-<tr><td><img src="images/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
+<tr><td><img src="templates/assets/img/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
 </table>
 Slot 1: {{slot1name}}<br />
 Slot 2: {{slot2name}}<br />
@@ -38,7 +38,7 @@ Slot 3: {{slot3name}}
 </table><br />
 
 <table width="100%">
-<tr><td class="title"><img src="images/button_spells.gif" alt="Spells" title="Spells" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/button_spells.gif" alt="Spells" title="Spells" /></td></tr>
 <tr><td>
 {{magiclist}}
 </td></tr>
diff --git a/templates/towns.php b/templates/towns.php
index 5d14934..c63946c 100644
--- a/templates/towns.php
+++ b/templates/towns.php
@@ -1,7 +1,7 @@
 <?php
 $template = <<<THEVERYENDOFYOU
 <table width="100%">
-<tr><td class="title"><img src="images/town_{{id}}.gif" alt="Welcome to {{name}}" title="Welcome to {{name}}" /></td></tr>
+<tr><td class="title"><img src="templates/assets/img/town_{{id}}.gif" alt="Welcome to {{name}}" title="Welcome to {{name}}" /></td></tr>
 <tr><td>
 <b>Town Options:</b><br />
 <ul>
diff --git a/towns.php b/towns.php
index 0f670cf..bc61d55 100644
--- a/towns.php
+++ b/towns.php
@@ -57,9 +57,9 @@ function buy() { // Displays a list of available items for purchase.
     while ($itemsrow = mysqli_fetch_array($itemsquery)) {
         if ($itemsrow["type"] == 1) { $attrib = "Attack Power:"; } else  { $attrib = "Defense Power:"; }
         $page .= "<tr><td width=\"4%\">";
-        if ($itemsrow["type"] == 1) { $page .= "<img src=\"images/icon_weapon.gif\" alt=\"weapon\" /></td>"; }
-        if ($itemsrow["type"] == 2) { $page .= "<img src=\"images/icon_armor.gif\" alt=\"armor\" /></td>"; }
-        if ($itemsrow["type"] == 3) { $page .= "<img src=\"images/icon_shield.gif\" alt=\"shield\" /></td>"; }
+        if ($itemsrow["type"] == 1) { $page .= "<img src=\"templates/assets/img/icon_weapon.gif\" alt=\"weapon\" /></td>"; }
+        if ($itemsrow["type"] == 2) { $page .= "<img src=\"templates/assets/img/icon_armor.gif\" alt=\"armor\" /></td>"; }
+        if ($itemsrow["type"] == 3) { $page .= "<img src=\"templates/assets/img/icon_shield.gif\" alt=\"shield\" /></td>"; }
         if ($userrow["weaponid"] == $itemsrow["id"] || $userrow["armorid"] == $itemsrow["id"] || $userrow["shieldid"] == $itemsrow["id"]) {
             $page .= "<td width=\"32%\"><span class=\"light\">".$itemsrow["name"]."</span></td><td width=\"32%\"><span class=\"light\">$attrib ".$itemsrow["attribute"]."</span></td><td width=\"32%\"><span class=\"light\">Already purchased</span></td></tr>\n";
         } else {
diff --git a/users.php b/users.php
index aadde92..c70a495 100644
--- a/users.php
+++ b/users.php
@@ -90,7 +90,7 @@ function register() { // Register a new account.
         
     }
     
-    $topnav = "<a href=\"login.php?do=login\"><img src=\"images/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"images/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
+    $topnav = "<a href=\"login.php?do=login\"><img src=\"templates/assets/img/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"templates/assets/img/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
     display($page, "Register", false, false, false);
     
 }
@@ -110,7 +110,7 @@ function verify() {
         display("Your account was verified successfully.<br /><br />You may now continue to the <a href=\"login.php?do=login\">Login Page</a> and start playing the game.<br /><br />Thanks for playing!","Verify Email",false,false,false);
     }
     $page = gettemplate("verify");
-    $topnav = "<a href=\"login.php?do=login\"><img src=\"images/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"images/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
+    $topnav = "<a href=\"login.php?do=login\"><img src=\"templates/assets/img/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"templates/assets/img/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
     display($page, "Verify Email", false, false, false);
     
 }
@@ -135,7 +135,7 @@ function lostpassword() {
         die();
     }
     $page = gettemplate("lostpassword");
-    $topnav = "<a href=\"login.php?do=login\"><img src=\"images/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"images/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
+    $topnav = "<a href=\"login.php?do=login\"><img src=\"templates/assets/img/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"templates/assets/img/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
     display($page, "Lost Password", false, false, false);
     
 }
@@ -157,7 +157,7 @@ function changepassword() {
         die();
     }
     $page = gettemplate("changepassword");
-    $topnav = "<a href=\"login.php?do=login\"><img src=\"images/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"images/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"images/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
+    $topnav = "<a href=\"login.php?do=login\"><img src=\"templates/assets/img/button_login.gif\" alt=\"Log In\" border=\"0\" /></a><a href=\"users.php?do=register\"><img src=\"templates/assets/img/button_register.gif\" alt=\"Register\" border=\"0\" /></a><a href=\"help.php\"><img src=\"templates/assets/img/button_help.gif\" alt=\"Help\" border=\"0\" /></a>";
     display($page, "Change Password", false, false, false); 
     
 }
