fixed a test and cleaned up zeitgeist image directory

config/global.ini.php

@@ -635,8 +635,6 @@ Plugins[] = MobileMessaging
 Plugins[] = Overlay
 Plugins[] = SegmentEditor
 Plugins[] = Insights
-
-Plugins[] = Morpheus
 Plugins[] = ZenMode
 
 [PluginsInstalled]

core/Twig.php

@@ -42,18 +42,19 @@ class Twig
 
 		//get current theme
 		$manager = Plugin\Manager::getInstance();
-		$theme = $manager->getThemeEnabled();
+		$theme   = $manager->getThemeEnabled();
 		$loaders = array();
 		
 		//create loader for custom theme to overwrite twig templates
-		if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME){
+		if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME) {
 			$customLoader = $this->getCustomThemeLoader($theme);
-			if($customLoader){
+			if ($customLoader) {
 				//make it possible to overwrite plugin templates
-				$this->addCustomPluginNamespaces($customLoader,$theme->getPluginName());
+				$this->addCustomPluginNamespaces($customLoader, $theme->getPluginName());
 				$loaders[] = $customLoader;
 			}
 		}
+
 		$loaders[] = $loader;
         
         $chainLoader = new Twig_Loader_Chain($loaders);

plugins/CorePluginsAdmin/templates/macros.twig

@@ -151,7 +151,7 @@
         </thead>
         <tbody id="plugins">
         {% for name,plugin in pluginsInfo %}
-            {% set isZeitgeist = isTheme and name == 'Zeitgeist' %}
+            {% set isZeitgeist = isTheme and (name == 'Morpheus' or name == 'Zeitgeist') %}
             {% if (plugin.alwaysActivated is defined and not plugin.alwaysActivated) or isTheme %}
                 <tr {% if plugin.activated %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %} data-filter-status="{% if plugin.activated %}active{% else %}inactive{% endif %}" data-filter-origin="{% if plugin.isCorePlugin %}core{% else %}noncore{% endif %}">
                     <td class="name" style="white-space:nowrap;">