diff --git a/ApplicationAbstract.php b/ApplicationAbstract.php
index 0458f595b..b69dfe3c4 100644
--- a/ApplicationAbstract.php
+++ b/ApplicationAbstract.php
@@ -58,7 +58,15 @@ class ApplicationAbstract
      * @var int
      * @since 1.0.0
      */
-    protected $orgId = 1;
+    protected $orgId = 0;
+
+    /**
+     * App theme.
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    protected $theme = '';
 
     /**
      * Database object.
diff --git a/Views/ViewAbstract.php b/Views/ViewAbstract.php
index 1418a4484..1ad6c42c4 100644
--- a/Views/ViewAbstract.php
+++ b/Views/ViewAbstract.php
@@ -256,6 +256,7 @@ abstract class ViewAbstract implements RenderableInterface
             $includeData = include $path;
             $ob          = (string) \ob_get_clean();
 
+            // todo: is this correct? finally is still called.
             if (\is_array($includeData)) {
                 return (string) \json_encode($includeData);
             }