diff --git a/README b/README
index 26b0e68..687eb68 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 ComicPress is the WordPress Comic Pubishing Theme.
 
-Copyright 2005-2009 Tyler Martin
-Copyright 2008-2009 John Bintz
-Copyright 2009 Philip M. Hofer
+Copyright 2005-2010 Tyler Martin
+Copyright 2008-2010 John Bintz
+Copyright 2009-2010 Philip M. Hofer
 
 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
diff --git a/sidebar-left.php b/sidebar-left.php
index e2949e0..fddaef6 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -3,19 +3,15 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 <div id="sidebar-left">
 	<div class="sidebar-head"></div>
 		<div class="sidebar">
-			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
-				<div class="widget">
-					<?php comicpress_calendar_embed() ?>
-				</div>
-				<div class="widget">
-					<?php comicpress_archive_dropdown(); ?>
-				</div>
-				<div class="widget">
-				<ul><li>
-					<?php comicpress_latest_comics() ?>
-				</li></ul>
-				</div>
-			<?php endif; ?>
+		<?php 
+			if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) :
+				if (!is_cp_theme_layout('standard,v')) { 
+					the_widget('CalendarWidget');
+					the_widget('ArchiveDropdownWidget','mode=monthly_archive');
+				}
+				the_widget('LatestComicsWidget');
+			endif; 
+		?>
 		</div>
 	<div class="sidebar-foot"></div>
 </div>
diff --git a/sidebar-right.php b/sidebar-right.php
index 19ef237..e25199f 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -3,25 +3,18 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 <div id="sidebar-right">
 	<div class="sidebar-head"></div>
 		<div class="sidebar">
-			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : ?>
-				<?php the_widget('BookmarkWidget',array(),array()); ?>
-				<?php if (is_cp_theme_layout('standard,v')) { ?>
-					<div class="widget">
-						<?php comicpress_calendar_embed(); ?>
-					</div>
-				<?php } ?>
-				<div class="widget">
-				<ul><li>
-					<h2>Menu</h2>
-						<ul>
-							<?php wp_list_pages('title_li=') ?>
-						</ul>
-				</li></ul>
-				</div>
-				<div class="widget">
-					<ul><?php wp_list_categories('title_li=<h2>Categories</h2>') ?></ul>
-				</div>
-			<?php endif; ?>
+		<?php 
+		if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : 
+			the_widget('BookmarkWidget','mode=three-button');
+			if (is_cp_theme_layout('standard,v')) { 
+				the_widget('CalendarWidget');
+				the_widget('ArchiveDropdownWidget','mode=monthly_archive'); 
+			}
+			the_widget('WP_Widget_Pages');
+			the_widget('WP_Widget_Categories','hierarchical=1&count=1');
+
+		endif; 
+		?>
 		</div>
 	<div class="sidebar-foot"></div>
 </div>
diff --git a/widgets/LatestComicsWidget.inc b/widgets/LatestComicsWidget.inc
new file mode 100644
index 0000000..fbd4d2a
--- /dev/null
+++ b/widgets/LatestComicsWidget.inc
@@ -0,0 +1,51 @@
+<?php
+/*
+Widget Name: Latest Comics Widget
+Widget URI: http://comicpress.org/
+Description: Display a list of links of the latest comics.
+Author: Philip M. Hofer (Frumph)
+Version: 1.02
+
+*/
+
+class LatestComicsWidget extends WP_Widget {
+	
+	function LatestComicsWidget($skip_widget_init = false) {
+		if (!$skip_widget_init) {
+			$widget_ops = array('classname' => __CLASS__, 'description' => __('Display a list of the latest comics available.','comicpress') );
+			$this->WP_Widget(__CLASS__, __('ComicPress Latest Comics','comicpress'), $widget_ops);
+		}
+	}
+	
+	function widget($args, $instance) {
+		global $post;
+		extract($args, EXTR_SKIP); 
+		
+		echo $before_widget;
+		$title = empty($instance['title']) ? __('Latest Comics','comicpress') : apply_filters('widget_title', $instance['title']); 
+		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; 
+		$latestcomics = get_posts('numberposts=5&category='.get_all_comic_categories_as_cat_string()); ?>
+		<ul>
+		<?php foreach($latestcomics as $post) : ?>
+			<li><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></li>
+			<?php endforeach; ?>
+		</ul>
+		<?php echo $after_widget;
+	}
+	
+	function update($new_instance, $old_instance) {
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		return $instance;
+	}
+	
+	function form($instance) {
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$title = strip_tags($instance['title']);
+		?>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
+		<?php
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/widgets/MenubarWidget.inc b/widgets/MenubarWidget.inc
new file mode 100644
index 0000000..fa48ac7
--- /dev/null
+++ b/widgets/MenubarWidget.inc
@@ -0,0 +1,121 @@
+<?php
+/*
+Widget Name: Menubar Widget
+Widget URI: http://comicpress.org/
+Description: Display a calendar of this months posts.
+Author: Philip M. Hofer (Frumph)
+Version: 1.05
+Author URI: http://frumph.net/
+
+*/
+
+class MenubarWidget extends WP_Widget {
+	
+	function MenubarWidget($skip_widget_init = false) {
+		if (!$skip_widget_init) {
+			$widget_ops = array('classname' => __CLASS__, 'description' => __('Displays a menubar.','comicpress') );
+			$this->WP_Widget(__CLASS__, __('Comicpress Menubar','comicpress'), $widget_ops);
+		}
+	}
+	
+	function comicpress_menubar() {
+		global $comicpress_options;
+		if (comicpress_check_child_file('menubar') == false) {
+			if (file_exists(get_stylesheet_directory() . '/custom-menubar.php')) {
+				include(get_stylesheet_directory() . '/custom-menubar.php');
+			} else { ?>
+			<div id="menubar">
+				
+				<div id="menunav">
+				<?php if ($comicpress_options['enable_search_in_menubar']) { ?>
+					<div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div>
+				<?php } ?>
+				<?php if ($comicpress_options['enable_rss_in_menubar']) { ?>
+					<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
+				<?php } ?>
+				<?php if ($comicpress_options['enable_navigation_in_menubar']) { ?>
+					<?php if (is_home()) {
+						$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
+						while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
+							global $wp_query; $wp_query->is_single = true; ?>
+							<div class="menunav-prev">
+							<?php previous_comic_link('%link', '&lsaquo;'); ?>
+							</div>
+							<?php $wp_query->is_single = false;
+						endwhile; 
+					} elseif (is_single() & in_comic_category()) { ?>
+						<div class="menunav-prev">
+						<?php previous_comic_link('%link', '&lsaquo;'); ?>
+						</div>
+						<div class="menunav-next">
+						<?php next_comic_link('%link', '&rsaquo;'); ?>
+						</div>
+					<?php } ?>
+				<?php } ?>
+				</div>
+				<?php 
+				$linkcatid = get_term_by('name','menubar','link_category');
+				$linkcatid = $linkcatid->term_id;
+				$menulinks = wp_list_bookmarks('echo=0&title_li=&categorize=0&title_before=&title_after=&category_name=menubar');
+				$menulinks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $menulinks);
+				$menulinks = preg_replace('#<ul ([^>]*)>#', '', $menulinks);
+				$menulinks = str_replace('</ul>', '', $menulinks);
+				if ($comicpress_options['enable_blogroll_off_links']) {
+					$bookmarks = wp_list_bookmarks('echo=0&title_li=&categorize=1&title_before=&title_after=&exclude_category='.$linkcatid); 
+					$bookmarks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $bookmarks);
+					$bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks); 
+				}
+				$listpages = '';
+				if (!$comicpress_options['disable_dynamic_menubar_links']) {
+					$listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li=');
+				}
+				if (!empty($bookmarks) && $comicpress_options['enable_blogroll_off_links'])  {
+					$listpages = str_replace('Links</a></li>', 'Links</a>
+								<ul>
+								'.$bookmarks.'
+								</ul>
+								</li>
+								', $listpages);
+				}
+				$listpages .= $menulinks;
+				?>
+				<ul id="menu">
+				<li class="page_item page-item-home<?php if (is_home()) { ?> current_page_item<?php } ?>"><a href="<?php bloginfo('url'); ?>">Home</a></li>
+				<?php echo $listpages; ?>
+				<?php if ($comicpress_options['contact_in_menubar']) { ?>
+					<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
+				<?php } ?>
+				</ul>
+				<div class="clear"></div>
+			</div>
+		<?php } 
+		}
+	} 	
+	
+	function widget($args, $instance) {
+		global $post;
+		extract($args, EXTR_SKIP); 
+		
+		echo $before_widget;
+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); 
+		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
+		$this->comicpress_menubar();
+		echo $after_widget;
+	}
+	
+	function update($new_instance, $old_instance) {
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		return $instance;
+	}
+	
+	function form($instance) {
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$title = strip_tags($instance['title']);
+		?>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
+		<?php
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/widgets/latestcomics.php b/widgets/latestcomics.php
index 2d3c76c..e69de29 100644
--- a/widgets/latestcomics.php
+++ b/widgets/latestcomics.php
@@ -1,70 +0,0 @@
-<?php
-/*
-Widget Name: Latest Comics
-Widget URI: http://comicpress.org/
-Description: Display a list of links of the latest comics.
-Author: Philip M. Hofer (Frumph)
-Version: 1.01
-Author URI: http://frumph.net/
-
-*/
-
-function comicpress_latest_comics() { ?>
-	<h2>Latest Comics</h2>
-	<ul>	
-	<?php global $post;
-	$latestcomics = get_posts('numberposts=5&category='.get_all_comic_categories_as_cat_string());
-	foreach($latestcomics as $post) : ?>
-		<li><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></li>
-		<?php endforeach; ?>
-	</ul>
-	<?php 
-}
-
-class widget_comicpress_latest_comics extends WP_Widget {
-	
-	function widget_comicpress_latest_comics() {
-		$widget_ops = array('classname' => 'widget_comicpress_latest_comics', 'description' => __('Display a list of the latest comics available.','comicpress') );
-		$this->WP_Widget('comicpress_latest_comics', __('ComicPress Latest Comics','comicpress'), $widget_ops);
-	}
-	
-	function widget($args, $instance) {
-		global $post;
-		extract($args, EXTR_SKIP); 
-		
-		echo $before_widget;
-		$title = empty($instance['title']) ? __('Latest Comics','comicpress') : apply_filters('widget_title', $instance['title']); 
-		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; 
-		$latestcomics = get_posts('numberposts=5&category='.get_all_comic_categories_as_cat_string()); ?>
-		<ul>
-		<?php foreach($latestcomics as $post) : ?>
-			<li><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></li>
-			<?php endforeach; ?>
-		</ul>
-		<?php echo $after_widget;
-	}
-	
-	function update($new_instance, $old_instance) {
-		$instance = $old_instance;
-		$instance['title'] = strip_tags($new_instance['title']);
-		return $instance;
-	}
-	
-	function form($instance) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = strip_tags($instance['title']);
-		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
-		<?php
-	}
-}
-register_widget('widget_comicpress_latest_comics');
-
-
-function widget_comicpress_latest_comics_init() {    
-	new widget_comicpress_latest_comics(); 
-} 
-
-add_action('widgets_init', 'widget_comicpress_latest_comics_init');
-
-?>
\ No newline at end of file