diff --git a/styles/base/ajax-loader.gif b/styles/base/ajax-loader.gif
deleted file mode 100644
index 09d621e..0000000
Binary files a/styles/base/ajax-loader.gif and /dev/null differ
diff --git a/styles/base/base.css b/styles/base/base.css
deleted file mode 100644
index 8457979..0000000
--- a/styles/base/base.css
+++ /dev/null
@@ -1,117 +0,0 @@
-#taskbar-container {
-  bottom: 0;
-  height: 25px;
-  position: fixed;
-  width: 100%;
-  z-index: 99;
-}
-
-#taskbar {
-  background-color: #EBEEF4;
-  border-width: 1px;
-  border-color: rgba(29, 49, 91, 0.3);
-  border-style: solid;
-  box-shadow: 0 0 3px #999;
-  height: 25px;
-  margin: 0 5px;
-  color: #333;
-}
-
-#taskbar .taskbar-item-loading {
-  background: url(ajax-loader.gif) no-repeat 50% 50%;
-  height: 30px;
-  line-height: 30px;
-}
-
-#taskbar-inner {
-}
-
-#taskbar-region-left {
-  float: left;
-}
-#taskbar-region-left .taskbar-item {
-  border-width: 0 1px 0 0;
-}
-
-#taskbar-region-center {
-  float: left;
-}
-#taskbar-region-center .taskbar-region-inner {
-  margin-left: 100px;
-}
-
-#taskbar-region-right {
-  float: right;
-}
-#taskbar-region-right .taskbar-item {
-  border-width: 0 0 0 1px;
-}
-
-.taskbar-item {
-  border: 0 solid rgba(29, 49, 91, 0.3);
-  position: relative;
-  float: left;
-  line-height: 24px;
-  padding: 0 7px;
-}
-.taskbar-item-content {
-  cursor: pointer;
-}
-.taskbar-item-titlebar {
-  background: url("close.png") no-repeat 3px 50% #ccc;
-  padding-left: 15px;
-  cursor: pointer;
-}
-
-.taskbar-item-extra {
-  background: #fff;
-  border: 1px solid #333;
-  display: none;
-  position: absolute;
-  bottom: 25px;
-  width: 250px;
-  max-height: 350px;
-  overflow-y: scroll;
-}
-#taskbar-region-left .taskbar-item-extra {
-  left: 0;
-}
-#taskbar-region-right .taskbar-item-extra {
-  right: 0;
-}
-
-.taskbar-element {
-  float: left;
-  line-height: 24px;
-  padding-left: 7px;
-}
-.taskbar-item-content .taskbar-element:first-child {
-  padding-left: 0;
-}
-
-.taskbar-item-count {
-  background-color: rgba(255,0,0,.8);
-  border-radius: 2px;
-  color: #fff;
-  font-size: 9px;
-  line-height: 10px;
-  padding: 1px 1px 1px 2px;
-  position: absolute;
-  right: -1px;
-  top: -2px;
-}
-.taskbar-item-seperator {
-}
-
-.taskbar-provider-custom {
-  display: table-cell;
-  height: 24px;
-  vertical-align: middle;
-}
-
-#taskbar .item-list .unread {
-  font-style: italic;
-}
-
-/** Style the page differently if the taskbar is being shown. **/
-.with-taskbar {}
diff --git a/styles/base/close.png b/styles/base/close.png
deleted file mode 100644
index 46f39ec..0000000
Binary files a/styles/base/close.png and /dev/null differ
diff --git a/taskbar.module b/taskbar.module
index 0ef664a..65484ba 100644
--- a/taskbar.module
+++ b/taskbar.module
@@ -472,8 +472,8 @@ function _taskbar_load_style($style = NULL) {
 
   $styles = taskbar_get_styles();
   // Load base style first
-  if (isset($styles[$style]['base'])) {
-    _taskbar_load_style($styles[$style]['base']);
+  if (isset($styles[$style]['taskbar_base'])) {
+    _taskbar_load_style($styles[$style]['taskbar_base']);
   }
 
   drupal_add_css($styles[$style]['path'] . '/' . $style . '.css');
diff --git a/taskbar.taskbar.inc b/taskbar.taskbar.inc
index 38f9f6c..c294533 100644
--- a/taskbar.taskbar.inc
+++ b/taskbar.taskbar.inc
@@ -11,9 +11,9 @@ function taskbar_taskbar_style() {
   $path = drupal_get_path('module', 'taskbar') . '/styles';
   return array(
     array(
-      'name' => 'base',
+      'name' => 'taskbar_base',
       'description' => 'Taskbar base style',
-      'path' => $path . '/base',
+      'path' => $path . '/taskbar_base',
     ),
     array(
       'name' => 'top',