diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
new file mode 100644
index 00000000..b5b2fa8b
--- /dev/null
+++ b/data/interfaces/default/config.tmpl
@@ -0,0 +1,237 @@
+#import os.path
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_header.tmpl")
+<center>
+  	<div class="smalltext">
+	  	<a href="#web_interface" >Web Interface</a> |
+	  	<a href="#download" class="smalltext">Download Settings</a> |
+	  	<a href="#providers" class="smalltext">Search Providers</a> |
+	  	<a href="#post_processing" class="smalltext">Quality &amp; Post Processing</a>
+	</div>
+</center>
+<div class="config">
+    <form action="configUpdate" method="post">
+    <a name="web_interface"><h1><u>Web Interface</u></h1></a>
+
+    <table class="configtable" summary="Web Interface">
+        <tr>
+            <td>
+              <p>
+                HTTP Host: <br><br>
+                <input type="text" name="http_host" value="%s" size="30" maxlength="40"><br>
+                <i class="smalltext">i.e. localhost or 0.0.0.0</i>
+              </p>
+            </td>
+            <td>
+              <p>
+                HTTP Username: <br><br>
+                <input type="text" name="http_username" value="%s" size="30" maxlength="40">
+              </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <p>
+                  HTTP Port: <br><br>
+                  <input type="text" name="http_port" value="%s" size="20" maxlength="40">
+                </p>
+            </td>
+
+            <td>
+                <p>
+                  HTTP Password: <br><br>
+                  <input type="password" name="http_password" value="%s" size="30" maxlength="40">
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <p>Launch Browser on Startup:<input type="checkbox" name="launch_browser" value="1" %s /></p>
+            </td>
+        </tr>
+    </table>
+
+    <a name="download"><h1><u>Download Settings</u></h1></a>
+
+    <table class="configtable" summary="Download Settings">
+        <tr>
+            <td>
+                <p>SABnzbd Host:</p><input type="text" name="sab_host" value="%s" size="30" maxlength="40"><br>
+
+                <i class="smalltext">usually localhost:8080</i>
+            </td>
+
+            <td>
+                <p>SABnzbd Username:</p><input type="text" name="sab_username" value="%s" size="20" maxlength="40">
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p>SABnzbd API:</p><input type="text" name="sab_apikey" value="%s" size="46" maxlength="40">
+            </td>
+
+            <td>
+                <br>
+
+                <p>SABnzbd Password:</p><input type="password" name="sab_password" value="%s" size="20" maxlength="40">
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p>SABnzbd Category:</p><input type="text" name="sab_category" value="%s" size="20" maxlength="40">
+            </td>
+
+            <td>
+                <br>
+
+                <p>Music Download Directory:</p><input type="text" name="music_download_dir" value="%s" size="60" maxlength="40"><br>
+
+                <i class="smalltext">Absolute or relative path to the dir where SAB downloads your music<br>
+                i.e. Downloads/music or /Users/name/Downloads/music</i>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p>Usenet Retention:</p><input type="text" name="usenet_retention" value="%s" size="20" maxlength="40">
+            </td>
+        </tr>
+    </table>
+
+    <a name="providers"><h1><u>Search Providers</u></h1></a>
+
+    <table class="configtable" summary="Search Providers">
+        <tr>
+            <td>
+                <p>NZBMatrix: <input type="checkbox" name="nzbmatrix" value="1" %s /></p>
+            </td>
+
+            <td>
+                <p>
+                  NZBMatrix Username: <br>
+                  <input type="text" name="nzbmatrix_username" value="%s" size="30" maxlength="40">
+                </p>
+            </td>
+
+            <td>
+                <p>
+                  NZBMatrix API: <br>
+                  <input type="text" name="nzbmatrix_apikey" value="%s" size="46" maxlength="40">
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p>Newznab: <input type="checkbox" name="newznab" value="1" %s /></p>
+            </td>
+
+            <td>
+                <br>
+
+                <p>
+                  Newznab Host:<br>
+                  <input type="text" name="newznab_host" value="%s" size="30" maxlength="40"><br>
+                  <i class="smalltext">i.e. http://nzb.su</i>
+                </p>
+            </td>
+
+            <td>
+                <br>
+
+                <p>
+                  Newznab API:<br>
+                  <input type="text" name="newznab_apikey" value="%s" size="46" maxlength="40">
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p>NZBs.org:<input type="checkbox" name="nzbsorg" value="1" %s /></p>
+            </td>
+
+            <td>
+                <br>
+
+                <p>
+                  NZBs.org UID:<br>
+                  <input type="text" name="nzbsorg_uid" value="%s" size="30" maxlength="40">
+                </p>
+            </td>
+
+            <td>
+                <br>
+
+                <p>
+                  NZBs.org Hash:<br>
+                  <input type="text" name="nzbsorg_hash" value="%s" size="46" maxlength="40">
+                </p>
+            </td>
+        </tr>
+    </table>
+
+    <a name="post_processing"><h1><u>Quality &amp; Post Processing</u></h1></a>
+
+    <table class="configtable" summary="Quality & Post Processing">
+        <tr>
+            <td>
+                <p><b>Album Quality:</b></p>
+                <input type="checkbox" name="include_lossless" value="1" %s />Include lossless <br>
+                <input type="checkbox" name="flac_to_mp3" value="1" %s />Convert lossless to mp3
+            </td>
+
+            <td>
+                <p>
+                  <p><b>iTunes:</b></p>
+                  <input type="checkbox" name="move_to_itunes" value="1" %s />Move downloads to iTunes
+                </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+
+                <p><b>Path to iTunes folder</b>:<br><input type="text" name="path_to_itunes" value="%s" size="60" maxlength="40">
+                  <br>
+                  <i class="smalltext">i.e. Music/iTunes or /Users/name/Music/iTunes</i>
+                </p>
+            </td>
+            <td>
+                  <b>Renaming &amp; Metadata:</b>
+                  <p>
+                    <input type="checkbox" name="rename_mp3s" value="1" %s />Rename &amp; add metadata
+                    <br>
+                    <input type="checkbox" name="cleanup" value="1" %s />Delete leftover files
+                  </p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <br>
+                <p><b>Album Art:</b></p>
+                <input type="checkbox" name="add_album_art" value="1" %s>Add album art
+            </td>
+        </tr>
+    </table>
+
+    <p class="center"><input type="submit" value="Save Changes"><br>
+    (For now, all changes require a restart to take effect)</p>
+  </form>
+</div>
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_footer.tmpl")
\ No newline at end of file
diff --git a/data/interfaces/default/hostory.tmpl b/data/interfaces/default/hostory.tmpl
new file mode 100644
index 00000000..0c03e2bf
--- /dev/null
+++ b/data/interfaces/default/hostory.tmpl
@@ -0,0 +1,3 @@
+#import os.path
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_header.tmpl")
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_footer.tmpl")
\ No newline at end of file
diff --git a/data/interfaces/default/upcoming.tmpl b/data/interfaces/default/upcoming.tmpl
new file mode 100644
index 00000000..0c03e2bf
--- /dev/null
+++ b/data/interfaces/default/upcoming.tmpl
@@ -0,0 +1,3 @@
+#import os.path
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_header.tmpl")
+#include os.path.abspath($appPath+"/data/interfaces/default/_inc_footer.tmpl")
\ No newline at end of file
diff --git a/webServer.py b/webServer.py
index 5efab693..4d308280 100644
--- a/webServer.py
+++ b/webServer.py
@@ -259,11 +259,11 @@ class Headphones:
 	unqueueAlbum.exposed = True
 	
 	def upcoming(self):
-		page = [templates._header]
-		page.append(templates._logobar)
-		page.append(templates._nav)
-		page.append(templates._footer)
-		return page
+		filename = os.path.join(self.templatePath,"upcoming.tmpl")
+		template = Template(file=filename)
+		template.rootPath = "."
+		template.appPath = "."
+		return str(template)
 	upcoming.exposed = True
 	
 	def manage(self):
@@ -303,11 +303,11 @@ class Headphones:
 		
 	
 	def history(self):
-		page = [templates._header]
-		page.append(templates._logobar)
-		page.append(templates._nav)
-		page.append(templates._footer)
-		return page
+		filename = os.path.join(self.templatePath,"history.tmpl")
+		template = Template(file=filename)
+		template.rootPath = "."
+		template.appPath = "."
+		return str(template)
 	history.exposed = True
 	
 	def config(self):

+ + HTTP Host: + + i.e. localhost or 0.0.0.0 + +	+ + HTTP Username: + + +
+ + HTTP Port: + + +	+ + HTTP Password: + + +
+ Launch Browser on Startup: +
+ SABnzbd Host: + + usually localhost:8080 +	+ SABnzbd Username: +
+ + + SABnzbd API: +	+ + + SABnzbd Password: +
+ + + SABnzbd Category: +	+ + + Music Download Directory: + + Absolute or relative path to the dir where SAB downloads your music + i.e. Downloads/music or /Users/name/Downloads/music +
+ + + Usenet Retention: +
+ NZBMatrix: +	+ + NZBMatrix Username: + + +	+ + NZBMatrix API: + + +
+ + + Newznab: +	+ + + + Newznab Host: + + i.e. http://nzb.su + +	+ + + + Newznab API: + + +
+ + + NZBs.org: +	+ + + + NZBs.org UID: + + +	+ + + + NZBs.org Hash: + + +