diff --git a/twitter_bootstrap_ui.admin.inc b/twitter_bootstrap_ui.admin.inc
index 14b44f5..1328bbe 100644
--- a/twitter_bootstrap_ui.admin.inc
+++ b/twitter_bootstrap_ui.admin.inc
@@ -2,34 +2,43 @@
 
 /*
  * @file
- *
+ * Contains the settings form for the twitter_bootstrap_ui module.
  */
  
 function twitter_bootstrap_ui_admin_settings() {
-  $form['twitter_bootstrap_ui_settings'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Twitter bootstrap Settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
-    '#weight' => -1
+  $form = array();
+  
+  $form['twitter_bootstrap_ui_js'] = array(
+    '#type' => 'select',
+    '#title' => t('Javascript Settings'),
+    '#description' => t('Choose a javascript configuration to use.'),
+    '#options' => array(
+      'bootstrap.js' => t('Default'),
+      'bootstrap.min.js' => t('Minified'),
+      'exclude' => t('Exclude'),
+    ),
+    '#default_value' => variable_get('twitter_bootstrap_ui_js', 'bootstrap.min.js'),
   );
-  $form['twitter_bootstrap_ui_settings']['jquerymobile_ui_plugin_jq_file'] = array(
-    '#type' => 'textfield',
-    '#title' => t('jQuery JavaScript'),
-    '#default_value' => variable_get('twitter_bootstrap_ui_jq_files', twitter_bootstrap_theme_get_setting('twitter_bootstrap_jq_files')),
-    '#description' => t('Enter the path and filename, relative to Drupal root, where the jQuery JavaScript file is located.'),
-  );
-  $form['twitter_bootstrap_ui_settings']['twitter_bootstrap_ui_css_files'] = array(
-    '#type' => 'textarea',
-    '#title' => t('CSS includes'),
-    '#default_value' => variable_get('twitter_bootstrap_ui_css_files', twitter_bootstrap_theme_get_setting('twitter_bootstrap_css_files')),
-    '#description' => t('Enter the path and filename, relative to Drupal root, where the CSS file is located, seperated by an new line.'),
+
+  $form['twitter_bootstrap_ui_css'] = array(
+    '#type' => 'select',
+    '#title' => t('CSS Settings'),
+    '#description' => t('Choose a CSS configuration to use.'),
+    '#options' => array(
+      'bootstrap.css' => t('Default'),
+      'bootstrap.min.css' => t('Minified'),
+      'bootstrap-responsive.css' => t('Responsive'),
+      'bootstrap-responsive.min.css' => t('Responsive Minified'),
+      'exclude' => t('Exclude'),
+    ),
+    '#default_value' => variable_get('twitter_bootstrap_ui_css', 'bootstrap.min.css'),
   );
-  $form['twitter_bootstrap_ui_settings']['twitter_bootstrap_ui_js_files'] = array(
-    '#type' => 'textarea',
-    '#title' => t('JS includes'),
-    '#default_value' => variable_get('twitter_bootstrap_ui_js_files', twitter_bootstrap_theme_get_setting('twitter_bootstrap_js_files')),
-    '#description' => t('Enter the path and filename, relative to Drupal root, where the JavaScript file is located, seperated by an new line.'),
+
+  $form['twitter_bootstrap_ui_autoload'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Autoload the Twitter Bootstrap library'),
+    '#description' => t('Check this box to automatically include Twitter Bootstrap as configured in your site.'),
+    '#default_value' => variable_get('twitter_bootstrap_ui_autoload', FALSE),
   );
 
   return system_settings_form($form);
diff --git a/twitter_bootstrap_ui.info b/twitter_bootstrap_ui.info
index 776c398..0eafeb3 100644
--- a/twitter_bootstrap_ui.info
+++ b/twitter_bootstrap_ui.info
@@ -1,3 +1,4 @@
 name = Twitter bootstrap UI
 dependencies[] = libraries (2.x)
 core = 7.x
+configure = admin/config/user-interface/twitter_bootstrap_ui
diff --git a/twitter_bootstrap_ui.module b/twitter_bootstrap_ui.module
index d92c341..6f6d37a 100644
--- a/twitter_bootstrap_ui.module
+++ b/twitter_bootstrap_ui.module
@@ -2,20 +2,18 @@
 
 /*
  * @file
- *
+ * Implements the main functionality for Twitter Bootstrap UI.
  */
 
 function twitter_bootstrap_ui_requirements($phase) {
   if ($phase == 'runtime') {
-	if(($library = libraries_detect('twitter_bootstrap')) && empty($library['installed'])) {
+	if (($library = libraries_detect('twitter_bootstrap')) && empty($library['installed'])) {
   
 	  $targs = array(
 		'@library-filepath' => libraries_get_path($library['machine name']),
 	  );
   
 	  $description = '<p>' .  $library['error message'] . '</p>';
-	  //$instructions .= '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@library-filepath</code>', $targs) . '</p>';
-	  //drupal_set_message($instructions);
 	  
 	  $requirements['twitter_bootstrap'] = array(
 		'title' => t('Twitter Bootstrap'), 
@@ -28,90 +26,71 @@ function twitter_bootstrap_ui_requirements($phase) {
 	}
   }
 }
+/**
+ * Implements hook_menu().
+ */
+function twitter_bootstrap_ui_menu() {
+  $items['admin/config/user-interface/twitter_bootstrap_ui'] = array(
+    'title' => t('Twitter Boostrap UI'),
+    'description' => t('Configuration for Twitter Bootstrap UI Module'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('twitter_bootstrap_ui_admin_settings'),
+    'access arguments' => array('administer twitter bootstrap ui'),
+    'file' => 'twitter_bootstrap_ui.admin.inc',
+    'type' => MENU_NORMAL_ITEM,
+  );
+  return $items;
+}
 
-function twitter_bootstrap_ui_libraries_info() {
-  // The following is a full explanation of all properties. See below for more
-  // concrete example implementations.
 
-  // This array key lets Libraries API search for 'sites/all/libraries/example'
-  // directory, which should contain the entire, original extracted library.
+/**
+ * Implements hook_permission().
+ */
+function twitter_bootstrap_ui_permission() {
+  return array(
+    'administer twitter bootstrap ui' =>  array(
+      'title' => t('Administer Twitter Bootstrap UI'),
+      'description' => t('Configure Twitter Bootstrap UI library'),
+    ),
+  );
+}
+
+/**
+ * Implements hook_init().
+ */
+function twitter_bootstrap_ui_init() {
+  if (variable_get('twitter_bootstrap_ui_autoload', FALSE)) {
+    libraries_load('twitter_bootstrap');
+  }
+}
+
+/**
+ * Implements hook_library_info().
+ */
+function twitter_bootstrap_ui_libraries_info() {  
+  // Load bootstrap based on configuration.
+  $js = variable_get('twitter_bootstrap_ui_js', 'bootstrap.min.js');
+  $css = variable_get('twitter_bootstrap_ui_css', 'bootstrap.min.css');
+
+  $files = array();
+  $files['js'] = $js != 'exclude' ? array('js/' . $js) : array();
+  $files['css'] = $css != 'exclude' ? array('css/' . $css) : array();
+
   $libraries['twitter_bootstrap'] = array(
     // Only used in administrative UI of Libraries API.
     'name' => 'Twitter Bootstrap',
     'vendor url' => 'http://twitter.github.com',
     'download url' => 'http://twitter.github.com/bootstrap/assets/bootstrap.zip',
-    // Optional: If, after extraction, the actual library files are contained in
-    // 'sites/all/libraries/example/lib', specify the relative path here.
-    //'path' => 'bootstrap',
-    // Optional: Define a custom version detection callback, if required.
-    #'version callback' => 'mymodule_get_version',
-    // Specify arguments for the version callback. By default,
-    // libraries_get_version() takes a named argument array:
     'version arguments' => array(
       'file' => 'css/bootstrap.css',
       'pattern' => '/Bootstrap v(\d+)/',
       'lines' => 3,
       'cols' => 50,
     ),
-    // Default list of files of the library to load. Important: Only specify
-    // third-party files belonging to the library here, not integration files of
-    // your module.
-    'files' => array(
-      // 'js' and 'css' follow the syntax of hook_library(), but file paths are
-      // relative to the library path.
-      'js' => array(
-        'js/bootstrap.js',
-      ),
-      'css' => array(
-        'css/bootstrap.css',
-      ),
-    ),
-    // Optional: Specify alternative variants of the library, if available.
-    'variants' => array(
-      // All properties defined for 'minified' override top-level properties.
-      'minified' => array(
-        'files' => array(
-		  'js' => array(
-			'js/bootstrap.min.js',
-		  ),
-		  'css' => array(
-			'css/bootstrap.min.css',
-		  ),
-        ),
-        //'variant callback' => 'mymodule_check_variant',
-        #'variant arguments' => array(
-         # 'variant' => 'minified',
-       # ),
-      ),
-    ),
-    // Optional, but usually required: Override top-level properties for later
-    // versions of the library. The properties of the minimum version that is
-    // matched override the top-level properties. Note:
-    // - When registering 'versions', it usually does not make sense to register
-    //   'files', 'variants', and 'integration files' on the top-level, as most
-    //   of those likely need to be different per version and there are no
-    //   defaults.
-    // - The array keys have to be strings, as PHP does not support floats for
-    //   array keys.
-    'versions' => array(
-      '2' => array(
-        'files' => array(
-		  'js' => array(
-			'js/bootstrap.js',
-		  ),
-		  'css' => array(
-			'css/bootstrap.css',
-		  ),
-        ),
-      ),
+    'files' => $files,
+    'integration files' => array(
+      'twitter_bootstrap' => variable_get('twitter_bootstrap_ui_autoload', FALSE) ? $files : array(),
     ),
-    // Optional: Register files to auto-load for your module. All files must be
-    // keyed by module, and follow the syntax of the 'files' property.
-    #'integration files' => array(
-    #  'mymodule' => array(
-    #    'js' => array('ex_lib.inc'),
-    #  ),
-    #),
   );
 
   return $libraries;