diff --git a/mix_and_match.info b/mix_and_match.info
index 91c9584..de730d8 100644
--- a/mix_and_match.info
+++ b/mix_and_match.info
@@ -9,7 +9,8 @@ stylesheets[all][] = css/mix-and-match-style.css
 stylesheets[all][] = css/base-colors.css
 stylesheets[all][] = css/mix-and-match-skins.css
 
-skinr[api] = 2
+fusion[api] = 2
+fusion[directory] = skins
 
 regions[sidebar_first] = Sidebar first
 regions[sidebar_second] = Sidebar second
@@ -97,6 +98,65 @@ settings[grid_adjusted_regions_fluid][content][] = sidebar_second
 ; Nested group fluid width adjustments: regions inside a parent group to subtract to get remaining width
 settings[grid_adjusted_groups_fluid][content_group][] = sidebar_second
 
+; Responsive settings
+; These appear to still be needed despite #563708 being applied.
+
+; Set to 0 to remove support for responsive themes.
+settings[responsive_enabled] = 1
+
+; Load JavaScript library to support media queries for older versions of IE.  Recommended.
+settings[responsive_ie_shim] = 1
+
+; Default grid parameters for responsive.
+settings[responsive_columns] = 12
+
+; Supported displays
+; Display "sidebar" is used for desktop, and for backwards compatibility with non-sidebar_responsive or pre-accelerator themes.
+settings[responsive_displays][] = sidebar
+settings[responsive_displays][] = sidebar_tablet_landscape
+settings[responsive_displays][] = sidebar_tablet_portrait
+settings[responsive_displays][] = sidebar_phone_landscape
+
+; Desktop layout.
+; These settings are also used for non-responsive and fluid grids. 
+settings[sidebar_enabled] = 1
+settings[sidebar_layout] = sidebars-split
+settings[sidebar_first_width] = 3
+settings[sidebar_second_width] = 3
+settings[sidebar_grid_width] = 1200
+settings[sidebar_gutter] = 30
+settings[sidebar_mquery] = 'only screen and (min-width:1200px)'
+settings[sidebar_mask] = 'rgba(0, 73, 225, .12)'
+
+; Tablet: landscape
+settings[sidebar_tablet_landscape_enabled] = 1
+settings[sidebar_tablet_landscape_layout] = sidebars-split
+settings[sidebar_tablet_landscape_first_width] = 3
+settings[sidebar_tablet_landscape_second_width] = 3
+settings[sidebar_tablet_landscape_grid_width] = 960
+settings[sidebar_tablet_landscape_gutter] = 20
+settings[sidebar_tablet_landscape_mquery] = 'only screen and (max-device-width: 1024px) and (orientation:landscape), only screen and (min-width:960px) and (max-width:1199px) and (min-device-width: 1100px)'
+settings[sidebar_tablet_landscape_mask] = 'rgba(213,95,28,.15)'
+
+; Tablet: portrait
+settings[sidebar_tablet_portrait_enabled] = 1
+settings[sidebar_tablet_portrait_layout] = sidebars-split
+settings[sidebar_tablet_portrait_first_width] = 3
+settings[sidebar_tablet_portrait_second_width] = 3
+settings[sidebar_tablet_portrait_grid_width] = 768
+settings[sidebar_tablet_portrait_gutter] = 20
+settings[sidebar_tablet_portrait_mquery] = 'only screen and (max-device-width: 1024px) and (orientation:portrait), only screen and (min-width:768px) and (max-width:959px) and (min-device-width: 1100px)'
+settings[sidebar_tablet_portrait_mask] = 'rgba(11,186,40,.15)'
+
+; Smartphone
+settings[sidebar_phone_landscape_enabled] = 1
+settings[sidebar_phone_landscape_layout] = sidebars-drop
+settings[sidebar_phone_landscape_first_width] = 3
+settings[sidebar_phone_landscape_second_width] = 3
+settings[sidebar_phone_landscape_grid_width] = mobile
+settings[sidebar_phone_landscape_gutter] = 10
+settings[sidebar_phone_landscape_mquery] = 'only screen and (max-width:759px)'
+settings[sidebar_phone_landscape_mask] = 'rgba(220,220,70,.1)'
 
 
 
diff --git a/mix_and_match.skinr.inc b/mix_and_match.skinr.inc
deleted file mode 100644
index d45bd1e..0000000
--- a/mix_and_match.skinr.inc
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-/**
- * @file
- * Implementation of a Skinr plugin.
- */
-
-/**
- * Implements hook_skinr_group_PLUGIN_info().
- */
-function mix_and_match_skinr_group_info() {
-  $groups['skinr_styles_colors'] = array(
-    'title' => t('Colors'),
-    'description' => t('Colors for backgrounds, headers, and links'),
-    'weight' => -14,
-  );
-  return $groups;
-}
-
-/**
- * Implements hook_skinr_skin_PLUGIN_info().
- *
- *
- */
-function mix_and_match_skinr_skin_info() {
-  $skins = array();
-  $skins['skinr_background_color'] = array(
-    'title' => t('Background Color'),
-    'type' => 'select',
-    'group' => 'skinr_styles_colors',
-    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
-    'default status' => TRUE,
-    'options' => array(
-      'white_bg' => array(
-        'title' => t('White'),
-        'class' => array('white-background'),
-      ),
-      'black_bg' => array(
-        'title' => t('Black'),
-        'class' => array('black-background'),
-      ),
-      'ltgray_bg' => array(
-        'title' => t('Light Gray'),
-        'class' => array('gray-background'),
-      ),
-        'medgray_bg' => array(
-        'title' => t('Medium Gray'),
-        'class' => array('med-gray-background'),
-      ),
-      'dkgray_bg' => array(
-        'title' => t('Dark Gray'),
-        'class' => array('dk-gray-background'),
-      ),
-      'red_bg' => array(
-        'title' => t('Red'),
-        'class' => array('red-background'),
-      ),
-      'blue_bg' => array(
-        'title' => t('Dark Blue'),
-        'class' => array('blue-background'),
-      ),
-      'ltblue_bg' => array(
-        'title' => t('Light Blue'),
-        'class' => array('lt-blue-background'),
-      ),
-      'dkgreen_bg' => array(
-        'title' => t('Dark Green'),
-        'class' => array('green-background'),
-      ),
-        'ltgreen_bg' => array(
-        'title' => t('Light Green'),
-        'class' => array('lt-green-background'),
-      ),
-        'orange_bg' => array(
-        'title' => t('Dark Orange'),
-        'class' => array('orange-background'),
-      ),
-        'ltorange_bg' => array(
-        'title' => t('Light Orange'),
-        'class' => array('lt-orange-background'),
-      ),
-    ),
-  );
-
-  $skins['skinr_header_background_color'] = array(
-    'title' => t('Header Background Color'),
-    'type' => 'select',
-    'description' => 'Select a color if you would like a header background different from the body background.',
-    'group' => 'skinr_styles_colors',
-    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
-    'default status' => TRUE,
-    'options' => array(
-      'black_header_bg' => array(
-        'title' => t('Black'),
-        'class' => array('black-header'),
-      ),
-      'gray_header_bg' => array(
-        'title' => t('Gray'),
-        'class' => array('gray-header'),
-      ),
-      'red_header_bg' => array(
-        'title' => t('Red'),
-        'class' => array('red-header'),
-      ),
-      'blue_header_bg' => array(
-        'title' => t('Blue'),
-        'class' => array('blue-header'),
-      ),
-      'green_header_bg' => array(
-        'title' => t('Green'),
-        'class' => array('green-header'),
-      ),
-      'orange_header_bg' => array(
-        'title' => t('Orange'),
-        'class' => array('orange-header'),
-      ),
-    ),
-  );
-
-  $skins['skinr_header_text_color'] = array(
-    'title' => t('Header Text Color'),
-    'type' => 'select',
-    'description' => 'Select a color for the block or node title text.',
-    'group' => 'skinr_styles_colors',
-    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
-    'default status' => TRUE,
-    'options' => array(
-      'white_header_text' => array(
-        'title' => t('White'),
-        'class' => array('white-title'),
-      ),
-      'black_header_text' => array(
-        'title' => t('Black'),
-        'class' => array('black-title'),
-      ),
-      'gray_header_text' => array(
-        'title' => t('Gray'),
-        'class' => array('gray-title'),
-      ),
-      'red_header_text' => array(
-        'title' => t('Red'),
-        'class' => array('red-title'),
-      ),
-      'blue_header_text' => array(
-        'title' => t('Blue'),
-        'class' => array('blue-title'),
-      ),
-      'green_header_text' => array(
-        'title' => t('Green'),
-        'class' => array('green-title'),
-      ),
-     'orange_header_text' => array(
-        'title' => t('Orange'),
-        'class' => array('orange-title'),
-      ),
-    ),
-  );
-
-  $skins['skinr_link_text_color'] = array(
-    'title' => t('Link Text Color'),
-    'type' => 'select',
-    'description' => 'Select a color for the link text.',
-    'group' => 'skinr_styles_colors',
-    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
-    'default status' => TRUE,
-    'options' => array(
-      'white_link_text' => array(
-        'title' => t('White'),
-        'class' => array('block-white-links'),
-      ),
-      'black_link_text' => array(
-        'title' => t('Black'),
-        'class' => array('block-black-links'),
-      ),
-      'gray_link_text' => array(
-        'title' => t('Gray'),
-        'class' => array('block-gray-links'),
-      ),
-      'ltgray_link_text' => array(
-        'title' => t('Light Gray'),
-        'class' => array('block-lt-gray-links'),
-      ),
-      'red_link_text' => array(
-        'title' => t('Red'),
-        'class' => array('block-red-links'),
-      ),
-      'blue_link_text' => array(
-        'title' => t('Blue'),
-        'class' => array('block-blue-links'),
-      ),
-      'green_link_text' => array(
-        'title' => t('Green'),
-        'class' => array('block-green-links'),
-      ),
-     'orange_link_text' => array(
-        'title' => t('Orange'),
-        'class' => array('block-orange-links'),
-      ),
-    ),
-  );
-
-  return $skins;
-}
\ No newline at end of file
diff --git a/skins/core/core.inc b/skins/core/core.inc
new file mode 100644
index 0000000..63e5c5f
--- /dev/null
+++ b/skins/core/core.inc
@@ -0,0 +1,184 @@
+<?php
+
+/**
+* Implements hook_fusion_apply_skin_core_info().
+*/
+function mix_and_match_fusion_apply_skin_core_info() {
+  $skins = array();
+  $skins['fusion_skins_background_color'] = array(
+    'title' => t('Background Color'),
+    'type' => 'select',
+    'group' => 'layout',
+    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
+    'default status' => TRUE,
+    'options' => array(
+      'white_bg' => array(
+        'title' => t('White'),
+        'class' => array('white-background'),
+      ),
+      'black_bg' => array(
+        'title' => t('Black'),
+        'class' => array('black-background'),
+      ),
+      'ltgray_bg' => array(
+        'title' => t('Light Gray'),
+        'class' => array('gray-background'),
+      ),
+      'medgray_bg' => array(
+        'title' => t('Medium Gray'),
+        'class' => array('med-gray-background'),
+      ),
+      'dkgray_bg' => array(
+        'title' => t('Dark Gray'),
+        'class' => array('dk-gray-background'),
+      ),
+      'red_bg' => array(
+        'title' => t('Red'),
+        'class' => array('red-background'),
+      ),
+      'blue_bg' => array(
+        'title' => t('Dark Blue'),
+        'class' => array('blue-background'),
+      ),
+      'ltblue_bg' => array(
+        'title' => t('Light Blue'),
+        'class' => array('lt-blue-background'),
+      ),
+      'dkgreen_bg' => array(
+        'title' => t('Dark Green'),
+        'class' => array('green-background'),
+      ),
+        'ltgreen_bg' => array(
+        'title' => t('Light Green'),
+        'class' => array('lt-green-background'),
+      ),
+        'orange_bg' => array(
+        'title' => t('Dark Orange'),
+        'class' => array('orange-background'),
+      ),
+        'ltorange_bg' => array(
+        'title' => t('Light Orange'),
+        'class' => array('lt-orange-background'),
+      ),
+    ),
+  );
+
+  $skins['fusion_skins_header_background_color'] = array(
+    'title' => t('Header Background Color'),
+    'type' => 'select',
+    'description' => 'Select a color if you would like a header background different from the body background.',
+    'group' => 'layout',
+    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
+    'default status' => TRUE,
+    'options' => array(
+      'black_header_bg' => array(
+        'title' => t('Black'),
+        'class' => array('black-header'),
+      ),
+      'gray_header_bg' => array(
+        'title' => t('Gray'),
+        'class' => array('gray-header'),
+      ),
+      'red_header_bg' => array(
+        'title' => t('Red'),
+        'class' => array('red-header'),
+      ),
+      'blue_header_bg' => array(
+        'title' => t('Blue'),
+        'class' => array('blue-header'),
+      ),
+      'green_header_bg' => array(
+        'title' => t('Green'),
+        'class' => array('green-header'),
+      ),
+      'orange_header_bg' => array(
+        'title' => t('Orange'),
+        'class' => array('orange-header'),
+      ),
+    ),
+  );
+
+  $skins['fusion_skins_header_text_color'] = array(
+    'title' => t('Header Text Color'),
+    'type' => 'select',
+    'description' => 'Select a color for the block or node title text.',
+    'group' => 'layout',
+    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
+    'default status' => TRUE,
+    'options' => array(
+      'white_header_text' => array(
+        'title' => t('White'),
+        'class' => array('white-title'),
+      ),
+      'black_header_text' => array(
+        'title' => t('Black'),
+        'class' => array('black-title'),
+      ),
+      'gray_header_text' => array(
+        'title' => t('Gray'),
+        'class' => array('gray-title'),
+      ),
+      'red_header_text' => array(
+        'title' => t('Red'),
+        'class' => array('red-title'),
+      ),
+      'blue_header_text' => array(
+        'title' => t('Blue'),
+        'class' => array('blue-title'),
+      ),
+      'green_header_text' => array(
+        'title' => t('Green'),
+        'class' => array('green-title'),
+      ),
+     'orange_header_text' => array(
+        'title' => t('Orange'),
+        'class' => array('orange-title'),
+      ),
+    ),
+  );
+
+  $skins['fusion_skins_link_text_color'] = array(
+    'title' => t('Link Text Color'),
+    'type' => 'select',
+    'description' => 'Select a color for the link text.',
+    'group' => 'layout',
+    'theme hooks' => array('block', 'panels_display', 'panels_pane', 'panels_panel', 'node'),
+    'default status' => TRUE,
+    'options' => array(
+      'white_link_text' => array(
+        'title' => t('White'),
+        'class' => array('block-white-links'),
+      ),
+      'black_link_text' => array(
+        'title' => t('Black'),
+        'class' => array('block-black-links'),
+      ),
+      'gray_link_text' => array(
+        'title' => t('Gray'),
+        'class' => array('block-gray-links'),
+      ),
+      'ltgray_link_text' => array(
+        'title' => t('Light Gray'),
+        'class' => array('block-lt-gray-links'),
+      ),
+      'red_link_text' => array(
+        'title' => t('Red'),
+        'class' => array('block-red-links'),
+      ),
+      'blue_link_text' => array(
+        'title' => t('Blue'),
+        'class' => array('block-blue-links'),
+      ),
+      'green_link_text' => array(
+        'title' => t('Green'),
+        'class' => array('block-green-links'),
+      ),
+     'orange_link_text' => array(
+        'title' => t('Orange'),
+        'class' => array('block-orange-links'),
+      ),
+    ),
+  );
+
+  return $skins;
+}