diff --git a/base.php b/base.php
index fcf114a..ce3e102 100644
--- a/base.php
+++ b/base.php
@@ -14,11 +14,11 @@
 
   <div class="wrap container" role="document">
     <div class="content row">
-      <main class="main <?php echo apply_filters('roots/main_class'); ?>" role="main">
+      <main class="main <?php echo roots_main_class(); ?>" role="main">
         <?php include roots_template_path(); ?>
       </main><!-- /.main -->
       <?php if (roots_display_sidebar()) : ?>
-        <aside class="sidebar <?php echo apply_filters('roots/sidebar_class'); ?>" role="complementary">
+        <aside class="sidebar <?php echo roots_sidebar_class(); ?>" role="complementary">
           <?php include roots_sidebar_path(); ?>
         </aside><!-- /.sidebar -->
       <?php endif; ?>
diff --git a/lib/config.php b/lib/config.php
index 1108599..58317fe 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -25,17 +25,15 @@ function roots_main_class() {
     $class = 'col-sm-12';
   }
 
-  return $class;
+  return apply_filters('roots/main_class', $class);
 }
-add_filter('roots/main_class', 'roots_main_class');
 
 /**
  * .sidebar classes
  */
 function roots_sidebar_class() {
-  return 'col-sm-4';
+  return apply_filters('roots/sidebar_class', 'col-sm-4');
 }
-add_filter('roots/sidebar_class', 'roots_sidebar_class');
 
 /**
  * Define which pages shouldn't have the sidebar