diff --git a/www/admin/release-files.php b/www/admin/release-files.php
index 67c8884e6..d4c4f3f07 100644
--- a/www/admin/release-files.php
+++ b/www/admin/release-files.php
@@ -16,7 +16,7 @@ if (isset($_GET["id"]))
 	if (!$rel)
 		$page->show404();
 
-    $nzbpath = $nzb->getNZBPath($_GET["id"], $page->site->nzbpath);
+    $nzbpath = $nzb->getNZBPath($_GET["id"], $page->settings->getSetting('nzbpath'));
 
     if (!file_exists($nzbpath))
         $page->show404();
diff --git a/www/admin/site-debug.php b/www/admin/site-debug.php
index c3be70921..34bde2d43 100644
--- a/www/admin/site-debug.php
+++ b/www/admin/site-debug.php
@@ -4,7 +4,7 @@ require_once("config.php");
 
 $page = new AdminPage();
 
-$s = $page->site;
+$s = $page->settings;
 unset($s->siteseed);
 unset($s->amazonprivkey);
 unset($s->tmdbkey);
diff --git a/www/templates/nntmux/views/frontend/profile.tpl b/www/templates/nntmux/views/frontend/profile.tpl
index c83c16aa3..4950c917f 100644
--- a/www/templates/nntmux/views/frontend/profile.tpl
+++ b/www/templates/nntmux/views/frontend/profile.tpl
@@ -60,7 +60,7 @@
 		</td>
 	</tr>
 	{if $isadmin || !$publicview}<tr><th title="Not public">Excluded Categories:</th><td>{$exccats|replace:",":"<br/>"}</td></tr>{/if}
-	{if $page->site->sabintegrationtype == 2 && $user.id==$userdata.id}
+	{if $page->settings->getSetting('sabintegrationtype') == 2 && $user.id==$userdata.id}
 		<tr><th>SABnzbd Integration:</th>
 		<td>
 			Url: {if $saburl == ''}N/A{else}{$saburl}{/if}<br/>
diff --git a/www/templates/nntmux/views/frontend/profileedit.tpl b/www/templates/nntmux/views/frontend/profileedit.tpl
index 5bb1ab0b3..a17269665 100644
--- a/www/templates/nntmux/views/frontend/profileedit.tpl
+++ b/www/templates/nntmux/views/frontend/profileedit.tpl
@@ -42,7 +42,7 @@
 	<fieldset>
 		<legend>Site Preferences</legend>
 		<table class="input">
-			{if $page->site->userselstyle == 1}
+			{if $page->settings->getSetting('userselstyle') == 1}
 			<tr>
 				<th>Site theme:</th>
 				<td>
@@ -113,7 +113,7 @@
 		</table>
 	</fieldset>
 
-	{if $page->site->sabintegrationtype != 1}
+	{if $page->settings->getSetting('sabintegrationtype') != 1}
 		<fieldset>
 			<legend>Queue Type</legend>
 			<table class="table table-condensed input">
@@ -130,7 +130,7 @@
 			</table>
 		</fieldset>
 	{/if}
-	{if $user.queuetype == 2 && ($page->site->sabintegrationtype == 0 || $page->site->sabintegrationtype == 2)}
+	{if $user.queuetype == 2 && ($page->settings->getSetting('sabintegrationtype') == 0 || $page->settings->getSetting('sabintegrationtype') == 2)}
 		<fieldset>
 			<legend>NZBGet Integration</legend>
 			<table class="table table-condensed input">
@@ -164,7 +164,7 @@
 			</table>
 		</fieldset>
 	{/if}
-	{if $user.queuetype == 1 && $page->site->sabintegrationtype == 2}
+	{if $user.queuetype == 1 && $page->settings->getSetting('sabintegrationtype') == 2}
 		<fieldset>
 			<legend>SABnzbd Integration</legend>
 			<table class="input">
diff --git a/www/templates/nntmux/views/frontend/viewqueue.tpl b/www/templates/nntmux/views/frontend/viewqueue.tpl
index f1b36cb4a..ef5c4ced2 100644
--- a/www/templates/nntmux/views/frontend/viewqueue.tpl
+++ b/www/templates/nntmux/views/frontend/viewqueue.tpl
@@ -1,10 +1,10 @@
 {if $error == ''}
-{if $page->site->sabintegrationtype > 0 || $user.queuetype == 2}
+{if $page->settings->getSetting('sabintegrationtype') > 0 || $user.queuetype == 2}
 <p style="text-align:center;">
 	The following queue is pulled from
 	<a href="{$serverURL|escape:"htmlall"}">{$serverURL|escape:"htmlall"}</a>.
 	<br />
-	{if $page->site->sabintegrationtype == 2 || $user.queuetype == 2}Edit your queue settings in <a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>.{/if}
+	{if $page->settings->getSetting('sabintegrationtype') == 2 || $user.queuetype == 2}Edit your queue settings in <a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>.{/if}
 </p>
 <div class="sab_queue"></div>
 {if $user.queuetype == 2}