diff --git a/src/flextype/core/Cache/Cache.php b/src/flextype/core/Cache/Cache.php
index 591fbf8c..04486b04 100755
--- a/src/flextype/core/Cache/Cache.php
+++ b/src/flextype/core/Cache/Cache.php
@@ -67,7 +67,7 @@ class Cache
         $this->now = time();
 
         // Create cache key to allow invalidate all cache on configuration changes.
-        $this->key = ($this->flextype['registry']->get('flextype.cache.prefix') ?? 'flextype') . '-' . md5(PATH['site'] . 'Flextype::VERSION');
+        $this->key = ($this->flextype['registry']->get('flextype.settings.cache.prefix') ?? 'flextype') . '-' . md5(PATH['site'] . 'Flextype::VERSION');
 
         // Get Cache Driver
         $this->driver = $this->getCacheDriver();
@@ -117,7 +117,7 @@ class Cache
      */
     public function fetch(string $id)
     {
-        if ($this->flextype['registry']->get('flextype.cache.enabled')) {
+        if ($this->flextype['registry']->get('flextype.settings.cache.enabled')) {
             return $this->driver->fetch($id);
         }
 
@@ -133,7 +133,7 @@ class Cache
      */
     public function contains(string $id) : bool
     {
-        if ($this->flextype['registry']->get('flextype.cache.enabled')) {
+        if ($this->flextype['registry']->get('flextype.settings.cache.enabled')) {
             return $this->driver->contains($id);
         }
 
@@ -153,7 +153,7 @@ class Cache
      */
     public function save(string $id, $data, ?int $lifetime = null) : void
     {
-        if (! $this->flextype['registry']->get('flextype.cache.enabled')) {
+        if (! $this->flextype['registry']->get('flextype.settings.cache.enabled')) {
             return;
         }
 
@@ -168,7 +168,7 @@ class Cache
      */
     public function delete(string $id) : void
     {
-        if (! $this->flextype['registry']->get('flextype.cache.enabled')) {
+        if (! $this->flextype['registry']->get('flextype.settings.cache.enabled')) {
             return;
         }
 
@@ -237,7 +237,7 @@ class Cache
     public function getLifetime()
     {
         if ($this->lifetime === null) {
-            $this->lifetime = $this->flextype['registry']->get('flextype.cache.lifetime') ?: 604800;
+            $this->lifetime = $this->flextype['registry']->get('flextype.settings.cache.lifetime') ?: 604800;
         }
 
         return $this->lifetime;
diff --git a/src/flextype/core/Cache/MemcachedAdapter.php b/src/flextype/core/Cache/MemcachedAdapter.php
index 4c93d632..fdf3fc1e 100644
--- a/src/flextype/core/Cache/MemcachedAdapter.php
+++ b/src/flextype/core/Cache/MemcachedAdapter.php
@@ -19,8 +19,8 @@ class MemcachedAdapter implements CacheAdapterInterface
     {
         $memcached = new Memecached();
         $memcached->addServer(
-            $this->flextype['registry']->get('flextype.cache.memcached.server', 'localhost'),
-            $this->flextype['registry']->get('flextype.cache.memcache.port', 11211)
+            $this->flextype['registry']->get('flextype.settings.cache.memcached.server', 'localhost'),
+            $this->flextype['registry']->get('flextype.settings.cache.memcache.port', 11211)
         );
 
         $driver = new MemcachedCache();
diff --git a/src/flextype/core/Cache/RedisAdapter.php b/src/flextype/core/Cache/RedisAdapter.php
index 91583a6f..c6a15ab9 100644
--- a/src/flextype/core/Cache/RedisAdapter.php
+++ b/src/flextype/core/Cache/RedisAdapter.php
@@ -19,15 +19,15 @@ class RedisAdapter implements CacheAdapterInterface
     public function getDriver() : object
     {
         $redis    = new Redis();
-        $socket   = $this->flextype['registry']->get('flextype.cache.redis.socket', false);
-        $password = $this->flextype['registry']->get('flextype.cache.redis.password', false);
+        $socket   = $this->flextype['registry']->get('flextype.settings.cache.redis.socket', false);
+        $password = $this->flextype['registry']->get('flextype.settings.cache.redis.password', false);
 
         if ($socket) {
             $redis->connect($socket);
         } else {
             $redis->connect(
-                $this->flextype['registry']->get('flextype.cache.redis.server', 'localhost'),
-                $this->flextype['registry']->get('flextype.cache.redis.port', 6379)
+                $this->flextype['registry']->get('flextype.settings.cache.redis.server', 'localhost'),
+                $this->flextype['registry']->get('flextype.settings.cache.redis.port', 6379)
             );
         }
 
diff --git a/src/flextype/core/Cache/SQLite3Adapter.php b/src/flextype/core/Cache/SQLite3Adapter.php
index 1a9adce7..4bef6305 100644
--- a/src/flextype/core/Cache/SQLite3Adapter.php
+++ b/src/flextype/core/Cache/SQLite3Adapter.php
@@ -24,8 +24,8 @@ class SQLite3Adapter implements CacheAdapterInterface
             Filesystem::createDir($cache_directory);
         }
 
-        $db = new SQLite3($cache_directory . $this->flextype['registry']->get('flextype.cache.sqlite3.database', 'flextype') . '.db');
+        $db = new SQLite3($cache_directory . $this->flextype['registry']->get('flextype.settings.cache.sqlite3.database', 'flextype') . '.db');
 
-        return new SQLite3Cache($db, $this->flextype['registry']->get('flextype.cache.sqlite3.table', 'flextype'));
+        return new SQLite3Cache($db, $this->flextype['registry']->get('flextype.settings.cache.sqlite3.table', 'flextype'));
     }
 }
diff --git a/src/flextype/core/Entries/Entries.php b/src/flextype/core/Entries/Entries.php
index 15ec40bc..e8e58201 100755
--- a/src/flextype/core/Entries/Entries.php
+++ b/src/flextype/core/Entries/Entries.php
@@ -503,8 +503,8 @@ class Entries
                 // Check if new entry file exists
                 if (! Filesystem::has($entry_file = $entry_dir . '/entry.md')) {
                     $data['uuid']         = Uuid::uuid4()->toString();
-                    $data['published_at'] = date($this->flextype->registry->get('flextype.date_format'), time());
-                    $data['created_at']   = date($this->flextype->registry->get('flextype.date_format'), time());
+                    $data['published_at'] = date($this->flextype->registry->get('flextype.settings.date_format'), time());
+                    $data['created_at']   = date($this->flextype->registry->get('flextype.settings.date_format'), time());
                     $data['published_by'] = (Session::exists('uuid') ? Session::get('uuid') : '');
                     $data['created_by']   = (Session::exists('uuid') ? Session::get('uuid') : '');
 
diff --git a/src/flextype/core/Parsers/Parser.php b/src/flextype/core/Parsers/Parser.php
index fdaf1934..858acb2f 100644
--- a/src/flextype/core/Parsers/Parser.php
+++ b/src/flextype/core/Parsers/Parser.php
@@ -103,7 +103,7 @@ class Parser
     {
         switch ($parser) {
             case 'frontmatter':
-                if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
+                if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
                     $key = md5($input);
 
                     if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -120,7 +120,7 @@ class Parser
 
                 break;
             case 'json':
-                if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
+                if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
                     $key = md5($input);
 
                     if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -137,7 +137,7 @@ class Parser
 
                 break;
             case 'yaml':
-                if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
+                if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
                     $key = md5($input);
 
                     if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -154,7 +154,7 @@ class Parser
 
                 break;
             case 'markdown':
-                if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
+                if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
                     $key = md5($input);
 
                     if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
diff --git a/src/flextype/core/Plugins/Plugins.php b/src/flextype/core/Plugins/Plugins.php
index 4bd8ba66..caab7ebd 100755
--- a/src/flextype/core/Plugins/Plugins.php
+++ b/src/flextype/core/Plugins/Plugins.php
@@ -69,7 +69,7 @@ class Plugins
         $this->flextype['registry']->set('plugins', []);
 
         // Set locale
-        $locale = $this->flextype['registry']->get('flextype.locale');
+        $locale = $this->flextype['registry']->get('flextype.settings.locale');
 
         // Get plugins list
         $plugins_list = $this->getPluginsList();
diff --git a/src/flextype/dependencies.php b/src/flextype/dependencies.php
index 10d14287..ca29a36b 100644
--- a/src/flextype/dependencies.php
+++ b/src/flextype/dependencies.php
@@ -74,12 +74,12 @@ $flextype['emitter'] = static function ($container) {
  */
 $flextype['slugify'] = static function ($container) {
     return new Slugify([
-        'separator' => $container['registry']->get('flextype.slugify.separator'),
-        'lowercase' => $container['registry']->get('flextype.slugify.lowercase'),
-        'trim' => $container['registry']->get('flextype.slugify.trim'),
-        'regexp' => $container['registry']->get('flextype.slugify.regexp'),
-        'lowercase_after_regexp' => $container['registry']->get('flextype.slugify.lowercase_after_regexp'),
-        'strip_tags' => $container['registry']->get('flextype.slugify.strip_tags'),
+        'separator' => $container['registry']->get('flextype.settings.slugify.separator'),
+        'lowercase' => $container['registry']->get('flextype.settings.slugify.lowercase'),
+        'trim' => $container['registry']->get('flextype.settings.slugify.trim'),
+        'regexp' => $container['registry']->get('flextype.settings.slugify.regexp'),
+        'lowercase_after_regexp' => $container['registry']->get('flextype.settings.slugify.lowercase_after_regexp'),
+        'strip_tags' => $container['registry']->get('flextype.settings.slugify.strip_tags'),
     ]);
 };
 
@@ -87,7 +87,7 @@ $flextype['slugify'] = static function ($container) {
  * Adds the cache adapter to the Flextype container
  */
 $flextype['cache_adapter'] = static function ($container) use ($flextype) {
-    $driver_name = $container['registry']->get('flextype.cache.driver');
+    $driver_name = $container['registry']->get('flextype.settings.cache.driver');
 
     if (! $driver_name || $driver_name === 'auto') {
         if (extension_loaded('apcu')) {
diff --git a/src/flextype/endpoints/delivery/entries.php b/src/flextype/endpoints/delivery/entries.php
index e5611313..ef875ac0 100644
--- a/src/flextype/endpoints/delivery/entries.php
+++ b/src/flextype/endpoints/delivery/entries.php
@@ -34,9 +34,9 @@ $app->get('/api/delivery/entries', function (Request $request, Response $respons
 
     // Set variables
     $id   = $query['id'];
-    $args = $query['args'] ?? null;
+    $data = $query['args'] ?? null;
 
-    if ($flextype['registry']->get('flextype.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
         // Validate delivery token
         if (validate_delivery_entries_token($request, $flextype)) {
             $delivery_entries_token_file_path = PATH['site'] . '/tokens/delivery/entries/' . $request->getQueryParams()['token'] . '/token.yaml';
@@ -49,7 +49,7 @@ $app->get('/api/delivery/entries', function (Request $request, Response $respons
                 }
 
                 // Fetch entry
-                $data = $flextype['entries']->fetch($id, $args);
+                $data = $flextype['entries']->fetch($id, $data);
 
                 // Set response code
                 $response_code = count($data) > 0 ? 200 : 404;
diff --git a/src/flextype/endpoints/delivery/images.php b/src/flextype/endpoints/delivery/images.php
index 6a4d3103..2fa845a0 100644
--- a/src/flextype/endpoints/delivery/images.php
+++ b/src/flextype/endpoints/delivery/images.php
@@ -32,7 +32,7 @@ $app->get('/api/delivery/images/{path:.+}', function (Request $request, Response
     // Get Query Params
     $query = $request->getQueryParams();
 
-    if ($flextype['registry']->get('flextype.api.images.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.images.enabled')) {
         // Validate delivery image token
         if (validate_delivery_images_token($request, $flextype)) {
             $delivery_images_token_file_path = PATH['site'] . '/site/delivery/images/' . $request->getQueryParams()['token'] . '/token.yaml';
diff --git a/src/flextype/endpoints/delivery/registry.php b/src/flextype/endpoints/delivery/registry.php
index f7f3fb0a..e1cdbfea 100644
--- a/src/flextype/endpoints/delivery/registry.php
+++ b/src/flextype/endpoints/delivery/registry.php
@@ -34,7 +34,7 @@ $app->get('/api/delivery/registry', function (Request $request, Response $respon
     // Set variables
     $id = $query['id'];
 
-    if ($flextype['registry']->get('flextype.api.registry.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.registry.enabled')) {
         // Validate delivery token
         if (validate_delivery_registry_token($request, $flextype)) {
             $delivery_registry_token_file_path = PATH['site'] . '/tokens/delivery/registry/' . $request->getQueryParams()['token'] . '/token.yaml';