diff --git a/404.php b/404.php
index f0e7172..9b7e875 100644
--- a/404.php
+++ b/404.php
@@ -1,5 +1,7 @@
 <?php get_header(); ?>
+	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">
+		<?php roots_main_before(); ?>
 			<div id="main" role="main">
 				<div class="container">
 					<h1><?php _e('File Not Found', 'roots'); ?></h1>
@@ -14,5 +16,7 @@
 					</ul>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
 		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>
diff --git a/archive.php b/archive.php
index c6bdb08..1c93e44 100644
--- a/archive.php
+++ b/archive.php
@@ -1,15 +1,25 @@
 <?php 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 class="container">
 					<h1><?php single_cat_title(); ?></h1>
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'category'); ?>
+					<?php roots_loop_after(); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
+			<?php roots_sidebar_inside_after(); ?>
 			</aside><!-- /#sidebar -->
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>
diff --git a/footer.php b/footer.php
index 3a02228..67cdca6 100644
--- a/footer.php
+++ b/footer.php
@@ -1,8 +1,6 @@
-	<?php if (get_option('roots_css_framework') === '1140') { ?>
-		</div><!-- /.row -->
-		<div class="row">
-	<?php } ?>		
+	<?php roots_footer_before(); ?>
 		<footer id="content-info" class="<?php echo roots_container_class; ?>" role="contentinfo">
+			<?php roots_footer_inside(); ?>
 			<div class="container">
 				<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Footer") ) : ?>
 				<?php endif; ?>
@@ -29,10 +27,9 @@
 				<?php } ?>
 			</div>	
 		</footer>
-	<?php if (get_option('roots_css_framework') === '1140') { ?>
-		</div><!-- /.row -->
-	<?php } ?>		
+		<?php roots_footer_after(); ?>	
 	</div><!-- /#wrap -->
 <?php wp_footer(); ?>
+<?php roots_footer(); ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/front-page.php b/front-page.php
index 8d73308..079eae7 100644
--- a/front-page.php
+++ b/front-page.php
@@ -1,14 +1,22 @@
 <?php 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 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">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
+			<?php roots_sidebar_inside_after(); ?>
 			</aside><!-- /#sidebar -->
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>
diff --git a/functions.php b/functions.php
index f841363..49ac662 100644
--- a/functions.php
+++ b/functions.php
@@ -9,6 +9,8 @@ include_once('inc/roots-options.php');		// theme options menu
 include_once('inc/roots-ob.php');			// output buffer
 include_once('inc/roots-cleanup.php');		// code cleanup/removal
 include_once('inc/roots-htaccess.php');		// h5bp htaccess
+include_once('inc/roots-hooks.php');		// hooks
+include_once('inc/roots-actions.php');		// actions
 include_once('inc/roots-custom.php');		// custom functions
 
 // set the value of the main container class depending on the selected grid framework
diff --git a/header.php b/header.php
index 64163b1..db22712 100644
--- a/header.php
+++ b/header.php
@@ -19,6 +19,7 @@
 	<script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/js/libs/jquery-1.6.1.min.js">\x3C/script>')</script>
 
 	<?php wp_head(); ?>
+	<?php roots_head(); ?>
 <?php if (get_option('roots_css_framework') === '1140') { ?>
 	<script src="<?php echo get_template_directory_uri(); ?>/js/css3-mediaqueries.js"></script>
 <?php } ?>	
@@ -33,11 +34,11 @@
 <?php } ?>
 </head>
 <body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
+	<?php roots_wrap_before(); ?>
 	<div id="wrap" class="container" role="document">
-	<?php if (get_option('roots_css_framework') === '1140') { ?>
-		<div class="row">
-	<?php } ?>	
+	<?php roots_header_before(); ?>
 		<header id="banner" class="<?php echo roots_container_class; ?>" role="banner">
+			<?php roots_header_inside(); ?>
 			<div class="container">
 				<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
 				<nav id="nav-main" role="navigation">
@@ -48,7 +49,4 @@
 				</nav>				
 			</div>
 		</header>
-	<?php if (get_option('roots_css_framework') === '1140') { ?>
-		</div><!-- /.row -->
-		<div class="row">
-	<?php } ?>
+	<?php roots_header_after(); ?>
diff --git a/inc/roots-actions.php b/inc/roots-actions.php
new file mode 100644
index 0000000..08c6ab6
--- /dev/null
+++ b/inc/roots-actions.php
@@ -0,0 +1,34 @@
+<?php 
+
+add_action('roots_header_before', 'roots_1140_header_before');
+add_action('roots_header_after', 'roots_1140_header_after');
+add_action('roots_footer_before', 'roots_1140_footer_before');
+add_action('roots_footer_after', 'roots_1140_footer_after');
+
+function roots_1140_header_before() {
+	if (get_option('roots_css_framework') === '1140') {
+		echo "<div class=\"row\">";
+	}	
+}
+
+function roots_1140_header_after() {
+	if (get_option('roots_css_framework') === '1140') {
+		echo "</div><!-- /.row -->";
+		echo "<div class=\"row\">";
+	}	
+}
+
+function roots_1140_footer_before() {
+	if (get_option('roots_css_framework') === '1140') {
+		echo "</div><!-- /.row -->";
+		echo "<div class=\"row\">";
+	}	
+}
+
+function roots_1140_footer_after() {
+	if (get_option('roots_css_framework') === '1140') {
+		echo "</div><!-- /.row -->";
+	}	
+}
+
+?>
\ No newline at end of file
diff --git a/inc/roots-hooks.php b/inc/roots-hooks.php
new file mode 100644
index 0000000..90e9d9b
--- /dev/null
+++ b/inc/roots-hooks.php
@@ -0,0 +1,33 @@
+<?php 
+
+// header.php
+function roots_head() { do_action( 'roots_head' ); }					
+function roots_wrap_before() { do_action( 'roots_wrap_before' ); }					
+function roots_header_before() { do_action( 'roots_header_before' ); }			
+function roots_header_inside() { do_action( 'roots_header_inside' ); }				
+function roots_header_after() { do_action( 'roots_header_after' ); }			
+
+// 404.php, archive.php, front-page.php, index.php, loop-page.php, loop-search.php, loop-single.php, loop.php
+// page-custom.php, page-full.php, page-sitemap.php, page-subpages.php, page.php, search.php, single.php
+function roots_content_before() { do_action( 'roots_content_before' ); }					
+function roots_content_after() { do_action( 'roots_content_after' ); }					
+function roots_main_before() { do_action( 'roots_main_before' ); }					
+function roots_main_after() { do_action( 'roots_main_after' ); }					
+function roots_post_before() { do_action( 'roots_post_before' ); }					
+function roots_post_after() { do_action( 'roots_post_after' ); }					
+function roots_post_inside_before() { do_action( 'roots_post_inside_before' ); }					
+function roots_post_inside_after() { do_action( 'roots_post_inside_after' ); }	
+function roots_loop_before() { do_action( 'roots_loop_before' ); }	
+function roots_loop_after() { do_action( 'roots_loop_after' ); }	
+function roots_sidebar_before() { do_action( 'roots_sidebar_before' ); }					
+function roots_sidebar_inside_before() { do_action( 'roots_sidebar_inside_before' ); }					
+function roots_sidebar_inside_after() { do_action( 'roots_sidebar_inside_after' ); }					
+function roots_sidebar_after() { do_action( 'roots_sidebar_after' ); }					
+
+// footer.php
+function roots_footer_before() { do_action( 'roots_footer_before' ); }	
+function roots_footer_inside() { do_action( 'roots_footer_inside' ); }
+function roots_footer_after() { do_action( 'roots_footer_after' ); }
+function roots_footer() { do_action( 'roots_footer' ); }
+
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 9db7489..3fdd438 100644
--- a/index.php
+++ b/index.php
@@ -1,15 +1,23 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo roots_container_class; ?>">
+	<?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 class="container">
-					<h1>Latest Posts</h1>
+					<h1><?php _e('Latest Posts', 'roots');?></h1>
 					<?php get_template_part('loop', 'index'); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
+			<?php roots_sidebar_inside_after(); ?>
 			</aside><!-- /#sidebar -->
-		</div><!-- /#content -->		
+		<?php roots_sidebar_after(); ?>
+		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>
diff --git a/loop-page.php b/loop-page.php
index 60feefe..e846683 100644
--- a/loop-page.php
+++ b/loop-page.php
@@ -1,10 +1,11 @@
 <?php /* Start loop */ ?>
 <?php while (have_posts()) : the_post(); ?>
-
-	<?php if (function_exists('yoast_breadcrumb')) { if (is_page() && $post->post_parent) { yoast_breadcrumb('<p id="breadcrumbs">','</p>'); } } ?>
-	<h1><?php the_title(); ?></h1>
-	<?php the_content(); ?>
-	<?php wp_link_pages(array('before' => '<nav id="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>' )); ?>
-
-<?php endwhile; // End the loop ?>
-
+	<?php roots_post_before(); ?>
+		<?php roots_post_inside_before(); ?>
+			<?php if (function_exists('yoast_breadcrumb')) { if (is_page() && $post->post_parent) { yoast_breadcrumb('<p id="breadcrumbs">','</p>'); } } ?>
+			<h1><?php the_title(); ?></h1>
+			<?php the_content(); ?>
+			<?php wp_link_pages(array('before' => '<nav id="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>' )); ?>
+		<?php roots_post_inside_after(); ?>
+	<?php roots_post_after(); ?>
+<?php endwhile; // End the loop ?>
\ No newline at end of file
diff --git a/loop-search.php b/loop-search.php
index b66a0fd..2a33b51 100644
--- a/loop-search.php
+++ b/loop-search.php
@@ -4,19 +4,19 @@
 		<p class="bottom"><?php _e('Sorry, no results were found.', 'roots'); ?></p>
 	</div>
 	<?php get_search_form(); ?>	
-	
 <?php endif; ?>
 
 <?php /* Start loop */ ?>
 <?php while (have_posts()) : the_post(); ?>
-
+	<?php roots_post_before(); ?>
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<?php roots_post_inside_before(); ?>
 			<header>
 				<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
 				<time pubdate datetime="<?php the_time('c'); ?>"><?php printf(__('Posted on %s at %s.', 'roots'), get_the_time('l, F jS, Y'), get_the_time()); ?></time>
 				<?php if (get_option('roots_post_author') == 'checked') { ?>
 				<p class="byline author vcard">
-					<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
+					<?php _e('Written by', 'roots'); ?> <span class="fn"><?php the_author(); ?></span>
 				</p>
 				<?php } ?>
 			</header>
@@ -26,10 +26,9 @@
 			<footer>
 				<?php $tag = get_the_tags(); if (!$tag) { } else { ?><p><?php the_tags(); ?></p><?php } ?>
 			</footer>
+		<?php roots_post_inside_after(); ?>			
 		</article>
-
-		<?php comments_template('', true); ?>
-
+	<?php roots_post_after(); ?>
 <?php endwhile; // End the loop ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
diff --git a/loop-single.php b/loop-single.php
index 022c994..fb54b87 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -1,27 +1,29 @@
 <?php /* Start loop */ ?>
 <?php while (have_posts()) : the_post(); ?>
-
-	<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
-		<header>
-			<h1 class="entry-title"><?php the_title(); ?></h1>
-			<time class="updated" datetime="<?php the_time('c'); ?>" pubdate><?php printf(__('Posted on %s at %s.', 'roots'), get_the_time('l, F jS, Y'),get_the_time())?></time>
-			<?php if (get_option('roots_post_author') == 'checked') { ?>
-			<p class="byline author vcard">
-				<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
-			</p>
-			<?php } ?>
-			<?php if (get_option('roots_post_tweet') == 'checked') { ?>
-			<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal"><?php _e('Tweet', 'roots');?></a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-			<?php } ?>
-		</header>
-		<div class="entry-content">
-			<?php the_content(); ?>
-		</div>
-		<footer>
-			<?php wp_link_pages(array('before' => '<nav id="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>' )); ?>
-			<p><?php the_tags(); ?></p>
-		</footer>
-		<?php comments_template(); ?>
-	</article>
-
+	<?php roots_post_before(); ?>
+		<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
+		<?php roots_post_inside_before(); ?>
+			<header>
+				<h1 class="entry-title"><?php the_title(); ?></h1>
+				<time class="updated" datetime="<?php the_time('c'); ?>" pubdate><?php printf(__('Posted on %s at %s.', 'roots'), get_the_time('l, F jS, Y'),get_the_time())?></time>
+				<?php if (get_option('roots_post_author') == 'checked') { ?>
+				<p class="byline author vcard">
+					<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
+				</p>
+				<?php } ?>
+				<?php if (get_option('roots_post_tweet') == 'checked') { ?>
+				<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal"><?php _e('Tweet', 'roots');?></a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+				<?php } ?>
+			</header>
+			<div class="entry-content">
+				<?php the_content(); ?>
+			</div>
+			<footer>
+				<?php wp_link_pages(array('before' => '<nav id="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>' )); ?>
+				<p><?php the_tags(); ?></p>
+			</footer>
+			<?php comments_template(); ?>
+			<?php roots_post_inside_after(); ?>		
+		</article>
+	<?php roots_post_after(); ?>
 <?php endwhile; // End the loop ?>
diff --git a/loop.php b/loop.php
index fb1dc23..34a51ec 100644
--- a/loop.php
+++ b/loop.php
@@ -4,13 +4,13 @@
 		<p class="bottom"><?php _e('Sorry, no results were found.', 'roots'); ?></p>
 	</div>
 	<?php get_search_form(); ?>	
-	
 <?php endif; ?>
 
 <?php /* Start loop */ ?>
 <?php while (have_posts()) : the_post(); ?>
-
+	<?php roots_post_before(); ?>
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<?php roots_post_inside_before(); ?>
 			<header>
 				<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
 				<time pubdate datetime="<?php the_time('c'); ?>"><?php printf( __('Posted on %s at %s.','roots'), get_the_time('l, F jS, Y'), get_the_time()) ?></time>
@@ -30,10 +30,9 @@
 			<footer>
 				<?php $tag = get_the_tags(); if (!$tag) { } else { ?><p><?php the_tags(); ?></p><?php } ?>
 			</footer>
+		<?php roots_post_inside_after(); ?>
 		</article>
-
-		<?php comments_template('', true); ?>
-
+	<?php roots_post_after(); ?>		
 <?php endwhile; // End the loop ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
diff --git a/page-custom.php b/page-custom.php
index f15e942..317ce73 100644
--- a/page-custom.php
+++ b/page-custom.php
@@ -3,16 +3,26 @@
 Template Name: Custom
 */
 get_header(); ?>
-		<div id="content" class="<?php echo roots_container_class; ?>">	
+	<?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 class="container">
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
+					<?php roots_loop_after(); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
+			<?php roots_sidebar_inside_after(); ?>				
 			</aside><!-- /#sidebar -->
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>
diff --git a/page-full.php b/page-full.php
index bd8f637..a690ce6 100644
--- a/page-full.php
+++ b/page-full.php
@@ -3,11 +3,17 @@
 Template Name: Full Width
 */
 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 class="container">
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
+					<?php roots_loop_after(); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
 		</div><!-- /#content -->
-<?php get_footer(); ?>
+	<?php roots_content_after(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/page-sitemap.php b/page-sitemap.php
index c9b6f2d..dfc085e 100644
--- a/page-sitemap.php
+++ b/page-sitemap.php
@@ -3,10 +3,14 @@
 Template Name: Sitemap
 */
 get_header(); ?>
+	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+		<?php roots_main_before(); ?>
+			<div id="main" class="<?php echo roots_container_class; ?>" role="main">
 				<div class="container">
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
+					<?php roots_loop_after(); ?>
 					<h2><?php _e('Pages', 'roots'); ?></h2>
 					<ul><?php wp_list_pages('sort_column=menu_order&depth=0&title_li='); ?></ul>
 					<h2><?php _e('Posts', 'roots'); ?></h2>
@@ -15,10 +19,16 @@ get_header(); ?>
 					<ul><?php wp_get_archives('type=monthly&limit=12'); ?></ul>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->
+			<?php roots_sidebar_inside_after(); ?>
+			</aside><!-- /#sidebar -->		
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
-<?php get_footer(); ?>
+	<?php roots_content_after(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/page-subpages.php b/page-subpages.php
index 2cc27ce..8dfc67d 100644
--- a/page-subpages.php
+++ b/page-subpages.php
@@ -3,10 +3,14 @@
 Template Name: List Subpages
 */
 get_header(); ?>
+	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
+		<?php roots_main_before(); ?>
+			<div id="main" class="<?php echo roots_container_class; ?>" role="main">
 				<div class="container">
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
+					<?php roots_loop_after(); ?>
 					<?php
 						$children = wp_list_pages('title_li=&child_of='.$post->ID.'&echo=0');
 						if ($children) { ?>
@@ -16,10 +20,16 @@ get_header(); ?>
 					<?php } ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->
+			<?php roots_sidebar_inside_after(); ?>
+			</aside><!-- /#sidebar -->		
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
-<?php get_footer(); ?>
+	<?php roots_content_after(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 8d73308..7061f6b 100644
--- a/page.php
+++ b/page.php
@@ -1,14 +1,24 @@
 <?php 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 class="container">
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'page'); ?>
+					<?php roots_loop_after(); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->
+			<?php roots_sidebar_inside_after(); ?>
+			</aside><!-- /#sidebar -->		
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
-<?php get_footer(); ?>
+	<?php roots_content_after(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 7b5c699..e18b3b6 100644
--- a/search.php
+++ b/search.php
@@ -1,15 +1,25 @@
 <?php get_header(); ?>
+	<?php roots_content_before(); ?>
 		<div id="content" class="<?php echo roots_container_class; ?>">	
-			<div id="main" class="<?php echo get_option('roots_main_class'); ?>">
+		<?php roots_main_before(); ?>
+			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
-					<h1><?php _e('Search Results for', 'roots'); ?> <?php echo get_search_query(); ?></h1>				
+					<h1><?php _e('Search Results for', 'roots'); ?> <?php echo get_search_query(); ?></h1>
+					<?php roots_loop_before(); ?>
 					<?php get_template_part('loop', 'search'); ?>
+					<?php roots_loop_after(); ?>
 				</div>
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->
+			<?php roots_sidebar_inside_after(); ?>
+			</aside><!-- /#sidebar -->		
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
-<?php get_footer(); ?>
\ No newline at end of file
+	<?php roots_content_after(); ?>
+<?php get_footer(); ?>
diff --git a/sidebar.php b/sidebar.php
index 3e88e0d..b4d6af7 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,3 +1,3 @@
 <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Sidebar") ) : ?>
 
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/single.php b/single.php
index 2cbc480..286e91e 100644
--- a/single.php
+++ b/single.php
@@ -1,14 +1,24 @@
 <?php 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 class="container">
-					<?php get_template_part('loop', 'single'); ?>		
+					<?php roots_loop_before(); ?>
+					<?php get_template_part('loop', 'single'); ?>
+					<?php roots_loop_after(); ?>
 				</div>	
 			</div><!-- /#main -->
+		<?php roots_main_after(); ?>
+		<?php roots_sidebar_before(); ?>			
 			<aside id="sidebar" class="<?php echo get_option('roots_sidebar_class'); ?>" role="complementary">
+			<?php roots_sidebar_inside_before(); ?>
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->			
+			<?php roots_sidebar_inside_after(); ?>
+			</aside><!-- /#sidebar -->		
+		<?php roots_sidebar_after(); ?>
 		</div><!-- /#content -->
+	<?php roots_content_after(); ?>
 <?php get_footer(); ?>