diff --git a/core/libraries/Theme.php b/core/libraries/Theme.php
index 4bd8237a..66d0d640 100644
--- a/core/libraries/Theme.php
+++ b/core/libraries/Theme.php
@@ -60,7 +60,6 @@ class Theme_Core {
   public function blocks() {
     /** @todo: make this data driven */
     $blocks = array(
-      'carousel' => carousel::block($this),
       'tag' => tag::block($this),
       'info' => info::block($this),
       'gmaps' => gmaps::block($this),
diff --git a/modules/carousel/helpers/carousel.php b/modules/carousel/helpers/carousel_block.php
similarity index 91%
rename from modules/carousel/helpers/carousel.php
rename to modules/carousel/helpers/carousel_block.php
index 31b513c7..f83a48da 100644
--- a/modules/carousel/helpers/carousel.php
+++ b/modules/carousel/helpers/carousel_block.php
@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class Carousel_Core {
-  public static function block($theme) {
+class carousel_block_Core {
+  public static function sidebar($theme) {
     $block = new Block();
     $block->id = "gCarousel";
     $block->title = "Album: <a href=#>{$theme->item()->title_edit}</a>";
     $block->content = '<img src="' .
       url::base() . "modules/carousel/images/carousel.png" .
       '" width="214"';
-    return $block;
+    return $block->__toString();
   }
 }
\ No newline at end of file
diff --git a/modules/carousel/helpers/carousel_installer.php b/modules/carousel/helpers/carousel_installer.php
new file mode 100644
index 00000000..3f4d55b5
--- /dev/null
+++ b/modules/carousel/helpers/carousel_installer.php
@@ -0,0 +1,33 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class carousel_installer {
+  public static function install() {
+    Kohana::log("debug", "carousel_installer::install");
+    $version = module::get_version("carousel");
+    Kohana::log("debug", "carousel: $version");
+    if ($version == 0) {
+      module::set_version("carousel", 1);
+    }
+  }
+
+  public static function uninstall() {
+    module::delete("carousel");
+  }
+}
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index a24e2e36..10f56178 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -1,4 +1,5 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
+<?= View::sidebar($theme) ?>
 <? foreach ($theme->blocks() as $block): ?>
   <?= $block ?>
 <? endforeach ?>