diff --git a/functions.php b/functions.php
index a7c067b..b253a6b 100644
--- a/functions.php
+++ b/functions.php
@@ -19,15 +19,15 @@ if (!isset($content_width)) {
   global $roots_options;
   $roots_css_framework = $roots_options['css_framework'];
   switch ($roots_css_framework) {
-      case 'blueprint':   $content_width = 950;   break;
-      case '960gs_12':    $content_width = 940;   break;
-      case '960gs_16':    $content_width = 940;   break;
-      case '960gs_24':    $content_width = 940;   break;
-      case '1140':        $content_width = 1140;  break;
-      case 'adapt':       $content_width = 940;   break;
-      case 'bootstrap':   $content_width = 940;   break;
-      case 'foundation':  $content_width = 980;   break;
-      default:            $content_width = 950;   break;
+    case 'blueprint':   $content_width = 950;   break;
+    case '960gs_12':    $content_width = 940;   break;
+    case '960gs_16':    $content_width = 940;   break;
+    case '960gs_24':    $content_width = 940;   break;
+    case '1140':        $content_width = 1140;  break;
+    case 'adapt':       $content_width = 940;   break;
+    case 'bootstrap':   $content_width = 940;   break;
+    case 'foundation':  $content_width = 980;   break;
+    default:            $content_width = 950;   break;
   }
 }
 
diff --git a/inc/roots-actions.php b/inc/roots-actions.php
index 662a8e5..9109cff 100644
--- a/inc/roots-actions.php
+++ b/inc/roots-actions.php
@@ -1,122 +1,10 @@
 <?php
 
-add_action('roots_head', 'roots_google_analytics');
-add_action('roots_head', 'roots_1140_head');
-add_action('roots_head', 'roots_adapt_head');
-add_action('roots_head', 'roots_foundation_head');
-add_action('roots_head', 'roots_bootstrap_head');
 add_action('roots_stylesheets', 'roots_get_stylesheets');
-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');
-add_action('roots_header_before', 'roots_bootstrap_header_before');
-add_action('roots_header_after', 'roots_bootstrap_header_after');
-add_action('roots_footer_before', 'roots_bootstrap_footer_before');
-add_action('roots_footer_after', 'roots_bootstrap_footer_after');
-
-function roots_google_analytics() {
-  global $roots_options;
-  $roots_google_analytics_id = $roots_options['google_analytics_id'];
-  $get_roots_google_analytics_id = esc_attr($roots_options['google_analytics_id']);
-  if ($roots_google_analytics_id !== '') {
-    echo "\n\t<script>\n";
-    echo "\t\tvar _gaq=[['_setAccount','$get_roots_google_analytics_id'],['_trackPageview'],['_trackPageLoadTime']];\n";
-    echo "\t\t(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];\n";
-    echo "\t\tg.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';\n";
-    echo "\t\ts.parentNode.insertBefore(g,s)}(document,'script'));\n";
-    echo "\t</script>\n";
-  }
-}
-
-function roots_1140_head() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  $template_uri = get_template_directory_uri();
-  if ($roots_css_framework === '1140') {
-    echo "\t<script src=\"$template_uri/js/libs/css3-mediaqueries.js\"></script>";
-  }
-}
-
-function roots_adapt_head() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  $template_uri = get_template_directory_uri();
-  if ($roots_css_framework === 'adapt') {
-    echo "\n\t<script>\n";
-    echo "\t\tvar ADAPT_CONFIG = {\n";
-    echo "\t\t\tpath: '$template_uri/css/adapt/',\n";
-    echo "\t\t\tdynamic: true,\n";
-    echo "\t\t\trange: [\n";
-    echo "\t\t\t\t'0px    to 760px  = mobile.css',\n";
-    echo "\t\t\t\t'760px  to 980px  = 720.css',\n";
-    echo "\t\t\t\t'980px  to 1280px = 960.css',\n";
-    echo "\t\t\t\t'1280px to 1600px = 1200.css',\n";
-    echo "\t\t\t\t'1600px to 1920px = 1560.css',\n";
-    echo "\t\t\t\t'1920px           = fluid.css'\n";
-    echo "\t\t\t]\n";
-    echo "\t\t};\n";
-    echo "\t</script>\n";
-    echo "\t<script src=\"$template_uri/js/libs/adapt.min.js\"></script>";
-  }
-}
-
-function roots_foundation_head() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  $template_uri = get_template_directory_uri();
-  if ($roots_css_framework === 'foundation') {
-    echo "\t<!-- Combine and Compress These Javascript Files -->\n";
-    echo "\t<script src=\"$template_uri/js/foundation/jquery.reveal.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/foundation/jquery.orbit-1.3.0.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/foundation/forms.jquery.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/foundation/jquery.customforms.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/foundation/jquery.placeholder.min.js\"></script>\n";
-    echo "\t<!--  End Combine and Compress Javascript Files -->\n";
-    echo "\t<script src=\"$template_uri/js/foundation/app.js\"></script>\n";
-    echo "\t<!-- IE Fix for HTML 5 Tags -->\n";
-    echo "\t<!--[if lt IE 9]>\n";
-    echo "\t\t<script src=\"http://html5shiv.googlecode.com/svn/trunk/html5.js\"></script>\n";
-    echo "\t<![endif]-->\n";
-  }
-}
-
-function roots_bootstrap_head() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  $roots_bootstrap_js = $roots_options['bootstrap_javascript'];
-  $roots_bootstrap_less_js = $roots_options['bootstrap_less_javascript'];
-  $template_uri = get_template_directory_uri();
-  if ($roots_css_framework === 'bootstrap_less') {
-    echo "\t<script src=\"$template_uri/js/bootstrap/less-1.1.3.min.js\"></script>\n";
-  }
-  if ($roots_bootstrap_js === true) {
-  	$roots_options['bootstrap_less_javascript'] = false;
-  	echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-modal.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-alerts.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-twipsy.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-popover.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-dropdown.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-scrollspy.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-tabs.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-buttons.js\"></script>\n";
-  }
-  if ($roots_bootstrap_less_js === true) {
-  	$roots_options['bootstrap_javascript'] = false;
-  	echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-modal.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-alerts.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-twipsy.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-popover.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-dropdown.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-scrollspy.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-tabs.js\"></script>\n";
-    echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-buttons.js\"></script>\n";
-  }
-}
 
 function roots_get_stylesheets() {
   global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
+  global $roots_css_framework;
 
   $styles = '';
 
@@ -162,7 +50,7 @@ function roots_get_stylesheets() {
       $styles .= stylesheet_link_tag('/bootstrap/bootstrap.css');
       break;
     case 'bootstrap_less' :
-      $styles .= stylesheet_link_tag_boostrap_less('/bootstrap/lib/bootstrap.less');
+      $styles .= less_stylesheet_link_tag('/bootstrap/lib/bootstrap.less');
       break;
   }
 
@@ -197,74 +85,153 @@ function stylesheet_link_tag($file, $tabs = 0, $newline = true) {
   return $indent . '<link rel="stylesheet" href="' . get_template_directory_uri() . '/css' . $file . '">' . ($newline ? "\n" : "");
 }
 
-function stylesheet_link_tag_boostrap_less($file, $tabs = 0, $newline = true) {
+function less_stylesheet_link_tag($file, $tabs = 0, $newline = true) {
   $indent = str_repeat("\t", $tabs);
   return $indent . '<link rel="stylesheet/less" media="all" href="' . get_template_directory_uri() . '/css' . $file . '">' . ($newline ? "\n" : "");
 }
 
-function roots_1140_header_before() {
+add_action('roots_footer', 'roots_google_analytics');
+
+function roots_google_analytics() {
   global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === '1140') {
-    echo '<div class="container"><div class="row">', "\n";
+  $roots_google_analytics_id = $roots_options['google_analytics_id'];
+  $get_roots_google_analytics_id = esc_attr($roots_options['google_analytics_id']);
+  if ($roots_google_analytics_id !== '') {
+    echo "\n\t<script>\n";
+    echo "\t\tvar _gaq=[['_setAccount','$get_roots_google_analytics_id'],['_trackPageview'],['_trackPageLoadTime']];\n";
+    echo "\t\t(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];\n";
+    echo "\t\tg.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';\n";
+    echo "\t\ts.parentNode.insertBefore(g,s)}(document,'script'));\n";
+    echo "\t</script>\n";
   }
 }
 
-function roots_1140_header_after() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === '1140') {
+// 1140 specific
+if (roots_current_framework() === '1140') {
+  add_action('roots_head', 'roots_1140_head');
+  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_head() {
+    $template_uri = get_template_directory_uri();
+    echo "\t<script src=\"$template_uri/js/libs/css3-mediaqueries.js\"></script>";
+  }
+
+  function roots_1140_header_before() {
+    echo '<div class="container"><div class="row">', "\n";
+  }
+
+  function roots_1140_header_after() {
     echo "</div></div><!-- /.row /.container -->\n";
     echo '<div class="container"><div class="row">', "\n";
   }
-}
 
-function roots_1140_footer_before() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === '1140') {
+  function roots_1140_footer_before() {
     echo "</div></div><!-- /.row /.container -->\n";
     echo '<div class="container"><div class="row">', "\n";
   }
-}
 
-function roots_1140_footer_after() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === '1140') {
+  function roots_1140_footer_after() {
     echo "</div></div><!-- /.row /.container -->\n";
   }
 }
-function roots_bootstrap_header_before() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === 'bootstrap' || $roots_css_framework === 'bootstrap_less') {
+
+// Adapt specific
+if (roots_current_framework() === 'adapt') {
+  add_action('roots_head', 'roots_adapt_head');
+
+  function roots_adapt_head() {
+  $template_uri = get_template_directory_uri();
+    echo "\n\t<script>\n";
+    echo "\t\tvar ADAPT_CONFIG = {\n";
+    echo "\t\t\tpath: '$template_uri/css/adapt/',\n";
+    echo "\t\t\tdynamic: true,\n";
+    echo "\t\t\trange: [\n";
+    echo "\t\t\t\t'0px    to 760px  = mobile.css',\n";
+    echo "\t\t\t\t'760px  to 980px  = 720.css',\n";
+    echo "\t\t\t\t'980px  to 1280px = 960.css',\n";
+    echo "\t\t\t\t'1280px to 1600px = 1200.css',\n";
+    echo "\t\t\t\t'1600px to 1920px = 1560.css',\n";
+    echo "\t\t\t\t'1920px           = fluid.css'\n";
+    echo "\t\t\t]\n";
+    echo "\t\t};\n";
+    echo "\t</script>\n";
+    echo "\t<script src=\"$template_uri/js/libs/adapt.min.js\"></script>";
+  }
+}
+
+// Foundation specific
+if (roots_current_framework() === 'foundation') {
+  add_action('roots_head', 'roots_foundation_head');
+
+  function roots_foundation_head() {
+    $template_uri = get_template_directory_uri();
+    echo "\t<script src=\"$template_uri/js/foundation/jquery.reveal.js\"></script>\n";
+    echo "\t<script src=\"$template_uri/js/foundation/jquery.orbit-1.3.0.js\"></script>\n";
+    echo "\t<script src=\"$template_uri/js/foundation/forms.jquery.js\"></script>\n";
+    echo "\t<script src=\"$template_uri/js/foundation/jquery.customforms.js\"></script>\n";
+    echo "\t<script src=\"$template_uri/js/foundation/jquery.placeholder.min.js\"></script>\n";
+    echo "\t<script src=\"$template_uri/js/foundation/app.js\"></script>\n";
+  }
+}
+
+// Bootstrap specific
+if (roots_current_framework() === 'bootstrap' || roots_current_framework() === 'bootstrap_less') {
+  add_action('roots_head', 'roots_bootstrap_head');
+  add_action('roots_header_before', 'roots_bootstrap_header_before');
+  add_action('roots_header_after', 'roots_bootstrap_header_after');
+  add_action('roots_footer_before', 'roots_bootstrap_footer_before');
+  add_action('roots_footer_after', 'roots_bootstrap_footer_after');
+
+  function roots_bootstrap_head() {
+    global $roots_options;
+    $roots_bootstrap_js = $roots_options['bootstrap_javascript'];
+    $roots_bootstrap_less_js = $roots_options['bootstrap_less_javascript'];
+    $template_uri = get_template_directory_uri();
+    if (roots_current_framework() === 'bootstrap_less') {
+      echo "\t<script src=\"$template_uri/js/bootstrap/less-1.1.3.min.js\"></script>\n";
+    }
+    if ($roots_bootstrap_js === true) {
+      $roots_options['bootstrap_less_javascript'] = false;
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-modal.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-alerts.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-twipsy.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-popover.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-dropdown.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-scrollspy.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-tabs.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-buttons.js\"></script>\n";
+    }
+    if ($roots_bootstrap_less_js === true) {
+      $roots_options['bootstrap_javascript'] = false;
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-modal.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-alerts.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-twipsy.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-popover.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-dropdown.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-scrollspy.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-tabs.js\"></script>\n";
+      echo "\t<script src=\"$template_uri/js/bootstrap/bootstrap-buttons.js\"></script>\n";
+    }
+  }
+
+  function roots_bootstrap_header_before() {
     echo '<div class="container">', "\n";
   }
-}
 
-function roots_bootstrap_header_after() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === 'bootstrap' || $roots_css_framework === 'bootstrap_less') {
+  function roots_bootstrap_header_after() {
     echo "</div><!-- /.container -->\n";
     echo '<div class="container">', "\n";
   }
-}
 
-function roots_bootstrap_footer_before() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === 'bootstrap' || $roots_css_framework === 'bootstrap_less') {
+  function roots_bootstrap_footer_before() {
     echo "</div><!-- /.container -->\n";
     echo '<div class="container">', "\n";
   }
-}
 
-function roots_bootstrap_footer_after() {
-  global $roots_options;
-  $roots_css_framework = $roots_options['css_framework'];
-  if ($roots_css_framework === 'bootstrap' || $roots_css_framework === 'bootstrap_less') {
+  function roots_bootstrap_footer_after() {
     echo "</div><!-- /.container -->\n";
   }
 }
diff --git a/inc/roots-options.php b/inc/roots-options.php
index 0433327..2ffe1e4 100644
--- a/inc/roots-options.php
+++ b/inc/roots-options.php
@@ -403,4 +403,40 @@ function roots_theme_options_validate($input) {
   return apply_filters('roots_theme_options_validate', $output, $input, $defaults);
 }
 
+function roots_current_framework() {
+  global $roots_options;
+  switch ($roots_options['css_framework']) {
+    case 'blueprint' :
+      return 'blueprint';
+      break;
+    case '960gs_12' :
+      return '960gs_12';
+      break;
+    case '960gs_16' :
+      return '960gs_16';
+      break;
+    case '960gs_24' :
+      return '960gs_24';
+      break;
+    case '1140' :
+      return '1140';
+      break;
+    case 'adapt' :
+      return 'adapt';
+      break;
+    case 'foundation' :
+      return 'foundation';
+      break;
+    case 'less' :
+      return 'less';
+      break;
+    case 'bootstrap' :
+      return 'bootstrap';
+      break;
+    case 'bootstrap_less' :
+      return 'bootstrap_less';
+      break;
+  }
+}
+
 ?>
\ No newline at end of file