diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
new file mode 100644
index 00000000..58d3b916
--- /dev/null
+++ b/themes/default/views/footer.html.php
@@ -0,0 +1,6 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div id="ft">
+  <div id="gFooter">
+    Powered by <a href="#">Gallery3</a> | <a href="#">About this Gallery</a> | ...
+  </div>
+</div>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
new file mode 100644
index 00000000..a5a85988
--- /dev/null
+++ b/themes/default/views/header.html.php
@@ -0,0 +1,29 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div id="gHeader">
+  <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  <h1><?= $item->title ?></h1>
+  <div id="gLoginMenu">
+    <a href="#"><?= _("Register") ?></a> |
+    <a href="#"><?= _("Login") ?></a>
+  </div>
+
+  <ul id="gSiteMenu">
+    <li><a href="index.html"><?= _("HOME") ?></a></li>
+    <li><a class="active" href="browse.html"><?= _("BROWSE") ?></a></li>
+    <li><a href="upload.html"><?= _("UPLOAD") ?></a></li>
+    <li><a href="upload.html"><?= _("MY GALLERY") ?></a></li>
+    <li><a href="#"><?= _("ADMIN") ?></a></li>
+  </ul>
+
+  <ul id="gBreadcrumbs">
+    <? foreach ($parents as $parent): ?>
+    <li><a href="<?= url::site("album/{$parent->id}") ?>"><?= $parent->title ?></a></li>
+    <? endforeach ?>
+    <li class="active"><span><?= $item->title ?></span></li>
+  </ul>
+
+  <form id="gSearchForm">
+    <input type="text" class="text" value="<?= _("Search Gallery ...") ?>"/>
+    <input type="submit" class="submit" value="search" />
+  </form>
+</div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 620f15e8..1aca82e4 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <title>Browse Photos :: <?= $item->title ?></title>
+    <title><?= _("Browse Photos") ?> :: <?= $item->title ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/reset-fonts-grids/reset-fonts-grids.css" />
     <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/base/base-min.css" />
@@ -20,36 +20,7 @@
 
   <body class="yui-skin-sam">
     <div id="doc2" class="yui-t5 gView">
-
-      <div id="gHeader">
-        <img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-        <h1><?= $item->title ?></h1>
-        <div id="gLoginMenu">
-          <a href="#"><?= _("Register") ?></a> |
-          <a href="#"><?= _("Login") ?></a>
-        </div>
-
-        <ul id="gSiteMenu">
-          <li><a href="index.html"><?= _("HOME") ?></a></li>
-          <li><a class="active" href="browse.html"><?= _("BROWSE") ?></a></li>
-          <li><a href="upload.html"><?= _("UPLOAD") ?></a></li>
-          <li><a href="upload.html"><?= _("MY GALLERY") ?></a></li>
-          <li><a href="#"><?= _("ADMIN") ?></a></li>
-        </ul>
-
-        <ul id="gBreadcrumbs">
-          <? foreach ($parents as $parent): ?>
-          <li><a href="<?= url::site("album/{$parent->id}") ?>"><?= $parent->title ?></a></li>
-          <? endforeach ?>
-          <li class="active"><span><?= $item->title ?></span></li>
-        </ul>
-
-        <form id="gSearchForm">
-          <input type="text" class="text" value="<?= _("Search Gallery ...") ?>"/>
-          <input type="submit" class="submit" value="search" />
-        </form>
-      </div>
-
+      <?= $theme->display("header.html") ?>
       <div id="bd">
         <div id="yui-main">
           <div id="gContent" class="yui-b">
@@ -57,18 +28,9 @@
           </div>
         </div>
 
-        <div id="gSidebar" class="yui-b">
-          <? foreach ($theme->blocks() as $block): ?>
-            <?= $block ?>
-          <? endforeach ?>
-        </div>
+        <?= $theme->display("sidebar.html") ?>
       </div>
-
-      <div id="ft">
-        <div id="gFooter">
-          Powered by <a href="#">Gallery3</a> | <a href="#">About this Gallery</a> | ...
-        </div><!-- END #gFooter -->
-      </div><!-- END YUI #ft -->
+      <?= $theme->display("footer.html") ?>
     </div>
   </body>
 </html>
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
new file mode 100644
index 00000000..e3e853c6
--- /dev/null
+++ b/themes/default/views/sidebar.html.php
@@ -0,0 +1,6 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div id="gSidebar" class="yui-b">
+  <? foreach ($theme->blocks() as $block): ?>
+    <?= $block ?>
+  <? endforeach ?>
+</div>
