diff --git a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
similarity index 92%
rename from 3.1/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
index 9d3341de..6d39f820 100644
--- a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php	
@@ -56,8 +56,8 @@
 <meta name="teoma" content="noindex, nofollow, noarchive" />
 <? endif; ?>
 <? if ($theme->blendpagetrans): ?>
-<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5)" />
-<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5)" />
+<meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" /> 
+<meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
 <? endif; ?>
 <!-- Internet Explorer 9 Meta tags : Start -->
 <meta name="application-name" content="<?= $_title; ?>" />
@@ -124,12 +124,20 @@
 <style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style>
 <? endif; ?>
 </head>
-<? if ($theme->item()): ?>
-<?   $item = $theme->item(); ?>
-<? else: ?>
-<?   $item = item::root(); ?>
-<? endif; ?>                             
-<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($theme->is_rtl)? "class=\"rtl\"" : null; ?> >
+<? if ($theme->item()):
+     $item = $theme->item();
+   else:
+     $item = item::root();
+   endif;
+   if ($theme->is_rtl):
+     $body_class = "rtl";
+   else:
+     $body_class = "";
+   endif;
+   if ($theme->viewmode == "mini"):
+     $body_class .= "viewmode-mini";
+   endif; ?>
+<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
 <?= $theme->page_top() ?>
 <?= $theme->site_status() ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
@@ -140,14 +148,15 @@
 <? endif ?>
 <div id="g-header">
 <?= $theme->header_top() ?>
-<? if ($header_text = module::get_var("gallery", "header_text")): ?>
+<? if ($theme->viewmode != "mini"): ?>
+<?   if ($header_text = module::get_var("gallery", "header_text")): ?>
 <span id="g-header-text"><?=  $theme->bb2html($header_text, 1) ?></span>
-<? else: ?>
+<?   else: ?>
   <a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
     <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" />
   </a>
-<? endif ?>
-
+<?   endif; ?>
+<? endif; ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?>
   <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
   <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
@@ -160,13 +169,18 @@
 <? if ($theme->loginmenu_position == "header"): ?>
 <?=  $theme->user_menu() ?>
 <? endif ?>
+
 <?
   // Custom rWatcher code, based on the breadcrumb menu function.
   // The rest of this file is the original page.html.php file from the Grey Dragon theme.
 ?>
 <? if (empty($breadcrumbs)): ?>
+<? if (empty($parents)): ?>
 <?= $theme->breadcrumb_menu($theme, null); ?>
 <? else: ?>
+<?= $theme->breadcrumb_menu($theme, $parents); ?>
+<? endif; ?>
+<? else: ?>
 <?
     $breadcrumb_content = "";
     if ($this->breadcrumbs_position == "hide"):
@@ -193,6 +207,7 @@
 
   // End Edit.
 ?>
+
 <? endif; ?>
 <?= $theme->custom_header(); ?>
 </div>
@@ -281,15 +296,17 @@
 </div>
 <? endif; ?>
 <div id="g-footer">
-<?= $theme->footer() ?>
-<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+<? if ($theme->viewmode != "mini"): ?>
+<?=  $theme->footer() ?>
+<?   if ($footer_text = module::get_var("gallery", "footer_text")): ?>
 <span id="g-footer-text"><?=  $theme->bb2html($footer_text, 1) ?></span>
-<? endif ?>
+<?   endif ?>
   <?= $theme->credits() ?>
   <ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul>
-<? if ($theme->loginmenu_position == "default"): ?>
+<?   if ($theme->loginmenu_position == "default"): ?>
   <?= $theme->user_menu() ?>
-<? endif ?>
+<?   endif; ?>
+<? endif; ?>
 <?= $theme->custom_footer(); ?>
 </div>
 <?= $theme->page_bottom() ?>
diff --git a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
similarity index 98%
rename from 3.1/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
index 5918299c..cc552628 100644
--- a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php	
@@ -53,7 +53,7 @@
     $siblings = $dynamic_siblings;
     for ($i = 1; $i <= $total_pages; $i++):
       if ($page_type == "item") {
-        $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id);
+        $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($siblings[$i-1]->name));
       } elseif ($page_type == "") {
       }
     endfor;
@@ -91,6 +91,7 @@
       $_pagelist[1] = url::site();
       break;
   }
+
 // rWatcher Mod
   endif;
 // End rWatcher Mod.
diff --git a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
similarity index 97%
rename from 3.1/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
index 5d3ede73..70fb4ca8 100644
--- a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php	
@@ -48,7 +48,7 @@
   <div id="g-info">
     <h1><?= $_title ?></h1>
   </div>
-  <?= $theme->add_paginator("top"); ?>
+  <?= $theme->add_paginator("top", FALSE); ?>
   <?= $theme->photo_top() ?>
   <? if (($theme->photo_descmode == "top") and ($_description)): ?>
     <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
@@ -56,7 +56,7 @@
   <div id="g-photo">
     <?= $theme->resize_top($item) ?>
     <? $_resizewidth = $item->resize_width;
-
+	
 // rWatcher Modification.
     $siblings = "";
     if (isset($dynamic_siblings)) {
@@ -116,7 +116,7 @@
   <? if (($theme->photo_descmode == "bottom") and ($_description)): ?>
     <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
   <? endif; ?>
-  <?= $theme->add_paginator("bottom"); ?>
+  <?= $theme->add_paginator("bottom", FALSE); ?>
   <?= $theme->photo_bottom() ?>
 </div>
 <?= $script ?>
\ No newline at end of file
diff --git a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/tag_albums_album.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
similarity index 100%
rename from 3.0/modules/tag_albums/-- Theme Files/greydragon/views/tag_albums_album.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
diff --git a/3.0/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php b/3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php
similarity index 93%
rename from 3.0/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php
index 54bb4db8..9b4635ef 100644
--- a/3.0/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php	
@@ -132,7 +132,7 @@
           <?= $theme->header_bottom() ?>
         </div>
 
-        <? // The following code was modifed to allow module-defined breadcrumbs.
+        <? // rWatcher EDIT: The following code was modifed to allow module-defined breadcrumbs.
            // Everything else in this file is a copy of the default page.html.php file.
         ?>
         <? if (!empty($breadcrumbs)): ?>
@@ -145,9 +145,14 @@
                  the immediate parent so that when you go back up a
                  level you're on the right page. -->
             <? if ($breadcrumb->url) : ?>
-              <a href="<?= $breadcrumb->url ?>"><?= html::purify($breadcrumb->title) ?></a>
+              <a href="<?= $breadcrumb->url ?>">
+              <? // limit the title length to something reasonable (defaults to 15) ?>
+              <?= html::purify(text::limit_chars($breadcrumb->title,
+                    module::get_var("gallery", "visible_title_length"))) ?>
+              </a>
             <? else : ?>
-              <?= html::purify($breadcrumb->title) ?>
+              <?= html::purify(text::limit_chars($breadcrumb->title,
+                    module::get_var("gallery", "visible_title_length"))) ?>
             <? endif ?>
           </li>
           <? $i++ ?>
@@ -156,7 +161,7 @@
         <? endif ?>
         <? // End modified code ?>
 
-		</div>
+      </div>
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
diff --git a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
similarity index 92%
rename from 3.0/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
index 9d3341de..6d39f820 100644
--- a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/calpage.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php	
@@ -56,8 +56,8 @@
 <meta name="teoma" content="noindex, nofollow, noarchive" />
 <? endif; ?>
 <? if ($theme->blendpagetrans): ?>
-<meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5)" />
-<meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5)" />
+<meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" /> 
+<meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
 <? endif; ?>
 <!-- Internet Explorer 9 Meta tags : Start -->
 <meta name="application-name" content="<?= $_title; ?>" />
@@ -124,12 +124,20 @@
 <style type="text/css"> #g-column-bottom #g-thumbnav-block, #g-column-top #g-thumbnav-block { display: none; } </style>
 <? endif; ?>
 </head>
-<? if ($theme->item()): ?>
-<?   $item = $theme->item(); ?>
-<? else: ?>
-<?   $item = item::root(); ?>
-<? endif; ?>                             
-<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($theme->is_rtl)? "class=\"rtl\"" : null; ?> >
+<? if ($theme->item()):
+     $item = $theme->item();
+   else:
+     $item = item::root();
+   endif;
+   if ($theme->is_rtl):
+     $body_class = "rtl";
+   else:
+     $body_class = "";
+   endif;
+   if ($theme->viewmode == "mini"):
+     $body_class .= "viewmode-mini";
+   endif; ?>
+<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
 <?= $theme->page_top() ?>
 <?= $theme->site_status() ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
@@ -140,14 +148,15 @@
 <? endif ?>
 <div id="g-header">
 <?= $theme->header_top() ?>
-<? if ($header_text = module::get_var("gallery", "header_text")): ?>
+<? if ($theme->viewmode != "mini"): ?>
+<?   if ($header_text = module::get_var("gallery", "header_text")): ?>
 <span id="g-header-text"><?=  $theme->bb2html($header_text, 1) ?></span>
-<? else: ?>
+<?   else: ?>
   <a id="g-logo" href="<?= item::root()->url() ?><?= ($theme->allow_root_page)? "?root=yes" : null; ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
     <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->logopath ?>" />
   </a>
-<? endif ?>
-
+<?   endif; ?>
+<? endif; ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?>
   <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
   <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
@@ -160,13 +169,18 @@
 <? if ($theme->loginmenu_position == "header"): ?>
 <?=  $theme->user_menu() ?>
 <? endif ?>
+
 <?
   // Custom rWatcher code, based on the breadcrumb menu function.
   // The rest of this file is the original page.html.php file from the Grey Dragon theme.
 ?>
 <? if (empty($breadcrumbs)): ?>
+<? if (empty($parents)): ?>
 <?= $theme->breadcrumb_menu($theme, null); ?>
 <? else: ?>
+<?= $theme->breadcrumb_menu($theme, $parents); ?>
+<? endif; ?>
+<? else: ?>
 <?
     $breadcrumb_content = "";
     if ($this->breadcrumbs_position == "hide"):
@@ -193,6 +207,7 @@
 
   // End Edit.
 ?>
+
 <? endif; ?>
 <?= $theme->custom_header(); ?>
 </div>
@@ -281,15 +296,17 @@
 </div>
 <? endif; ?>
 <div id="g-footer">
-<?= $theme->footer() ?>
-<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+<? if ($theme->viewmode != "mini"): ?>
+<?=  $theme->footer() ?>
+<?   if ($footer_text = module::get_var("gallery", "footer_text")): ?>
 <span id="g-footer-text"><?=  $theme->bb2html($footer_text, 1) ?></span>
-<? endif ?>
+<?   endif ?>
   <?= $theme->credits() ?>
   <ul id="g-footer-rightside"><li><?= $theme->copyright ?></li></ul>
-<? if ($theme->loginmenu_position == "default"): ?>
+<?   if ($theme->loginmenu_position == "default"): ?>
   <?= $theme->user_menu() ?>
-<? endif ?>
+<?   endif; ?>
+<? endif; ?>
 <?= $theme->custom_footer(); ?>
 </div>
 <?= $theme->page_bottom() ?>
diff --git a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
similarity index 98%
rename from 3.0/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
index 5918299c..cc552628 100644
--- a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/paginator.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php	
@@ -53,7 +53,7 @@
     $siblings = $dynamic_siblings;
     for ($i = 1; $i <= $total_pages; $i++):
       if ($page_type == "item") {
-        $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id);
+        $_pagelist[$i] = url::site("tag_albums/show/" . $siblings[$i-1]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($siblings[$i-1]->name));
       } elseif ($page_type == "") {
       }
     endfor;
@@ -91,6 +91,7 @@
       $_pagelist[1] = url::site();
       break;
   }
+
 // rWatcher Mod
   endif;
 // End rWatcher Mod.
diff --git a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
similarity index 97%
rename from 3.0/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
index 5d3ede73..70fb4ca8 100644
--- a/3.0/modules/tag_albums/-- Theme Files/greydragon/views/photo.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php	
@@ -48,7 +48,7 @@
   <div id="g-info">
     <h1><?= $_title ?></h1>
   </div>
-  <?= $theme->add_paginator("top"); ?>
+  <?= $theme->add_paginator("top", FALSE); ?>
   <?= $theme->photo_top() ?>
   <? if (($theme->photo_descmode == "top") and ($_description)): ?>
     <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
@@ -56,7 +56,7 @@
   <div id="g-photo">
     <?= $theme->resize_top($item) ?>
     <? $_resizewidth = $item->resize_width;
-
+	
 // rWatcher Modification.
     $siblings = "";
     if (isset($dynamic_siblings)) {
@@ -116,7 +116,7 @@
   <? if (($theme->photo_descmode == "bottom") and ($_description)): ?>
     <div id="g-info"><div class="g-description"><?= $_description ?></div></div>
   <? endif; ?>
-  <?= $theme->add_paginator("bottom"); ?>
+  <?= $theme->add_paginator("bottom", FALSE); ?>
   <?= $theme->photo_bottom() ?>
 </div>
 <?= $script ?>
\ No newline at end of file
diff --git a/3.1/modules/tag_albums/-- Theme Files/greydragon/views/tag_albums_album.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
similarity index 100%
rename from 3.1/modules/tag_albums/-- Theme Files/greydragon/views/tag_albums_album.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
diff --git a/3.1/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php b/3.1/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php
similarity index 93%
rename from 3.1/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php
index 54bb4db8..9b4635ef 100644
--- a/3.1/modules/tag_albums/-- Theme Files/clean_canvas/views/calpage.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php	
@@ -132,7 +132,7 @@
           <?= $theme->header_bottom() ?>
         </div>
 
-        <? // The following code was modifed to allow module-defined breadcrumbs.
+        <? // rWatcher EDIT: The following code was modifed to allow module-defined breadcrumbs.
            // Everything else in this file is a copy of the default page.html.php file.
         ?>
         <? if (!empty($breadcrumbs)): ?>
@@ -145,9 +145,14 @@
                  the immediate parent so that when you go back up a
                  level you're on the right page. -->
             <? if ($breadcrumb->url) : ?>
-              <a href="<?= $breadcrumb->url ?>"><?= html::purify($breadcrumb->title) ?></a>
+              <a href="<?= $breadcrumb->url ?>">
+              <? // limit the title length to something reasonable (defaults to 15) ?>
+              <?= html::purify(text::limit_chars($breadcrumb->title,
+                    module::get_var("gallery", "visible_title_length"))) ?>
+              </a>
             <? else : ?>
-              <?= html::purify($breadcrumb->title) ?>
+              <?= html::purify(text::limit_chars($breadcrumb->title,
+                    module::get_var("gallery", "visible_title_length"))) ?>
             <? endif ?>
           </li>
           <? $i++ ?>
@@ -156,7 +161,7 @@
         <? endif ?>
         <? // End modified code ?>
 
-		</div>
+      </div>
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
