2 files changed, 6 insertions, 4 deletions
diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php
index e9ff9791..3255f04d 100644
--- a/core/libraries/Admin_View.php
+++ b/core/libraries/Admin_View.php
@@ -28,9 +28,10 @@ class Admin_View_Core extends View {
    * @param   string  $theme_name view name
    * @return  void
    */
-  public function __construct($name, $theme_name="default") {
+  public function __construct($name) {
     parent::__construct($name);
-    $this->theme_name = $theme_name;
+
+    $this->theme_name = module::get_var("core", "active_admin_theme");
     $this->set_global('theme', $this);
     $this->set_global('user', user::active());
   }
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index 030e564d..37507a70 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -29,9 +29,10 @@ class Theme_View_Core extends View {
    * @param   string  $theme_name view name
    * @return  void
    */
-  public function __construct($name, $page_type, $theme_name="default") {
+  public function __construct($name, $page_type) {
     parent::__construct($name);
-    $this->theme_name = $theme_name;
+
+    $this->theme_name = module::get_var("core", "active_theme");
     $this->set_global('theme', $this);
     $this->set_global('user', user::active());
     $this->set_global("page_type", $page_type);