diff --git a/src/vendor/erdiko/core/Response.php b/src/vendor/erdiko/core/Response.php
index <HASH>..<HASH> 100755
--- a/src/vendor/erdiko/core/Response.php
+++ b/src/vendor/erdiko/core/Response.php
@@ -67,7 +67,8 @@ class Response
      */
     public function getThemeName()
     {
-        return $this->_themeName;
+        $name = (empty($this->_themeName)) ? $this->_theme->getName() : $this->_themeName;
+        return $name;
     }
 
     /**
diff --git a/src/vendor/erdiko/core/Theme.php b/src/vendor/erdiko/core/Theme.php
index <HASH>..<HASH> 100755
--- a/src/vendor/erdiko/core/Theme.php
+++ b/src/vendor/erdiko/core/Theme.php
@@ -147,6 +147,11 @@ class Theme extends Container
         $this->_name = $name;
     }
 
+    public function getName()
+    {
+        return $this->_name;
+    }
+
     /**
      * Get template file populated by the config
      * e.g. get header/footer
Updated response class and theme class.