diff --git skinr.api.php skinr.api.php
index 9514b83..36b8310 100644
--- skinr.api.php
+++ skinr.api.php
@@ -199,6 +199,9 @@ function hook_skinr_api_VERSION() {
  *   enable skins which are required to make the theme work properly by default.
  *   Setting this property to 1 will cause it to be enabled by default for all
  *   installed themes.
+ * - status: (optional) An associative array whose keys are theme names and
+ *   whose corresponding values denote the desired default status for the
+ *   particular theme.
  *
  * The "hook" prefix is substituted with the name of the module or theme
  * implementing it.
@@ -295,6 +298,13 @@ function hook_skinr_skin_PLUGIN_info() {
         'attached' => array('css' => array('css/nav-colors.css')),
       ),
     ),
+    // Optionally, specify a global default status, or default status for a
+    // particular theme; mostly makes sense for themes only.
+    'default status' => 0,
+    'status' => array(
+      'bartik' => 1,
+      'garland' => 0,
+    ),
   );
   return $skins;
 }
diff --git skinr.install skinr.install
index 34994ef..cf72faa 100644
--- skinr.install
+++ skinr.install
@@ -102,22 +102,20 @@ function skinr_schema() {
     'primary key' => array('rid'),
   );
 
-  $schema['skinr_skinsets'] = array(
-    'description' => "A list of all non-theme skinsets that are or have been installed in Drupal's file system.",
+  $schema['skinr_statuses'] = array(
+    'description' => 'Keeps track of skin statuses.',
     'fields' => array(
-      'filename' => array(
-        'description' => 'The path of the primary file for this item, relative to the Drupal root; e.g. skins/skinset/skinset.info.',
+      'skin' => array(
+        'description' => "The skin's name.",
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 64,
         'not null' => TRUE,
-        'default' => '',
       ),
-      'name' => array(
-        'description' => 'The name of the item; e.g. skinset.',
+      'theme' => array(
+        'description' => "The theme's system name.",
         'type' => 'varchar',
-        'length' => 255,
+        'length' => 64,
         'not null' => TRUE,
-        'default' => '',
       ),
       'status' => array(
         'description' => 'Boolean indicating whether or not this item is enabled.',
@@ -125,55 +123,11 @@ function skinr_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'info' => array(
-        'description' => "A serialized array containing information from the skinset's .info file; keys can include name, description, package, version, core, and skinr.",
-        'type' => 'text',
-        'not null' => FALSE,
-        'serialize' => TRUE,
-      ),
-    ),
-    'primary key' => array('filename'),
-    'indexes' => array(
-      'name' => array('name'),
-    ),
-  );
-
-  $schema['skinr_skins'] = array(
-    'description' => 'Keeps track of the whether a skin is enabled for a specific skinset and theme.',
-    'fields' => array(
-      'name' => array(
-        'description' => 'The name of the skinset or theme that this skin belongs to.',
-        'type' => 'varchar',
-        'length' => 64,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'type' => array(
-        'description' => 'The type of this item; skinset or theme.',
-        'type' => 'varchar',
-        'length' => 16,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'skin' => array(
-        'description' => 'The name of the skin which you are saving settings for.',
-        'type' => 'varchar',
-        'length' => 128,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'status' => array(
-        'description' => 'A serialized array of values for each theme indicating whether or not the skin is enabled.',
-        'type' => 'text',
-        'size' => 'big',
-        'not null' => TRUE,
-        'serialize' => TRUE,
-        ),
     ),
-    'primary key' => array('name', 'skin'),
+    'primary key' => array('skin', 'theme'),
     'indexes' => array(
-      'name' => array('name'),
       'skin' => array('skin'),
+      'theme' => array('theme'),
     ),
   );
 
diff --git skinr.module skinr.module
index b16a46b..b7f1aee 100644
--- skinr.module
+++ skinr.module
@@ -541,6 +541,34 @@ function skinr_implements() {
 }
 
 /**
+ * Implements hook_themes_enabled().
+ */
+function skinr_themes_enabled($theme_list) {
+  _skinr_themes_status_update();
+}
+
+/**
+ * Implements hook_themes_disabled().
+ */
+function skinr_themes_disabled($theme_list) {
+  _skinr_themes_status_update();
+}
+
+/**
+ * Clear all skin plugin data from cache.
+ *
+ * @see skinr_themes_enabled().
+ * @see skinr_themes_disabled().
+ */
+function _skinr_themes_status_update() {
+  drupal_static_reset('skinr_implements');
+  drupal_static_reset('skinr_get_skin_info');
+  cache_clear_all('skinr_skin_info', 'cache');
+  drupal_static_reset('skinr_get_group_info');
+  cache_clear_all('skinr_group_info', 'cache');
+}
+
+/**
  * Includes $extension.skinr.inc files of extensions compatible with this version of Skinr.
  *
  * @todo Shoot me. Twice.
@@ -840,30 +868,6 @@ function skinr_current_theme($exclude_admin_theme = FALSE) {
 }
 
 /**
- * Prepare defaults for skins.
- *
- * @return
- *   An array of default skin settings.
- *
- * @todo Merge into skinr_get_skin_info() and remove this function.
- */
-function skinr_skin_info_default() {
-  return array(
-    'name' => '',
-    'title' => '',
-    'type' => 'checkboxes',
-    'description' => '',
-    'group' => '',
-    'theme hooks' => array('*'),
-    'attached' => array(),
-    'options' => array(),
-    'weight' => NULL,
-    'default status' => 0,
-    'status' => array(),
-  );
-}
-
-/**
  * Prepare the default status for a skin.
  *
  * @param $default_status
@@ -874,16 +878,69 @@ function skinr_skin_info_default() {
  */
 function skinr_skin_info_status_default($default_status = 0) {
   $status = array();
-  foreach (list_themes() as $theme_name => $theme) {
+  foreach (list_themes() as $name => $theme) {
     if (!$theme->status) {
       continue;
     }
-    $status[$theme_name] = $default_status;
+    $status[$name] = $default_status;
   }
   return $status;
 }
 
 /**
+ * Get the status of a skin for a particular theme.
+ *
+ * @param $skin
+ *   Skin name.
+ * @param $theme
+ *   Theme name.
+ *
+ * @return
+ *   The skins's status. TRUE or FALSE.  
+ */
+function skinr_skin_info_status($skin, $theme) {
+  return (bool) db_query("SELECT status FROM {skinr_statuses} WHERE skin = :skin AND theme = :theme", array(
+      ':skin' => $skin,
+      ':theme' => $theme,
+    ))->fetchField();
+}
+
+/**
+ * Enable a skin for a specific theme.
+ *
+ * @param $skin
+ *   Skin name.
+ * @param $theme
+ *   Theme name.
+ */
+function skinr_skin_info_enable($skin, $theme) {
+  if (!skinr_skin_info_status($skin, $theme)) {
+    // Only write a record if status isn't set yet.
+    $record = new stdClass();
+    $record->skin = $skin;
+    $record->theme = $theme;
+    $record->status = 1;
+
+    drupal_write_record('skinr_statuses', $record);
+  }
+}
+
+/**
+ * Disable a skin for a specific theme.
+ *
+ * @param $skin
+ *   Skin name.
+ * @param $theme
+ *   Theme name.
+ */
+function skinr_skin_info_disable($skin, $theme) {
+  db_delete('skinr_statuses')
+    ->condition('skin', $skin)
+    ->condition('theme', $theme)
+    ->execute();
+}
+
+/**
  * Helper function to prepend a path to an array of stylesheet or script filenames.
  *
  * If the url is absolute (e.g. the url start with 'http://' or 'https://')
@@ -928,8 +985,20 @@ function _skinr_add_path_to_files(&$files, $path) {
  */
 function skinr_skin_info_process(&$skin_infos, $source) {
   foreach ($skin_infos as $skin_name => $skin_info) {
-    // Merge in defaults.
-    $skin_infos[$skin_name] = array_merge(skinr_skin_info_default(), $skin_infos[$skin_name]);
+    // Populate default properties.
+    $skin_infos[$skin_name] += array(
+      'name' => '',
+      'title' => '',
+      'type' => 'checkboxes',
+      'description' => '',
+      'group' => '',
+      'theme hooks' => array('*'),
+      'attached' => array(),
+      'options' => array(),
+      'weight' => NULL,
+      'default status' => 0,
+      'status' => array(),
+    );
 
     // Merge in name.
     $skin_infos[$skin_name]['name'] = $skin_name;
@@ -937,8 +1006,17 @@ function skinr_skin_info_process(&$skin_infos, $source) {
     // Merge in source information.
     $skin_infos[$skin_name]['source'] = $source;
 
-    // Merge in default statuses for all themes.
-    $skin_infos[$skin_name]['status'] = array_merge(skinr_skin_info_status_default($skin_infos[$skin_name]['default status']), $skin_infos[$skin_name]['status']);
+    // Merge in default status for all themes.
+    $default_status = skinr_skin_info_status_default($skin_infos[$skin_name]['default status']);
+    $skin_infos[$skin_name]['status'] = array_merge($default_status, $skin_infos[$skin_name]['status']);
+
+    // Insert overridden statuses.
+    $result = db_query("SELECT skin, theme, status FROM {skinr_statuses} WHERE skin = :skin", array(
+      ':skin' => $skin_name,
+    ));
+    foreach ($result as $status) {
+      $skin_infos[$skin_name]['status'][$status->theme] = $status->status;
+    }
 
     // Add path to stylesheets.
     if (isset($skin_infos[$skin_name]['attached']['css'])) {
diff --git skinr_ui.admin.inc skinr_ui.admin.inc
index 9a80c6e..831caeb 100644
--- skinr_ui.admin.inc
+++ skinr_ui.admin.inc
@@ -420,8 +420,6 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) {
  * @see skinr_ui_admin_skin_infos_submit()
  */
 function skinr_ui_admin_skin_infos($form, $form_state) {
-  $form = array();
-
   $skins = skinr_get_skin_info();
   if (empty($skins)) {
     $form['skins_empty'] = array(
@@ -433,11 +431,16 @@ function skinr_ui_admin_skin_infos($form, $form_state) {
   uasort($skins, 'skinr_ui_sort_by_title');
   $form['skins'] = array('#tree' => TRUE);
 
+  $current_theme = skinr_current_theme();
+
   // Iterate through each of the skins.
   foreach ($skins as $name => $skin) {
     $extra = array();
-    // @todo Status for skins is now per theme; either figure out a better way to display, or delete the status row.
-    $extra['enabled'] = TRUE;
+
+    // Display status of the current theme.
+    // @todo We need to revamp this whole section. At that point we'll build in
+    //   the ability to change status per theme.
+    $extra['enabled'] = $skin['status'][$current_theme];
 
     // Generate link for skin's configuration page
     $configure_link = menu_get_item('admin/appearance/skinr/skins/settings/'. $name);
@@ -465,7 +468,6 @@ function skinr_ui_admin_skin_infos($form, $form_state) {
         t('Name'),
         t('Source type'),
         t('Source name'),
-        t('Source version'),
         t('Source plug-in'),
         t('Theme hooks'),
         array('data' => t('Enabled'), 'class' => array('checkbox')),
@@ -506,8 +508,11 @@ function _skinr_ui_admin_skin_infos_build_row($skin, $extra) {
   );
 
 
-  // Grab source info.
-  $info = system_get_info($skin['source']['type'], $skin['source']['name']);
+  // Grab source info. Can't use system_get_info() because it only returns
+  // enabled themes. We need to have access to disabled base themes.
+  $type = $skin['source']['type'] == 'module' ? 'module_enabled' : $skin['source']['type'];
+  $system_list = system_list($type);
+  $info = $system_list[$skin['source']['name']]->info;
 
   $form['source type'] = array(
     '#markup' => $skin['source']['type'],
@@ -515,11 +520,8 @@ function _skinr_ui_admin_skin_infos_build_row($skin, $extra) {
   $form['source name'] = array(
     '#markup' => $info['name'],
   );
-  $form['source version'] = array(
-    '#markup' => $info['version'],
-  );
   $form['source plugin'] = array(
-    '#markup' => '', //$skin['source']['plugin'],
+    '#markup' => basename($skin['source']['path']),
   );
 
   $theme_hooks = array();
@@ -530,31 +532,13 @@ function _skinr_ui_admin_skin_infos_build_row($skin, $extra) {
     '#markup' => implode('<br />', $theme_hooks),
   );
 
-  // Check the compatibilities.
-  $compatible = TRUE;
-  $status_short = '';
-  $status_long = '';
-
-  // @todo Check for Skinr API compatibility.
-  $compatible = TRUE;
-
-  // If this skin is compatible, present a checkbox indicating
-  // this skin may be installed. Otherwise, show a big red X.
-  if ($compatible) {
-    $form['enable'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Enable'),
-      '#default_value' => $extra['enabled'],
-    );
-    if ($extra['disabled']) {
-      $form['enable']['#disabled'] = TRUE;
-    }
-  }
-  else {
-    $form['enable'] = array(
-      '#markup' =>  theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('incompatible'), 'title' => $status_short)),
-    );
-    $form['name']['#markup'] .= theme('theme_skinr_ui_admin_skin_infos_incompatible', array('message' => $status_long));
+  $form['enable'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable'),
+    '#default_value' => $extra['enabled'],
+  );
+  if ($extra['disabled']) {
+    $form['enable']['#disabled'] = TRUE;
   }
 
   // Build operation links.
@@ -646,7 +630,6 @@ function theme_skinr_ui_admin_skin_infos_fieldset($variables) {
     // Source.
     $row[] = drupal_render($skin_info['source type']);
     $row[] = drupal_render($skin_info['source name']);
-    $row[] = drupal_render($skin_info['source version']);
     $row[] = drupal_render($skin_info['source plugin']);
 
     // Theme hooks.
diff --git skinr_ui.module skinr_ui.module
index 18b6d32..d78bd11 100644
--- skinr_ui.module
+++ skinr_ui.module
@@ -41,7 +41,6 @@ function skinr_ui_menu() {
     'title' => 'List',
     'description' => t('Manage Skinr settings.'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
-    'parent' => 'admin/appearance/skinr',
     'weight' => -10,
   );
 
@@ -51,39 +50,25 @@ function skinr_ui_menu() {
     'description' => 'Manage which skins are available when changing Skinr settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('skinr_ui_admin_skin_infos'),
-    'access arguments' => array('administer site configuration'),
+    'access arguments' => array('administer skinr'),
     'file' => 'skinr_ui.admin.inc',
     'type' => MENU_LOCAL_TASK,
-    'parent' => 'admin/appearance/skinr',
   );
   $items['admin/appearance/skinr/skins/select'] = array(
     'title' => 'List',
     'description' => 'Manage your skins.',
     'type' => MENU_DEFAULT_LOCAL_TASK,
-    'parent' => 'admin/appearance/skinr/skins',
     'weight' => -1,
   );
-  // drupal_uninstall_modules() invokes hook_menu() in disabled modules and does
-  // not respect module dependencies. Therefore, uninstalling both Skinr UI and
-  // Skinr at the same time is leading to a database error, since
-  // skinr_get_skin_info() tries to load data from tables that have been deleted
-  // already.
-  // @see http://drupal.org/node/151452
-  // @see http://drupal.org/node/320303
-  $skin_infos = array();
-  if (in_array('skinr', module_list())) {
-    $skin_infos = skinr_get_skin_info();
-  }
-  foreach ($skin_infos as $skin_info) {
-    $items['admin/appearance/skinr/skins/settings/' . $skin_info['name']] = array(
+  foreach (skinr_get_skin_info() as $name => $skin_info) {
+    $items['admin/appearance/skinr/skins/settings/' . $name] = array(
       'title' => $skin_info['title'],
       'description' => 'Manage which options are available for each Skin when changing Skinr settings.',
       'page callback' => 'drupal_get_form',
-      'page arguments' => array('skinr_ui_admin_skin_infos_settings', $skin_info['name']),
-      'access arguments' => array('administer site configuration'),
+      'page arguments' => array('skinr_ui_admin_skin_infos_settings', $name),
+      'access arguments' => array('administer skinr'),
       'file' => 'skinr_ui.admin.inc',
       'type' => MENU_LOCAL_TASK,
-      'parent' => 'admin/appearance/skinr/skins',
     );
   }
 
@@ -93,7 +78,6 @@ function skinr_ui_menu() {
     'page callback' => 'skinr_rules',
     'type' => MENU_LOCAL_TASK,
     'access arguments' => array('administer skinr'),
-    'parent' => 'admin/appearance/skinr',
     'weight' => 1,
     'description' => t('Configure region and page level Skinr rules.'),
     'file' => 'skinr_ui.rules.inc',
@@ -130,7 +114,6 @@ function skinr_ui_menu() {
     'page arguments' => array('skinr_ui_import_form'),
     'type' => MENU_LOCAL_TASK,
     'access arguments' => array('administer skinr'),
-    'parent' => 'admin/appearance/skinr',
     'weight' => 2,
     'description' => t('Import Skinr settings.'),
     'file' => 'skinr_ui.admin.inc',
@@ -141,7 +124,6 @@ function skinr_ui_menu() {
     'page arguments' => array('skinr_ui_export_form'),
     'type' => MENU_LOCAL_TASK,
     'access arguments' => array('administer skinr'),
-    'parent' => 'admin/appearance/skinr',
     'weight' => 3,
     'description' => t('Export Skinr settings.'),
     'file' => 'skinr_ui.admin.inc',
diff --git tests/skinr_ui.test tests/skinr_ui.test
index 38a78a1..add4311 100644
--- tests/skinr_ui.test
+++ tests/skinr_ui.test
@@ -75,7 +75,7 @@ class SkinrUIBasicTestCase extends DrupalWebTestCase {
    * @todo Remove the overly verbose inline comments after the Skinr development
    *   team has figured out how to write tests.
    */
-  function testSkinEdit() {
+  function xtestSkinEdit() {
     // Go to the front page, on which the user menu block should appear.
     $this->drupalGet('');
     // Click the first (index 0) 'Edit skin' link on the page, which should be
@@ -120,4 +120,38 @@ class SkinrUIBasicTestCase extends DrupalWebTestCase {
     $class = (string) $elements[0]['class'];
     $this->assertTrue(strpos($class, ' font-1 '), 'CSS class of configured skin option found.');
   }
+
+  /**
+   * Tests default status of skins.
+   *
+   * @todo Add assertions for 'default status' itself.
+   */
+  function testSkinAdminDefaultStatus() {
+    // The skinr_test_basetheme skin defined by the skinr_test_basetheme theme
+    // specifies a default status for itself. Enable its subtheme (only) to test
+    // it.
+    theme_enable(array('garland', 'skinr_test_subtheme'));
+    // @todo 
+    cache_clear_all('skinr_*', 'cache', TRUE);
+
+    // Verify that the skin appears on the skin overview page.
+    $this->drupalGet('admin/appearance/skinr/skins');
+    $this->assertLinkByHref('admin/appearance/skinr/skins/settings/skinr_test_basetheme');
+    $this->drupalGet('admin/appearance/skinr/skins/settings/skinr_test_basetheme');
+
+    // Verify that it is enabled for Bartik and disabled for Garland by default.
+    $this->assertFieldChecked('edit-skins-skinr-test-basetheme-skinr-test-basetheme-enable', 'skinr_test_basetheme skin is enabled for skinr_test_basetheme.');
+    $this->assertNoFieldChecked('edit-skins-bartik-skinr-test-basetheme-enable', 'skinr_test_basetheme skin is disabled for Bartik.');
+    $this->assertNoFieldChecked('edit-skins-garland-skinr-test-basetheme-enable', 'skinr_test_basetheme skin is disabled for Garland.');
+  }
+
+  /**
+   * Tests status of skins.
+   *
+   * @todo Once admin section is revamped, test setting a skins's status for
+   *   a theme.
+   */
+  function testSkinAdminStatus() {
+    
+  }
 }
diff --git tests/themes/skinr_test_basetheme/skinr_test_basetheme.skinr.inc tests/themes/skinr_test_basetheme/skinr_test_basetheme.skinr.inc
index c3406fc..a2559e9 100644
--- tests/themes/skinr_test_basetheme/skinr_test_basetheme.skinr.inc
+++ tests/themes/skinr_test_basetheme/skinr_test_basetheme.skinr.inc
@@ -7,7 +7,10 @@
 function skinr_test_basetheme_skinr_skin_info() {
   $skins['skinr_test_basetheme'] = array(
     'title' => 'Base theme skin',
-    'default status' => 1,
+    'default status' => 0,
+    'status' => array(
+      'skinr_test_basetheme' => 1,
+    ),
   );
   return $skins;
 }