diff --git a/A_STARTER_THEME/overrides/page.vars.inc b/A_STARTER_THEME/overrides/page.vars.inc
index 5b19ea7..5e4d4b7 100644
--- a/A_STARTER_THEME/overrides/page.vars.inc
+++ b/A_STARTER_THEME/overrides/page.vars.inc
@@ -26,7 +26,7 @@ $logo_img = '';
 if (hex_setting('toggle_logo', 1)) {
   // Moved logo into images folder.
   if (hex_setting('default_logo', 1)) {
-    $logo = hex_path('theme', 'hex') . '/images/logo.png';
+    $logo = "$directory/images/logo.png";
   }
   $logo_img = theme('image', array(
     'path' => $logo,
diff --git a/HexagonBase/includes/build_files.inc b/HexagonBase/includes/build_files.inc
index dfb26c3..ff6b2a9 100644
--- a/HexagonBase/includes/build_files.inc
+++ b/HexagonBase/includes/build_files.inc
@@ -22,60 +22,52 @@ function hex_build_files() {
 
   $files = array();
   // Get plug-in and theme defined files.
-  foreach (hex_list('plugin+theme') as $component) {
-    _hex_build_files($files, $component, hex_type($component));
-  }
-
-  return $files;
-}
-
-/**
- * Private function. Does the heavy lifting for hex_build_files().
- */
-function _hex_build_files(&$files, $name, $type) {
-
-  $file_patterns = array();
-  // .info/.pinfo defined extensions.
-  foreach (call_user_func("hex_{$type}_info", 'file.extensions', array(), $name) as $group => $ext) {
-    $ext = preg_quote($ext, '/');
-    $file_patterns[$group][] = "/^[[:alpha:]][[:alnum:]._-]+$ext$/";
-  }
-  // .info/.pinfo defined patterns.
-  foreach (call_user_func("hex_{$type}_info", 'file.patterns', array(), $name) as $group => $pattern) {
-    $file_patterns[$group][] = $pattern;
-  }
-  // hook_file_patterns().
-  if (function_exists($name . '_file_patterns')) {
-    foreach (call_user_func($name . '_file_patterns', $file_patterns) as $group => $pattern) {
+  foreach (hex_list('plugin+theme') as $name) {
+    $file_patterns = array();
+    // .info/.pinfo defined extensions.
+    foreach (hex_info('file.extensions', array(), $name) as $group => $ext) {
+      $ext = preg_quote($ext, '/');
+      $file_patterns[$group][] = "/^[[:alpha:]][[:alnum:]._-]+$ext$/";
+    }
+    // .info/.pinfo defined patterns.
+    foreach (hex_info('file.patterns', array(), $name) as $group => $pattern) {
       $file_patterns[$group][] = $pattern;
     }
-  }
-
-  foreach ($file_patterns as $contexts => $patterns) {
-    // Get search scope (prefixed) from pattern group.
-    $search_scopes = array($type);
-    $prefix = '';
-    if (is_string($contexts) && strpos($contexts, ':') !== FALSE) {
-      // scope1|scope2:group
-      list($scopes, $prefix) = explode(':', $contexts);
-      $search_scopes = explode('|', $scopes);
+    // hook_file_patterns().
+    if (function_exists($name . '_file_patterns')) {
+      foreach (call_user_func($name . '_file_patterns', $file_patterns) as $group => $pattern) {
+        $file_patterns[$group][] = $pattern;
+      }
     }
-    foreach ($search_scopes as $scope) {
-      foreach (hex_file_scan($patterns, $scope) as $found_files) {
-        foreach ($found_files as $file) {
-          foreach (array_merge(array('all', $file->scope), $file->hosts) as $scope) {
-            $name_space = $prefix ? "$prefix/{$file->filename}" : $file->filename;
-            if (!isset($files[$scope][$name_space])) {
-              $files[$scope][$name_space] = array();
-            }
-            if (!in_array($file->uri, $files[$scope][$name_space])) {
-              $files[$scope][$name_space][] = $file->uri;
+
+    foreach ($file_patterns as $contexts => $patterns) {
+      // Get search scope (prefixed) from pattern group.
+      $search_scopes = array(hex_type($name));
+      $prefix = '';
+      if (is_string($contexts) && strpos($contexts, ':') !== FALSE) {
+        // scope1|scope2:group
+        list($scopes, $prefix) = explode(':', $contexts);
+        $search_scopes = explode('|', $scopes);
+      }
+      foreach ($search_scopes as $scope) {
+        foreach (hex_file_scan($patterns, $scope) as $found_files) {
+          foreach ($found_files as $file) {
+            foreach (array_merge(array('all', $file->scope), $file->hosts) as $scope) {
+              $name_space = $prefix ? "$prefix/{$file->filename}" : $file->filename;
+              if (!isset($files[$scope][$name_space])) {
+                $files[$scope][$name_space] = array();
+              }
+              if (!in_array($file->uri, $files[$scope][$name_space])) {
+                $files[$scope][$name_space][] = $file->uri;
+              }
             }
           }
         }
       }
     }
   }
+
+  return $files;
 }
 
 /**
diff --git a/HexagonBase/includes/meta_plugin.inc b/HexagonBase/includes/meta_plugin.inc
index 32c4462..ddb1eea 100644
--- a/HexagonBase/includes/meta_plugin.inc
+++ b/HexagonBase/includes/meta_plugin.inc
@@ -1,9 +1,5 @@
 <?php
 
-// Plugin group weights for drupal_add_css() and drupal_add_js().
-define('CSS_PLUGIN', 200);
-define('JS_PLUGIN',  200);
-
 /**
  * Get info data specific to a given plug-in. The information will be pulled
  * from the plug-in's .pinfo file.
@@ -123,10 +119,10 @@ function hex_plugin_alter($host_function, &$data, &$context1 = NULL, &$context2
   if (!isset($drupal_static_fast)) {
     $drupal_static_fast['functions'] = &drupal_static(__FUNCTION__);
   }
-  $functions = &$drupal_static_fast['functions'];
+  $functions = &$drupal_static_fast['functions'][$host_function];
 
-  if (!isset($functions["$host_function"])) {
-    $functions["$host_function"] = array();
+  if (!isset($functions)) {
+    $functions = array();
 
     $active_themes = hex_active_themes();
     $pos = 0;
@@ -137,18 +133,18 @@ function hex_plugin_alter($host_function, &$data, &$context1 = NULL, &$context2
         $alter = str_replace("{$host}_", '', $host_function);
         foreach (hex_plugin_list("$host.active") as $plugin) {
           if (function_exists($func = $plugin . '_' . $alter)) {
-            $functions["$host_function"][] = $func;
+            $functions[] = $func;
           }
         }
         // Break out if functions were found and added.
-        if ($functions["$host_function"]) {
+        if ($functions) {
           break;
         }
       }
     }
   }
 
-  foreach ($functions["$host_function"] as $function) {
+  foreach ($functions as $function) {
     $function($data, $context1, $context2);
   }
 }
diff --git a/HexagonBase/template.php b/HexagonBase/template.php
index c928708..d211e32 100644
--- a/HexagonBase/template.php
+++ b/HexagonBase/template.php
@@ -5,50 +5,42 @@
  * Contains the base functionality for Hexagon and includes other files when
  * necessary.
  */
-define('HEX_ROOT',     DRUPAL_ROOT . '/' . drupal_get_path('theme', 'hex'));
-define('HEX_INCLUDES', HEX_ROOT . '/includes');
+define('HEX_INCLUDES', DRUPAL_ROOT . '/' . drupal_get_path('theme', 'hex') . '/includes');
 
-_hex_initialize();
+// Hold the theme_key.
+$GLOBALS['theme_static'] = $GLOBALS['theme_key'];
+$GLOBALS['theme_target'] = $GLOBALS['theme_key'];
 
-/**
- * Initializes the theme.
- */
-function _hex_initialize() {
-  // Hold the theme_key.
-  $GLOBALS['theme_static'] = $GLOBALS['theme_key'];
-  $GLOBALS['theme_target'] = $GLOBALS['theme_key'];
+include_once HEX_INCLUDES . '/caching.inc';
+include_once HEX_INCLUDES . '/common.inc';
+include_once HEX_INCLUDES . '/meta_theme.inc';
+include_once HEX_INCLUDES . '/meta_plugin.inc';
+include_once HEX_INCLUDES . '/meta_files.inc';
+include_once HEX_INCLUDES . '/alter_stubs.inc';
 
-  include_once HEX_INCLUDES . '/caching.inc';
-  include_once HEX_INCLUDES . '/common.inc';
-  include_once HEX_INCLUDES . '/meta_theme.inc';
-  include_once HEX_INCLUDES . '/meta_plugin.inc';
-  include_once HEX_INCLUDES . '/meta_files.inc';
-  include_once HEX_INCLUDES . '/alter_stubs.inc';
+// Load and initialize the theme and plug-ins only if Hexagon or any of its
+// child themes are active. This conditional loading eliminates any possible
+// conflicts when inside the theme settings form while this theme or any
+// child is not currently active.
 
-  // Load and initialize the theme and plug-ins only if Hexagon or any of its
-  // child themes are active. This conditional loading eliminates any possible
-  // conflicts when inside the theme settings form while this theme or any
-  // child is not currently active.
+if (in_array('hex', hex_active_themes(HEX_CURRENT_PAGE))) {
+  if (hex_setting('development_mode:disable_theme_caching', 0, HEX_ACTIVE)) {
+    // Clear theme .info data and registry.
+    system_rebuild_theme_data();
+    drupal_theme_rebuild();
+  }
+  if (cache_get('theme_registry:' . hex_active_theme(), 'cache') === FALSE) {
+    // Follow the registry and clear hex specific caches.
+    hex_clear_caches();
+  }
 
-  if (in_array('hex', hex_active_themes(HEX_CURRENT_PAGE))) {
-    if (hex_setting('development_mode:disable_theme_caching', 0, HEX_ACTIVE)) {
-      // Clear theme .info data and registry.
-      system_rebuild_theme_data();
-      drupal_theme_rebuild();
-    }
-    if (cache_get('theme_registry:' . hex_active_theme(), 'cache') === FALSE) {
-      // Follow the registry and clear hex specific caches.
-      hex_clear_caches();
+  // Initialize plug-ins and themes.
+  foreach (hex_list('plugin+theme') as $component) {
+    if (hex_type($component) === 'plugin' && file_exists($file = hex_path($component) . "/$component.plug.inc")) {
+      include_once DRUPAL_ROOT . '/' . $file;
     }
-
-    // Initialize plug-ins and themes.
-    foreach (hex_list('plugin+theme') as $component) {
-      if (hex_type($component) === 'plugin' && file_exists($file = hex_path($component) . "/$component.plug.inc")) {
-        include_once DRUPAL_ROOT . '/' . $file;
-      }
-      if (function_exists($component . '_initialize')) {
-        call_user_func($component . '_initialize');
-      }
+    if (function_exists($component . '_initialize')) {
+      call_user_func($component . '_initialize');
     }
   }
 }

