diff --git a/includes/form.inc b/includes/form.inc
index c2d3adf..56a07e0 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -28,7 +28,8 @@ function bootstrap_form_search_form_alter(&$form, &$form_state) {
 
   $form['basic']['keys']['#title'] = '';
   $form['basic']['keys']['#attributes']['class'][] = 'search-query';
-  $form['basic']['keys']['#attributes']['class'][] = 'span2';
+  $form['basic']['keys']['#attributes']['class'][] = 'col-sm-2';
+  $form['basic']['keys']['#attributes']['class'][] = 'col-md-2';
   $form['basic']['keys']['#attributes']['placeholder'] = t('Search');
 
   // Hide the default button from display and implement a theme wrapper to add
@@ -49,7 +50,8 @@ function bootstrap_form_search_block_form_alter(&$form, &$form_state) {
 
   $form['search_block_form']['#title'] = '';
   $form['search_block_form']['#attributes']['class'][] = 'search-query';
-  $form['search_block_form']['#attributes']['class'][] = 'span2';
+  $form['search_block_form']['#attributes']['class'][] = 'col-sm-2';
+  $form['search_block_form']['#attributes']['class'][] = 'col-md-2';
   $form['search_block_form']['#attributes']['placeholder'] = t('Search');
 
   // Hide the default button from display and implement a theme wrapper to add
diff --git a/template.php b/template.php
index a211598..f0ea2f0 100755
--- a/template.php
+++ b/template.php
@@ -274,22 +274,22 @@ function bootstrap_process_block(&$variables, $hook) {
 /**
  * Returns the correct span class for a region
  */
-function _bootstrap_content_span($columns = 1) {
+function _bootstrap_content_col($columns = 1) {
   $class = FALSE;
   
   switch($columns) {
     case 1:
-      $class = 'span12';
+      $classes = 'col-sm-12 col-md-12';
       break;
     case 2:
-      $class = 'span9';
+      $classes = 'col-sm-9 col-md-9';
       break;
     case 3:
-      $class = 'span6';
+      $classes = 'col-sm-6 col-md-6';
       break;
   }
   
-  return $class;
+  return $classes;
 }
 
 /**
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index a84f395..d6c6071 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -49,15 +49,15 @@
     <?php print render($page['header']); ?>
   </header> <!-- /#header -->
 
-  <div class="row-fluid">
+  <div class="row">
 
     <?php if (!empty($page['sidebar_first'])): ?>
-      <aside class="span3" role="complementary">
+      <aside class="col-sm-3 col-md-3" role="complementary">
         <?php print render($page['sidebar_first']); ?>
       </aside>  <!-- /#sidebar-first -->
     <?php endif; ?>  
 
-    <section class="<?php print _bootstrap_content_span($columns); ?>">  
+    <section class="<?php print _bootstrap_content_col($columns); ?>">  
       <?php if (!empty($page['highlighted'])): ?>
         <div class="highlighted hero-unit"><?php print render($page['highlighted']); ?></div>
       <?php endif; ?>
@@ -82,7 +82,7 @@
     </section>
 
     <?php if (!empty($page['sidebar_second'])): ?>
-      <aside class="span3" role="complementary">
+      <aside class="col-sm-3 col-md-3" role="complementary">
         <?php print render($page['sidebar_second']); ?>
       </aside>  <!-- /#sidebar-second -->
     <?php endif; ?>