diff --git a/includes/theme.inc b/includes/theme.inc
index d4d70f8..d03126b 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -213,7 +213,7 @@ function bootstrap_item_list($variables) {
     }
     $output .= "</$type>";
   }
- 
+
   return $output;
 }
 
@@ -284,7 +284,7 @@ function bootstrap_css_alter(&$css) {
       'type' => 'external',
       'every_page' => TRUE,
       'media' => 'all',
-      'preprocess' => TRUE,
+      'preprocess' => FALSE,
       'group' => CSS_THEME,
       'browsers' => array('IE' => TRUE, '!IE' => TRUE),
       'weight' => -2,
@@ -309,8 +309,6 @@ function bootstrap_css_alter(&$css) {
  * Implements hook_js_alter().
  */
 function bootstrap_js_alter(&$js) {
-  $files = array();
-
   // Load excluded JS files from theme.
   $excludes = _bootstrap_alter(bootstrap_theme_get_info('exclude'), 'js');
 
@@ -342,27 +340,21 @@ function bootstrap_js_alter(&$js) {
   }
 
   $js = array_diff_key($js, $excludes);
-  if (theme_get_setting('cdn_bootstrap')) {
-    $files[] = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version')  .'/js/bootstrap.min.js';
-  }
 
-  // Rearrange / Add JS
-  $group = -50;
-  $weight = -100;
-  foreach ($files as $file) {
-    if (!isset($js[$file])) {
-      $js[$file] = drupal_js_defaults();
-      $js[$file]['data'] = $file;
-      $js[$file]['group'] = $group;
-      $js[$file]['weight'] = $weight;
-      $weight++;
-    }
+  // Add CDN.
+  if (theme_get_setting('cdn_bootstrap')) {
+    $cdn = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version')  .'/js/bootstrap.min.js';
+    $js[$cdn] = drupal_js_defaults();
+    $js[$cdn]['data'] = $cdn;
+    $js[$cdn]['type'] = 'external';
+    $js[$cdn]['every_page'] = TRUE;
+    $js[$cdn]['weight'] = -100;
   }
 }
 
 function _bootstrap_alter($files, $type) {
   $output = array();
-  
+
   foreach($files as $key => $value) {
     if (isset($files[$key][$type])) {
       foreach ($files[$key][$type] as $file => $name) {
@@ -455,5 +447,5 @@ function bootstrap_preprocess_table(&$variables) {
   if(!in_array('table-no-striping', $variables['attributes']['class'])) {
     $variables['attributes']['class'][] = 'table-striped';
   }
-  
+
 }