diff --git a/bootstrap.info b/bootstrap.info
index c32b637..2243816 100644
--- a/bootstrap.info
+++ b/bootstrap.info
@@ -11,14 +11,12 @@ regions[sidebar_first]  = 'Primary'
 regions[sidebar_second] = 'Secondary'
 regions[footer]         = 'Footer'
 
-stylesheets[all][] = bootstrap/css/bootstrap.css
-stylesheets[all][] = bootstrap/css/bootstrap-responsive.css
 stylesheets[all][] = css/style.css
 
-scripts[] = bootstrap/js/bootstrap.js
-
 settings[toggle_name] = 0
 settings[toggle_search] = 1
+settings[cdn_bootstrap] = 1
+settings[cdn_jquery] = 1
 x
 ;Exclude
 ;javascript
diff --git a/includes/modules/theme.inc b/includes/modules/theme.inc
index c74063e..757cfc1 100644
--- a/includes/modules/theme.inc
+++ b/includes/modules/theme.inc
@@ -91,17 +91,52 @@ function bootstrap_status_messages($variables) {
 }
 
 function bootstrap_css_alter(&$css) {
-  //global $theme_key;
-  //$theme_path = drupal_get_path('theme', $theme_key);
+  $theme_path = drupal_get_path('theme', 'bootstrap');
+  $files = array();
 
   $excludes = _bootstrap_alter(bootstrap_theme_get_info('exclude'), 'css');
   $css = array_diff_key($css, $excludes);
+
+  if (theme_get_setting('cdn_bootstrap')){
+    $files[]= array(
+      'url' => 'http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css',
+      'type' => 'external'
+      );
+  }
+  else {
+    $files[]= array (
+      'url' => $theme_path . '/bootstrap/css/bootstrap-responsive.css',
+      'type' => 'file',
+    );
+
+    $files[]= array (
+      'url' => $theme_path . '/bootstrap/css/bootstrap.css',
+      'type' => 'file',
+    );
+  }
+
+  foreach ($files as $file) {
+    if (!isset($css[$file['url']])) {
+      $css[$file['url']]['data'] = $file['url'];
+      $css[$file['url']]['type'] = $file['type'];
+      $css[$file['url']]['every_page'] = TRUE;
+      $css[$file['url']]['media'] = 'all';
+      $css[$file['url']]['preprocess'] = TRUE;
+      $css[$file['url']]['group'] = 0;
+      $css[$file['url']]['weight'] = 0;
+      $css[$file['url']]['browsers'] = array('IE' => TRUE, '!IE' => TRUE);
+    }
+  }
+
 }
 
 /**
  * Implements hook_js_alter().
  */
 function bootstrap_js_alter(&$js) {
+  $theme_path = drupal_get_path('theme', 'bootstrap');
+  $files = array();
+
   $excludes = _bootstrap_alter(bootstrap_theme_get_info('exclude'), 'js');
 
   // If bootstrap_ui available, we should not add js from theme info file.
@@ -111,6 +146,31 @@ function bootstrap_js_alter(&$js) {
   }
 
   $js = array_diff_key($js, $excludes);
+  if (theme_get_setting('cdn_jquery')) {
+    // Add jQuery and the switch script to the $files array
+    $files[] = 'http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js';
+
+    if (theme_get_setting('cdn_bootstrap')) {
+      $files[] = 'http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js';
+    }
+    else {
+      $files[] = $theme_path . 'bootstrap/js/bootstrap.js';
+    }
+    $files[] = $theme_path . 'js/switch.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++;
+      }
+    }
+  }
 }
 
 function _bootstrap_alter($files, $type) {
diff --git a/theme-settings.php b/theme-settings.php
index 005b6fb..f928eeb 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -25,5 +25,19 @@ function bootstrap_form_system_theme_settings_alter(&$form, $form_state, $form_i
     '#default_value' => theme_get_setting('bootstrap_rebuild_registry'),
     '#description'   => t('During theme development, it can be very useful to continuously <a href="!link">rebuild the theme registry</a>. WARNING: this is a huge performance penalty and must be turned off on production websites.', array('!link' => 'http://drupal.org/node/173880#theme-registry')),
   );
+
+  $form['themedev']['cdn_bootstrap'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Use cdn to load in the bootstrap files'),
+    '#default_value' => theme_get_setting('cdn_bootstrap'),
+    '#description'   => t('If you dont want to add add the bootstrap files yourself you can always use cdn, but be warned this is a third party hosting')
+  );
+
+  $form['themedev']['cdn_jquery'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Use cdn to load in the bootstrap files'),
+    '#default_value' => theme_get_setting('cdn_jquery'),
+    '#description'   => t('If you dont want to add add the jqyery files yourself you can always use cdn, but be warned this is a third party hosting and uses the noconflict solution. This means that 2 versions of jquery are loaded, what is a suboptimal solution')
+  );
 }