diff --git a/comicpress-options.php b/comicpress-options.php
index a8cfe1a..3d38579 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -215,15 +215,12 @@ function comicpress_admin() {
 			<div class="<?php if ($tab == 'buyprint') { ?>on<?php } else { ?>off<?php } ?>" title="buyprintoptions"><span><?php _e('Buy Print','comicpress'); ?></span></div>
 			<div class="<?php if ($tab == 'members') { ?>on<?php } else { ?>off<?php } ?>" title="membersoptions"><span><?php _e('Members','comicpress'); ?></span></div>
 		</div>
-		<?php include(get_template_directory() . '/options/themestyle.php'); ?>
-		<?php include(get_template_directory() . '/options/generaloptions.php'); ?>
-		<?php include(get_template_directory() . '/options/indexoptions.php'); ?>
-		<?php include(get_template_directory() . '/options/postoptions.php'); ?>
-		<?php include(get_template_directory() . '/options/archivesearchoptions.php'); ?>
-		<?php include(get_template_directory() . '/options/menubaroptions.php'); ?>
-		<?php include(get_template_directory() . '/options/customheaderoptions.php'); ?>
-		<?php include(get_template_directory() . '/options/buyprintoptions.php'); ?>
-		<?php include(get_template_directory() . '/options/membersoptions.php'); ?>
+		
+		<?php
+			foreach (glob(get_template_directory() . '/options/*.php') as $file) {
+				include($file);
+			}
+		?>
 	</div>
 	
 </div>
diff --git a/sidebar-left.php b/sidebar-left.php
index aca06c4..c2d20f1 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -7,7 +7,7 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 			if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) :
 				if (!is_cp_theme_layout('standard,v')) { 
 					the_widget('ComicPressCalendarWidget');
-//					the_widget('ComicPressArchiveDropdownWidget','mode=monthly_archive');
+					the_widget('ComicPressArchiveDropdownWidget', 'mode=storyline_order');
 				}
 				the_widget('ComicPressLatestComicsWidget');
 			endif; 
diff --git a/sidebar-right.php b/sidebar-right.php
index 65de015..afc5026 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -8,12 +8,11 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 			the_widget('ComicpressBookmarkWidget','mode=three-button');
 			if (is_cp_theme_layout('standard,v')) { 
 				the_widget('ComicPressCalendarWidget');
-				the_widget('ComicpressArchiveDropdownWidget','mode=monthly_archive');
+				the_widget('ComicPressArchiveDropdownWidget', 'mode=storyline_order');
 			}
 			if ($comicpress_options['disable_comic_frontpage']) {
 				the_widget('ComicPressLatestThumbnailWidget');
 			}
-			the_widget('WP_Widget_Search');
 			the_widget('WP_Widget_Pages');
 			the_widget('WP_Widget_Categories','hierarchical=1&count=1');