diff --git a/archive.php b/archive.php
index 1c93e44..055c777 100644
--- a/archive.php
+++ b/archive.php
@@ -2,7 +2,7 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<h1><?php single_cat_title(); ?></h1>
 					<?php roots_loop_before(); ?>
@@ -12,7 +12,7 @@
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/front-page.php b/front-page.php
index 079eae7..951ed9f 100644
--- a/front-page.php
+++ b/front-page.php
@@ -2,14 +2,14 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
 				</div>
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/index.php b/index.php
index 3fdd438..fc14a6e 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<h1><?php _e('Latest Posts', 'roots');?></h1>
 					<?php get_template_part('loop', 'index'); ?>
@@ -10,7 +10,7 @@
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/page-custom.php b/page-custom.php
index 317ce73..359d89d 100644
--- a/page-custom.php
+++ b/page-custom.php
@@ -6,7 +6,7 @@ get_header(); ?>
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">
 		<?php roots_main_before(); ?>	
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
@@ -15,7 +15,7 @@ get_header(); ?>
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/page-sitemap.php b/page-sitemap.php
index dfc085e..e6f0712 100644
--- a/page-sitemap.php
+++ b/page-sitemap.php
@@ -6,7 +6,7 @@ get_header(); ?>
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo roots_container_class; ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
@@ -21,7 +21,7 @@ get_header(); ?>
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/page-subpages.php b/page-subpages.php
index 8dfc67d..43dc32f 100644
--- a/page-subpages.php
+++ b/page-subpages.php
@@ -6,7 +6,7 @@ get_header(); ?>
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo roots_container_class; ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
@@ -22,7 +22,7 @@ get_header(); ?>
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/page.php b/page.php
index 7061f6b..e8d9906 100644
--- a/page.php
+++ b/page.php
@@ -2,7 +2,7 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
@@ -11,7 +11,7 @@
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/search.php b/search.php
index e18b3b6..10b04b3 100644
--- a/search.php
+++ b/search.php
@@ -2,7 +2,7 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<h1><?php _e('Search Results for', 'roots'); ?> <?php echo get_search_query(); ?></h1>
 					<?php roots_loop_before(); ?>
@@ -12,7 +12,7 @@
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
diff --git a/single.php b/single.php
index 286e91e..d2a8b43 100644
--- a/single.php
+++ b/single.php
@@ -2,7 +2,7 @@
 	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 		<?php roots_main_before(); ?>
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+			<div id="main" class="<?php echo $options['css_main_class']; ?>" role="main">
 				<div class="container">
 					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'single'); ?>
@@ -11,7 +11,7 @@
 			</div><!-- /#main -->
 		<?php roots_main_after(); ?>
 		<?php roots_sidebar_before(); ?>			
-			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<aside id="sidebar" class="<?php echo $options['css_sidebar_class']; ?>" role="complementary">
 			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>