diff --git a/context_reaction_theme.module b/context_reaction_theme.module
index 02232b4..beebc2f 100644
--- a/context_reaction_theme.module
+++ b/context_reaction_theme.module
@@ -1,17 +1,27 @@
 <?php
 
-function context_reaction_theme_init() {
-  if ($plugin = context_get_plugin('reaction', 'active_theme')) {
-    $plugin->execute($vars);
+
+function context_reaction_theme_custom_theme() {
+  //init core conditions here to trigger all context's with a 
+  //active_theme reaction and core conditions only
+  if ($plugin = context_get_plugin('condition', 'path')) {
+    $plugin->execute();
+  }
+  if ($plugin = context_get_plugin('condition', 'language')) {
+    global $language;
+    $plugin->execute($language->language);
+  }
+  if ($plugin = context_get_plugin('condition', 'user')) {
+    global $user;
+    $plugin->execute($user);
   }
   
-}
-/*
-function context_reaction_theme_custom_theme() {
-  dpm('aa');
+  //check for the active theme reaction
   if ($plugin = context_get_plugin('reaction', 'active_theme')) {
-    dpm($plugin);
-    $plugin->execute($vars);
+    $custom_theme = $plugin->execute();
+    if ($custom_theme) {
+      return $custom_theme;
+    }
   }
 }
 
diff --git a/plugins/context_reaction_active_theme.inc b/plugins/context_reaction_active_theme.inc
index 294125a..1e876b8 100644
--- a/plugins/context_reaction_active_theme.inc
+++ b/plugins/context_reaction_active_theme.inc
@@ -14,7 +14,9 @@ class context_reaction_active_theme extends context_reaction {
     foreach($themes as $name => $theme) {
       if($theme->status == 1) $options[$name] = $name;
     }
-
+    
+    $settings = $this->fetch_from_context($context);
+    
     $form = array(
       '#tree' => TRUE,
       '#title' => t('Theme'),
@@ -23,7 +25,7 @@ class context_reaction_active_theme extends context_reaction {
         '#description' => t('Choose a theme to activate when this context is active.'),
         '#type' => 'select',
         '#options' => $options,
-        '#default_value' => 0//$this->fetch_from_context($context),
+        '#default_value' => $settings['theme'],
       ),
     );
     return $form;
@@ -33,12 +35,14 @@ class context_reaction_active_theme extends context_reaction {
    * Return the active theme
    */
   function execute() {
+    $theme = NULL;
+    
     foreach ($this->get_contexts() as $k => $v) {
       if ($v->reactions['active_theme']['theme']){
-        global $custom_theme;
-        $custom_theme = $v->reactions['active_theme']['theme'];
+        $theme = $v->reactions['active_theme']['theme'];
       }
     }
     
+    return $theme;    
   }
 }
