3 files changed, 7 insertions, 13 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 43024840..b952af1c 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,9 +2,7 @@
 <div id="gAlbumHeader">
   <h1><?= $item->title_edit ?></h1>
   <span class="gUnderState"><?= $item->description_edit ?></span>
-  <? if ($theme->module("slideshow")): ?>
-    <?= slideshow::link() ?>
-  <? endif; ?>
+  <?= View::album_header($theme) ?>
 </div>
 
 <ul id="gAlbumGrid">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 24aecfb5..b2263eff 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -9,17 +9,10 @@
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
           media="screen,print,projection" />
-    <link rel="alternate" type="application/rss+xml"
-          href="<?= url::site("media_rss/feed/{$theme->item()->id}") ?>"
-          />
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/user.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/comment.js") ?>" type="text/javascript"></script>
-    <script src="http://lite.piclens.com/current/piclens.js" type="text/javascript"></script>
-    <? if ($user): ?>
-    <script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script>
-    <? endif; ?>
     <!-- this stuff will likely be integrated into lib, possibly theme css -->
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("jquery/jquery.ui.css") ?>"
           media="screen,print,projection" />
@@ -27,6 +20,10 @@
     <script src="<?= $theme->url("jquery/jquery.ui.tabs.js") ?>" type="text/javascript"></script>
     <!--script src="<?= $theme->url("jquery/jquery.ui.accordion.js") ?>" type="text/javascript"></script-->
     <!--script src="<?= $theme->url("jquery/jquery.ui.init.js") ?>" type="text/javascript"></script-->
+    <?= View::head($theme) ?>
+    <? if ($user): ?>
+    <script src="<?= url::file("lib/jquery.jeditable.js") ?>" type="text/javascript"></script>
+    <? endif; ?>
   </head>
 
   <body>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 6cf95a23..88ffedf9 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,9 +1,8 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItem">
   <a href="" class="gButtonLink">Full size (1024x768)</a>
-  <? if ($theme->module("slideshow")): ?>
-    <?= slideshow::link() ?>
-  <? endif; ?>
+  <?= View::photo($theme) ?>
+
   <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
        height="<?= $item->resize_height ?>" />