diff --git a/STARTER_THEME/examples/plug-in/example-plugin.css b/STARTER_THEME/examples/plug-in/example-plugin.css
new file mode 100644
index 0000000000000000000000000000000000000000..92b3b0b9d29447101e5ddf600f51d9c415e20fdd
--- /dev/null
+++ b/STARTER_THEME/examples/plug-in/example-plugin.css
@@ -0,0 +1,16 @@
+
+body.color-me {
+  background-color: yellow;
+}
+body.flip-me {
+   -moz-transform-origin: 50% 50%;
+-webkit-transform-origin: 50% 50%;
+    -ms-transform-origin: 50% 50%;
+     -o-transform-origin: 50% 50%;
+        transform-origin: 50% 50%;
+   -moz-transform: rotate(180deg);
+-webkit-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+     -o-transform: rotate(180deg);
+        transform: rotate(180deg);
+}
diff --git a/STARTER_THEME/examples/plug-in/example_plugin.pinfo b/STARTER_THEME/examples/plug-in/example_plugin.pinfo
new file mode 100644
index 0000000000000000000000000000000000000000..2e5eac576b874788fd39d33a48b3311db9298236
--- /dev/null
+++ b/STARTER_THEME/examples/plug-in/example_plugin.pinfo
@@ -0,0 +1,53 @@
+name = Example Plug-in
+description = An example plug-in.
+
+; The hex api version. This is required.
+
+hexapi = 2.x
+
+; If protected, overriding the plug-in is not possible. This is useful when the
+; plug-in provides critical features that should not be altered.
+
+protected = false
+
+; Plug-in dependencies. If this plug-in is explicitly enabled, the dependencies
+; will enable themselves. 'auto enable' will not enable dependent plug-ins.
+;
+; dependencies[] = foo
+
+; Other dependencies. It can contain themes or modules. This is extensible.
+;
+; requirements[] = my_theme
+; requirements[] = views
+
+; Setting this to true will automatically enable it when it doesn't depend on
+; other components or when all defined dependents are available.
+
+auto enable = false
+
+; If a theme requires absoultely needs the plug-in, it's best to set it in the
+; theme .info file to lock it in place.
+;
+; hex plugin[] = example_plugin
+
+; Add styles.
+
+stylesheets[all][] = example-plugin.css
+
+; Or scripts.
+;
+; scripts[] = script.js
+
+; Define features provided by the plug-in. This is also possible from the theme.
+; This adds to the pool of feature toggles in the theme configuration form.
+
+feature set[color_me] = Color me! (example plug-in)
+feature set[flip_me]  = Flip me! (example plug-in)
+
+; To define a subset from the available features, set them through the .info
+; file in the theme as it's normally done. The display order in the theme
+; configuration form will reflect the order it is set in the .info file.
+; see http://drupal.org/node/171205#features
+;
+; feature[] = logo
+; feature[] = color_me
diff --git a/STARTER_THEME/examples/plug-in/example_plugin.plug.inc b/STARTER_THEME/examples/plug-in/example_plugin.plug.inc
new file mode 100644
index 0000000000000000000000000000000000000000..6880092cf6104912c2d075efe421cf0866f56327
--- /dev/null
+++ b/STARTER_THEME/examples/plug-in/example_plugin.plug.inc
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file will be included when the plug-in is active. Set your custom
+ * functions here.
+ */
+
+/**
+ * Implements hook_preprocess_html()
+ */
+function example_plugin_preprocess_html(&$variables) {
+  if (hex_settings('example_plugin.toggle_color_me')) {
+    $variables['classes_array'][] = 'color-me';
+  }
+  if (hex_settings('example_plugin.toggle_flip_me')) {
+    $variables['classes_array'][] = 'flip-me';
+  }
+}
diff --git a/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.pinfo b/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.pinfo
deleted file mode 100644
index d45f48a6586d899c2afccfe416b5ba3e2742ebaa..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.pinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-name = Example Compatibility
-description = This is just an example plug-in that auto-enables itself when required modules are active.
-description.status = Your modules need my help!
-version     = HEX_VERSION
-
-; Set type.
-plugin.type = compatibility
-
-; Add module dependencies.
-module.dependencies[] = MODULE_1
-module.dependencies[] = MODULE_2
diff --git a/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.plug.inc b/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.plug.inc
deleted file mode 100644
index b587f20c5f0fe5f525606a6377c09e50560d0784..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_compatibility/example_compatibility.plug.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * This file will be included when the plug-in is active. Set your custom
- * functions here.
- */
diff --git a/STARTER_THEME/examples/plug-ins/example_extension/example-extension.css b/STARTER_THEME/examples/plug-ins/example_extension/example-extension.css
deleted file mode 100644
index 31674db555c995c7bbcb4f5ecea1ebbaf94492c2..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_extension/example-extension.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-body {
-  background-color: yellow;
-}
diff --git a/STARTER_THEME/examples/plug-ins/example_extension/example_extension.pinfo b/STARTER_THEME/examples/plug-ins/example_extension/example_extension.pinfo
deleted file mode 100644
index fc6ede63b0f65b12887b59b1ba1a99b9a1edb46f..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_extension/example_extension.pinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-name = Example Extension
-description = This is just an example plug-in that provides extra functionality.
-description.status = Power Up! Seeing yellow yet?
-version     = HEX_VERSION
-
-; Set type.
-plugin.type = extension
-
-; Add plugin dependencies.
-plugin.dependencies[] = example_library
-
-; Add styles.
-stylesheets[all][] = example-extension.css
diff --git a/STARTER_THEME/examples/plug-ins/example_extension/example_extension.plug.inc b/STARTER_THEME/examples/plug-ins/example_extension/example_extension.plug.inc
deleted file mode 100644
index b587f20c5f0fe5f525606a6377c09e50560d0784..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_extension/example_extension.plug.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * This file will be included when the plug-in is active. Set your custom
- * functions here.
- */
diff --git a/STARTER_THEME/examples/plug-ins/example_library/example_library.pinfo b/STARTER_THEME/examples/plug-ins/example_library/example_library.pinfo
deleted file mode 100644
index 3725c2a14318be6741b40c30bb490d8c330262c2..0000000000000000000000000000000000000000
--- a/STARTER_THEME/examples/plug-ins/example_library/example_library.pinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-name = Example Library
-description = This is just an example plug-in that contains resources for others to use.
-description.status = Empty library enabled!
-version     = HEX_VERSION
-
-; Set type.
-plugin.type = library
-
-; Add plugin dependencies.
-plugin.dependencies[] = example_library
diff --git a/STARTER_THEME/terrain_starter.info b/STARTER_THEME/terrain_starter.info
index 96e46e0d4d432a49c6865195bb8edc2ffd94b377..9542c1def45dd61db1d35f4c1f2d49e2131245cb 100644
--- a/STARTER_THEME/terrain_starter.info
+++ b/STARTER_THEME/terrain_starter.info
@@ -1,10 +1,8 @@
 name = Terrain Starter
 description = Starter theme based on Terrain.  Requires the <a href="http://drupal.org/project/hexagon">Hexagon</a> base theme.
 screenshot = images/screenshot.png
-base theme = hex
 base theme = terrain
 core = 7.x
-engine = phptemplate
 
 ; Default core regions.
 regions[sidebar_first]  = Left sidebar
@@ -21,22 +19,17 @@ regions[page_bottom]    = Page bottom
 stylesheets[all][] = styles/typography.css
 stylesheets[all][] = styles/style.css
 stylesheets[all][] = styles/colors.css
+stylesheets[all][] = styles/960-12-fluid.css
+
+; 960.gs grid library.
+hex plugins[] = ninesixty
+hex plugins[] = plex_theme
+hex plugins[] = plex_debugger
 
 ; global development_mode switch. The following can also be changed from the
 ; theme settings form. http://DOMAIN/admin/appearance/settings/THEME_NAME
-settings[development_mode] = true
+settings[plex_debugger.development_mode] = true
 
 ; disables .info caching (this file), theme registry and all internal caches
-; help by Hexagon. This switch depends on 'development_mode'.
-settings[development_mode:disable_theme_caching] = true
-
-; Writes debugging messages to the watchdog log.
-settings[development_mode:debug_log] = true
-
-; Smarter Styles
-plugins[] = smarter_styles
-
-; 960.gs grid library.
-plugins[] = ninesixty
-stylesheets[all][] = styles/960-12-fluid.css
-
+; held by Hexagon. This switch depends on 'development_mode'.
+settings[plex_debugger.development_mode:no_caching] = true
diff --git a/overrides/page.vars.inc b/overrides/page.vars.inc
index 5e4d4b7b0c55f2216dc0005588f36ebff45c147b..b639edb384535253c1608018a7da74644d8528f2 100644
--- a/overrides/page.vars.inc
+++ b/overrides/page.vars.inc
@@ -23,9 +23,9 @@ $secondary_menu_links = &$variables['secondary_menu_links'];
 
 // Logo
 $logo_img = '';
-if (hex_setting('toggle_logo', 1)) {
+if (hex_settings('toggle_logo')) {
   // Moved logo into images folder.
-  if (hex_setting('default_logo', 1)) {
+  if (hex_settings('default_logo')) {
     $logo = "$directory/images/logo.png";
   }
   $logo_img = theme('image', array(
diff --git a/plugins/ninesixty/ninesixty.pinfo b/plugins/ninesixty/ninesixty.pinfo
index 2bfa2a13c879b67229d8e89d857d31fb7aeb664c..9979ed55263bffa629140cf4cfac19742cef420b 100644
--- a/plugins/ninesixty/ninesixty.pinfo
+++ b/plugins/ninesixty/ninesixty.pinfo
@@ -2,6 +2,4 @@
 
 name = NineSixty
 description = Provides 960 Grid System styles and a helper function.
-version = HEX_VERSION
-plugin.type = extension
-plugin.protected = true
+hexapi = 2.x
diff --git a/terrain.info b/terrain.info
index eadab15622d526725cfcdeabd9089e2ba49daed0..c3f31c964976365cee962f3d2ca7672c861c32cc 100644
--- a/terrain.info
+++ b/terrain.info
@@ -3,7 +3,6 @@ description = A responsive theme based on Hexagon Starter.  Requires the <a href
 screenshot = images/screenshot.png
 base theme = hex
 core = 7.x
-engine = phptemplate
 
 ; Default core regions.
 regions[sidebar_first]  = Left sidebar
@@ -22,19 +21,6 @@ stylesheets[all][] = styles/terrain-typography.css
 stylesheets[all][] = styles/terrain-style.css
 stylesheets[all][] = styles/terrain-colors.css
 
-; global development_mode switch. The following can also be changed from the
-; theme settings form. http://DOMAIN/admin/appearance/settings/THEME_NAME
-settings[development_mode] = true
-
-; disables .info caching (this file), theme registry and all internal caches
-; help by Hexagon. This switch depends on 'development_mode'.
-settings[development_mode:disable_theme_caching] = true
-
-; Writes debugging messages to the watchdog log.
-settings[development_mode:debug_log] = true
-
-; Smarter Styles
-plugins[] = smarter_styles
-
 ; 960.gs grid library.
-plugins[] = ninesixty
+hex plugins[] = ninesixty
+hex plugins[] = plex_theme
\ No newline at end of file
