diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index cc36de03..ecae3946 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -158,6 +158,8 @@ class Theme_View_Core extends View {
     case "album_bottom":
     case "album_top":
     case "credits";
+    case "dynamic_bottom":
+    case "dynamic_top":
     case "footer":
     case "head":
     case "header_bottom":
@@ -165,16 +167,14 @@ class Theme_View_Core extends View {
     case "page_bottom":
     case "page_top":
     case "photo_blocks":
+    case "photo_bottom":
     case "photo_top":
     case "sidebar_blocks":
     case "sidebar_bottom":
     case "sidebar_top":
-    case "tag_bottom":
-    case "tag_top":
     case "thumb_bottom":
     case "thumb_info":
     case "thumb_top":
-    case "photo_bottom":
       $blocks = array();
       foreach (module::installed() as $module) {
         $helper_class = "{$module->name}_theme";
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 01c5d2df..bba1a751 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -36,7 +36,7 @@ class Tags_Controller extends REST_Controller {
     $template->set_global('tag', $tag);
     $template->set_global('children', $tag->items($page_size, $offset));
     $template->set_global('children_count', $children_count);
-    $template->content = new View("tag.html");
+    $template->content = new View("dynamic.html");
 
     print $template;
   }
diff --git a/themes/default/views/tag.html.php b/themes/default/views/dynamic.html.php
similarity index 92%
rename from themes/default/views/tag.html.php
rename to themes/default/views/dynamic.html.php
index 27777e94..8d2d2123 100644
--- a/themes/default/views/tag.html.php
+++ b/themes/default/views/dynamic.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gAlbumHeader">
   <div id="gAlbumHeaderButtons">
-    <?= $theme->tag_top() ?>
+    <?= $theme->dynamic_top() ?>
   </div>
   <h1><?= $tag->name ?></h1>
 </div>
@@ -24,6 +24,6 @@
   </li>
   <? endforeach ?>
 </ul>
-<?= $theme->tag_bottom() ?>
+<?= $theme->dynamic_bottom() ?>
 
 <?= $theme->pager() ?>