diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0e962caa..cc008c50 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest]
         php: ['7.4', '8.0']
         dependency-version: [prefer-stable]
 
diff --git a/.htaccess b/.htaccess
index 78941dce..a08fddbc 100755
--- a/.htaccess
+++ b/.htaccess
@@ -17,7 +17,7 @@
 
 RewriteEngine On
 
-RewriteBase /
+RewriteBase /flextype/
 
 ## Begin - Exploits
 # If you experience problems on your site block out the operations listed below
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
new file mode 100644
index 00000000..887df1d5
--- /dev/null
+++ b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/FindHelperTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/HelpersTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/EntriesShortcodeTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/RawShortcodeTest.php::test":4,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::has":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::get":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::move":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::copy":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::macro":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::create":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::mixin":4,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::fetch":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::update":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::delete":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesBlogTest.php::create":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/EntriesFieldTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/ParsersFieldTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/PublishedByFieldTest.php::test":3,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/RegistryFieldTest.php::test":4,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/PublishedByFieldTest.php::PublishedByField":3},"times":{"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::create":0.004,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/FilterHelperTest.php::test":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/FindHelperTest.php::test":0.003,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/FlextypeTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/HelpersTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/MarkdownTest.php::test":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/ShortcodeTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/EntriesShortcodeTest.php::test":0.008,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/RawShortcodeTest.php::test":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/RegistryShortcodeTest.php::test":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/UrlShortcodeTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/PluginsTest.php::test":0.005,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/FrontmatterTest.php::test":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/JsonTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/NeonTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpArrayTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpCodeTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/YamlTest.php::test":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::has":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::update":0.004,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::delete":0.007,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::move":0.008,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::copy":0.009,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::test":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::registry":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::macro":0.012,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::mixin":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesTest.php::fetch":0.007,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/HelpersTest.php::test":0.036,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/FlextypeTest.php::get":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/PluginsTest.php::get":0.007,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/FrontmatterTest.php::encode":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/FrontmatterTest.php::decode":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/FrontmatterTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/MarkdownTest.php::get":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/MarkdownTest.php::parse":0.057,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/ShortcodesTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/ShortcodesTest.php::add":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/ShortcodesTest.php::parse":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/JsonTest.php::encode":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/JsonTest.php::decode":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/JsonTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/NeonTest.php::encode":0.013,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/NeonTest.php::decode":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/NeonTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpArrayTest.php::encode":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpArrayTest.php::decode":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpArrayTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpCodeTest.php::encode":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpCodeTest.php::decode":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/PhpCodeTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/YamlTest.php::encode":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/YamlTest.php::decode":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Serializers\/YamlTest.php::get":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/EntriesShortcodeTest.php::[entries_fetch]":0.004,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/RawShortcodeTest.php::[raw]":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/RegistryShortcodeTest.php::[registry_get]":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/UrlShortcodeTest.php::[registry_get]":0.001,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Parsers\/Shortcodes\/UrlShortcodeTest.php::[url]":0,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/EntriesBlogTest.php::create":0.008,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/CreatedAtFieldTest.php::test":0.003,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/CreatedByFieldTest.php::test":0.017,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/EntriesFieldTest.php::test":0.005,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/IdFieldTest.php::test":0.005,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/ModifiedAtFieldTest.php::test":0.015,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/ParsersFieldTest.php::test":0.044,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/PublishedAtFieldTest.php::test":0.002,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/PublishedByFieldTest.php::test":0.009,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/RegistryFieldTest.php::test":0.016,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/RoutableFieldTest.php::test":0.007,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/SlugFieldTest.php::test":0.006,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/UuidFieldTest.php::test":0.012,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/VisibilityFieldTest.php::test":0.007,"\/Applications\/MAMP\/htdocs\/flextype\/tests\/src\/flextype\/core\/Entries\/Fields\/PublishedByFieldTest.php::PublishedByField":0.046}}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86ab04f2..ad000734 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,17 +3,25 @@
 
 ### Features
 
-* **core**: Core updated from Slim 3 to Slim4!
+* **core**: Core updated from Slim 3 to Slim 4!
 
     See: [Upgrade Guide](https://www.slimframework.com/docs/v4/start/upgrade.html)
 
 * **core**: PHP-DI added instead of Pimple DI.
 
+  See: [Usage Guide](https://php-di.org/doc/frameworks/slim.html)
+
 * **entries**: Added ability to create completely customizable high level collections for entries.
 
-    Example: https://github.com/flextype/flextype/issues/563#issuecomment-893507342
+    Example: https://github.com/flextype/flextype/issues/563
 
-* **entries**: Added new method `getOptions`.
+* **entries**: Added ability to set custom actions for each entries collections.
+
+* **entries**: Added new method `getOptions` to get entries options.
+
+* **entries**: Added new method `setOptions` to set entries options.
+
+* **entries**: Added new method `setRegistry` to set entries registry.
 
 * **entries**: Added ability to override logic for built-in custom fields.
 
@@ -52,12 +60,65 @@
     ...
     ```
 
-* **media**: Added new Media API based on core Entries API.
+* **endpoints** All Rest API Endpoints codebase were rewritten from scratch.
 
-* **content**: Added new Content API based on core Entries API.
+* **endpoints** New Rest API Endpoint `/api/utils/cache/clear`.
+
+    ```
+    Clear cache
+    
+    endpoint: POST /api/utils/cache/clear
+    
+    Body:
+      token        - [REQUIRED] - Valid public token.
+      access_token - [REQUIRED] - Valid access token.
+    
+    Returns:
+      Returns an empty body with HTTP status 204
+    ```
 
 * **images** League Glide updated to Glide 2.
 
+* **images** added ablity to define League Glide settings.
+
+    ```yaml
+    api:
+      images:
+        
+        # Set to true to enable Images API
+        enabled: true
+
+        # Images driver (gd, imagick)
+        driver: gd
+
+        # Images directory.
+        directory: '/uploads'
+
+        # Images max size
+        max_image_size: 
+
+          # Image max width
+          width: 2000 
+
+          # Image max height
+          height: 2000
+
+        # Images watermarks
+        watermarks: 
+
+          # Images watermarks directory
+          directory: '/watermarks'
+
+        # Images cache
+        cache:
+
+          # Images cache directory
+          directory: '/images'
+        
+        # Group of presets for images processing.
+        presets: []
+    ```
+
 * **csrf**: Added Atomastic CSRF protection for Cross Site Request Forgery protection by comparing provided token with session token to ensure request validity.
 
 * **serializers**: Added new serializer `Neon`. 
@@ -120,7 +181,7 @@
           allowed: ['yaml', 'json', 'neon']
     ```
 
-* **parsers**: Markdown parser [Commonmark updated to v2](https://commonmark.thephpleague.com/2.0/upgrading/). 
+* **parsers**: Markdown parser [Commonmark updated to v2](https://commonmark.thephpleague.com/2.0/upgrading/)
 
 * **parsers**: Added ability to set global settings for all parsers. 
 
@@ -204,7 +265,7 @@
 
 * **cache**: Added new cache driver `Phparray` to storage cache data in raw php arrays files.
 
-* **helpers**: All core helpers are located in the `/src/flextype/helpers.php`.
+* **helpers**: All core helpers are located in the `/src/flextype/helpers/`.
 
 * **helpers**: Added helper function `app` to get Flextype Application instance.
 
@@ -214,7 +275,7 @@
 
 * **helpers**: Added helper function `cache` to get Flextype Cache Service.
 
-* **helpers**: Added helper function `content` to get Flextype Content Service.
+* **helpers**: Added helper function `entries` to get Flextype Entries Service.
 
 * **helpers**: Added helper function `media` to get Flextype Media Service.
 
@@ -230,13 +291,92 @@
 
 * **helpers**: Added helper function `plugins` to get Flextype Plugins Service.
 
-* **helpers**: Added helper function `image` to create a new image instance.
+* **helpers**: Added helper function `imageFile` to create a new image instance for image file.
 
 * **helpers**: Added helper function `imageCanvas` to create a new image canvas instance.
 
-* **helpers**: Added helper function `imageCache` to create a new cached image instance.
+* **helpers**: Added helper function `token` to generate unique token.
 
-* **macros**: All core macros are located in the `/src/flextype/macros.php`.
+* **helpers**: Added helper function `tokenHash` to generate unique token hash.
+
+* **helpers**: Added helper function `tokenHashValidate` to validate token hash.
+
+* **helpers**: Added helper function `urlFor` to get url for a named route.
+
+* **helpers**: Added helper function `fullUrlFor` to get full url for a named route.
+
+* **helpers**: Added helper function `isCurrentUrl` to determine is current url equal to route name.
+
+* **helpers**: Added helper function `getCurrentUrl` to get current path on given Uri.
+
+* **helpers**: Added helper function `getBasePath` to get base path.
+
+* **helpers**: Added helper function `setBasePath` to set base path.
+
+* **helpers**: Added helper function `redirect` to create redirect.
+
+* **helpers**: Added helper function `upload` to upload files and process uloaded images.
+
+* **uploder**: Added Sirius Uploader for file upload. 
+
+    ```yaml
+    # Upload
+    upload:
+
+      # Uploads directory
+      directory: '/uploads'
+
+      # Overwrite existing files.
+      overwrite: true
+
+      # Auto-confirm uploads.
+      autoconfirm: false
+
+      # Prefixing uploads.
+      prefix: ''
+
+      # Validation options
+      validation:
+
+        # Allowed file extensions.
+        allowed_file_extensions: ['gif', 'jpg', 'jpeg', 'png', 'ico', 'webm', 'svg']
+
+        # Maximum file size.
+        max_file_size: '24M'
+
+        # Image validation options
+        image:
+        
+          # Image maxiumum and minimum width
+          width:
+            max: 4920
+            min: 100
+
+          # Image maxiumum and minimum height
+          height: 
+            max: 3264
+            min: 100
+        
+          # Image ratio
+          #ratio:
+          #  The option can be a number (eg: 1.3) or a ratio-like string (eg: 4:3, 16:9).
+          #  size: 1.3
+
+          #  The option error_margin specifies how much the image is allowed to 
+          #  deviate from the target ratio. Default value is 0.
+          #  error_margin: 0
+
+      # Process uploaded files
+      process:
+
+        # Images process settings
+        image:
+
+          # Image quality
+          quality: 70
+    ```
+
+* **macros**: All core macros are located in the `/src/flextype/macros/`.
 
 * **macros**: Added `onlyFromCollection` and `exceptFromCollection` macros for Arrays ([#553](https://github.com/flextype/flextype/issues/553))
 
@@ -254,49 +394,47 @@
 
 ### BREAKING CHANGES
 
-* **core** Use new helpers functions to access Flextype Services.
+* **helpers** Use new helpers functions to access Flextype Services.
 
-  * use `content()` instead of `flextype('entries')`
+  * use `entries()` instead of `flextype('entries')`
   * use `session()` instead of `flextype('session')`
   * use `cache()` instead of `flextype('cache')`
   * use `app()` instead of `flextype()`
   * use `container()` instead of `flextype('container_name_here')`
   * use `parsers()` instead of `flextype('parsers')`
   * use `serializers()` instead of `flextype('serializers')`
-  * use `media()` instead of `flextype('media')`
   * use `plugins()` instead of `flextype('plugins')`
   * use `emitter()` instead of `flextype('emitter')`
   * use `logger()` instead of `flextype('logger')`
   * use `registry()` instead of `flextype('registry')`
 
-* **core**: Use helper function `app` to access Flextype Application instance instead of old helper function `flextype()`.
+* **helpers**: Use helper function `app` to access Flextype Application instance instead of old helper function `flextype()`.
 
-* **core**: Use helper function `container` to access Flextype Application container instead of old helper function `flextype()` with container name argument.
+* **helpers**: Use helper function `container` to access Flextype Application container instead of old helper function `flextype()` with container name argument.
 
-  * use `container()->get('content')` instead of `flextype('entries')`
-  * use `container()->set('content', new Content())` instead of `flextype()['content'] = new Content()`
+  * use `container()->get('entries')` instead of `flextype('entries')`
+  * use `container()->set('content', new Entries())` instead of `flextype()['entries'] = new Entries()`
 
-* **entries**: Don't use Entries API directly. Instead, you should use API's based on Entries API. e.g. built-in Content API, Media API, or create your own by extending Entries API.
+* **helpers**: Use helper function `filterCollection` instead of old `filter`.
 
-* **entries**: Project entries moved from `/project/entries/` to `/project/entries/content/`.
+* **tokens**: Project tokens moved from `/project/tokens/` to `/project/entries/tokens/`.
 
-* **content**: Content API for content manipulations instead of base Entries API. 
+* **entries**: Changes for etnries memory storage.
 
-  * use `content()->fetch()` instead of `flextype('entries')->fetch()`
-  * use `content()->create()` instead of `flextype('entries')->create()`
-  * use `content()->delete()` instead of `flextype('entries')->delete()`
-  etc...
-
-* **content**: Changes for content(prev. entries) memory storage.
-
-  * use `content()->registry()->get()` instead of `flextype('entries')->storage()->get()`
-  * use `content()->registry()->set()` instead of `flextype('entries')->storage()->set()`
-  * use `content()->registry()->has()` instead of `flextype('entries')->storage()->has()`
-  * use `content()->registry()->delete()` instead of `flextype('entries')->storage()->delete()`
+  * use `entries()->registry()->get()` instead of `flextype('entries')->storage()->get()`
+  * use `entries()->registry()->set()` instead of `flextype('entries')->storage()->set()`
+  * use `entries()->registry()->has()` instead of `flextype('entries')->storage()->has()`
+  * use `entries()->registry()->delete()` instead of `flextype('entries')->storage()->delete()`
 
   note: all method from Atomastic Arrays are available for Arrays Storage Object manipulations
   docs: https://github.com/atomastic/arrays
 
+### Refactoring
+
+* **core**: general code refactoring and improvements.
+
+* **tests**: All unit tests were rewritten.
+
 <a name="0.9.16"></a>
 # [0.9.16](https://github.com/flextype/flextype/compare/v0.9.15...v0.9.16) (2021-01-14)
 
diff --git a/composer.json b/composer.json
index ae32af59..b99f8d82 100755
--- a/composer.json
+++ b/composer.json
@@ -36,19 +36,17 @@
 
         "slim/slim": "^4.8.1",
 
-        "filp/whoops": "^2.14",
-
         "league/event": "^2.2.0",
-        "league/glide": "^2.0.0",
+        "intervention/image":  "^2.6.1",
 
         "phpfastcache/phpfastcache": "^8.0.6",
 
         "respect/validation": "^2.2.3",
         "monolog/monolog": "^2.3.2",
         "cocur/slugify": "^4.0.0",
-        "ramsey/uuid": "^4.1.1",
+        "ramsey/uuid": "^4.2.1",
         "symfony/yaml": "^5.3.6",
-        "symfony/finder": "^5.3.4",
+        "symfony/finder": "^5.3.7",
 
         "thunderer/shortcode": "^0.7.4",
 
@@ -56,11 +54,15 @@
         "slim/psr7": "^1.4",
         "php-di/php-di": "^6.3.4",
         "php-di/slim-bridge": "^3.1.1",
-        "middlewares/whoops": "^2.0",
-        "nette/neon": "^3.2",
+        "nette/neon": "^3.2", 
         "league/commonmark": "^2.0",
         "siriusphp/upload": "^3.0",
+<<<<<<< HEAD
         "symfony/console": "^5.3"
+=======
+
+        "filp/whoops": "^2.14"
+>>>>>>> dev
     },
     "suggest": {
         "ext-zend-opcache": "Recommended for better performance",
diff --git a/phpunit.xml b/phpunit.xml
index 69a03bf1..01174ffa 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -11,7 +11,6 @@
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
diff --git a/project/blueprints/accounts-admin/add/blueprint.yaml b/project/blueprints/accounts-admin/add/blueprint.yaml
new file mode 100644
index 00000000..24bea36e
--- /dev/null
+++ b/project/blueprints/accounts-admin/add/blueprint.yaml
@@ -0,0 +1,108 @@
+title: Create new account
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_account_add
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                      - name: roles
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: password
+                        properties:
+                          type: string
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.accounts.edit"
+                      args:
+                        id: "{{ query.id }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('accounts_admin_create_new_account') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_create') }}"
+                  - type: Row
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputEmail
+                            properties:
+                              name: id
+                              label:
+                                value: "{{ __('accounts_admin_email') }}"
+                              validation:
+                                required: true
+                                pattern: '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{1,63}$'
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputPassword
+                            properties:
+                              name: password
+                              label:
+                                value: "{{ __('accounts_admin_password') }}"
+                              validation:
+                                required: true 
+                                pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Tagify
+                            properties:
+                              name: roles
+                              label:
+                                value: "{{ __('accounts_admin_roles') }}"
\ No newline at end of file
diff --git a/project/blueprints/accounts-admin/blueprint.yaml b/project/blueprints/accounts-admin/blueprint.yaml
new file mode 100644
index 00000000..e4fed0a4
--- /dev/null
+++ b/project/blueprints/accounts-admin/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Accounts Admin
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('accounts_admin_accounts') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create') }}"
+                  href: "{{ urlFor('admin.accounts.add') }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/accounts-admin/edit/blueprint.yaml b/project/blueprints/accounts-admin/edit/blueprint.yaml
new file mode 100644
index 00000000..71d42301
--- /dev/null
+++ b/project/blueprints/accounts-admin/edit/blueprint.yaml
@@ -0,0 +1,159 @@
+title: Edit account
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_account_edit
+                  process:
+                    fields:
+                      - name: name
+                        properties:
+                          type: string
+                      - name: bio
+                        properties:
+                          type: string
+                      - name: location
+                        properties:
+                          type: string
+                      - name: website
+                        properties:
+                          type: string
+                      - name: roles
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: new_password
+                        properties:
+                          type: string
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.accounts.edit"
+                      args:
+                        id: "{{ query.id }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('accounts_admin_edit_account') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Row
+                            properties:
+                              class: g-3
+                            blocks:
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputText
+                                    properties:
+                                      name: name
+                                      label:
+                                        value: "{{ __('accounts_admin_name') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputTextarea
+                                    properties:
+                                      name: bio
+                                      rows: 8
+                                      label:
+                                        value: "{{ __('accounts_admin_bio') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Row
+                            properties:
+                              class: g-3
+                            blocks:
+                              - type: Column
+                                properties:
+                                  size: 6/12
+                                blocks:
+                                  - type: InputText
+                                    properties:
+                                      name: location
+                                      label:
+                                        value: "{{ __('accounts_admin_location') }}"
+                              - type: Column
+                                properties:
+                                  size: 6/12
+                                blocks:
+                                  - type: InputText
+                                    properties:
+                                      name: website
+                                      label:
+                                        value: "{{ __('accounts_admin_website') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: Tagify
+                                    properties:
+                                      name: roles
+                                      label:
+                                        value: "{{ __('accounts_admin_roles') }}"
+                              - type: Column
+                                properties:
+                                  size: 6/12
+                                blocks:
+                                  - type: Select2
+                                    properties:
+                                      name: state
+                                      value: enabled
+                                      items: 
+                                        enabled: "{{ __('admin_enabled') }}"
+                                        disabled: "{{ __('admin_disabled') }}"
+                                      label:
+                                        value: "{{ __('admin_state') }}"
+                              - type: Column
+                                properties:
+                                  size: 6/12
+                                blocks:
+                                  - type: InputPassword
+                                    properties:
+                                      name: new_password
+                                      label:
+                                        value: "{{ __('accounts_admin_new_password') }}"
\ No newline at end of file
diff --git a/project/blueprints/accounts-admin/login/blueprint.yaml b/project/blueprints/accounts-admin/login/blueprint.yaml
new file mode 100644
index 00000000..d49c8a97
--- /dev/null
+++ b/project/blueprints/accounts-admin/login/blueprint.yaml
@@ -0,0 +1,83 @@
+title: Login
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_account_login
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                      - name: password
+                        properties:
+                          type: string
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 4/12
+                          style:
+                            margin: 0 auto
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('accounts_admin_login') }}"
+                          - type: Row
+                            properties:
+                              class: g-3 mt-2
+                            blocks:
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputEmail
+                                    properties:
+                                      name: id
+                                      validation:
+                                        required: true
+                                        pattern: '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{1,63}$'
+                                      label:
+                                        value: "{{ __('accounts_admin_email') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputPassword
+                                    properties:
+                                      name: password
+                                      validation:
+                                        required: true 
+                                        pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+                                      label:
+                                        value: "{{ __('accounts_admin_password') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mt-4
+                                blocks:
+                                  - type: InputSubmit
+                                    properties:
+                                      name: submit
+                                      value: "{{ __('accounts_admin_login') }}"
+                                  - type: Anchor
+                                    properties:
+                                      class: btn btn-link
+                                      value: "{{ __('accounts_admin_forgot_password') }}"
+                                      href: "./reset-password"
+                                      
\ No newline at end of file
diff --git a/project/blueprints/accounts-admin/registration/blueprint.yaml b/project/blueprints/accounts-admin/registration/blueprint.yaml
new file mode 100644
index 00000000..b77bd35b
--- /dev/null
+++ b/project/blueprints/accounts-admin/registration/blueprint.yaml
@@ -0,0 +1,102 @@
+title: Registration
+icon:
+  set: bootstrap
+  name: file-text
+vars:
+  - name: version
+    type: string
+    value: "@parsers:twig; {{ registry().get('flextype.manifest.version') }}"
+actions:
+  get:
+    - name: foo
+      properties:
+        vars:
+          - name: version
+            type: string
+            value: "@parsers:twig; {{ registry().get('flextype.manifest.version') }}"     
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        vars: 
+          - name: version
+            type: string
+            value: "@parsers:twig; {{ registry().get('flextype.manifest.version') }}"
+        value: |
+          @parsers:twig; 
+          Flextype: {{ version }}
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_account_registration
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                      - name: password
+                        properties:
+                          type: string
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 4/12
+                          style:
+                            margin: 0 auto
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "@parsers:twig;{{ __('accounts_admin_create_new_account') }} - {{ version }}"
+                          - type: Row
+                            properties:
+                              class: g-3 mt-2
+                            blocks:
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputEmail
+                                    properties:
+                                      name: id
+                                      label:
+                                        value: "@parsers:twig;{{ __('accounts_admin_email') }}"
+                                      validation:
+                                        required: true
+                                        pattern: '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{1,63}$'
+                                      help: "@parsers:twig;{{ __('accounts_admin_installation_email_tip') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputPassword
+                                    properties:
+                                      name: password
+                                      label:
+                                        value: "@parsers:twig;{{ __('accounts_admin_password') }}"
+                                      validation:
+                                        required: true 
+                                        pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+                                      help: "@parsers:twig;{{ __('accounts_admin_installation_password_tip') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mt-4
+                                blocks:
+                                  - type: InputSubmit
+                                    properties:
+                                      name: submit
+                                      value: "@parsers:twig;{{ __('accounts_admin_create') }}"
\ No newline at end of file
diff --git a/project/blueprints/accounts-admin/reset-password/blueprint.yaml b/project/blueprints/accounts-admin/reset-password/blueprint.yaml
new file mode 100644
index 00000000..28348839
--- /dev/null
+++ b/project/blueprints/accounts-admin/reset-password/blueprint.yaml
@@ -0,0 +1,70 @@
+title: Reset password
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_account_reset_password
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                      - name: password
+                        properties:
+                          type: string
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 4/12
+                          style:
+                            margin: 0 auto
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('accounts_admin_reset_password') }}"
+                          - type: Row
+                            properties:
+                              class: g-3 mt-2
+                            blocks:
+                              - type: Column
+                                properties:
+                                  size: 12
+                                blocks:
+                                  - type: InputEmail
+                                    properties:
+                                      name: id
+                                      validation:
+                                        required: true
+                                        pattern: '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{1,63}$'
+                                      label:
+                                        value: "{{ __('accounts_admin_email') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mt-4
+                                blocks:
+                                  - type: InputSubmit
+                                    properties:
+                                      name: submit
+                                      value: "{{ __('accounts_admin_reset') }}"
+                                  - type: Anchor
+                                    properties:
+                                      class: btn btn-link
+                                      value: "{{ __('accounts_admin_cancel') }}"
+                                      href: "./login"
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/account/blueprint.yaml b/project/blueprints/admin/entries/accounts/account/blueprint.yaml
new file mode 100644
index 00000000..917845da
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/account/blueprint.yaml
@@ -0,0 +1,222 @@
+title: Account
+icon:
+  set: bootstrap
+  name: people-circle
+admin:
+  entries:
+    accounts:
+      account:
+        item: 
+          emitter:
+            addListener:
+              - name: onAdminThemeTail
+                properties:
+                  value: |
+                    <form id="delete-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
+                        {{ csrf() }}
+                        <input type="hidden" name="id" value="{{ entry.id }}">
+                        <input type="hidden" name="id-current" value="{{ query.id }}">
+                    </form>
+                    <form id="duplicate-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
+                        {{ csrf() }}
+                        <input type="hidden" name="id" value="{{ entry.id }}">
+                    </form>
+          blocks:
+            - type: Row
+              properties:
+                class: "m-0"
+              blocks:
+                - type: Column
+                  properties:
+                    size: 12
+                    class: card
+                  blocks:
+                    - type: Row
+                      properties:
+                        class: d-flex align-items-center row-hover
+                      blocks:
+                        - type: Column
+                          properties:
+                            size: 1/12
+                            class: p-2 text-center
+                          blocks: 
+                            - type: Display
+                              properties:
+                                class: 'asd'
+                                value: "{{ icon('person-circle', 'bootstrap') }}"
+                        - type: Column
+                          properties:
+                            size: 10/12
+                          blocks:
+                            - type: Row
+                              properties: 
+                                class: gy-2
+                              blocks:
+                                - type: Column
+                                  properties:
+                                    size: 5/12
+                                    class: p-2 px-3
+                                  blocks:
+                                    - type: Display
+                                      properties:
+                                        wrapper: div
+                                        style:
+                                          opacity: .4
+                                        value: "{{ __('Email') }}"
+                                    - type: Display
+                                      properties:
+                                        wrapper: div
+                                        value: "{{ strings(entry.id).lastSegment('/') }}"
+                        - type: Column
+                          properties:
+                            size: 1/12
+                            class: p-2 text-center
+                          blocks:
+                            - type: ActionsDropdown
+                              properties:
+                                items:
+                                  - href: "{{ urlFor('admin.entries.index') }}?id={{ entry.id }}"
+                                    value: "{{ __('View') }}"
+                                    visible: "{{ entry.has_children }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: eye
+                                  - href: "{{ urlFor('admin.entries.edit') }}?id={{ entry.id }}"
+                                    value: "{{ __('admin_edit') }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: pencil
+                                  - href: "{{ urlFor('admin.entries.add') }}?id={{ entry.id }}"
+                                    value: "{{ __('Add') }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: plus-circle
+                                  - href: "#"
+                                    value: "{{ __('admin_duplicate') }}"
+                                    events:
+                                      onclick: "event.preventDefault(); document.getElementById('duplicate-content-id-{{ entry.id }}').submit();"
+                                    icon: 
+                                      set: bootstrap
+                                      name: files
+                                  - href: "{{ urlFor('admin.entries.rename') }}?id={{ entry.id }}"
+                                    value: "{{ __('admin_rename') }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: file-font
+                                  - href: "{{ urlFor('admin.entries.move') }}?id={{ entry.id }}"
+                                    value: "{{ __('admin_move') }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: arrow-right-square
+                                  - href: "#"
+                                    events:
+                                      onclick: "confirmationEntryDelete(event, '{{ entry.id }}');"
+                                    value: "{{ __('admin_delete') }}"
+                                    icon: 
+                                      set: bootstrap
+                                      name: trash
+        edit: 
+          blocks:
+            - type: Container
+              properties:
+                breakpoint: medium
+              blocks:
+                - type: Row
+                  blocks:
+                    - type: Column
+                      blocks:
+                        - type: Form
+                          properties:
+                            name: form_account_add
+                            process:
+                              fields:
+                                - name: id
+                                  properties:
+                                    type: string
+                                - name: roles
+                                  properties:
+                                    type: string
+                                - name: state
+                                  properties:
+                                    type: string
+                                - name: password
+                                  properties:
+                                    type: string
+                              messages: 
+                                error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                                success: "{{ __('admin_message_entries_api_token_updated') }}"
+                              redirect:
+                                route: "admin.accounts.edit"
+                                args:
+                                  id: "{{ query.id }}"
+                          blocks:
+                            - type: Row
+                              properties:
+                                class: mt-4 mb-4
+                              blocks:
+                                - type: Column
+                                  properties:
+                                    size: 6/12
+                                  blocks:
+                                    - type: Heading
+                                      properties:
+                                        size: large
+                                        id: title
+                                        value: "{{ __('accounts_admin_create_new_account') }}"
+                                - type: Column
+                                  properties:
+                                    size: 6/12
+                                    class: d-flex align-items-center justify-content-end text-end 
+                                  blocks:
+                                    - type: InputSubmit
+                                      properties:
+                                        type: primary
+                                        value: "{{ __('admin_create') }}"
+                            - type: Row
+                              blocks:
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                  blocks:
+                                    - type: InputEmail
+                                      properties:
+                                        name: id
+                                        label:
+                                          value: "{{ __('accounts_admin_email') }}"
+                                        validation:
+                                          required: true
+                                          pattern: '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{1,63}$'
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                  blocks:
+                                    - type: InputPassword
+                                      properties:
+                                        name: password
+                                        label:
+                                          value: "{{ __('accounts_admin_password') }}"
+                                        validation:
+                                          required: true 
+                                          pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' 
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                  blocks:
+                                    - type: Select2
+                                      properties:
+                                        name: state
+                                        value: enabled
+                                        items: 
+                                          enabled: "{{ __('admin_enabled') }}"
+                                          disabled: "{{ __('admin_disabled') }}"
+                                        label:
+                                          value: "{{ __('admin_state') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                  blocks:
+                                    - type: Tagify
+                                      properties:
+                                        name: roles
+                                        label:
+                                          value: "{{ __('accounts_admin_roles') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/account/item/blueprint.yaml b/project/blueprints/admin/entries/accounts/account/item/blueprint.yaml
new file mode 100644
index 00000000..787659ae
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/account/item/blueprint.yaml
@@ -0,0 +1,125 @@
+title: Default
+icon:
+  set: bootstrap
+  name: file-text    
+vars:
+  - name: foo 
+    value: "@parsers:twig; {{ urlFor('admin.entries.deleteProcess') }}"                           
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        vars:
+          - name: boo
+            value: "boo"
+        value: |
+          @parsers:twig;
+          1. {{ foo }}
+          2. {{ boo }}
+          <form id="delete-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+              <input type="hidden" name="id-current" value="{{ query.id }}">
+          </form>
+          <form id="duplicate-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+          </form>
+blocks:
+  - type: Row
+    properties:
+      class: "m-0"
+    blocks:
+      - type: Column
+        properties:
+          size: 12
+          class: card
+        blocks:
+          - type: Row
+            properties:
+              class: d-flex align-items-center row-hover
+            blocks:
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks: 
+                  - type: Display
+                    properties:
+                      value: |
+                        @parsers:twig,markdown,shortcode;
+                        **Email:** {{ acl().getUserLoggedInEmail() }}
+                        **Url:** [url]
+                        {#{ icon('person-circle', 'bootstrap') }#}"
+              - type: Column
+                properties:
+                  size: 10/12
+                blocks:
+                  - type: Row
+                    properties: 
+                      class: gy-2
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 5/12
+                          class: p-2 px-3
+                        blocks:
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              style:
+                                opacity: .4
+                              value: |
+                                @twig
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              value: "{{ urlFor('admin.entries.index') }}?id={{ entry.id }}"
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks:
+                  - type: ActionsDropdown
+                    properties:
+                      items:
+                        - href: "@twig {{ urlFor('admin.entries.index') }}?id={{ entry.id }}"
+                          value: "@twig: {{ __('View') }}"
+                          visible: "@twig {{ entry.has_children }}"
+                          icon: 
+                            set: bootstrap
+                            name: eye
+                        - href: "@twig {{ urlFor('admin.entries.edit') }}?id={{ entry.id }}"
+                          value: "@twig {{ __('admin_edit') }}"
+                          icon: 
+                            set: bootstrap
+                            name: pencil
+                        - href: "@twig {{ urlFor('admin.entries.add') }}?id={{ entry.id }} @endtwig"
+                          value: "@twig {{ __('Add') }}"
+                          icon: 
+                            set: bootstrap
+                            name: plus-circle
+                        - href: "#"
+                          value: "@twig {{ __('admin_duplicate') }}"
+                          events:
+                            onclick: "@twig event.preventDefault(); document.getElementById('duplicate-content-id-{{ entry.id }}').submit();"
+                          icon: 
+                            set: bootstrap
+                            name: files
+                        - href: "@twig {{ urlFor('admin.entries.rename') }}?id={{ entry.id }}"
+                          value: "@twig {{ __('admin_rename') }}"
+                          icon: 
+                            set: bootstrap
+                            name: file-font
+                        - href: "@twig {{ urlFor('admin.entries.move') }}?id={{ entry.id }}"
+                          value: "@twig {{ __('admin_move') }}"
+                          icon: 
+                            set: bootstrap
+                            name: arrow-right-square
+                        - href: "#"
+                          events:
+                            onclick: "@twig confirmationEntryDelete(event, '{{ entry.id }}');"
+                          value: "@twig {{ __('admin_delete') }}"
+                          icon: 
+                            set: bootstrap
+                            name: trash
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/account/move/blueprint.yaml b/project/blueprints/admin/entries/accounts/account/move/blueprint.yaml
new file mode 100644
index 00000000..1d6ed013
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/account/move/blueprint.yaml
@@ -0,0 +1,90 @@
+title: Move entry
+icon:
+  set: bootstrap
+  name: file-alt
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+    blocks:
+      - type: Row
+        properties:
+          class: justify-content-center
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries_move') }}"
+                  class: mb-4
+              - type: Form
+                properties:
+                  name: form_entries_move
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                      - name: entry_current_id
+                        properties:
+                          type: string
+                          value: "{{ entryCurrentID }}"
+                      - name: entry_parent_id
+                        properties:
+                          type: string
+                          value: "{{ entryParentID }}"
+                      - name: from
+                        properties:
+                          type: string
+                      - name: to
+                        properties:
+                          type: string
+                    messages: 
+                      error: "{{ __('admin_message_entries_was_not_moved') }}"
+                      success: "{{ __('admin_message_entries_moved') }}"
+                    redirect:
+                      route: admin.entries.index
+                      args:
+                        id: "{{ _form.registry.data.to }}"
+                blocks:  
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: from
+                              value: "{{ entryParentID }}"
+                              label:
+                                value: "{{ __('admin_from') }}"
+                              disabled: true
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: to
+                              items: "{{ serializers().json.encode(entries) }}"
+                              label:
+                                value: "{{ __('admin_to') }}"
+                      - type: Column
+                        properties:
+                          size: 12
+                          class: pt-2
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_entries_create
+                              type: primary
+                              value: "{{ __('admin_move') }}"
+                              class: js-submit-entry-move-form
+      
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/account/rename/blueprint.yaml b/project/blueprints/admin/entries/accounts/account/rename/blueprint.yaml
new file mode 100644
index 00000000..89a2ec13
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/account/rename/blueprint.yaml
@@ -0,0 +1,72 @@
+title: Rename entry
+icon:
+  set: bootstrap
+  name: file-alt
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+    blocks:
+      - type: Row
+        properties:
+          class: justify-content-center
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_rename_entry') }}"
+                  class: mb-4
+              - type: Form
+                properties:
+                  name: form_entries_rename
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                      - name: new_id
+                        properties:
+                          type: string
+                          value: |
+                            {% if registry().get('plugins.admin.settings.entries.slugify') %}
+                              {{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) ~ '/' ~ flextype.slugify.slugify(_form.registry.data.name) }}
+                            {% else %}
+                              {{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) ~ '/' ~ _form.registry.data.name }}
+                            {% endif %}
+                    messages: 
+                      error: "{{ __('admin_message_entries_was_not_renamed') }}"
+                      success: "{{ __('admin_message_entries_renamed') }}"
+                    redirect:
+                      route: admin.entries.index
+                      args:
+                        id: "{{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) }}" 
+                blocks:
+                  - type: Column
+                    properties:
+                      size: 12
+                    blocks:
+                      - type: InputText
+                        properties:
+                          name: name
+                          label:
+                            value: "{{ __('admin_name') }}"
+                          help: "{{ __('admin_help_text_for_entries_name') }}"
+                          value: "{{ arraysFromString(query.id, '/').last() }}"
+                          validation:
+                            required: true
+                            minlength: 1
+                            errorMessage: "{{ __('admin_error_name_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 12
+                          class: pt-4
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_rename') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/blueprint.yaml b/project/blueprints/admin/entries/accounts/blueprint.yaml
new file mode 100644
index 00000000..471a7ea0
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/blueprint.yaml
@@ -0,0 +1,4 @@
+title: Accounts
+icon:
+  set: bootstrap
+  name: file-text
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/index/blueprint.yaml b/project/blueprints/admin/entries/accounts/index/blueprint.yaml
new file mode 100644
index 00000000..c6956196
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/index/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Accounts
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('Accounts') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('Create new account') }}"
+                  href: "{{ urlFor('admin.entries.add', {}, {'id': query.id}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/accounts/item/blueprint.yaml b/project/blueprints/admin/entries/accounts/item/blueprint.yaml
new file mode 100644
index 00000000..3f2c1475
--- /dev/null
+++ b/project/blueprints/admin/entries/accounts/item/blueprint.yaml
@@ -0,0 +1,126 @@
+title: Default
+icon:
+  set: bootstrap
+  name: file-text                               
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <form id="delete-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+              <input type="hidden" name="id-current" value="{{ query.id }}">
+          </form>
+          <form id="duplicate-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+          </form>
+blocks:
+  - type: Row
+    properties:
+      class: "m-0 {{ urlFor('admin.entries.deleteProcess') }}"
+    blocks:
+      - type: Column
+        properties:
+          size: 12
+          class: card
+        blocks:
+          - type: Row
+            properties:
+              class: d-flex align-items-center row-hover
+            blocks:
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks: 
+                  - type: Display
+                    properties:
+                      value: "{{ icon('person-circle', 'bootstrap') }}"
+              - type: Column
+                properties:
+                  size: 10/12
+                blocks:
+                  - type: Row
+                    properties: 
+                      class: gy-2
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 2/12
+                          class: p-2 px-3
+                        blocks:
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              style:
+                                opacity: .4
+                              value: "{{ __('title') }}"
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              value: "{{ entry.title }}"
+                      - type: Column
+                        properties:
+                          size: 2/12
+                          class: p-2 px-3
+                        blocks:
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              style:
+                                opacity: .4
+                              value: "{{ __('id') }}"
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              value: "{{ entry.id }}"
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks:
+                  - type: ActionsDropdown
+                    properties:
+                      items:
+                        - href: "{{ urlFor('admin.entries.index') }}?id={{ entry.id }}"
+                          value: "{{ __('View') }}"
+                          visible: "{{ entry.has_children }}"
+                          icon: 
+                            set: bootstrap
+                            name: eye
+                        - href: "{{ urlFor('admin.entries.edit') }}?id={{ entry.id }}"
+                          value: "{{ __('admin_edit') }}"
+                          icon: 
+                            set: bootstrap
+                            name: pencil
+                        - href: "{{ urlFor('admin.entries.add') }}?id={{ entry.id }}"
+                          value: "{{ __('Add') }}"
+                          icon: 
+                            set: bootstrap
+                            name: plus-circle
+                        - href: "#"
+                          value: "{{ __('admin_duplicate') }}"
+                          events:
+                            onclick: "event.preventDefault(); document.getElementById('duplicate-content-id-{{ entry.id }}').submit();"
+                          icon: 
+                            set: bootstrap
+                            name: files
+                        - href: "{{ urlFor('admin.entries.rename') }}?id={{ item.id }}"
+                          value: "{{ __('admin_rename') }}"
+                          icon: 
+                            set: bootstrap
+                            name: file-font
+                        - href: "{{ urlFor('admin.entries.move') }}?id={{ item.id }}"
+                          value: "{{ __('admin_move') }}"
+                          icon: 
+                            set: bootstrap
+                            name: arrow-right-square
+                        - href: "#"
+                          events:
+                            onclick: "confirmationEntryDelete(event, '{{ entry.id }}');"
+                          value: "{{ __('admin_delete') }}"
+                          icon: 
+                            set: bootstrap
+                            name: trash
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/blueprint.yaml b/project/blueprints/admin/entries/blueprint.yaml
new file mode 100644
index 00000000..8f3644b4
--- /dev/null
+++ b/project/blueprints/admin/entries/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "@parsers:twig; {{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('Create new entry') }}"
+                  href: "{{ urlFor('admin.entries.add', [], {'id': query.id}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/add/blueprint.yaml b/project/blueprints/admin/entries/default/add/blueprint.yaml
new file mode 100644
index 00000000..b700c208
--- /dev/null
+++ b/project/blueprints/admin/entries/default/add/blueprint.yaml
@@ -0,0 +1,229 @@
+title: Create new entry
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-entry-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_entries_create]").click();
+            });
+
+            {% if registry().get('plugins.admin.settings.entries.slugify') %}
+              $("input[name=title]").on("keyup change", function () {
+                $("input[name=name]").val(getSlug($("input[name=title]").val()));
+              });
+            {% else %}
+              $("input[name=title]").on("keyup change", function () {
+                $("input[name=name]").val($("input[name=title]").val()));
+              });
+            {% endif %}
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+            - type: Form
+              properties:
+                name: form_entries_create
+                process:
+                  fields:
+                    - name: title
+                      properties:
+                        type: string
+                    - name: id
+                      properties:
+                        type: string
+                        value: |
+                          {% if registry().get('plugins.admin.settings.entries.slugify') %}
+                            {{ strings(query.id ~ '/' ~ flextype.slugify.slugify(_form.registry.data.name)).trimLeft('/') }}
+                          {% else %}
+                            {{ strings(query.id ~ '/' ~ _form.registry.data.name).trimLeft('/') }}
+                          {% endif %}
+                    - name: routable
+                      properties:
+                        type: bool
+                    - name: visibility
+                      properties:
+                        type: string
+                    - name: blueprint
+                      properties:
+                        type: string
+                    - name: published_at
+                      properties:
+                        type: string
+                    - name: publised_by
+                      properties:
+                        type: string
+                        value: "{{ acl().getUserLoggedInUuid() }}"
+                    - name: created_by
+                      properties:
+                        type: string
+                        value: "{{ acl().getUserLoggedInUuid() }}"
+                    - name: template
+                      properties: 
+                        type: string
+                        ignore: "{{ registry().has('plugins.site') ? false : true }}"
+                        value: |
+                          @parsers:twig;
+                          {% if registry().has('plugins.site') %}
+                            {% if filesystem().file(PATH_PROJECT ~ '/themes/' ~ registry().get('plugins.site.settings.theme') ~ '/templates/' ~ _form.registry.data.blueprint ~ '.html').exists() %}
+                              {{ _form.registry.data.blueprint }}
+                            {% else %}
+                              default
+                            {% endif %}
+                          {% endif %}
+                  messages: 
+                    error: "{{ __('admin_message_entries_was_not_created') }}"
+                    success: "{{ __('admin_message_entries_created') }}"
+                  redirect:
+                    route: |
+                      @parsers:twig;
+                      {% if _form.registry.data.redirect == 'index' %}
+                        admin.entries.index
+                      {% elseif _form.registry.data.redirect == 'edit' %}
+                        admin.entries.edit
+                      {% elseif _form.registry.data.redirect == 'add' %}
+                        admin.entries.add
+                      {% endif %}
+                    args:
+                      id: "{{ (_form.registry.data.redirect == 'add' or _form.registry.data.redirect == 'index') ? query.id : (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) ~ '/' ~ _form.registry.data.name }}"
+              blocks:
+                - type: Row
+                  properties:
+                    class: mt-4 mb-4
+                  blocks:
+                    - type: Column
+                      properties:
+                        size: 6/12
+                      blocks:
+                        - type: Heading
+                          properties:
+                            size: large
+                            value: "{{ __('admin_create_new_content') }}"
+                    - type: Column
+                      properties:
+                        size: 6/12
+                        class: d-flex align-items-center justify-content-end text-end 
+                      blocks:
+                        - type: InputSubmit
+                          properties:
+                            name: submit_form_entries_create
+                            style:
+                              display: none
+                        - type: ButtonGroup
+                          properties:
+                            buttons:
+                              - type: Button
+                                properties:
+                                  value: "{{ __('admin_create') }}"
+                                  class: js-submit-entry-create-form
+                                  data: 
+                                    redirect: index
+                              - type: ButtonToggle
+                                properties:
+                                  type: secondary
+                                  value: "{{ __('admin_create_and_edit') }}"    
+                                  items:
+                                    - href: "#"
+                                      value: "{{ __('admin_create_and_edit') }}"
+                                      class: js-submit-entry-create-form
+                                      data:
+                                        redirect: edit
+                                    - href: "#"
+                                      value: "{{ __('admin_create_and_add') }}"
+                                      class: js-submit-entry-create-form
+                                      data:
+                                        redirect: add
+                - type: InputHidden
+                  properties:
+                    name: current_id
+                    value: "{{ query.id }}"
+                - type: InputHidden
+                  properties:
+                    name: redirect    
+                - type: Row
+                  properties:
+                    class: g-3
+                  blocks:
+                    - type: Column
+                      properties:
+                        size: 6/12
+                      blocks:
+                        - type: InputText
+                          properties:
+                            name: title
+                            label:
+                              value: "{{ __('admin_title') }}"
+                            class: js-title
+                            help: "{{ __('admin_help_text_for_entries_label') }}"
+                            validation:
+                              required: true
+                              minlength: 1
+                              errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                    - type: Column
+                      properties:
+                        size: 6/12
+                      blocks:
+                        - type: InputText
+                          properties:
+                            name: name
+                            label:
+                              value: "{{ __('admin_name') }}"
+                            class: js-name
+                            help: "{{ __('admin_help_text_for_entries_name') }}"
+                            validation:
+                              required: true
+                              minlength: 1
+                              errorMessage: "{{ __('admin_error_name_empty_input') }}"
+                    - type: Column
+                      properties:
+                        size: 3/12
+                      blocks:
+                        - type: Select2
+                          properties:
+                            name: routable
+                            value: true
+                            items: "{{ serializers().json.encode(routable) }}"
+                            label:
+                              value: "{{ __('admin_routable') }}"
+                    - type: Column
+                      properties:
+                        size: 3/12
+                      blocks:
+                        - type: Select2
+                          properties:
+                            name: visibility
+                            value: visible
+                            items: "{{ serializers().json.encode(visibility) }}"
+                            label:
+                              value: "{{ __('admin_visibility') }}"
+                    - type: Column
+                      properties:
+                        size: 3/12
+                      blocks:
+                        - type: Select2
+                          properties:
+                            name: blueprint
+                            items: "{{ serializers().json.encode(blueprints) }}"
+                            label:
+                              value: "{{ __('admin_blueprint') }}"          
+                    - type: Column
+                      properties:
+                        size: 3/12
+                      blocks:
+                        - type: Flatpickr 
+                          properties:
+                            name: published_at
+                            label:
+                              value: "{{ __('admin_published_at') }}"
+                              
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/blueprint.yaml b/project/blueprints/admin/entries/default/blueprint.yaml
new file mode 100644
index 00000000..09bb847b
--- /dev/null
+++ b/project/blueprints/admin/entries/default/blueprint.yaml
@@ -0,0 +1,249 @@
+title: Default
+icon:
+  set: bootstrap
+  name: file-text                                   
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks: 
+          - type: Column
+            blocks:
+              - type: Form
+                properties: 
+                  name: form_entries_edit
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                      - name: title
+                        properties:
+                          type: string
+                      - name: content
+                        properties:
+                          type: string
+                      - name: description
+                        properties:
+                          type: string
+                      - name: routable
+                        properties:
+                          type: bool
+                      - name: visibility
+                        properties:
+                          type: string
+                      - name: published_at
+                        properties:
+                          type: string
+                      - name: source
+                        properties:
+                          type: string
+                      - name: template 
+                        properties:
+                          ignore: "{{ registry().has('plugins.site') ? false : true }}"
+                          type: string
+                      - name: menu_item_title
+                        properties:
+                          type: string
+                      - name: menu_item_url
+                        properties:
+                          type: string
+                      - name: menu_item_target
+                        properties:
+                          type: string
+                      - name: menu_item_order
+                        properties:
+                          type: int
+                    messages: 
+                      error: "{{ __('admin_message_entries_changes_not_saved') }}"
+                      success: "{{ __('admin_message_entries_changes_saved') }}"
+                    redirect:
+                      route: admin.entries.edit 
+                      args:
+                        id: "{{ query.id }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_content') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              class: js-submit-entries-form-editor
+                              value: "{{ __('admin_save') }}"
+                              id: submit
+                  - type: Tabs
+                    properties:
+                      tabs:
+                        main: 
+                          title: "{{ __('admin_main') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3 mt-3
+                                blocks:
+                                  - type: InputText 
+                                    properties:
+                                      name: title
+                                      label:
+                                        value: "{{ __('admin_title') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3
+                                blocks:
+                                  - type: Trumbowyg  
+                                    properties:
+                                      name: content
+                                      label:
+                                        value: "{{ __('admin_entries') }}"
+                                      options:
+                                        btns:
+                                          - strong
+                                          - em
+                                          - del
+                                          - link
+                                          - insertImage
+                                          - viewHTML
+                        settings: 
+                          title: "{{ __('admin_settings') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3 mt-3
+                                blocks: 
+                                  - type: Heading
+                                    properties:
+                                      value: "{{ __('admin_general') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3
+                                blocks:
+                                  - type: InputTextarea 
+                                    properties:
+                                      name: description
+                                      validation:
+                                        required: true
+                                      rows: 3
+                                      label:
+                                        value: "{{ __('admin_description') }}"
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: template
+                                      label:
+                                        value: "{{ __('admin_template') }}"   
+                                      items: "{{ serializers().json.encode(templates) }}"                     
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: routable
+                                      label:
+                                        value: "{{ __('admin_routable') }}"   
+                                      items: "{{ serializers().json.encode(routable) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: visibility
+                                      label:
+                                        value: "{{ __('admin_visibility') }}"   
+                                      items: "{{ serializers().json.encode(visibility) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Flatpickr 
+                                    properties:
+                                      name: published_at
+                                      label:
+                                        value: "{{ __('admin_published_at') }}"
+                            - type: Row
+                              blocks: 
+                                - type: Column
+                                  properties:
+                                    size: 12
+                                    class: mb-3 mt-3
+                                  blocks: 
+                                    - type: Heading
+                                      properties:
+                                        value: "{{ __('admin_menu') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks: 
+                                    - type: InputText
+                                      properties:
+                                        name: menu_item_title
+                                        label:
+                                          value: "{{ __('admin_menu_item_title') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputText  
+                                      properties:
+                                        name: menu_item_url
+                                        label:
+                                          value: "{{ __('admin_menu_item_url') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: Select2 
+                                      properties:
+                                        name: menu_item_target
+                                        label:
+                                          value: "{{ __('admin_menu_item_target') }}"
+                                        items: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputNumber
+                                      properties:
+                                        name: menu_item_order
+                                        label:
+                                          value: "{{ __('admin_menu_item_order') }}"
+                                        value: 1  
+            
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/index/blueprint.yaml b/project/blueprints/admin/entries/default/index/blueprint.yaml
new file mode 100644
index 00000000..9b22b64b
--- /dev/null
+++ b/project/blueprints/admin/entries/default/index/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('Create new entry') }}"
+                  href: "{{ urlFor('admin.entries.add', {}, {'id': query.id}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/item/blueprint.yaml b/project/blueprints/admin/entries/default/item/blueprint.yaml
new file mode 100644
index 00000000..25d88643
--- /dev/null
+++ b/project/blueprints/admin/entries/default/item/blueprint.yaml
@@ -0,0 +1,126 @@
+title: Default
+icon:
+  set: bootstrap
+  name: file-text                               
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <form id="delete-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+              <input type="hidden" name="id-current" value="{{ query.id }}">
+          </form>
+          <form id="duplicate-entry-id-{{ entry.id }}" action="{{ urlFor('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
+              {{ csrf() }}
+              <input type="hidden" name="id" value="{{ entry.id }}">
+          </form>
+blocks:
+  - type: Row
+    properties:
+      class: m-0
+    blocks:
+      - type: Column
+        properties:
+          size: 12
+          class: card
+        blocks:
+          - type: Row
+            properties:
+              class: d-flex align-items-center row-hover
+            blocks:
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks: 
+                  - type: Display
+                    properties:
+                      value: "{{ icon('file-text', 'bootstrap') }}"
+              - type: Column
+                properties:
+                  size: 10/12
+                blocks:
+                  - type: Row
+                    properties: 
+                      class: gy-2
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 2/12
+                          class: p-2 px-3
+                        blocks:
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              style:
+                                opacity: .4
+                              value: "{{ __('title') }}"
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              value: "{{ entry.title }}"
+                      - type: Column
+                        properties:
+                          size: 2/12
+                          class: p-2 px-3
+                        blocks:
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              style:
+                                opacity: .4
+                              value: "{{ __('id') }}"
+                          - type: Display
+                            properties:
+                              wrapper: div
+                              value: "{{ entry.id }}"
+              - type: Column
+                properties:
+                  size: 1/12
+                  class: p-2 text-center
+                blocks:
+                  - type: ActionsDropdown
+                    properties:
+                      items:
+                        - href: "{{ urlFor('admin.entries.index') }}?id={{ entry.id }}"
+                          value: "{{ __('View') }}"
+                          visible: "{{ entry.has_children }}"
+                          icon: 
+                            set: bootstrap
+                            name: eye
+                        - href: "{{ urlFor('admin.entries.edit') }}?id={{ entry.id }}"
+                          value: "{{ __('admin_edit') }}"
+                          icon: 
+                            set: bootstrap
+                            name: pencil
+                        - href: "{{ urlFor('admin.entries.add') }}?id={{ entry.id }}"
+                          value: "{{ __('Add') }}"
+                          icon: 
+                            set: bootstrap
+                            name: plus-circle
+                        - href: "#"
+                          value: "{{ __('admin_duplicate') }}"
+                          events:
+                            onclick: "event.preventDefault(); document.getElementById('duplicate-content-id-{{ entry.id }}').submit();"
+                          icon: 
+                            set: bootstrap
+                            name: files
+                        - href: "{{ urlFor('admin.entries.rename') }}?id={{ item.id }}"
+                          value: "{{ __('admin_rename') }}"
+                          icon: 
+                            set: bootstrap
+                            name: file-font
+                        - href: "{{ urlFor('admin.entries.move') }}?id={{ item.id }}"
+                          value: "{{ __('admin_move') }}"
+                          icon: 
+                            set: bootstrap
+                            name: arrow-right-square
+                        - href: "#"
+                          events:
+                            onclick: "confirmationEntryDelete(event, '{{ entry.id }}');"
+                          value: "{{ __('admin_delete') }}"
+                          icon: 
+                            set: bootstrap
+                            name: trash
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/move/blueprint.yaml b/project/blueprints/admin/entries/default/move/blueprint.yaml
new file mode 100644
index 00000000..1d6ed013
--- /dev/null
+++ b/project/blueprints/admin/entries/default/move/blueprint.yaml
@@ -0,0 +1,90 @@
+title: Move entry
+icon:
+  set: bootstrap
+  name: file-alt
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+    blocks:
+      - type: Row
+        properties:
+          class: justify-content-center
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries_move') }}"
+                  class: mb-4
+              - type: Form
+                properties:
+                  name: form_entries_move
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                      - name: entry_current_id
+                        properties:
+                          type: string
+                          value: "{{ entryCurrentID }}"
+                      - name: entry_parent_id
+                        properties:
+                          type: string
+                          value: "{{ entryParentID }}"
+                      - name: from
+                        properties:
+                          type: string
+                      - name: to
+                        properties:
+                          type: string
+                    messages: 
+                      error: "{{ __('admin_message_entries_was_not_moved') }}"
+                      success: "{{ __('admin_message_entries_moved') }}"
+                    redirect:
+                      route: admin.entries.index
+                      args:
+                        id: "{{ _form.registry.data.to }}"
+                blocks:  
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: from
+                              value: "{{ entryParentID }}"
+                              label:
+                                value: "{{ __('admin_from') }}"
+                              disabled: true
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: to
+                              items: "{{ serializers().json.encode(entries) }}"
+                              label:
+                                value: "{{ __('admin_to') }}"
+                      - type: Column
+                        properties:
+                          size: 12
+                          class: pt-2
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_entries_create
+                              type: primary
+                              value: "{{ __('admin_move') }}"
+                              class: js-submit-entry-move-form
+      
\ No newline at end of file
diff --git a/project/blueprints/admin/entries/default/rename/blueprint.yaml b/project/blueprints/admin/entries/default/rename/blueprint.yaml
new file mode 100644
index 00000000..2e463053
--- /dev/null
+++ b/project/blueprints/admin/entries/default/rename/blueprint.yaml
@@ -0,0 +1,72 @@
+title: Rename entry
+icon:
+  set: bootstrap
+  name: file-alt
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+    blocks:
+      - type: Row
+        properties:
+          class: justify-content-center
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_rename_content') }}"
+                  class: mb-4
+              - type: Form
+                properties:
+                  name: form_entries_rename
+                  process:
+                    fields:
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                      - name: new_id
+                        properties:
+                          type: string
+                          value: |
+                            {% if registry().get('plugins.admin.settings.entries.slugify') %}
+                              {{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) ~ '/' ~ flextype.slugify.slugify(_form.registry.data.name) }}
+                            {% else %}
+                              {{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) ~ '/' ~ _form.registry.data.name }}
+                            {% endif %}
+                    messages: 
+                      error: "{{ __('admin_message_entries_was_not_renamed') }}"
+                      success: "{{ __('admin_message_entries_renamed') }}"
+                    redirect:
+                      route: admin.entries.index
+                      args:
+                        id: "{{ (strings(query.id).contains('/') ? arraysFromString(query.id, '/').slice(0, -1).toString('/') : query.id) }}" 
+                blocks:
+                  - type: Column
+                    properties:
+                      size: 12
+                    blocks:
+                      - type: InputText
+                        properties:
+                          name: name
+                          label:
+                            value: "{{ __('admin_name') }}"
+                          help: "{{ __('admin_help_text_for_entries_name') }}"
+                          value: "{{ arraysFromString(query.id, '/').last() }}"
+                          validation:
+                            required: true
+                            minlength: 1
+                            errorMessage: "{{ __('admin_error_name_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 12
+                          class: pt-4
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_rename') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/plugins/blueprint.yaml b/project/blueprints/admin/plugins/blueprint.yaml
new file mode 100644
index 00000000..19f14fdb
--- /dev/null
+++ b/project/blueprints/admin/plugins/blueprint.yaml
@@ -0,0 +1,30 @@
+title: Plugin
+type: plugins
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_plugins') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_get_more_plugins') }}"
+                  href: "https://flextype.org/downloads/extend/plugins"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/plugins/information/blueprint.yaml b/project/blueprints/admin/plugins/information/blueprint.yaml
new file mode 100644
index 00000000..f6f772d6
--- /dev/null
+++ b/project/blueprints/admin/plugins/information/blueprint.yaml
@@ -0,0 +1,20 @@
+title: Plugin Information
+type: plugins
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_information') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/plugins/settings/blueprint.yaml b/project/blueprints/admin/plugins/settings/blueprint.yaml
new file mode 100644
index 00000000..733cbb4a
--- /dev/null
+++ b/project/blueprints/admin/plugins/settings/blueprint.yaml
@@ -0,0 +1,68 @@
+title: Plugin Settings
+type: plugins
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks: 
+          - type: Column
+            blocks:
+              - type: Form
+                properties: 
+                  name: form_settings
+                  process:
+                    fields:
+                      - name: settings
+                        properties:
+                          type: string
+                      - name: id
+                        properties:
+                          type: string
+                          value: "{{ query.id }}"
+                    messages: 
+                      error: "{{ __('admin_message_settings_was_not_saved') }}"
+                      success: "{{ __('admin_message_settings_saved') }}"
+                    redirect:
+                      route: admin.settings.index 
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_settings') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                              id: submit
+                  - type: Row
+                    blocks: 
+                    - type: Column
+                      properties:
+                        size: 12
+                      blocks:
+                        - type: Codemirror 
+                          properties:
+                            name: settings
+                            value: "{{ settings }}"
+                            options: 
+                              mode: yaml
+            
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/access/add/blueprint.yaml b/project/blueprints/admin/system/api/access/add/blueprint.yaml
new file mode 100644
index 00000000..ffe1283b
--- /dev/null
+++ b/project/blueprints/admin/system/api/access/add/blueprint.yaml
@@ -0,0 +1,209 @@
+title: Create new token
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-token-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_token_create]").click();
+            });
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_create
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                          value: 0
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: created_at
+                        properties:
+                          type: string
+                          value: "{{ time }}"
+                      - name: created_by
+                        properties:
+                          type: string
+                          value: "{{ acl().getUserLoggedInUuid() }}"
+                      - name: uuid
+                        properties:
+                          type: string
+                          value: "{{ uuid }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_created') }}"
+                      success: "{{ __('admin_message_entries_api_token_created') }}"
+                    redirect:
+                      route: |
+                        {% if _form.registry.data.redirect == 'index' %}
+                          admin.api.tokens
+                        {% elseif _form.registry.data.redirect == 'edit' %}
+                          admin.api.edit
+                        {% elseif _form.registry.data.redirect == 'add' %}
+                          admin.api.add
+                        {% endif %}
+                      args:
+                        api: "{{ query.api }}"
+                blocks:   
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_create_new_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_token_create
+                              style:
+                                display: none
+                          - type: ButtonGroup
+                            properties:
+                              buttons:
+                                - type: Button
+                                  properties:
+                                    value: "{{ __('admin_create') }}"
+                                    class: js-submit-token-create-form
+                                    data: 
+                                      redirect: index
+                                - type: ButtonToggle
+                                  properties:
+                                    type: secondary
+                                    value: "{{ __('admin_create_and_edit') }}"    
+                                    items:
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_edit') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: edit
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_add') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: add
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}"
+                                   
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/access/blueprint.yaml b/project/blueprints/admin/system/api/access/blueprint.yaml
new file mode 100644
index 00000000..568442f1
--- /dev/null
+++ b/project/blueprints/admin/system/api/access/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create_new_token') }}"
+                  href: "{{ urlFor('admin.api.add', {}, {'api': query.api}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/access/edit/blueprint.yaml b/project/blueprints/admin/system/api/access/edit/blueprint.yaml
new file mode 100644
index 00000000..8908ef88
--- /dev/null
+++ b/project/blueprints/admin/system/api/access/edit/blueprint.yaml
@@ -0,0 +1,157 @@
+title: Edit token
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_edit
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: token
+                        properties:
+                          type: string
+                          value: "{{ query.token }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.api.edit"
+                      args:
+                        api: "{{ query.api }}"
+                        token: "{{ query.token }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/blueprint.yaml b/project/blueprints/admin/system/api/blueprint.yaml
new file mode 100644
index 00000000..71356ecd
--- /dev/null
+++ b/project/blueprints/admin/system/api/blueprint.yaml
@@ -0,0 +1,19 @@
+title: API
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_api') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/entries/add/blueprint.yaml b/project/blueprints/admin/system/api/entries/add/blueprint.yaml
new file mode 100644
index 00000000..ffe1283b
--- /dev/null
+++ b/project/blueprints/admin/system/api/entries/add/blueprint.yaml
@@ -0,0 +1,209 @@
+title: Create new token
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-token-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_token_create]").click();
+            });
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_create
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                          value: 0
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: created_at
+                        properties:
+                          type: string
+                          value: "{{ time }}"
+                      - name: created_by
+                        properties:
+                          type: string
+                          value: "{{ acl().getUserLoggedInUuid() }}"
+                      - name: uuid
+                        properties:
+                          type: string
+                          value: "{{ uuid }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_created') }}"
+                      success: "{{ __('admin_message_entries_api_token_created') }}"
+                    redirect:
+                      route: |
+                        {% if _form.registry.data.redirect == 'index' %}
+                          admin.api.tokens
+                        {% elseif _form.registry.data.redirect == 'edit' %}
+                          admin.api.edit
+                        {% elseif _form.registry.data.redirect == 'add' %}
+                          admin.api.add
+                        {% endif %}
+                      args:
+                        api: "{{ query.api }}"
+                blocks:   
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_create_new_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_token_create
+                              style:
+                                display: none
+                          - type: ButtonGroup
+                            properties:
+                              buttons:
+                                - type: Button
+                                  properties:
+                                    value: "{{ __('admin_create') }}"
+                                    class: js-submit-token-create-form
+                                    data: 
+                                      redirect: index
+                                - type: ButtonToggle
+                                  properties:
+                                    type: secondary
+                                    value: "{{ __('admin_create_and_edit') }}"    
+                                    items:
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_edit') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: edit
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_add') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: add
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}"
+                                   
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/entries/blueprint.yaml b/project/blueprints/admin/system/api/entries/blueprint.yaml
new file mode 100644
index 00000000..568442f1
--- /dev/null
+++ b/project/blueprints/admin/system/api/entries/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create_new_token') }}"
+                  href: "{{ urlFor('admin.api.add', {}, {'api': query.api}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/entries/edit/blueprint.yaml b/project/blueprints/admin/system/api/entries/edit/blueprint.yaml
new file mode 100644
index 00000000..8908ef88
--- /dev/null
+++ b/project/blueprints/admin/system/api/entries/edit/blueprint.yaml
@@ -0,0 +1,157 @@
+title: Edit token
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_edit
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: token
+                        properties:
+                          type: string
+                          value: "{{ query.token }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.api.edit"
+                      args:
+                        api: "{{ query.api }}"
+                        token: "{{ query.token }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/images/add/blueprint.yaml b/project/blueprints/admin/system/api/images/add/blueprint.yaml
new file mode 100644
index 00000000..ffe1283b
--- /dev/null
+++ b/project/blueprints/admin/system/api/images/add/blueprint.yaml
@@ -0,0 +1,209 @@
+title: Create new token
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-token-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_token_create]").click();
+            });
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_create
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                          value: 0
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: created_at
+                        properties:
+                          type: string
+                          value: "{{ time }}"
+                      - name: created_by
+                        properties:
+                          type: string
+                          value: "{{ acl().getUserLoggedInUuid() }}"
+                      - name: uuid
+                        properties:
+                          type: string
+                          value: "{{ uuid }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_created') }}"
+                      success: "{{ __('admin_message_entries_api_token_created') }}"
+                    redirect:
+                      route: |
+                        {% if _form.registry.data.redirect == 'index' %}
+                          admin.api.tokens
+                        {% elseif _form.registry.data.redirect == 'edit' %}
+                          admin.api.edit
+                        {% elseif _form.registry.data.redirect == 'add' %}
+                          admin.api.add
+                        {% endif %}
+                      args:
+                        api: "{{ query.api }}"
+                blocks:   
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_create_new_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_token_create
+                              style:
+                                display: none
+                          - type: ButtonGroup
+                            properties:
+                              buttons:
+                                - type: Button
+                                  properties:
+                                    value: "{{ __('admin_create') }}"
+                                    class: js-submit-token-create-form
+                                    data: 
+                                      redirect: index
+                                - type: ButtonToggle
+                                  properties:
+                                    type: secondary
+                                    value: "{{ __('admin_create_and_edit') }}"    
+                                    items:
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_edit') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: edit
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_add') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: add
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}"
+                                   
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/images/blueprint.yaml b/project/blueprints/admin/system/api/images/blueprint.yaml
new file mode 100644
index 00000000..568442f1
--- /dev/null
+++ b/project/blueprints/admin/system/api/images/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create_new_token') }}"
+                  href: "{{ urlFor('admin.api.add', {}, {'api': query.api}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/images/edit/blueprint.yaml b/project/blueprints/admin/system/api/images/edit/blueprint.yaml
new file mode 100644
index 00000000..8908ef88
--- /dev/null
+++ b/project/blueprints/admin/system/api/images/edit/blueprint.yaml
@@ -0,0 +1,157 @@
+title: Edit token
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_edit
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: token
+                        properties:
+                          type: string
+                          value: "{{ query.token }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.api.edit"
+                      args:
+                        api: "{{ query.api }}"
+                        token: "{{ query.token }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/media/add/blueprint.yaml b/project/blueprints/admin/system/api/media/add/blueprint.yaml
new file mode 100644
index 00000000..ffe1283b
--- /dev/null
+++ b/project/blueprints/admin/system/api/media/add/blueprint.yaml
@@ -0,0 +1,209 @@
+title: Create new token
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-token-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_token_create]").click();
+            });
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_create
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                          value: 0
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: created_at
+                        properties:
+                          type: string
+                          value: "{{ time }}"
+                      - name: created_by
+                        properties:
+                          type: string
+                          value: "{{ acl().getUserLoggedInUuid() }}"
+                      - name: uuid
+                        properties:
+                          type: string
+                          value: "{{ uuid }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_created') }}"
+                      success: "{{ __('admin_message_entries_api_token_created') }}"
+                    redirect:
+                      route: |
+                        {% if _form.registry.data.redirect == 'index' %}
+                          admin.api.tokens
+                        {% elseif _form.registry.data.redirect == 'edit' %}
+                          admin.api.edit
+                        {% elseif _form.registry.data.redirect == 'add' %}
+                          admin.api.add
+                        {% endif %}
+                      args:
+                        api: "{{ query.api }}"
+                blocks:   
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_create_new_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_token_create
+                              style:
+                                display: none
+                          - type: ButtonGroup
+                            properties:
+                              buttons:
+                                - type: Button
+                                  properties:
+                                    value: "{{ __('admin_create') }}"
+                                    class: js-submit-token-create-form
+                                    data: 
+                                      redirect: index
+                                - type: ButtonToggle
+                                  properties:
+                                    type: secondary
+                                    value: "{{ __('admin_create_and_edit') }}"    
+                                    items:
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_edit') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: edit
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_add') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: add
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}"
+                                   
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/media/blueprint.yaml b/project/blueprints/admin/system/api/media/blueprint.yaml
new file mode 100644
index 00000000..568442f1
--- /dev/null
+++ b/project/blueprints/admin/system/api/media/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create_new_token') }}"
+                  href: "{{ urlFor('admin.api.add', {}, {'api': query.api}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/media/edit/blueprint.yaml b/project/blueprints/admin/system/api/media/edit/blueprint.yaml
new file mode 100644
index 00000000..8908ef88
--- /dev/null
+++ b/project/blueprints/admin/system/api/media/edit/blueprint.yaml
@@ -0,0 +1,157 @@
+title: Edit token
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_edit
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: token
+                        properties:
+                          type: string
+                          value: "{{ query.token }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.api.edit"
+                      args:
+                        api: "{{ query.api }}"
+                        token: "{{ query.token }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/registry/add/blueprint.yaml b/project/blueprints/admin/system/api/registry/add/blueprint.yaml
new file mode 100644
index 00000000..ffe1283b
--- /dev/null
+++ b/project/blueprints/admin/system/api/registry/add/blueprint.yaml
@@ -0,0 +1,209 @@
+title: Create new token
+icon:
+  set: bootstrap
+  name: file-text
+emitter:
+  addListener:
+    - name: onAdminThemeTail
+      properties:
+        value: |
+          <script>
+            $('.js-submit-token-create-form').click(function () {
+              $("input[name=redirect]").val($(this).data('redirect'));
+              $("input[name=submit_form_token_create]").click();
+            });
+          </script>
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_create
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                          value: 0
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: created_at
+                        properties:
+                          type: string
+                          value: "{{ time }}"
+                      - name: created_by
+                        properties:
+                          type: string
+                          value: "{{ acl().getUserLoggedInUuid() }}"
+                      - name: uuid
+                        properties:
+                          type: string
+                          value: "{{ uuid }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_created') }}"
+                      success: "{{ __('admin_message_entries_api_token_created') }}"
+                    redirect:
+                      route: |
+                        {% if _form.registry.data.redirect == 'index' %}
+                          admin.api.tokens
+                        {% elseif _form.registry.data.redirect == 'edit' %}
+                          admin.api.edit
+                        {% elseif _form.registry.data.redirect == 'add' %}
+                          admin.api.add
+                        {% endif %}
+                      args:
+                        api: "{{ query.api }}"
+                blocks:   
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_create_new_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              name: submit_form_token_create
+                              style:
+                                display: none
+                          - type: ButtonGroup
+                            properties:
+                              buttons:
+                                - type: Button
+                                  properties:
+                                    value: "{{ __('admin_create') }}"
+                                    class: js-submit-token-create-form
+                                    data: 
+                                      redirect: index
+                                - type: ButtonToggle
+                                  properties:
+                                    type: secondary
+                                    value: "{{ __('admin_create_and_edit') }}"    
+                                    items:
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_edit') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: edit
+                                      - href: "#"
+                                        value: "{{ __('admin_create_and_add') }}"
+                                        class: js-submit-token-create-form
+                                        data:
+                                          redirect: add
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}"
+                                   
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/registry/blueprint.yaml b/project/blueprints/admin/system/api/registry/blueprint.yaml
new file mode 100644
index 00000000..568442f1
--- /dev/null
+++ b/project/blueprints/admin/system/api/registry/blueprint.yaml
@@ -0,0 +1,29 @@
+title: Entries
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_entries') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_create_new_token') }}"
+                  href: "{{ urlFor('admin.api.add', {}, {'api': query.api}) }}"
+                  class: btn btn-primary
\ No newline at end of file
diff --git a/project/blueprints/admin/system/api/registry/edit/blueprint.yaml b/project/blueprints/admin/system/api/registry/edit/blueprint.yaml
new file mode 100644
index 00000000..8908ef88
--- /dev/null
+++ b/project/blueprints/admin/system/api/registry/edit/blueprint.yaml
@@ -0,0 +1,157 @@
+title: Edit token
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            blocks:
+              - type: Form
+                properties:
+                  name: form_token_edit
+                  process:
+                    fields:
+                      - name: title
+                        properties:
+                          type: string
+                      - name: limit_calls
+                        properties:
+                          type: int
+                      - name: icon.name
+                        properties:
+                          type: string
+                      - name: icon.set
+                        properties:
+                          type: string
+                      - name: state
+                        properties:
+                          type: string
+                      - name: calls
+                        properties:
+                          type: int
+                      - name: api
+                        properties:
+                          type: string
+                          value: "{{ query.api }}"
+                      - name: token
+                        properties:
+                          type: string
+                          value: "{{ query.token }}"
+                    messages: 
+                      error: "{{ __('admin_message_entries_api_token_was_not_updated') }}"
+                      success: "{{ __('admin_message_entries_api_token_updated') }}"
+                    redirect:
+                      route: "admin.api.edit"
+                      args:
+                        api: "{{ query.api }}"
+                        token: "{{ query.token }}"
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_edit_token') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                  - type: Row
+                    properties:
+                      class: g-3
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 12
+                        blocks:
+                          - type: InputHidden
+                            properties:
+                              name: redirect  
+                          - type: InputText
+                            properties:
+                              name: title
+                              label:
+                                value: "{{ __('admin_title') }}"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_title_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputNumber
+                            properties:
+                              name: limit_calls
+                              label:
+                                value: "{{ __('admin_api_calls_limit') }}"
+                              value: 0
+                              help: "{{ __('admin_help_text_for_api_calls_limit_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('admin_error_api_calls_empty_input') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: Select2
+                            properties:
+                              name: state
+                              value: enabled
+                              items: 
+                                enabled: "{{ __('admin_enabled') }}"
+                                disabled: "{{ __('admin_disabled') }}"
+                              label:
+                                value: "{{ __('admin_state') }}"
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.name
+                              label:
+                                value: "{{ __('admin_icon_name') }}"
+                              value: "newspaper"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
+                      - type: Column
+                        properties:
+                          size: 3/12
+                        blocks:
+                          - type: InputText
+                            properties:
+                              name: icon.set
+                              label:
+                                value: "{{ __('admin_icon_set') }}"
+                              value: "bootstrap"
+                              class: js-title
+                              help: "{{ __('admin_help_text_for_tokens_label') }}"
+                              validation:
+                                required: true
+                                minlength: 1
+                                errorMessage: "{{ __('form_admin_error_icon_empty_input') }}" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/settings/blueprint.yaml b/project/blueprints/admin/system/settings/blueprint.yaml
new file mode 100644
index 00000000..f4600184
--- /dev/null
+++ b/project/blueprints/admin/system/settings/blueprint.yaml
@@ -0,0 +1,64 @@
+title: Settings
+type: settings
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks: 
+          - type: Column
+            blocks:
+              - type: Form
+                properties: 
+                  name: form_settings
+                  process:
+                    fields:
+                      - name: settings
+                        properties:
+                          type: string
+                    messages: 
+                      error: "{{ __('admin_message_settings_was_not_saved') }}"
+                      success: "{{ __('admin_message_settings_saved') }}"
+                    redirect:
+                      route: admin.settings.index 
+                blocks:
+                  - type: Row
+                    properties:
+                      class: mt-4 mb-4
+                    blocks:
+                      - type: Column
+                        properties:
+                          size: 6/12
+                        blocks:
+                          - type: Heading
+                            properties:
+                              size: large
+                              id: title
+                              value: "{{ __('admin_settings') }}"
+                      - type: Column
+                        properties:
+                          size: 6/12
+                          class: d-flex align-items-center justify-content-end text-end 
+                        blocks:
+                          - type: InputSubmit
+                            properties:
+                              type: primary
+                              value: "{{ __('admin_save') }}"
+                              id: submit
+                  - type: Row
+                    blocks: 
+                    - type: Column
+                      properties:
+                        size: 12
+                      blocks:
+                        - type: Codemirror 
+                          properties:
+                            name: settings
+                            value: "{{ settings }}"
+                            options: 
+                              mode: yaml
+            
\ No newline at end of file
diff --git a/project/blueprints/admin/system/tools/blueprint.yaml b/project/blueprints/admin/system/tools/blueprint.yaml
new file mode 100644
index 00000000..4606384d
--- /dev/null
+++ b/project/blueprints/admin/system/tools/blueprint.yaml
@@ -0,0 +1,20 @@
+title: Tools
+type: system
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_tools') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/system/tools/cache/blueprint.yaml b/project/blueprints/admin/system/tools/cache/blueprint.yaml
new file mode 100644
index 00000000..c483a641
--- /dev/null
+++ b/project/blueprints/admin/system/tools/cache/blueprint.yaml
@@ -0,0 +1,32 @@
+title: Cache
+type: system
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_cache') }}"
+          - type: Column
+            properties:
+              size: 6/12
+              class: d-flex align-items-center justify-content-end text-end
+            blocks:
+              - type: Anchor
+                properties:
+                  value: "{{ __('admin_clear_cache_all') }}"
+                  href: "#"
+                  class: btn btn-primary
+                  events: 
+                    onclick: "clearCache('all');" 
\ No newline at end of file
diff --git a/project/blueprints/admin/system/tools/information/blueprint.yaml b/project/blueprints/admin/system/tools/information/blueprint.yaml
new file mode 100644
index 00000000..955d65d8
--- /dev/null
+++ b/project/blueprints/admin/system/tools/information/blueprint.yaml
@@ -0,0 +1,20 @@
+title: Information
+type: system
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_information') }}"
\ No newline at end of file
diff --git a/project/blueprints/admin/system/tools/registry/blueprint.yaml b/project/blueprints/admin/system/tools/registry/blueprint.yaml
new file mode 100644
index 00000000..00062864
--- /dev/null
+++ b/project/blueprints/admin/system/tools/registry/blueprint.yaml
@@ -0,0 +1,20 @@
+title: Registry
+type: system
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4 mb-4
+    blocks:
+      - type: Row
+        blocks:
+          - type: Column
+            properties:
+              size: 6/12
+            blocks:
+              - type: Heading
+                properties:
+                  size: large
+                  value: "{{ __('admin_registry') }}"
\ No newline at end of file
diff --git a/project/blueprints/blog/blueprint.yaml b/project/blueprints/blog/blueprint.yaml
new file mode 100644
index 00000000..69d2aa4b
--- /dev/null
+++ b/project/blueprints/blog/blueprint.yaml
@@ -0,0 +1,196 @@
+title: Blog
+type: entry
+icon:
+  set: bootstrap
+  name: file-text
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks: 
+          - type: Column
+            blocks:
+              - type: Form
+                process:
+                  fields:
+                    - title
+                    - content
+                    - description
+                    - keywords
+                  messages:
+                    error: admin_message_entries_changes_saved
+                    success: admin_message_entries_changes_not_saved
+                  redirect:
+                    route: admin.entries.edit args:id,type
+                properties: 
+                  name: form_entries_edit
+                blocks:
+                  - type: InputSubmit
+                    properties:
+                      id: submit
+                      style:
+                        display: none
+                  - type: Tabs
+                    properties:
+                      tabs:
+                        main: 
+                          title: "{{ __('admin_main') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                                - type: Column
+                                  properties:
+                                    size: 12
+                                    class: mb-3 mt-3
+                                  blocks:
+                                    - type: InputText 
+                                      properties:
+                                        name: title
+                                        label:
+                                          value: "{{ __('admin_title') }}"
+                                - type: Column
+                                  properties:
+                                    size: 12
+                                    class: mb-3
+                                  blocks:
+                                    - type: Trumbowyg  
+                                      properties:
+                                        name: content
+                                        label:
+                                          value: "{{ __('admin_entries') }}"
+                                        options:
+                                          btns:
+                                            - strong
+                                            - em
+                                            - del
+                                            - link
+                                            - insertImage
+                                            - viewHTML
+                        settings: 
+                          title: "{{ __('admin_settings') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3 mt-3
+                                blocks: 
+                                  - type: Heading
+                                    properties:
+                                      value: "{{ __('admin_general') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3
+                                blocks:
+                                  - type: InputTextarea 
+                                    properties:
+                                      name: description
+                                      validation:
+                                        required: true
+                                      rows: 3
+                                      label:
+                                        value: "{{ __('admin_description') }}"
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: template
+                                      label:
+                                        value: "{{ __('admin_template') }}"   
+                                      items: "{{ serializers().json.encode(templates) }}"                     
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: routable
+                                      label:
+                                        value: "{{ __('admin_routable') }}"   
+                                      items: "{{ serializers().json.encode(routable) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: visibility
+                                      label:
+                                        value: "{{ __('admin_visibility') }}"   
+                                      items: "{{ serializers().json.encode(visibility) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Flatpickr 
+                                    properties:
+                                      name: published_at
+                                      label:
+                                        value: "{{ __('admin_published_at') }}"
+                            - type: Row
+                              blocks: 
+                                - type: Column
+                                  properties:
+                                    size: 12
+                                    class: mb-3 mt-3
+                                  blocks: 
+                                    - type: Heading
+                                      properties:
+                                        value: "{{ __('admin_menu') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks: 
+                                    - type: InputText
+                                      properties:
+                                        name: menu_item_title
+                                        label:
+                                          value: "{{ __('admin_menu_item_title') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputText  
+                                      properties:
+                                        name: menu_item_url
+                                        label:
+                                          value: "{{ __('admin_menu_item_url') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: Select2 
+                                      properties:
+                                        name: menu_item_target
+                                        label:
+                                          value: "{{ __('admin_menu_item_target') }}"
+                                        items: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputNumber
+                                      properties:
+                                        name: menu_item_order
+                                        label:
+                                          value: "{{ __('admin_menu_item_order') }}"
+                                        value: 1
+
+                            
+                      
+            
\ No newline at end of file
diff --git a/project/blueprints/blog/post/blueprint.yaml b/project/blueprints/blog/post/blueprint.yaml
new file mode 100644
index 00000000..daf1277b
--- /dev/null
+++ b/project/blueprints/blog/post/blueprint.yaml
@@ -0,0 +1,196 @@
+title: Blog post
+type: entry
+icon:
+  set: bootstrap
+  name: file
+blocks:
+  - type: Container
+    properties:
+      class: mt-4
+      breakpoint: medium
+    blocks:
+      - type: Row
+        blocks: 
+          - type: Column
+            blocks:
+              - type: Form
+                process:
+                  fields:
+                    - title
+                    - content
+                    - description
+                    - keywords
+                  messages:
+                    error: admin_message_entries_changes_saved
+                    success: admin_message_entries_changes_not_saved
+                  redirect:
+                    route: admin.entries.edit args:id,type
+                properties: 
+                  name: form_entries_edit
+                blocks:
+                  - type: InputSubmit
+                    properties:
+                      id: submit
+                      style:
+                        display: none
+                  - type: Tabs
+                    properties:
+                      tabs:
+                        main: 
+                          title: "{{ __('admin_main') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3 mt-3
+                                blocks:
+                                  - type: InputText 
+                                    properties:
+                                      name: title
+                                      label:
+                                        value: "{{ __('admin_title') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3
+                                blocks:
+                                  - type: Trumbowyg  
+                                    properties:
+                                      name: content
+                                      label:
+                                        value: "{{ __('admin_entries') }}"
+                                      options:
+                                        btns:
+                                          - strong
+                                          - em
+                                          - del
+                                          - link
+                                          - insertImage
+                                          - viewHTML
+                        settings: 
+                          title: "{{ __('admin_settings') }}"
+                          blocks:
+                            - type: Row
+                              blocks: 
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3 mt-3
+                                blocks: 
+                                  - type: Heading
+                                    properties:
+                                      value: "{{ __('admin_general') }}"
+                              - type: Column
+                                properties:
+                                  size: 12
+                                  class: mb-3
+                                blocks:
+                                  - type: InputTextarea 
+                                    properties:
+                                      name: description
+                                      validation:
+                                        required: true
+                                      rows: 3
+                                      label:
+                                        value: "{{ __('admin_description') }}"
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: template
+                                      label:
+                                        value: "{{ __('admin_template') }}"   
+                                      items: "{{ serializers().json.encode(templates) }}"                     
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: routable
+                                      label:
+                                        value: "{{ __('admin_routable') }}"   
+                                      items: "{{ serializers().json.encode(routable) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Select2 
+                                    properties:
+                                      name: visibility
+                                      label:
+                                        value: "{{ __('admin_visibility') }}"   
+                                      items: "{{ serializers().json.encode(visibility) }}"  
+                              - type: Column
+                                properties:
+                                  size: 3/12
+                                  class: mb-3
+                                blocks:
+                                  - type: Flatpickr 
+                                    properties:
+                                      name: published_at
+                                      label:
+                                        value: "{{ __('admin_published_at') }}"
+                            - type: Row
+                              blocks: 
+                                - type: Column
+                                  properties:
+                                    size: 12
+                                    class: mb-3 mt-3
+                                  blocks: 
+                                    - type: Heading
+                                      properties:
+                                        value: "{{ __('admin_menu') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks: 
+                                    - type: InputText
+                                      properties:
+                                        name: menu_item_title
+                                        label:
+                                          value: "{{ __('admin_menu_item_title') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputText  
+                                      properties:
+                                        name: menu_item_url
+                                        label:
+                                          value: "{{ __('admin_menu_item_url') }}"
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: Select2 
+                                      properties:
+                                        name: menu_item_target
+                                        label:
+                                          value: "{{ __('admin_menu_item_target') }}"
+                                        items: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
+                                - type: Column
+                                  properties:
+                                    size: 3/12
+                                    class: mb-3
+                                  blocks:
+                                    - type: InputNumber
+                                      properties:
+                                        name: menu_item_order
+                                        label:
+                                          value: "{{ __('admin_menu_item_order') }}"
+                                        value: 1
+
+                            
+                      
+            
\ No newline at end of file
diff --git a/project/config/flextype/settings.yaml b/project/config/flextype/settings.yaml
new file mode 100644
index 00000000..cd77c3f1
--- /dev/null
+++ b/project/config/flextype/settings.yaml
@@ -0,0 +1,702 @@
+# Set the timezone to be used on the project.
+# For a list of valid timezone settings, see:
+# http://php.net/manual/en/timezones.php
+timezone: UTC
+
+# Charset
+#
+# Set internal character encoding.
+#
+# Currently the following names are supported:
+# http://php.net/manual/en/function.mb-regex-encoding.php#121645
+charset: UTF-8
+
+# The locale that'll be used by the Flextype.
+#
+# Available locales to use: src/flextype/config/locales.yaml
+locale: en_US
+
+# Application Base url
+#
+# Define application base url
+base_url: ''
+
+# Application Base Path
+#
+# Define application base path if application located in subdirectory
+base_path: '/flextype'
+
+# Valid date format
+#
+# Date format variants:
+#
+#   d-m-Y H:i" - 02-02-2020 09:41
+#   Y-m-d H:i" - 2020-02-02 09:41
+#   m/d/Y h:i a - 02/02/2020 09:41 pm
+#   H:i d-m-Y - 09:41 02-02-2020
+#   h:i a m/d/Y - 09:41 pm 02/02/2020
+
+# Valid date format
+date_format: 'd-m-Y H:i'
+
+# Valid date format to display
+date_display_format: 'd-m-Y H:i'
+
+# Display errors
+#
+# Please make sure to set false for error `display` in production!
+#
+# Displaying PHP errors on a public server can be a serious security risk:
+#
+# - Error messages are displayed with detailed information about the code structure (e.g. file path, class, method)
+# - With Whoops enabled, there will be even more detailed information about the code structure
+# - Detailed error messages for login failures could leak information to attackers
+#
+# In a production environment, always log errors to your PHP error logs.
+errors:
+
+  # Set true to display errors.
+  display: true
+
+  # Editor (emacs, idea, macvim, phpstorm, sublime, textmate, xdebug, vscode, atom, espresso)
+  editor: atom
+
+  # Error page title
+  page_title: Error!
+
+  # Handler (pretty, plain, json, xml)
+  handler: pretty
+
+# Entries
+entries:
+  directory: '/entries'
+  collections:
+    default:
+      filename: entry
+      extension: yaml
+      serializer: yaml
+      fields:
+        registry:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/RegistryField.php"
+        entries:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/EntriesField.php"
+          fetch:
+            result: toObject
+        slug:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/SlugField.php"
+        published_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/PublishedAtField.php"
+        published_by:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/PublishedByField.php"
+        modified_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php"
+        created_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedAtField.php"
+        created_by:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedByField.php"
+        routable:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/RoutableField.php"
+        parsers:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ParsersField.php"
+        visibility:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/VisibilityField.php"
+        uuid:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
+        id:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
+    accounts:
+      pattern: accounts
+      filename: entry
+      extension: yaml
+      serializer: yaml
+      fields: 
+        registry:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/RegistryField.php"
+        slug:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/SlugField.php"
+        parsers:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ParsersField.php"
+        uuid:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
+        id:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
+    accounts_item:
+      pattern: accounts/(.*)
+      filename: account
+      extension: yaml
+      serializer: yaml
+      fields: 
+        registry:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/RegistryField.php"
+        slug:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/SlugField.php"
+        registered_at:
+          enabled: true
+          path: "/project/plugins/accounts/core/Entries/Fields/RegisteredAtField.php"
+        parsers:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ParsersField.php"
+        uuid:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
+        id:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
+    tokens:
+      pattern: tokens
+      filename: token
+      extension: yaml
+      serializer: yaml
+      fields: 
+        modified_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php"
+        created_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedAtField.php"
+        created_by:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedByField.php"
+        uuid:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
+        id:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
+    tokens_item:
+      pattern: tokens/([a-zA-Z0-9_-]+)
+      filename: token
+      extension: yaml
+      serializer: yaml
+      fields: 
+        modified_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php"
+        created_at:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedAtField.php"
+        created_by:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/CreatedByField.php"
+        uuid:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
+        id:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
+        calls:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Tokens/Items/CallsField.php"
+        total_calls:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Tokens/Items/TotalCallsField.php"
+        state:
+          enabled: true
+          path: "/src/flextype/core/Entries/Fields/Tokens/Items/StateField.php"
+
+# Cache
+#
+# - enabled:         Set to true to enable caching
+#
+# - prefix:          Cache prefix string (prevents cache conflicts)
+#
+# - driver:          Available drivers: auto (will get one from installed cache drivers), apcu,
+#                    apc, array, wincache, xcache, memcache, memcached, redis, file.
+#
+# - drivers.files.path: The path where the written cache files belong to (system temp directory by default).
+#
+# - drivers.files.secure_file_manipulation: This option enforces a strict I/O manipulation policy by adding more integrity checks.
+#                                           This option may slow down the write operations, therefore you must use it with caution.
+#
+# - drivers.files.htaccess: Option designed to (dis)allow the auto-generation of .htaccess.
+#
+# - drivers.files.security_key: A security key that define the subdirectory name. 'auto' value will be the HTTP_HOST value.
+#
+# - drivers.files.cache_file_extension: This allows you to setup a custom (but safe) cache file extension. ('txt|cache|db|pfc')
+#
+# - drivers.files.item_detailed_dates: This option will define if the Items will make use of detailed dates such as Creation/modification date.
+#                                      Trying to access to these date without being explicitly enabled will throw a LogicException
+#
+# - drivers.files.auto_tmp_fallback: Option designed to automatically attempt to fallback to temporary directory if the cache fails to write on the specified directory.
+#
+# - drivers.files.default_ttl: This option define a default ttl (time-to-live, in seconds) for item that has no specified expiration date/ttl.
+#
+# - drivers.files.default_key_hash_function: This option will allow you to define a custom hash function for the $item->getEncodedKey() method.
+#                                                  Callable objects are not allowed, but static method such as \Absolute\Namespace\ToStatic::method are allowed.
+#
+# - drivers.files.default_file_name_hash_function: This option will allow you to define a custom hash function for every I/O method that ends up to write an hashed filename on the disk.
+#
+# - drivers.files.default_chmod: This option will define the chmod used to write driver cache files.
+#
+# - drivers.files.limited_memory_by_object:
+#
+# - drivers.files.compress_data:
+#
+# - drivers.files.prevent_cache_slams: This option will allow you to prevent cache slams when making use of heavy cache items.
+#
+# - drivers.files.cache_slams_timeout: This option defines the cache slams timeout in seconds.
+cache:
+  enabled: false
+  router: routes
+  auto_reload: 
+    storage: false
+    plugins: false
+    flextype: false
+  driver: auto
+  drivers:
+    apcu: {}
+    cassandra:
+      host: '127.0.0.1'
+      port: 9042
+      timeout: 2
+      username: ''
+      password: ''
+      ssl_enabled: false
+      ssl_verify: false
+      default_ttl: 900
+    cookie:
+      aware_of_untrustable_data: false
+      limited_memory_by_object: 4096
+      default_ttl: 900
+    couchbase:
+      host: '127.0.0.1'
+      port: 8091
+      username: ''
+      password: ''
+      bucket_name: default
+      default_ttl: 900
+    couchdb:
+      database: 'flextype'
+      path: '/'
+      host: '127.0.0.1'
+      port: 8091
+      username: ''
+      password: ''
+      bucket_name: default
+      ssl: false
+      timeout: 10
+      default_ttl: 900
+    devnull: {}
+    devfalse: {}
+    devtrue: {}
+    phparray:
+      path: '/data'
+      security_key: 'auto'
+      htaccess: true
+      secure_file_manipulation: false
+      default_ttl: 900
+    files:
+      path: '/data'
+      security_key: 'auto'
+      htaccess: true
+      secure_file_manipulation: false
+      cache_file_extension: txt
+      default_ttl: 900
+    leveldb:
+      path: '/data'
+      security_key: 'auto'
+      htaccess: true
+      default_ttl: 900
+    memcache:
+      host: '127.0.0.1'
+      port: 11211
+      sasl_user: ''
+      sasl_password: ''
+      path: ''
+      compress_data: false
+      servers: {}
+      default_ttl: 900
+    memcached:
+      host: '127.0.0.1'
+      port: 11211
+      sasl_user: ''
+      sasl_password: ''
+      path: ''
+      compress_data: false
+      servers: {}
+      default_ttl: 900
+    memstatic: {}
+    mongodb:
+      host: '127.0.0.1'
+      port: 27017
+      username: ''
+      password: ''
+      timeout: 3
+      servers: {}
+      collection_name: 'Cache'
+      default_ttl: 900
+    predis:
+      host: '127.0.0.1'
+      port: 6379
+      password: ''
+      timeout: 5
+      database: 0
+      opt_prefix: ''
+      persistent: false
+      default_ttl: 900
+    redis:
+      host: '127.0.0.1'
+      port: 6379
+      password: ''
+      timeout: 5
+      database: 0
+      opt_prefix: ''
+      default_ttl: 900
+    riak:
+      host: '127.0.0.1'
+      port: 8098
+      prefix: 'riak'
+      default_ttl: 900
+    sqlite:
+      path: '/data'
+      security_key: auto
+      htaccess: true
+      default_ttl: 900
+    ssdb:
+      host: 127.0.0.1
+      port: 8888
+      password: ''
+      timeout: 5
+    wincache: {}
+    xcache: {}
+    zenddisk: {}
+    zendshm: {}
+
+# Slim
+#
+# - add_content_length_header: When true, Slim will add a Content-Length header to
+#                              the response. If you are using a runtime analytics tool,
+#                              such as New Relic, then this should be disabled.
+#
+# - router_cache_file: Filename for caching the FastRoute routes. Must be set to
+#                      a valid filename within a writeable directory. If the file
+#                      does not exist, then it is created with the correct cache
+#                      information on first run. Set to false to disable the FastRoute
+#                      cache system.
+#
+# - determine_route_before_app_middleware: When true, the route is calculated before
+#                                          any middleware is executed. This means that you
+#                                          can inspect route parameters in middleware if you need to.
+#
+# - output_buffering: If false, then no output buffering is enabled.
+#                     If 'append' or 'prepend', then any echo or print statements
+#                     are captured and are either appended or prepended to the Response
+#                     returned from the route callable.
+add_content_length_header: true
+router_cache_file: false
+determine_route_before_app_middleware: false
+output_buffering: append
+
+# Slugify
+slugify:
+
+  # Set true to enable slugify.
+  enabled: true
+
+  # By default Slugify will use dashes as separators.
+  # If you want to use a different default separator,
+  # you can set the separator option.
+  separator: "-"
+
+  # By default Slugify will convert the slug to lowercase.
+  # If you want to preserve the case of the string you can set the
+  # lowercase option to false.
+  lowercase: true
+
+  # By default Slugify will remove leading and trailing separators before
+  # returning the slug. If you do not want the slug to be trimmed you can
+  # set the trim option to false.
+  trim: true
+
+  # You can also change the regular expression that is used to replace
+  # characters with the separator.
+  regexp: "/[^A-Za-z0-9]+/"
+
+  # Lowercasing is done before using the regular expression.
+  # If you want to keep the lowercasing behavior but your
+  # regular expression needs to match uppercase letters,
+  # you can set the lowercase_after_regexp option to true.
+  lowercase_after_regexp: false
+
+  # Adds in an option to go through strip_tags() in case the string contains HTML etc.
+  strip_tags: false
+
+# Serializers
+#
+# json.decode.cache: Cache result data or no. Default is true.
+# json.decode.assoc: Decode assoc. When TRUE, returned objects will be converted into associative arrays.
+# json.decode.depth: Decode Depth. Set the maximum depth. Must be greater than zero.
+# json.decode.flags: Bitmask consisting of decode options.
+# json.encode.options: Bitmask consisting of encode options
+# json.encode.depth: Encode Depth. Set the maximum depth. Must be greater than zero.
+#
+# yaml.decode.cache: Cache result data or no. Default is true.
+# yaml.decode.native: Use native php pecl parser or symfony parser.
+# yaml.decode.flags: A bit field of DUMP_* constants to customize the dumped YAML string.
+# yaml.encode.inline: The level where you switch to inline YAML.
+# yaml.encode.indent: The amount of spaces to use for indentation of nested nodes.
+# yaml.encode.flags: A bit field of DUMP_* constants to customize the dumped YAML string.
+#
+# frontmatter.decode.cache: Cache result data or no. Default is true.
+# frontmatter.decode.header_serializer: Header serializer.
+# frontmatter.encode.header_serializer: Header serializer.
+#
+# neon.decode.cache: Cache result data or no. Default is true.
+# neon.encode.flags: The flag can be 1, which will create multiline output.
+#
+# phparray.decode.cache: Cache result data or no. Default is true.
+#
+# phpcode.decode.cache: Cache result data or no. Default is true.
+serializers:
+  json: 
+    decode:
+      cache: true
+      assoc: true
+      depth: 512
+      flags: 0
+    encode: 
+      options: 0
+      depth: 512
+  yaml:
+    decode:
+      cache: true
+      native: true
+      flags: 0
+    encode:    
+      inline: 10
+      indent: 2
+      flags: 0
+  frontmatter:
+    decode:
+      cache: true
+      header:
+        serializer: yaml
+        allowed: ['yaml', 'json', 'neon']
+    encode:    
+      header:
+        serializer: yaml
+        allowed: ['yaml', 'json', 'neon']
+  neon:
+    decode:
+      cache: true
+    encode:
+      flags: 1
+  phparray:
+    decode:
+      cache: true
+  phpcode:
+    decode:
+      cache: true
+
+# Parsers
+#
+# - markdown.cache:                                 Cache result data or no. Default is true.
+#
+# - markdown.commonmark.renderer.block_separator:   String to use for separating renderer block elements.
+#
+# - markdown.commonmark.renderer.inner_separator:   String to use for separating inner block contents.
+#
+# - markdown.commonmark.renderer.soft_break:        String to use for rendering soft breaks.
+#
+# - markdown.commonmark.commonmark.enable_em:       Disable <em> parsing by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.enable_strong:   Disable <strong> parsing by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.use_asterisk:    Disable parsing of * for emphasis by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.use_underscore:  Disable parsing of _ for emphasis by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.unordered_list_markers: Array of characters that can be used to indicate a bulleted list.
+#
+# - markdown.commonmark.html_input:                `strip` all HTML (equivalent to 'safe' => true). `allow` all HTML input as-is (default value; equivalent to `‘safe’ => false) `escape` Escape all HTML.
+#
+# - markdown.commonmark.allow_unsafe_links:         Remove risky link and image URLs by setting this to false (default: true).
+#
+# - markdown.commonmark.max_nesting_level:          The maximum nesting level for blocks (default: PHP_INT_MAX). Setting this to a positive integer can help protect against long parse times and/or segfaults if blocks are too deeply-nested.
+#
+# - markdown.commonmark.slug_normalizer.max_length: Limits the size of generated slugs (defaults to 255 characters)
+parsers:
+  markdown:
+    cache: true
+    commonmark:
+      renderer:
+        block_separator: "\n"
+        inner_separator: "\n"
+        soft_break: "\n"
+      commonmark:
+        enable_em: true
+        enable_strong: true
+        use_asterisk: true
+        use_underscore: true
+        unordered_list_markers: ['-', '*', '+']
+      html_input: 'allow'
+      allow_unsafe_links: false
+      max_nesting_level: 9223372036854775807
+      slug_normalizer:
+        max_length: 255
+  shortcodes:
+    cache: true
+    shortcodes:
+      media:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/MediaShortcode.php"
+      entries:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/EntriesShortcode.php"
+      raw:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/RawShortcode.php"
+      registry:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php"
+      url:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/UrlShortcode.php"
+
+# CORS
+#
+# CORS (Cross-origin resource sharing) allows JavaScript web apps to make HTTP requests to other domains.
+# This is important for third party web apps using Flextype, as without CORS, a JavaScript app hosted on example.com
+# couldn't access our APIs because they're hosted on another.com which is a different domain.
+cors:
+
+  # Set to true to enable cors
+  enabled: true
+
+  # The Access-Control-Allow-Origin response header indicates whether
+  # the response can be shared with requesting code from the given origin.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
+  origin: "*"
+
+  # The Access-Control-Allow-Headers response header is used in response
+  # to a preflight request which includes the Access-Control-Request-Headers
+  # to indicate which HTTP headers can be used during the actual request.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
+  headers: ["X-Requested-With", "Content-Type", "Accept", "Origin", "Authorization"]
+  
+  # The Access-Control-Allow-Methods response header specifies the method
+  # or methods allowed when accessing the resource in response to a preflight request.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
+  methods: [GET, POST, PUT, DELETE, PATCH, OPTIONS]
+  
+  # The Access-Control-Expose-Headers response header indicates which headers
+  # can be exposed as part of the response by listing their names.
+  #
+  # read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
+  expose: []
+
+  # The Access-Control-Allow-Credentials response header tells browsers whether
+  # to expose the response to frontend JavaScript code when the request's credentials
+  # mode (Request.credentials) is include.
+  #
+  # read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
+  credentials: false
+
+# Upload
+upload:
+
+  # Uploads directory
+  directory: '/uploads'
+
+  # Overwrite existing files.
+  overwrite: true
+
+  # Auto-confirm uploads.
+  autoconfirm: false
+
+  # Prefixing uploads.
+  prefix: ''
+
+  # Validation options
+  validation:
+
+    # Allowed file extensions.
+    allowed_file_extensions: ['gif', 'jpg', 'jpeg', 'png', 'ico', 'webm', 'svg']
+
+    # Maximum file size.
+    max_file_size: '24M'
+
+    # Image validation options
+    image:
+    
+      # Image maxiumum and minimum width
+      width:
+        max: 4920
+        min: 100
+
+      # Image maxiumum and minimum height
+      height: 
+        max: 3264
+        min: 100
+    
+      # Image ratio
+      #ratio:
+      #  The option can be a number (eg: 1.3) or a ratio-like string (eg: 4:3, 16:9).
+      #  size: 1.3
+
+      #  The option error_margin specifies how much the image is allowed to 
+      #  deviate from the target ratio. Default value is 0.
+      #  error_margin: 0
+
+  # Process uploaded files
+  process:
+
+    # Images process settings
+    image:
+
+      # Image quality
+      quality: 70
+    
+# Session
+#
+# Set session options before you start the session
+# Standard PHP session configuration options
+# https://secure.php.net/manual/en/session.configuration.php
+session:
+
+  # Session name
+  name: Flextype
+
+# Flextype Rest APIs
+api:
+
+  # Entries API
+  entries:
+
+    # Set to true to enable Entries API
+    enabled: true
+
+  # Registry API
+  registry:
+
+    # Set to true to enable Registry API
+    enabled: true
+
+  # Utils API
+  utils:
+
+    # Set to true to enable Utils API
+    enabled: true
\ No newline at end of file
diff --git a/project/config/plugins/accounts-admin/settings.yaml b/project/config/plugins/accounts-admin/settings.yaml
new file mode 100644
index 00000000..46cb2237
--- /dev/null
+++ b/project/config/plugins/accounts-admin/settings.yaml
@@ -0,0 +1,13 @@
+enabled: true
+priority: 90
+supper_admin_registered: true
+from:
+  name: Flextype
+  email: sergey.romanenko@flextype.org
+navigation:
+  links: {  }
+  actions:
+    -
+      properties:
+        href: '{{ urlFor(''admin.accounts.index'') }}'
+        icon: { set: bootstrap, name: users }
diff --git a/project/config/plugins/accounts/settings.yaml b/project/config/plugins/accounts/settings.yaml
new file mode 100644
index 00000000..d944aa08
--- /dev/null
+++ b/project/config/plugins/accounts/settings.yaml
@@ -0,0 +1,77 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Accounts plugin priority
+priority: 100
+
+# From email
+from:
+  name: Flextype
+  email: sergey.romanenko@flextype.org
+
+# Index(accounts)
+index:
+  enabled: true
+
+# Registraton
+registration:
+  enabled: true
+  default_roles: user
+  default_state: enabled
+  redirect:
+    route:
+      name: accounts.login
+
+# Login
+login:
+  enabled: true
+  redirect:
+    route:
+      name: accounts.profile
+
+# Profile
+profile:
+  enabled: true
+
+# Profile Edit
+profile_edit:
+  enabled: true
+  redirect:
+    route:
+      name: accounts.profile
+
+# New Password
+new_password:
+  enabled: true
+  redirect:
+    route:
+      name: accounts.login
+
+# Reset Password
+reset_password:
+  enabled: true
+  redirect:
+    route:
+      name: accounts.login
+
+# Logout
+logout:
+  redirect:
+    route:
+      name: accounts.login
+
+
+# Entries
+entries:
+  accounts:
+    collection: accounts
+    fields:
+      uuid:
+        enabled: true
+        path: "/project/plugins/accounts/app/Fields/UuidField.php"
+      id:
+        enabled: true
+        path: "/project/plugins/accounts/app/Fields/IdField.php"
+      registered_at:
+        enabled: true
+        path: "/project/plugins/accounts/app/Fields/RegisteredAtField.php"
\ No newline at end of file
diff --git a/project/config/plugins/acl/settings.yaml b/project/config/plugins/acl/settings.yaml
new file mode 100644
index 00000000..21f1d326
--- /dev/null
+++ b/project/config/plugins/acl/settings.yaml
@@ -0,0 +1,5 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# ACL plugin priority
+priority: 40
diff --git a/project/config/plugins/admin/settings.yaml b/project/config/plugins/admin/settings.yaml
new file mode 100644
index 00000000..d8b4388c
--- /dev/null
+++ b/project/config/plugins/admin/settings.yaml
@@ -0,0 +1,49 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# custom admin pane route
+route: admin
+
+# entries settings
+entries:
+  slugify: true
+
+# plugin priority
+priority: 50
+
+# admin navigation
+navigation:
+  dropdown: 
+
+  links: []
+  actions: 
+    - properties:
+        href: "{{ urlFor('admin.entries.index') }}"
+        icon:
+          set: bootstrap
+          name: newspaper
+    - properties:
+        href: "{{ urlFor('admin.media.index') }}"
+        icon:
+          set: bootstrap
+          name: images
+    - properties:
+        href: "{{ urlFor('admin.plugins.index') }}"
+        icon:
+          set: bootstrap
+          name: box
+    - properties:
+        href: "{{ urlFor('admin.tools.index') }}"
+        icon:
+          set: bootstrap
+          name: briefcase
+    - properties:
+        href: "{{ urlFor('admin.api.index') }}"
+        icon:
+          set: bootstrap
+          name: diagram-3
+    - properties:
+        href: "{{ urlFor('admin.settings.index') }}"
+        icon:
+          set: bootstrap
+          name: gear
diff --git a/project/config/plugins/blueprints/settings.yaml b/project/config/plugins/blueprints/settings.yaml
new file mode 100644
index 00000000..60ed207c
--- /dev/null
+++ b/project/config/plugins/blueprints/settings.yaml
@@ -0,0 +1,126 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Blueprint plugin priority
+priority: 40
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Entries
+entries:
+  directory: '/blueprints'
+  collections:
+    default:
+      filename: blueprint
+      extension: yaml
+      serializer: yaml
+      fields: []
+
+# Blocks
+blocks:
+  ActionsDropdown:
+    type: ActionsDropdown
+    properties: []
+    template: plugins/blueprints/blocks/blocks/ActionsDropdown/block.html
+  Anchor:
+    type: Anchor
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Anchor/block.html
+  Alert:
+    type: Alert
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Alert/block.html 
+  Button:
+    type: Button 
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Button/block.html 
+  ButtonGroup:
+    type: ButtonGroup 
+    properties: []
+    template: plugins/blueprints/blocks/blocks/ButtonGroup/block.html 
+  Display:
+    type: Display
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Display/block.html 
+  Divider:
+    type: Divider
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Divider/block.html 
+  Container:
+    type: Container
+    properties: []
+    blocks: []
+    template: plugins/blueprints/blocks/blocks/Container/block.html 
+  Row:
+    type: Row
+    properties: []
+    blocks: []
+    template: plugins/blueprints/blocks/blocks/Row/block.html 
+  Column:
+    type: Column
+    properties: []
+    blocks: []
+    template: plugins/blueprints/blocks/blocks/Column/block.html 
+  Tabs:
+    type: Tabs
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Tabs/block.html 
+  Form:
+    type: Form
+    properties: []
+    blocks: []
+    template: plugins/blueprints/blocks/blocks/Form/block.html 
+  Heading:
+    type: Heading
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Heading/block.html 
+  Image:
+    type: Image
+    properties: []
+    template: plugins/blueprints/blocks/blocks/Image/block.html 
+  InputText:
+    type: InputText
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputText/block.html
+  InputEmail:
+    type: InputEmail
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputEmail/block.html 
+  InputPassword:
+    type: InputPassword
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputPassword/block.html 
+  InputTextarea:
+    type: InputTextarea
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputTextarea/block.html 
+  InputHidden:
+    type: InputHidden
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputHidden/block.html 
+  InputNumber:
+    type: InputNumber
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputNumber/block.html 
+  InputTags:
+    type: InputTags
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputTags/block.html     
+  InputSelect:
+    type: InputSelect
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputSelect/block.html 
+  InputReset:
+    type: InputReset
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputReset/block.html 
+  InputButton:
+    type: InputButton
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputButton/block.html  
+  InputSubmit:
+    type: InputSubmit
+    properties: []
+    template: plugins/blueprints/blocks/blocks/InputSubmit/block.html    
diff --git a/project/config/plugins/codemirror/settings.yaml b/project/config/plugins/codemirror/settings.yaml
new file mode 100644
index 00000000..bb09e679
--- /dev/null
+++ b/project/config/plugins/codemirror/settings.yaml
@@ -0,0 +1,183 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Plugin priority
+priority: 41
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Blocks
+blocks:
+  Codemirror:
+    type: Codemirror
+    properties:
+      name: codemirror
+      
+      # Codemirror options
+      options: 
+        
+        # The mode to use.
+        # https://codemirror.net/mode/
+        # variants: yaml, yaml-frontmatter, htmlmixed, xml, php, javascript, markdown, css, twig
+        mode: "yaml-frontmatter"
+
+        # Explicitly set the line separator for the editor. 
+        # By default is null)
+        lineSeparator: null
+
+        # Whether to show line numbers to the left of the editor.
+        lineNumbers: true
+
+        # Whether CodeMirror should scroll or wrap for long lines.
+        # Defaults to false (scroll).
+        lineWrapping: false
+
+        # At which number to start counting lines.
+        firstLineNumber: 1
+
+        # Determines whether the gutter scrolls along with the content horizontally (false) 
+        # or whether it stays fixed during horizontal scrolling.
+        fixedGutter: true
+
+        # Chooses a scrollbar implementation. 
+        scrollbarStyle: "native"
+
+        # When fixedGutter is on, and there is a horizontal scrollbar, by default the gutter will be visible to the left of this scrollbar. 
+        # If this option is set to true, it will be covered by an element with class CodeMirror-gutter-filler.
+        coverGutterNextToScrollbar: true
+
+        # This disables editing of the editor content by the user. 
+        # If the special value "nocursor" is given (instead of simply true), 
+        # focusing of the editor is also disallowed.
+        readOnly: false
+
+        # This label is read by the screenreaders when CodeMirror text area is focused. 
+        # This is helpful for accessibility.
+        screenReaderLabel: ""
+
+        # Whether the cursor should be drawn when a selection is active.
+        showCursorWhenSelecting: false
+
+        # The theme to style the editor with. only "elegant" available 
+        theme: elegant
+
+        # The width of a tab character. 
+        # Defaults to 2.
+        tabSize: 2
+
+        # How many spaces a block (whatever that means in the edited language) should be indented. 
+        # The default is 2.
+        indentUnit: 2
+        
+        # Whether, when indenting, the first N*tabSize spaces should be replaced by N tabs. 
+        # Default is false.
+        indentWithTabs: false
+
+        # Whether to use the context-sensitive indentation that the mode provides (or just indent the same as the line before).
+        # Defaults to true.
+        smartIndent: true
+
+        # Flips overall layout and selects base paragraph direction to be left-to-right or right-to-left. 
+        # Default is "ltr".
+        direction: ltr
+
+        # Determines whether horizontal cursor movement through right-to-left (Arabic, Hebrew) text is visual
+        # (pressing the left arrow moves the cursor left) or logical (pressing the left arrow moves to the next lower index in the string, which is visually right in right-to-left text). 
+        # The default is false on Windows, and true on other platforms.
+        rtlMoveVisually: false
+
+        # Configures whether the editor should re-indent the current line when a character is typed that might change its proper indentation (only works if the mode supports indentation). 
+        # Default is true.
+        electricChars: true
+
+        # Configures the key map to use.
+        # https://codemirror.net/doc/manual.html#keymaps
+        keyMap: "default"
+
+        # When enabled, which is the default, doing copy or cut when there is no selection will copy or cut the whole lines that have cursors on them.
+        lineWiseCopyCut: true
+
+        # When pasting something from an external source (not from the editor itself), if the number of lines matches the number of selection, 
+        # CodeMirror will by default insert one line per selection. You can set this to false to disable that behavior.
+        pasteLinesPerSelection: true
+        
+        # Determines whether multiple selections are joined as soon as they touch (the default) or only when they overlap (true).
+        selectionsMayTouch: true
+        
+        # The maximum number of undo levels that the editor stores. 
+        # Note that this includes selection change events.
+        undoDepth: 200
+
+        # The period of inactivity (in milliseconds) that will cause a new history event to be started when typing or deleting.
+        historyEventDelay: 1250
+
+        # Can be used to make CodeMirror focus itself on initialization. 
+        #
+        # When fromTextArea is used, and no explicit value is given for this option, 
+        # it will be set to true when either the source textarea is focused, 
+        # or it has an autofocus attribute and no other element is focused.
+        autofocus: false
+
+        # Controls whether drag-and-drop is enabled.
+        dragDrop: true
+
+        # Half-period in milliseconds used for cursor blinking.
+        # By setting this to zero, blinking can be disabled. A negative value hides the cursor entirely.
+        cursorBlinkRate: 530
+
+        # How much extra space to always keep above and below the cursor when approaching the top or bottom of the visible view in a scrollable document.
+        cursorScrollMargin: 0
+
+        # Determines the height of the cursor. 
+        # Default is 1, meaning it spans the whole height of the line.
+        # For some fonts (and by some tastes) a smaller height (for example 0.85), 
+        # which causes the cursor to not reach all the way to the bottom of the line, looks better
+        cursorHeight: 1 
+
+        # If set to true, will keep the cursor height constant for an entire line (or wrapped part of a line). 
+        # When false, the cursor's height is based on the height of the adjacent reference character.
+        singleCursorHeightPerLine: true
+
+        # Controls whether, when the context menu is opened with a click outside of the current selection, the cursor is moved to the point of the click.
+        resetSelectionOnContextMenu: true
+
+        # Highlighting is done by a pseudo background-thread that will work for workTime milliseconds
+        workTime: 200
+
+        # and then use timeout to sleep for workDelay milliseconds.
+        workDelay: 300 
+
+        # Indicates how quickly CodeMirror should poll its input textarea for changes (when focused). 
+        # Most input is captured by events, but some things, like IME input on some browsers, don't generate events that allow CodeMirror to properly detect it.
+        pollInterval: 100
+
+        # By default, CodeMirror will combine adjacent tokens into a single span if they have the same class. 
+        # This will result in a simpler DOM tree, and thus perform better. With some kinds of styling (such as rounded corners), this will change the way the document looks. You can set this option to false to disable this behavior.
+        flattenSpans: true
+
+        # When enabled (off by default), an extra CSS class will be added to each token, indicating the (inner) mode that produced it, prefixed with "cm-m-". 
+        # For example, tokens from the XML mode will get the cm-m-xml class.
+        # https://codemirror.net/doc/manual.html#innerMode
+        addModeClass: false
+
+        # When highlighting long lines, in order to stay responsive,
+        # the editor will give up and simply style the rest of the line as plain text when it reaches a certain position. 
+        maxHighlightLength:  10000 
+
+        # Specifies the amount of lines that are rendered above and below the part of the document that's currently scrolled into view. 
+        # This affects the amount of updates needed when scrolling, and the amount of work that such an update does. 
+        # You should usually leave it at its default, 10. Can be set to Infinity to make sure the whole document is always rendered, and thus the browser's text search works on it. This will have bad effects on performance of big documents.
+        viewportMargin: 10
+
+        # Specifies whether or not spellcheck will be enabled on the input.
+        spellcheck: false
+
+        # Specifies whether or not autocorrect will be enabled on the input.
+        autocorrect: false
+
+        # Specifies whether or not autocapitalization will be enabled on the input.
+        autocapitalize: false
+
+    template: plugins/codemirror/blocks/Codemirror/block.html
\ No newline at end of file
diff --git a/project/config/plugins/contact/settings.yaml b/project/config/plugins/contact/settings.yaml
new file mode 100644
index 00000000..2b4f36fb
--- /dev/null
+++ b/project/config/plugins/contact/settings.yaml
@@ -0,0 +1,14 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Contact plugin priority
+priority: 100
+
+default_subject: Default subject
+message_success: "Email sended."
+from:
+  name: Flextype
+  email: sergey.romanenko@flextype.org
+to:
+  name: Flextype
+  email: sergey.romanenko@flextype.org
diff --git a/project/config/plugins/data-guard/settings.yaml b/project/config/plugins/data-guard/settings.yaml
new file mode 100644
index 00000000..af67fe5e
--- /dev/null
+++ b/project/config/plugins/data-guard/settings.yaml
@@ -0,0 +1,2 @@
+enabled: true
+priority: 100
diff --git a/project/config/plugins/feed/settings.yaml b/project/config/plugins/feed/settings.yaml
new file mode 100644
index 00000000..c2c8c8ae
--- /dev/null
+++ b/project/config/plugins/feed/settings.yaml
@@ -0,0 +1,3 @@
+enabled: true
+priority: 100
+feed: []
diff --git a/project/config/plugins/flatpickr/settings.yaml b/project/config/plugins/flatpickr/settings.yaml
new file mode 100644
index 00000000..c6dc78af
--- /dev/null
+++ b/project/config/plugins/flatpickr/settings.yaml
@@ -0,0 +1,160 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Plugin priority
+priority: 41
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Blocks
+blocks:
+  Flatpickr:
+    type: Flatpickr
+    properties:
+      name: flatpickr
+      
+      # Flatpickr options
+      options:
+
+        # Allows the user to enter a date directly input the input field. By default, direct entry is disabled.
+        allowInput: false
+
+        # Allow preloading of invalid date
+        allowInvalidPreload: false
+
+        # Exactly the same as date format, but for the altInput field
+        altFormat: "F j, Y"
+
+        # Show the user a readable date (as per altFormat), but return something totally different to the server.
+        altInput: false
+
+        # This class will be added to the input element created by the altInput option.  
+        # Note that altInput already inherits classes from the original input.
+        altInputClass: ""
+
+        # Whether to enable animations, such as month transitions
+        animate: true
+
+        # Defines how the date will be formatted in the aria-label for calendar days, using the same tokens as dateFormat. 
+        # If you change this, you should choose a value that will make sense if a screen reader reads it out loud.
+        ariaDateFormat: "F j, Y"
+
+        # Whether the default time should be auto-filled when the input is empty and gains or loses focus. 
+        autoFillDefaultTime: true
+
+        # Whether clicking on the input should open the picker.
+        # Set it to false if you only want to open the calendar programmatically
+        clickOpens: true
+
+        # Whether calendar should close after date selection
+        closeOnSelect: true
+        
+        # If "mode" is "multiple", this string will be used to join
+        # selected dates together for the date input value.
+        conjunction: null
+  
+        # A string of characters which are used to define how the date will be displayed in the input box.
+        # See https://chmln.github.io/flatpickr/formatting
+        dateFormat: "d-m-Y H:i"
+
+        # The initial selected date(s).
+        defaultDate: null
+
+        # Initial value of the hour element, when no date is selected 
+        defaultHour: 12
+
+        # Initial value of the minute element, when no date is selected 
+        defaultMinute: 0
+
+        # Initial value of the seconds element, when no date is selected 
+        defaultSeconds: 0
+
+        # Set this to true to always use the non-native picker on mobile devices.
+        # By default, Flatpickr utilizes native datetime widgets unless certain options (e.g. disable) are used.
+        disableMobile: false
+
+        # Disables all dates except these specified. 
+        # See https://chmln.github.io/flatpickr/examples/#disabling-all-dates-except-select-few 
+        #enable: []
+                
+        # Disables certain dates, preventing them from being selected.
+        # See https://chmln.github.io/flatpickr/examples/#disabling-specific-dates
+        #disable: []
+
+        # Enables seconds selection in the time picker.
+        enableSeconds: false
+
+        # Enables the time picker
+        enableTime: true
+
+        # Adjusts the step for the hour input (incl. scrolling)
+        hourIncrement: 1
+
+        # By default, clicking anywhere outside of calendar/input will close the calendar.
+        # Clicking on elements specified in this option will not close the calendar
+        ignoredFocusElements: []
+
+        # Displays the calendar inline
+        inline: false
+
+        # The locale, either as a string (e.g. "ru", "en") or as an object.
+        # See https://chmln.github.io/flatpickr/localization/ 
+        locale: "default"
+
+        # Adjusts the step for the minute input (incl. scrolling)
+        minuteIncrement: 5
+
+        # Date selection mode, defaults to "single"
+        # variants: single, multiple, or range
+        mode: "single"
+
+        # How the month selector in the calendar should be shown
+        # variants: dropdown, static
+        monthSelectorType: "static"
+
+        # HTML for the right arrow icon, used to switch months.
+        nextArrow: "<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M13.207 8.472l-7.854 7.854-0.707-0.707 7.146-7.146-7.146-7.148 0.707-0.707 7.854 7.854z' /></svg>"
+
+        # Hides the day selection in calendar.
+        # Use it along with "enableTime" to create a time picker.
+        noCalendar: false
+
+        # A custom datestring parser
+        parseDate: false
+
+        # Plugins. 
+        # See https://chmln.github.io/flatpickr/plugins/ 
+        # plugins: []
+
+        # How the calendar should be positioned with regards to the input.
+        # variants: auto, above, below, auto left, auto center, above right, below left, below center, below right
+        position: "auto"
+          
+        # The element off of which the calendar will be positioned.
+        # Defaults to the date input
+        positionElement: null
+
+        # HTML for the left arrow icon, used to switch months.
+        prevArrow: "<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M5.207 8.471l7.146 7.147-0.707 0.707-7.853-7.854 7.854-7.853 0.707 0.707-7.147 7.146z' /></svg>"
+
+        # Whether to display the current month name in shorthand mode, e.g. "Sep" instead "September"
+        shorthandCurrentMonth: false
+
+        # Creates a wrapper to position the calendar. Use this if the input is inside a scrollable element
+        static: false
+
+        # Sets the number of months to show 
+        showMonths: 1
+
+        # Displays time picker in 24 hour mode without AM/PM selection when enabled.
+        time_24hr: false
+
+        # Display week numbers left of the calendar.
+        weekNumbers: false
+
+        # See https://chmln.github.io/flatpickr/examples/#flatpickr-external-elements
+        wrap: false
+         
+    template: plugins/flatpickr/blocks/Flatpickr/block.html
\ No newline at end of file
diff --git a/project/config/plugins/icon/settings.yaml b/project/config/plugins/icon/settings.yaml
new file mode 100644
index 00000000..e0b85b9e
--- /dev/null
+++ b/project/config/plugins/icon/settings.yaml
@@ -0,0 +1,5 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Icon plugin priority
+priority: 1
diff --git a/project/config/plugins/page-view-counter/settings.yaml b/project/config/plugins/page-view-counter/settings.yaml
new file mode 100644
index 00000000..af67fe5e
--- /dev/null
+++ b/project/config/plugins/page-view-counter/settings.yaml
@@ -0,0 +1,2 @@
+enabled: true
+priority: 100
diff --git a/project/config/plugins/php-embed/settings.yaml b/project/config/plugins/php-embed/settings.yaml
new file mode 100644
index 00000000..d4ca9418
--- /dev/null
+++ b/project/config/plugins/php-embed/settings.yaml
@@ -0,0 +1 @@
+enabled: true
diff --git a/project/config/plugins/phpmailer/settings.yaml b/project/config/plugins/phpmailer/settings.yaml
new file mode 100644
index 00000000..ede80ba7
--- /dev/null
+++ b/project/config/plugins/phpmailer/settings.yaml
@@ -0,0 +1,5 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# PHP Mailer plugin priority
+priority: 100
diff --git a/project/config/plugins/reading-time/settings.yaml b/project/config/plugins/reading-time/settings.yaml
new file mode 100644
index 00000000..af67fe5e
--- /dev/null
+++ b/project/config/plugins/reading-time/settings.yaml
@@ -0,0 +1,2 @@
+enabled: true
+priority: 100
diff --git a/project/config/plugins/redirect/settings.yaml b/project/config/plugins/redirect/settings.yaml
new file mode 100644
index 00000000..0e49a99a
--- /dev/null
+++ b/project/config/plugins/redirect/settings.yaml
@@ -0,0 +1,3 @@
+enabled: true
+priority: 100
+redirect: []
diff --git a/project/config/plugins/section/settings.yaml b/project/config/plugins/section/settings.yaml
new file mode 100644
index 00000000..d4ca9418
--- /dev/null
+++ b/project/config/plugins/section/settings.yaml
@@ -0,0 +1 @@
+enabled: true
diff --git a/project/config/plugins/select2/settings.yaml b/project/config/plugins/select2/settings.yaml
new file mode 100644
index 00000000..05b5bc49
--- /dev/null
+++ b/project/config/plugins/select2/settings.yaml
@@ -0,0 +1,91 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Plugin priority
+priority: 41
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Blocks
+blocks:
+  Select2:
+    type: Select2
+    properties:
+      name: select2
+      
+      # Select2 options
+      options:
+
+        # Provides support for ajax data sources.
+        # See: https://select2.org/data-sources/ajax
+        ajax: null
+
+        # Provides support for clearable selections.
+        # See: https://select2.org/selections#clearable-selections
+        allowClear: false
+
+        # Controls whether the dropdown is closed after a selection is made.
+        # See: https://select2.org/dropdown#forcing-the-dropdown-to-remain-open-after-selection
+        closeOnSelect: true
+
+        # Allows rendering dropdown options from an array.
+        # See: https://select2.org/data-sources/arrays
+        data: null
+
+        # Enable debugging messages in the browser console.
+        debug: false
+
+        # Sets the dir attribute on the selection and dropdown containers to indicate the direction of the text.
+        # See: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/dir
+        dir: ltr
+
+        # When set to `true`, the select control will be disabled.
+        disabled: false
+
+        # Dropdown auto width
+        dropdownAutoWidth: false
+
+        # Adds additional CSS classes to the dropdown container. 
+        # The helper :all: can be used to add all CSS classes present on the original <select> element.
+        dropdownCssClass: ''
+
+        # Maximum number of characters that may be provided for a search term.
+        maximumInputLength: 0
+
+        # The maximum number of items that may be selected in a multi-select control. 
+        # If the value of this option is less than 1, the number of selected items will not be limited.
+        maximumSelectionLength: 0
+
+        # Minimum number of characters required to start a search.
+        # See: https://select2.org/searching#minimum-search-term-length
+        minimumInputLength: 0
+
+        # The minimum number of results required to display the search box.
+        # See: https://select2.org/searching#limiting-display-of-the-search-box-to-large-result-sets
+        minimumResultsForSearch: 0
+
+        # This option enables multi-select (pillbox) mode. 
+        # Select2 will automatically map the value of the multiple HTML attribute to this option during initialization.
+        multiple: false
+
+        # Specifies the placeholder for the control.
+        placeholder: null
+
+        # Adds additional CSS classes to the selection container. 
+        # The helper :all: can be used to add all CSS classes present on the original <select> element.
+        selectionCssClass: ''
+
+        # Implements automatic selection when the dropdown is closed.
+        # See: https://select2.org/dropdown#automatic-selection
+        selectOnClose: false
+
+        # If true, resolves issue for multiselects using closeOnSelect: false that caused the list of results 
+        # to scroll to the first selection after each select/unselect (see https://github.com/select2/select2/pull/5150). 
+        # This behaviour was intentional to deal with infinite scroll UI issues (if you need this behavior, set false) 
+        # but it created an issue with multiselect dropdown boxes of fixed length. 
+        # This pull request adds a configurable option to toggle between these two desirable behaviours.
+        scrollAfterSelect: false
+
+    template: plugins/select2/blocks/Select2/block.html
\ No newline at end of file
diff --git a/project/config/plugins/site/settings.yaml b/project/config/plugins/site/settings.yaml
new file mode 100644
index 00000000..07b37450
--- /dev/null
+++ b/project/config/plugins/site/settings.yaml
@@ -0,0 +1,44 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Site plugin priority
+priority: 10000
+
+# The title of the website
+title: Flextype
+
+# The description of the website
+description: Build fast, flexible, easier to manage websites with Flextype.
+
+# The keywords of the website
+keywords: flextype, php, cms, flat-file cms, flat cms, flatfile cms, html
+
+# The robots of the website
+robots: index, follow
+
+# The name and email address of the website author
+author:
+  email: ''
+  name: ''
+
+# The theme to use.
+#
+# Don't edit the provided theme templates directly, because they get updated
+# in next releases. If you wish to modify a default theme, copy its folder, and
+# change the name here accordingly.
+theme: bootstrap
+
+# The entries settings
+#
+# - main:                 Main entry
+# - error404.title:       Title to display on Error404 page
+# - error404.description: Description to display on Error404 page
+# - error404.content:     Content to display on Error404 page
+# - error404.template:    Template to use on Error404 page
+entries:
+  main: home
+  error404:
+    title: Error 404
+    description: We're sorry but the page you are looking for doesn't appear to exist!
+    content: "<center>We're sorry but the page you are looking for doesn't appear to exist!</center>"
+    template: default
diff --git a/project/config/plugins/sitemap/settings.yaml b/project/config/plugins/sitemap/settings.yaml
new file mode 100644
index 00000000..706f4e16
--- /dev/null
+++ b/project/config/plugins/sitemap/settings.yaml
@@ -0,0 +1,22 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Sitemap plugin priority
+priority: 100
+
+# Route
+route: sitemap.xml
+
+# Ignore list
+ignore:
+
+# Addition list
+additions:
+
+# Default values for entries
+default:
+  changefreq: daily
+  priority: !!float 1
+
+# Date format
+date_format: Y-m-d
diff --git a/project/config/plugins/tagify/settings.yaml b/project/config/plugins/tagify/settings.yaml
new file mode 100644
index 00000000..6bb6cbba
--- /dev/null
+++ b/project/config/plugins/tagify/settings.yaml
@@ -0,0 +1,154 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Plugin priority
+priority: 41
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Blocks
+blocks:
+  Tagify:
+    type: Tagify
+    properties:
+      name: tagify
+      
+      # Tagify options
+      options:
+
+        # Tag data Object property which will be displayed as the tag's text. 
+        # Remember to keep "value" property unique.
+        tagTextProp: "value"
+
+        # Placeholder text. 
+        # If this attribute is set on an input/textarea element it will override this setting
+        placeholder: ""
+
+        # [RegEx string] split tags by any of these delimiters. 
+        # Example delimeters: ",|.| " (comma, dot or whitespace)
+        delimiters: ","
+
+        # Validate input by RegEx pattern (can also be applied on the input itself as an attribute) Ex: /[1-9]/
+        pattern: null
+
+        # Use select for single-value dropdown-like select box. 
+        # See mix as value to allow mixed-content. The 'pattern' setting must be set to some character.
+        mode: null
+        
+        # Interpolation for mix mode. 
+        # Everything between these will become a tag
+        mixTagsInterpolator: ['[[', ']]']
+
+        # Define conditions in which typed mix-tags content is allowing a tag to be created after.
+        mixTagsAllowedAfter: /,|\.|\:|\s/	
+
+        # Should duplicate tags be allowed or not
+        duplicates: false
+
+        # If `true` trim the tag's value (remove before/after whitespaces)
+        trim: true
+
+        # Should ONLY use tags allowed in whitelist.
+        # In `mix-mode`, setting it to `false` will not allow creating new tags.
+        enforceWhitelist: false
+
+        # Tries to suggest the input's value while typing (match from whitelist) by adding the rest of term as grayed-out text
+        autoComplete.enabled: true
+
+        # If `true`, when `→` is pressed, use the suggested value to create a tag, else just auto-completes the input. 
+        # In mixed-mode this is ignored and treated as "true"
+        rautoComplete.rightKey: false
+
+        # An array of allowed tags (Strings or Objects). 
+        # When using Objects in the whitelist array a `value` property is a must & should be unique. 
+        # Also, the *whitelist used for auto-completion when `autoCompletion.enabled` is `true`
+        whitelist: []
+
+        # An array of tags which aren't allowed
+        blacklist: []
+
+        # Automatically adds the text which was inputed as a tag when blur event happens
+        addTagOnBlur: true
+
+        # `false` or `null` will disallow editing
+        editTags:
+
+          # Number of clicks to enter "edit-mode": 1 for single click. 
+          # Any other value is considered as double-click
+          clicks: 1
+
+          # keeps invalid edits as-is until esc is pressed while in focus
+          keepInvalid: true
+        
+        # If `true`, do not remove tags which did not pass validation
+        keepInvalidTags: false
+
+        # If `true`, do not add invalid, temporary, tags before automatically removing them
+        skipInvalid: true
+
+        # On pressing backspace key:
+        # true - remove last tag 
+        # edit - edit last tag
+        backspace: true
+
+        # `node` or `string` to add after a tag added
+        mixMode:
+          insertAfterTag: \u00A0
+
+        # allows tags to get focus, and also to be deleted via backspace
+        a11y:
+          focusableTags: false
+        
+        dropdown:
+
+          # Minimum characters input for showing a suggestions list. 
+          # `false` will not render a suggestions list.
+          enabled: 2
+          
+          # if `true`, match exact item when a suggestion is selected (from the dropdown) and also more strict matching for dulpicate items. 
+          # Ensure `fuzzySearch` is `false` for this to work.
+          caseSensitive: false
+
+          # Maximum items to show in the suggestions list
+          maxItems: 10
+
+          # Custom classname for the dropdown suggestions selectbox
+          classname: ""
+
+          # Enables filtering dropdown items values' by string containing and not only beginning
+          fuzzySearch: true
+
+          # Enable searching for accented items in the whitelist without typing exact match
+          accentedSearch: true
+
+          # manual - will not render the dropdown, and you would need to do it yourself. 
+          # text - places the dropdown next to the caret
+          # input - places the dropdown next to the input (useful in rare situations)
+          # all - normal, full-width design
+          position: "all"
+
+          # When a suggestions list is shown, highlight the first item, 
+          # and also suggest it in the input (The suggestion can be accepted with `→` key)
+          highlightFirst: false
+
+          # close the dropdown after selecting an item, if `enabled:0` is set (which means always show dropdown on focus)
+          closeOnSelect: true
+
+          # Keep typed text after selecting a suggestion
+          clearOnSelect: true
+
+          # When a user types something and trying to match the whitelist items for suggestions, 
+          # this setting allows matching other keys of a whitelist objects
+          searchKeys: ["value", "searchBy"]
+
+          # If defined, will force the placement of the dropdown in respect 
+          # to the Boolean value: `true` will always show the suggestions dropdown above the input field a
+          # and `false` will always show it below. 
+          #
+          # By default this setting it not defined and the placement of the dropdown is automatically decided according to the space availble,
+          # where opening it below the input is preferred.
+          placeAbove: ""
+
+    template: plugins/tagify/blocks/Tagify/block.html
\ No newline at end of file
diff --git a/project/config/plugins/themes-admin/settings.yaml b/project/config/plugins/themes-admin/settings.yaml
new file mode 100644
index 00000000..998c0a0c
--- /dev/null
+++ b/project/config/plugins/themes-admin/settings.yaml
@@ -0,0 +1,18 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Themes Admin plugin priority
+priority: 90
+
+# Themes Admin navigation
+navigation:
+  dropdown: []
+  actions: 
+    - properties:
+        target: "_blank"
+        href: "{{ getBaseUrl() }}"
+        icon:
+          set: bootstrap
+          name: globe
+   
+    
\ No newline at end of file
diff --git a/project/config/plugins/trumbowyg/settings.yaml b/project/config/plugins/trumbowyg/settings.yaml
new file mode 100644
index 00000000..40665b80
--- /dev/null
+++ b/project/config/plugins/trumbowyg/settings.yaml
@@ -0,0 +1,151 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Plugin priority
+priority: 41
+
+# Place to load
+assetsLoadOnAdmin: true
+assetsLoadOnSite: false
+
+# Blocks
+blocks:
+  Trumbowyg:
+    type: Trumbowyg
+    properties:
+      name: trumbowyg
+      
+      # Trumbowyg options
+      options:
+
+        # Localization
+        #
+        # If the lang was not found, english values are used by default.
+        lang: en
+
+        # SVG icons
+        #
+        # A pack of SVG icons is available and enabled by default. 
+        # This file is loaded via XHR request in JavaScript so it is possible the path is not matching with your assets file paths. 
+        # You can change the path of the SVG or disable this feature.
+        #
+        # If you do not want SVG icons, you can set this option to `false`. 
+        # Then, you can add your custom icons by CSS or what you want.
+        svgPath: ../../project/plugins/trumbowyg/blocks/Trumbowyg/dist/fonts/trumbowyg/icons.svg
+
+        # Semantic
+        #
+        # Generates a better, more semantic oriented HTML 
+        # (i.e. <em> instead of <i>, <strong> instead of <b>, etc.).
+        semantic:
+          'b': 'strong'
+          'i': 'em'
+          's': 'del'
+          'strike': 'del'
+          'p': 'p'
+
+        # Reset CSS
+        # 
+        # If you don't want the page style to impact on the look of the text in the editor, 
+        # you will need to apply a reset-css on the editor. 
+        # To activate this feature set `true`
+        resetCss: false
+
+        # Auto grow
+        #
+        # The text editing zone can extend itself when writing a long text. 
+        # To activate this feature set `true`
+        autogrow: false
+
+        # Auto grow on enter
+        #
+        # The text editing zone can extend itself when editor get focus and reduce on blur. 
+        # To activate this feature set `true`
+        autogrowOnEnter: false
+
+        # URL protocol
+        # 
+        # An option to auto-prefix URLs with a protocol.
+        # When this option is set to true, URLs missing a protocol will be prefixed
+        # with https://. Alternatively, a string can be provided for a custom prefix.
+        # For example, a value of true would convert example.com to https://example.com, 
+        # while a value of ftp converts to ftp://example.com.
+        #
+        # Anchors, email addresses and relative links are left unchanged.
+        urlProtocol: false
+
+        # Image width modal edit 
+        #
+        # Add a field in image insert/edit modal which allow users to set the image width.
+        # To activate this feature set `true`
+        imageWidthModalEdit: false
+
+        # Remove format pasted
+        #
+        # If you don't want styles pasted from clipboard (from Word or other webpage for example),
+        # set the removeformatPasted option to `true`
+        removeformatPasted: true
+
+        # Hide button texts 
+        #
+        # You can hide button texts showed when you put `svgPath` to `false`.
+        # If you disable SVG icons and button texts, you should design them by yourself.
+        hideButtonTexts: false
+
+        # Tags to remove
+        #
+        # Allow to sanitize the code by removing all tags you want. 
+        # The `tagsToRemove` option is an array.
+        tagsToRemove: []
+
+        # Tags to keep 
+        #
+        # Sometimes you want to keep some empty `i` tags for Font Awesome or anything else. 
+        # You can define this list via the `tagsToKeep` option.
+        tagsToKeep: ['hr', 'img', 'embed', 'iframe', 'input']
+
+        # Minimal links
+        # 
+        # Reduce the link overlay to use only `url` and `text` fields, omitting `title` and `target`.
+        minimalLinks: false
+
+        # Default link target
+        #
+        # Allow to set link target attribute value to what you want, even if the `minimalLinks` option is set to `true`.
+        defaultLinkTarget: _blank
+
+        # Tag classes
+        #
+        # Add classes to any tag.
+        # for e.g:
+        #   h1: 'h1', // Bootstrap example
+        #   blockquote: 'bg-grey-100 rounded-xl', // Tailwind CSS example
+        tagClasses: []
+        
+        # Active dropdown icon
+        #
+        # Dropdown icon can change to the active sub-button icon with this option enabled.
+        # To activate this feature set `true`
+        changeActiveDropdownIcon: false
+
+        # Prefix
+        #
+        # Prefix of all class added on elements of Trumbowyg
+        prefix: 'trumbowyg-'
+        
+        # Disabled
+        disabled: false
+
+        # Button pane
+        #
+        # Available buttons: viewHTML, undo, redo, strong, em, del, superscript, subscript, link
+        # insertImage, justifyLeft, justifyCenter, justifyRight, justifyFull, unorderedList, orderedList,
+        # horizontalRule, removeformat, fullscreen
+        btns: []
+
+        # Plugins
+        #
+        # Available plugins https://alex-d.github.io/Trumbowyg/documentation/plugins/
+        plugins: []
+
+    template: plugins/trumbowyg/blocks/Trumbowyg/block.html
\ No newline at end of file
diff --git a/project/config/plugins/twig/settings.yaml b/project/config/plugins/twig/settings.yaml
new file mode 100644
index 00000000..a8ab5435
--- /dev/null
+++ b/project/config/plugins/twig/settings.yaml
@@ -0,0 +1,42 @@
+# enabled: true or false to disable the plugin
+enabled: true
+
+# Twig
+#
+# - auto_reload: When developing with Twig, it's useful to recompile the template
+#                whenever the source code changes. If you don't provide a value
+#                for the auto_reload option, it will be determined automatically
+#                based on the debug value.
+#
+# - debug:       When set to true, the generated templates have a __toString()
+#                method that you can use to display the generated nodes
+#
+# - charset:     The charset used by the templates.
+#
+# - cache:       Set false to disable caching.
+#
+# - extensions   Flextype Twig Extension to load.
+auto_reload: true
+cache: true
+debug: false
+charset: "UTF-8"
+extensions: 
+  - I18n
+  - Filesystem
+  - Csrf
+  - Constants
+  - Strings
+  - Arrays
+  - Filters
+  - Functions
+  - Tests
+  - Emitter
+  - Registry
+  - Entries
+  - Serializers
+  - Parsers
+  - Flash
+  - Slugify
+
+# Twig plugin priority
+priority: 0
diff --git a/project/config/themes/bootstrap-blog/settings.yaml b/project/config/themes/bootstrap-blog/settings.yaml
new file mode 100644
index 00000000..ca7859e4
--- /dev/null
+++ b/project/config/themes/bootstrap-blog/settings.yaml
@@ -0,0 +1 @@
+blog_id: blog
diff --git a/project/config/themes/bootstrap-site/settings.yaml b/project/config/themes/bootstrap-site/settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/project/config/themes/bootstrap/settings.yaml b/project/config/themes/bootstrap/settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/project/config/themes/nes/settings.yaml b/project/config/themes/nes/settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/project/config/themes/noir/settings.yaml b/project/config/themes/noir/settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/project/entries/accounts/admin@admin.com/account.yaml b/project/entries/accounts/admin@admin.com/account.yaml
new file mode 100644
index 00000000..fb8ac0f5
--- /dev/null
+++ b/project/entries/accounts/admin@admin.com/account.yaml
@@ -0,0 +1,11 @@
+hashed_password: $2y$10$lAEa.dne32mIfa5qxdsOL.zbPPk1n4cpZgtvz4Iit7TyRYLcXy/Fy
+roles: admin
+state: enabled
+published_at: '09-09-2021 17:41'
+published_by: ''
+created_at: '09-09-2021 17:41'
+created_by: ''
+routable: true
+visibility: visible
+uuid: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+blueprint: admin/entries/default
diff --git a/project/entries/media/6iJBixVkHLw8TdmSGmnx2J9Au5hpAeH6OL5PhMPRoSLtkpHwq9hNTAsHd7XyHWv2/media.yaml b/project/entries/media/6iJBixVkHLw8TdmSGmnx2J9Au5hpAeH6OL5PhMPRoSLtkpHwq9hNTAsHd7XyHWv2/media.yaml
new file mode 100644
index 00000000..b7472944
--- /dev/null
+++ b/project/entries/media/6iJBixVkHLw8TdmSGmnx2J9Au5hpAeH6OL5PhMPRoSLtkpHwq9hNTAsHd7XyHWv2/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpMqaoYu
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:45'
+created_by: ''
+uuid: 1479014f-bc8e-4ed0-959c-b858ccdfb249
diff --git a/project/entries/media/GY1Okrn4U1FVjNxnJ8nflBJRMfHhVdrej8alpYFAzMIfxRokMbrR1NzMda3C1TWw/media.yaml b/project/entries/media/GY1Okrn4U1FVjNxnJ8nflBJRMfHhVdrej8alpYFAzMIfxRokMbrR1NzMda3C1TWw/media.yaml
new file mode 100644
index 00000000..04187447
--- /dev/null
+++ b/project/entries/media/GY1Okrn4U1FVjNxnJ8nflBJRMfHhVdrej8alpYFAzMIfxRokMbrR1NzMda3C1TWw/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/php29hCcV
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:48'
+created_by: ''
+uuid: 49a4d3e6-dcd3-4c24-8cd4-53cfbbc18ba2
diff --git a/project/entries/media/LUGW9lXqP32Vze4ZrabSTxxKc185FExGz6V5AaPFCJas8k9PBOiB8wfzU3rKNnFv/media.yaml b/project/entries/media/LUGW9lXqP32Vze4ZrabSTxxKc185FExGz6V5AaPFCJas8k9PBOiB8wfzU3rKNnFv/media.yaml
new file mode 100644
index 00000000..9103f74a
--- /dev/null
+++ b/project/entries/media/LUGW9lXqP32Vze4ZrabSTxxKc185FExGz6V5AaPFCJas8k9PBOiB8wfzU3rKNnFv/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/php4QPI2d
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:48'
+created_by: ''
+uuid: 4e54069c-1cbd-48da-9990-8f7d9731fd20
diff --git a/project/entries/media/MUFqqfy3XdMXS38nLSAvFIoKNYxw97DOVzlMFISvvNJmcvy5sDlY7czaGSbj5YYn/media.yaml b/project/entries/media/MUFqqfy3XdMXS38nLSAvFIoKNYxw97DOVzlMFISvvNJmcvy5sDlY7czaGSbj5YYn/media.yaml
new file mode 100644
index 00000000..0b51a1ab
--- /dev/null
+++ b/project/entries/media/MUFqqfy3XdMXS38nLSAvFIoKNYxw97DOVzlMFISvvNJmcvy5sDlY7czaGSbj5YYn/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpxN5uxW
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:40'
+created_by: ''
+uuid: 2adce02f-8a5c-40ed-935a-6991ce48d415
diff --git a/project/entries/media/QopJFzMvr06hheO65JB5uFOOdLkGuMFt4RjgM06sowa26uRYud5savy8fk40oLeW/media.yaml b/project/entries/media/QopJFzMvr06hheO65JB5uFOOdLkGuMFt4RjgM06sowa26uRYud5savy8fk40oLeW/media.yaml
new file mode 100644
index 00000000..a7083921
--- /dev/null
+++ b/project/entries/media/QopJFzMvr06hheO65JB5uFOOdLkGuMFt4RjgM06sowa26uRYud5savy8fk40oLeW/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpRLVfwT
+    error: 0
+    size: 14714
+created_at: '22-08-2021 15:13'
+created_by: ''
+uuid: 66f6280e-6622-41e9-ac12-23e09c3d442d
diff --git a/project/entries/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/media.yaml b/project/entries/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/media.yaml
new file mode 100644
index 00000000..20848edc
--- /dev/null
+++ b/project/entries/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpHhbN48
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:59'
+created_by: ''
+uuid: 7cfdaf9c-89bb-43a2-a3d1-fcbbfff29182
diff --git a/project/entries/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/media.yaml b/project/entries/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/media.yaml
new file mode 100644
index 00000000..0b5fabff
--- /dev/null
+++ b/project/entries/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpKXRCiQ
+    error: 0
+    size: 14714
+created_at: '22-08-2021 15:00'
+created_by: ''
+uuid: 3fcd6289-540f-40c8-9616-3350dd5a6072
diff --git a/project/entries/media/media.yaml b/project/entries/media/media.yaml
new file mode 100644
index 00000000..da1a6ba2
--- /dev/null
+++ b/project/entries/media/media.yaml
@@ -0,0 +1,3 @@
+created_at: '21-08-2021 18:17'
+created_by: ''
+uuid: 2304c28d-7407-4221-b978-e73c773f7932
diff --git a/project/entries/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/media.yaml b/project/entries/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/media.yaml
new file mode 100644
index 00000000..a5fe0f01
--- /dev/null
+++ b/project/entries/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpgVzMz3
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:50'
+created_by: ''
+uuid: a4b9bc9d-fbde-46a3-a17f-e585753b37e1
diff --git a/project/entries/media/u5X1u1pfJkSndphvGl86KV3HjTPg3FixnDqBzMqC6vrPr4HJZZcZ0XsmZBV7Wg7t/media.yaml b/project/entries/media/u5X1u1pfJkSndphvGl86KV3HjTPg3FixnDqBzMqC6vrPr4HJZZcZ0XsmZBV7Wg7t/media.yaml
new file mode 100644
index 00000000..396d6155
--- /dev/null
+++ b/project/entries/media/u5X1u1pfJkSndphvGl86KV3HjTPg3FixnDqBzMqC6vrPr4HJZZcZ0XsmZBV7Wg7t/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpQhhVQx
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:47'
+created_by: ''
+uuid: a6a49d66-eba0-4518-9c85-5e199081dcd2
diff --git a/project/entries/media/z5oi0HzKTGXuVC35wSMDOthFWH2TniTF3BkvSXrURP2nnDF568p9OwMl0lrGuRO2/media.yaml b/project/entries/media/z5oi0HzKTGXuVC35wSMDOthFWH2TniTF3BkvSXrURP2nnDF568p9OwMl0lrGuRO2/media.yaml
new file mode 100644
index 00000000..77a2c3c9
--- /dev/null
+++ b/project/entries/media/z5oi0HzKTGXuVC35wSMDOthFWH2TniTF3BkvSXrURP2nnDF568p9OwMl0lrGuRO2/media.yaml
@@ -0,0 +1,10 @@
+resource:
+  file:
+    name: photo-1557682250-33bd709cbe85.jpeg
+    type: image/jpeg
+    tmp_name: /Applications/MAMP/tmp/php/phpBI26Gm
+    error: 0
+    size: 14714
+created_at: '22-08-2021 14:47'
+created_by: ''
+uuid: b81ad556-a311-46ab-aaaa-23eb4d6a96b0
diff --git a/project/entries/tokens/foo/token.yaml b/project/entries/tokens/foo/token.yaml
new file mode 100644
index 00000000..2ac6c639
--- /dev/null
+++ b/project/entries/tokens/foo/token.yaml
@@ -0,0 +1,4 @@
+title: Foo
+calls: 31
+limit_calls: 0
+state: enabled
diff --git a/project/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/photo_1557682250_33bd709cbe85.jpeg b/project/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/photo_1557682250_33bd709cbe85.jpeg
new file mode 100644
index 00000000..50414b16
Binary files /dev/null and b/project/media/agNcpV8uXKeX7kBfJMtxijI72Ocv5MEX9Nf6w5dHpLDzljEylXE89joNMzwDtj89/photo_1557682250_33bd709cbe85.jpeg differ
diff --git a/project/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/photo_1557682250_33bd709cbe85.jpeg b/project/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/photo_1557682250_33bd709cbe85.jpeg
new file mode 100644
index 00000000..50414b16
Binary files /dev/null and b/project/media/m0K6B2JmjV2OLbULG3STrDHH0UPJKR2riMr7wnQfEMHnVHI8YIw2sb2u4mTDi4ho/photo_1557682250_33bd709cbe85.jpeg differ
diff --git a/project/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/photo_1557682250_33bd709cbe85.jpeg b/project/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/photo_1557682250_33bd709cbe85.jpeg
new file mode 100644
index 00000000..50414b16
Binary files /dev/null and b/project/media/nV0QYRcRriddtdlFedfqeJI6eBqIDghpPl7h8Ga8aOjrRLMtp6T1YPVRt4WTXStl/photo_1557682250_33bd709cbe85.jpeg differ
diff --git a/project/themes/bootstrap/.gitignore b/project/themes/bootstrap/.gitignore
new file mode 100755
index 00000000..c00a8d8e
--- /dev/null
+++ b/project/themes/bootstrap/.gitignore
@@ -0,0 +1,20 @@
+# Global
+.composer
+composer.lock
+package-lock.json
+vendor/
+node_modules/
+dist/
+
+# Flextype Site Specific
+var/
+
+# OS Generated
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+*.swp
+
+# phpstorm
+.idea/*
diff --git a/project/themes/bootstrap/CHANGELOG.md b/project/themes/bootstrap/CHANGELOG.md
new file mode 100644
index 00000000..5f7e1216
--- /dev/null
+++ b/project/themes/bootstrap/CHANGELOG.md
@@ -0,0 +1,3 @@
+<a name="1.0.0"></a>
+# [1.0.0](https://github.com/flextype-themes/bootstrap) (2020-05-26)
+* Initial Release
diff --git a/project/themes/bootstrap/README.md b/project/themes/bootstrap/README.md
new file mode 100755
index 00000000..697debd1
--- /dev/null
+++ b/project/themes/bootstrap/README.md
@@ -0,0 +1,35 @@
+<h1 align="center">Bootstrap theme for <a href="https://flextype.org/">Flextype</a></h1>
+
+![preview](preview.png)
+
+<p align="center">
+<a href="https://github.com/flextype-themes/bootstrap/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/bootstrap.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/bootstrap"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/bootstrap"><img src="https://img.shields.io/github/downloads/flextype-themes/bootstrap/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/bootstrap"><img src="https://img.shields.io/badge/Flextype-0.9.16-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+</p>
+
+## Features
+
+* Fully Responsive.
+* Cross browser compatible.
+* Powered by [Twitter Bootstrap Framework](https://getbootstrap.com)
+
+## Dependencies
+
+The following dependencies need to be downloaded and installed for Bootstrap Site Theme.
+
+| Item | Version | Download |
+|---|---|---|
+| [flextype](https://github.com/flextype/flextype) | 0.9.16 | [download](https://github.com/flextype/flextype/) |
+| [site](https://github.com/flextype-plugins/site) | >=1.0.0 | [download](https://github.com/flextype-plugins/site/releases) |
+
+## Installation
+
+1. Download & Install all required dependencies.
+2. Create new folder `/project/themes/bootstrap`
+3. Download Bootstrap Site Theme and unzip theme to the folder `/project/themes/bootstrap`
+4. Update setting `theme` with new value `bootstrap` in `/project/config/plugins/site/settings.yaml`
+
+The theme by itself is useful, but you may have an easier time getting up and running by installing a project demo content for this theme, it is placed in the `_project` folder. The Bootstrap Site Project demo content contains: sample content, fieldsets for [Admin Panel Plugin](https://github.com/flextype-plugins/admin). Just copy `_project` folder content into your project folder.
+
+## LICENSE
+[The MIT License (MIT)](https://github.com/flextype-themes/bootstrap/blob/master/LICENSE.txt)
+Copyright (c) 2021 [Sergey Romanenko](https://github.com/Awilum)
diff --git a/project/themes/bootstrap/_project/entries/about/entry.md b/project/themes/bootstrap/_project/entries/about/entry.md
new file mode 100644
index 00000000..f117ef25
--- /dev/null
+++ b/project/themes/bootstrap/_project/entries/about/entry.md
@@ -0,0 +1,17 @@
+---
+title: About
+menu_item_title: About
+menu_item_url: about
+menu_item_target: _self
+menu_item_order: '1'
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<br><br>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<br><br>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/project/themes/bootstrap/_project/entries/home/entry.md b/project/themes/bootstrap/_project/entries/home/entry.md
new file mode 100644
index 00000000..1248d7e1
--- /dev/null
+++ b/project/themes/bootstrap/_project/entries/home/entry.md
@@ -0,0 +1,13 @@
+---
+title: Home
+menu_item_title: Home
+menu_item_url: home
+menu_item_target: _self
+menu_item_order: '1'
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<br><br>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/project/themes/bootstrap/_project/fieldsets/page.yaml b/project/themes/bootstrap/_project/fieldsets/page.yaml
new file mode 100644
index 00000000..e1692703
--- /dev/null
+++ b/project/themes/bootstrap/_project/fieldsets/page.yaml
@@ -0,0 +1,63 @@
+title: Page
+default_field: title
+icon: 'far fa-file-alt'
+sections:
+  main:
+    title: admin_main
+    form:
+      fields:
+        title:
+          title: admin_title
+          type: text
+          size: 12
+        content:
+          title: admin_entries
+          type: html
+          size: 12
+  settings:
+    title: admin_settings
+    form:
+      fields:
+        general_heading:
+          title: admin_general
+          type: heading
+        description:
+          title: admin_description
+          type: textarea
+          size: 12
+        template:
+          title: admin_template
+          type: select_template
+          size: 4/12
+        visibility:
+          title: admin_visibility
+          type: select_visibility
+          size: 4/12
+        published_at:
+          title: admin_published_at
+          type: datetimepicker
+          size: 4/12
+        routable:
+          title: admin_routable
+          type: select_routable
+          size: 4/12
+        menu_heading:
+          title: admin_menu
+          type: heading
+        menu_item_title:
+          title: admin_menu_item_title
+          type: text
+          size: 4/12
+        menu_item_url:
+          title: admin_menu_item_url
+          type: text
+          size: 4/12
+        menu_item_target:
+          title: admin_menu_item_target
+          type: select
+          options: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
+          size: 4/12
+        menu_item_order:
+          title: admin_menu_item_order
+          type: text
+          size: 4/12
diff --git a/project/themes/bootstrap/assets/src/css/styles.css b/project/themes/bootstrap/assets/src/css/styles.css
new file mode 100644
index 00000000..e69de29b
diff --git a/project/themes/bootstrap/preview.png b/project/themes/bootstrap/preview.png
new file mode 100644
index 00000000..8bb0810a
Binary files /dev/null and b/project/themes/bootstrap/preview.png differ
diff --git a/project/themes/bootstrap/settings.yaml b/project/themes/bootstrap/settings.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/project/themes/bootstrap/templates/default.php b/project/themes/bootstrap/templates/default.php
new file mode 100644
index 00000000..9f26b637
--- /dev/null
+++ b/project/themes/bootstrap/templates/default.php
@@ -0,0 +1 @@
+Foo
\ No newline at end of file
diff --git a/project/themes/bootstrap/templates/partials/base.html b/project/themes/bootstrap/templates/partials/base.html
new file mode 100644
index 00000000..b3b4612a
--- /dev/null
+++ b/project/themes/bootstrap/templates/partials/base.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<html lang="{{ registry().get('flextype.settings.locale') }}">
+    <head>
+        {% block head %}
+            <meta charset="{{ registry().get('flextype.settings.charset')|lower }}">
+            <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+            <meta name="description" content="{% if entry.description %}{{ entry.description }}{% else %}{{ registry().get('plugins.site.settings.description') }}{% endif %}">
+            <meta name="keywords" content="{% if entry.keywords %}{{ entry.keywords }}{% else %}{{ registry().get('plugins.site.settings.keywords') }}{% endif %}">
+            <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry().get('plugins.site.settings.robots') }}{% endif %}">
+            <meta name="generator" content="Powered by Flextype"/>
+
+            {% do
+                emitter().emit('onThemeMeta') %}
+
+            <title>
+                {% if entry.title %}{{ entry.title|e('html') }}
+                    |
+                {% endif %}{{ registry().get('plugins.site.settings.title')|e('html') }}</title>
+
+            <link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap&subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
+
+            <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+
+            {% set theme = registry().get('plugins.site.settings.theme') %}
+            {% do registry().set('assets.site.css.bootstrap_site', 'project/themes/' ~ theme ~ '/assets/src/css/styles.css') %}
+
+            {% if registry().has('assets.site.css') %}
+                {% for css in registry().get('assets.site.css') %}
+                    <link href="{{ getBaseUrl() }}/{{ css }}" rel="stylesheet">
+                {% endfor %}
+            {% endif %}
+
+            {% do
+                emitter().emit('onThemeHeader') %}
+        {% endblock %}
+    </head>
+<body>
+    <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
+        <a class="navbar-brand" href="{{ getBaseUrl() }}">{{ registry().get('plugins.site.settings.title')|e('html') }}</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+          <ul class="navbar-nav mr-auto">
+              {% for item in entries().fetch('', {'collection': true}).sortBy('menu_item_order', 'asc').all() %}
+                  {% if item.menu_item_title %}
+                      <li class="nav-item {% if item.menu_item_url in entry.id %}active{% endif %}">
+                        <a class="nav-link" href="{{ getBaseUrl() }}/{{ item.menu_item_url }}">{{ item.menu_item_title }}</a>
+                      </li>
+                  {% endif %}
+              {% endfor %}
+          </ul>
+        </div>
+    </nav>
+
+    <main role="main" class="container pt-5">
+        <section id="content" class="pt-5">
+            {% block content %}{% endblock %}
+        </section>
+        <footer class="text-center pt-4">
+            {% block footer %}
+                <div>
+                    {{ __('site_powered_by_flextype')|raw }}
+                </div>
+            {% endblock %}
+        </footer>
+    </main>
+
+        <!-- Optional JavaScript -->
+        <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+        <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+        <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+
+        {% if registry().has('assets.site.js') %}
+            {% for js in registry().get('assets.site.js') %}
+                {% if js %}
+                    <script type="text/javascript" src="{{ getBaseUrl() }}/{{ js }}"></script>
+                {% endif %}
+            {% endfor %}
+        {% endif %}
+
+        {% do
+            emitter().emit('onThemeTail') %}
+    </body>
+</html>
diff --git a/project/themes/bootstrap/theme.php b/project/themes/bootstrap/theme.php
new file mode 100644
index 00000000..a8221125
--- /dev/null
+++ b/project/themes/bootstrap/theme.php
@@ -0,0 +1,5 @@
+<?php
+
+/**
+ * Bootstrap
+ */
diff --git a/project/themes/bootstrap/theme.yaml b/project/themes/bootstrap/theme.yaml
new file mode 100755
index 00000000..e292cb35
--- /dev/null
+++ b/project/themes/bootstrap/theme.yaml
@@ -0,0 +1,15 @@
+name: Bootstrap
+version: 1.0.0
+description: Twitter Bootstrap theme for Flextype.
+author:
+  name: Sergey Romanenko
+  email: sergey.romanenko@flextype.org
+  url: https://flextype.org
+homepage: https://github.com/flextype-themes/bootstrap
+documentation: https://github.com/flextype-themes/bootstrap
+bugs: https://github.com/flextype-themes/bootstrap/issues
+license: MIT
+
+dependencies:
+  flextype: 0.9.16
+  site: '>=1.0.0'
diff --git a/project/tokens/entries/7e467dfb90a2911d2901da97805da180/token.yaml b/project/tokens/entries/7e467dfb90a2911d2901da97805da180/token.yaml
new file mode 100644
index 00000000..b40e7eed
--- /dev/null
+++ b/project/tokens/entries/7e467dfb90a2911d2901da97805da180/token.yaml
@@ -0,0 +1,12 @@
+title: Default
+icon:
+  icon: newspaper
+  set: bootstrap
+limit_calls: 0
+calls: 0
+state: enabled
+uuid: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_at: null
+updated_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+updated_at: null
diff --git a/project/tokens/images/93f27ec999bef62b72ac441365d076a3/token.yaml b/project/tokens/images/93f27ec999bef62b72ac441365d076a3/token.yaml
new file mode 100644
index 00000000..5d683d31
--- /dev/null
+++ b/project/tokens/images/93f27ec999bef62b72ac441365d076a3/token.yaml
@@ -0,0 +1,12 @@
+title: Default
+icon:
+  icon: images
+  set: bootstrap
+limit_calls: 0
+calls: 0
+state: enabled
+uuid: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_at: null
+updated_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+updated_at: null
diff --git a/project/tokens/media/17f68dd190122d2c2e050e4361de9899/token.yaml b/project/tokens/media/17f68dd190122d2c2e050e4361de9899/token.yaml
new file mode 100644
index 00000000..3a2dba2b
--- /dev/null
+++ b/project/tokens/media/17f68dd190122d2c2e050e4361de9899/token.yaml
@@ -0,0 +1,12 @@
+title: Default
+icon:
+  icon: archive
+  set: bootstrap
+limit_calls: 0
+calls: 0
+state: enabled
+uuid: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_at: null
+updated_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+updated_at: null
diff --git a/project/tokens/registry/5e3385188a15feb10f014d538605a9a6/token.yaml b/project/tokens/registry/5e3385188a15feb10f014d538605a9a6/token.yaml
new file mode 100644
index 00000000..3a2dba2b
--- /dev/null
+++ b/project/tokens/registry/5e3385188a15feb10f014d538605a9a6/token.yaml
@@ -0,0 +1,12 @@
+title: Default
+icon:
+  icon: archive
+  set: bootstrap
+limit_calls: 0
+calls: 0
+state: enabled
+uuid: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+created_at: null
+updated_by: 1b22573f-4c8a-45c6-a860-5f24a1d6ae5b
+updated_at: null
diff --git a/project/uploads/media/foo/media.jpg b/project/uploads/media/foo/media.jpg
new file mode 100644
index 00000000..c7ba56b6
Binary files /dev/null and b/project/uploads/media/foo/media.jpg differ
diff --git a/src/flextype/core/Actions.php b/src/flextype/core/Actions.php
new file mode 100644
index 00000000..fd2c0140
--- /dev/null
+++ b/src/flextype/core/Actions.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Flextype (https://flextype.org)
+ * Founded by Sergey Romanenko and maintained by Flextype Community.
+ */
+
+namespace Flextype;
+
+use Atomastic\Arrays\Arrays;
+
+class Actions extends Arrays
+{
+    /**
+     * Actions instance
+     */
+    private static ?Actions $instance = null;
+
+    /**
+     * Actions registry storage
+     */
+    private static ?Arrays $registry = null;
+
+    /**
+     * Gets the instance via lazy initialization (created on first usage)
+     */
+    public static function getInstance(): Actions
+    {
+        if (static::$instance === null) {
+            static::$instance = new self();
+        }
+
+        if (static::$registry === null) {
+            static::$registry = new Arrays();
+        }
+
+        return static::$instance;
+    }
+
+    /**
+     * Is not allowed to call from outside to prevent from creating multiple instances,
+     * to use the Registry, you have to obtain the instance from Registry::getInstance() instead.
+     */
+    protected function __construct()
+    {
+    }
+
+    /**
+     * Prevent the instance from being cloned (which would create a second instance of it)
+     */
+    protected function __clone()
+    {
+    }
+
+    /**
+     * Prevent from being unserialized (which would create a second instance of it)
+     */
+    public function __wakeup(): void
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/core/Endpoints/Images.php b/src/flextype/core/Endpoints/Images.php
deleted file mode 100644
index b9f0820f..00000000
--- a/src/flextype/core/Endpoints/Images.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype\Endpoints;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-use function container;
-use function count;
-use function filesystem;
-
-class Images extends Api
-{
-    /**
-     * Fetch image.
-     *
-     * @param string                 $path     Image path.
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function fetch(string $path, ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'images',
-                'params' => ['token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Check is file exists
-        if (! filesystem()->file(PATH['project'] . '/uploads/' . $path)->exists()) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404);
-        }
-
-        // Return image response
-        return container()->get('images')->getImageResponse($path, $request->getQueryParams());
-    }
-}
diff --git a/src/flextype/core/Entries/Actions/Media/CopyAction.php b/src/flextype/core/Entries/Actions/Media/CopyAction.php
deleted file mode 100644
index b9dd3fae..00000000
--- a/src/flextype/core/Entries/Actions/Media/CopyAction.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-emitter()->addListener('onEntriesMove', static function (): void {
-
-    if (! entries()->registry()->get('collection.options.actions.copy.enabled')) {
-        return;
-    }
-
-    $id    = entries()->registry()->get('copy.id');
-    $newID = entries()->registry()->get('copy.newID');
-
-    $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-    $mediaResourceDirectoryNewLocation     = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $newID;
-   
-    if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-        filesystem()->directory($mediaResourceDirectoryCurrentLocation)->copy($mediaResourceDirectoryNewLocation);
-    }
-});
\ No newline at end of file
diff --git a/src/flextype/core/Entries/Actions/Media/CreateAction.php b/src/flextype/core/Entries/Actions/Media/CreateAction.php
deleted file mode 100644
index 23fcc19e..00000000
--- a/src/flextype/core/Entries/Actions/Media/CreateAction.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-emitter()->addListener('onEntriesCreate', static function (): void {
-
-    if (! entries()->registry()->get('collection.options.actions.create.enabled')) {
-        return;
-    }
-
-    $id   = entries()->registry()->get('create.id');
-    $data = entries()->registry()->get('create.data');
-
-    $data['resource'] = $data['resource'] ?? '';
-
-    if (is_array($data['resource'])) {
-    
-        $media = upload($data['resource'], $id);
-       
-        if ($media->name) {
-
-            $uploadDirectory = strings(PATH['project']  . '/' . registry()->get('flextype.settings.upload.directory') . '/' . $id)->reduceSlashes()->toString();
-            $mediaFile =  $uploadDirectory . '/media.' . filesystem()->file($media->name)->extension();
-            filesystem()->file($uploadDirectory . '/' . $media->name)->move($mediaFile);
-
-            $data['resource'] = strings($id . '/media.' . filesystem()->file($media->name)->extension())->reduceSlashes()->toString();
-        } else {
-            $data['resource'] = '';
-        }
-    }
-
-    entries()->registry()->set('create.data', array_merge(entries()->registry()->get('create.data'), $data));
-});
\ No newline at end of file
diff --git a/src/flextype/core/Entries/Actions/Media/DeleteAction.php b/src/flextype/core/Entries/Actions/Media/DeleteAction.php
deleted file mode 100644
index 032545a7..00000000
--- a/src/flextype/core/Entries/Actions/Media/DeleteAction.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-emitter()->addListener('onEntriesMove', static function (): void {
-
-    if (! entries()->registry()->get('collection.options.actions.delete.enabled')) {
-        return;
-    }
-
-    $id = entries()->registry()->get('move.id');
-
-    $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-        
-    if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-        filesystem()->directory($mediaResourceDirectoryCurrentLocation)->delete();
-    } 
-});
\ No newline at end of file
diff --git a/src/flextype/core/Entries/Actions/Media/MoveAction.php b/src/flextype/core/Entries/Actions/Media/MoveAction.php
deleted file mode 100644
index 9a17ec44..00000000
--- a/src/flextype/core/Entries/Actions/Media/MoveAction.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-emitter()->addListener('onEntriesMove', static function (): void {
-
-    if (! entries()->registry()->get('collection.options.actions.move.enabled')) {
-        return;
-    }
-
-    $id    = entries()->registry()->get('move.id');
-    $newID = entries()->registry()->get('move.newID');
-
-    $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-    $mediaResourceDirectoryNewLocation     = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $newID;
-   
-    if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-        filesystem()->directory($mediaResourceDirectoryCurrentLocation)->move($mediaResourceDirectoryNewLocation);
-    }
-});
\ No newline at end of file
diff --git a/src/flextype/core/Entries/Entries.php b/src/flextype/core/Entries/Entries.php
index 74f5be94..9dfaf065 100755
--- a/src/flextype/core/Entries/Entries.php
+++ b/src/flextype/core/Entries/Entries.php
@@ -36,6 +36,8 @@ class Entries
      * Local entries registry used for storing current requested
      * entries data and allow to change them on fly.
      *
+     * @var Arrays
+     * 
      * @access private
      */
     private Arrays $registry;
@@ -52,6 +54,7 @@ class Entries
      *   actions     - Array of actions for entries collection.
      *
      * @var array
+     * 
      * @access private
      */
     private array $options = [];
@@ -66,18 +69,18 @@ class Entries
     {
         $this->setRegistry($registry);
         $this->setOptions($options);
-        $this->loadCollectionsActions();
+        $this->loadCollectionsEvents();
         $this->loadCollectionsFields();
     }
 
     /** 
-     * Load Collections Actions
+     * Load Collections Events
      *
      * @access public
      */
-    private function loadCollectionsActions(): void
+    private function loadCollectionsEvents(): void
     {
-        $actions = [];
+        $events = [];
 
         if (! isset($this->options['collections']) ||
             ! is_array($this->options['collections'])) {
@@ -87,29 +90,29 @@ class Entries
         foreach ($this->options['collections'] as $collection) {
             
             if (
-                ! isset($collection['actions']) ||
-                ! is_array($collection['actions']) ||
-                count($collection['actions']) <= 0
+                ! isset($collection['events']) ||
+                ! is_array($collection['events']) ||
+                count($collection['events']) <= 0
             ) {
                 continue;
             }
 
-            foreach ($collection['actions'] as $action) {
+            foreach ($collection['events'] as $event) {
 
-                if (! isset($action['path'])) {
+                if (! isset($event['path'])) {
                     continue;
                 }
 
-                $actions[] = ROOT_DIR . $action['path'];
+                $events[] = ROOT_DIR . $event['path'];
             }
         }
 
-        $actions = arrays($actions)->unique()->toArray();
+        $events = arrays($events)->unique()->toArray();
 
-        foreach ($actions as $action) {
-            if (filesystem()->file($action)->exists()) {
+        foreach ($events as $event) {
+            if (filesystem()->file($event)->exists()) {
                
-                include_once $action; 
+                include_once $event; 
             }
         } 
     }
@@ -304,7 +307,7 @@ class Entries
 
                     $currentEntryID = strings($currenEntry->getPath())
                         ->replace('\\', '/')
-                        ->replace(PATH['project'] . '/entries/', '')
+                        ->replace(PATH['project'] . $this->options['directory'] . '/', '')
                         ->trim('/')
                         ->toString();
 
@@ -561,7 +564,7 @@ class Entries
         // Set collection options
         $this->registry()->set('collection.options', $this->getCollectionOptions($id));
 
-        return PATH['project'] . '/entries/' . $id . '/' . $this->registry()->get('collection.options.filename') . '.' . $this->registry()->get('collection.options.extension');
+        return PATH['project'] . $this->options['directory'] . '/' . $id . '/' . $this->registry()->get('collection.options.filename') . '.' . $this->registry()->get('collection.options.extension');
     }
 
     /**
@@ -575,7 +578,7 @@ class Entries
      */
     public function getDirectoryLocation(string $id): string
     {
-        return PATH['project'] . '/entries/' . $id;
+        return PATH['project'] . $this->options['directory'] . '/' . $id;
     }
 
     /**
@@ -596,10 +599,10 @@ class Entries
         $entryFile = $this->getFileLocation($id);
 
         if (filesystem()->file($entryFile)->exists()) {
-            return strings('entry' . $entryFile . (filesystem()->file($entryFile)->lastModified() ?: ''))->hash()->toString();
+            return strings($this->options['directory'] . $entryFile . (filesystem()->file($entryFile)->lastModified() ?: ''))->hash()->toString();
         }
 
-        return strings('entry' . $entryFile)->hash()->toString();
+        return strings($this->options['directory'] . $entryFile)->hash()->toString();
     }
 
     /**
diff --git a/src/flextype/core/Handlers/HttpErrorHandler.php b/src/flextype/core/Handlers/HttpErrorHandler.php
deleted file mode 100644
index cb6da13f..00000000
--- a/src/flextype/core/Handlers/HttpErrorHandler.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php 
-
-namespace Flextype\Handlers;
-
-use Psr\Http\Message\ResponseInterface;
-use Slim\Exception\HttpBadRequestException;
-use Slim\Exception\HttpException;
-use Slim\Exception\HttpForbiddenException;
-use Slim\Exception\HttpMethodNotAllowedException;
-use Slim\Exception\HttpNotFoundException;
-use Slim\Exception\HttpNotImplementedException;
-use Slim\Exception\HttpUnauthorizedException;
-use Slim\Handlers\ErrorHandler;
-use Exception;
-use Throwable;
-
-class HttpErrorHandler extends ErrorHandler
-{
-    public const BAD_REQUEST = 'BAD_REQUEST';
-    public const INSUFFICIENT_PRIVILEGES = 'INSUFFICIENT_PRIVILEGES';
-    public const NOT_ALLOWED = 'NOT_ALLOWED';
-    public const NOT_IMPLEMENTED = 'NOT_IMPLEMENTED';
-    public const RESOURCE_NOT_FOUND = 'RESOURCE_NOT_FOUND';
-    public const SERVER_ERROR = 'SERVER_ERROR';
-    public const UNAUTHENTICATED = 'UNAUTHENTICATED';
-    
-    protected function respond(): ResponseInterface
-    {
-        $exception = $this->exception;
-        $statusCode = 500;
-        $type = self::SERVER_ERROR;
-        $description = 'An internal error has occurred while processing your request.';
-
-        if ($exception instanceof HttpException) {
-            $statusCode = $exception->getCode();
-            $description = $exception->getMessage();
-
-            if ($exception instanceof HttpNotFoundException) {
-                $type = self::RESOURCE_NOT_FOUND;
-            } elseif ($exception instanceof HttpMethodNotAllowedException) {
-                $type = self::NOT_ALLOWED;
-            } elseif ($exception instanceof HttpUnauthorizedException) {
-                $type = self::UNAUTHENTICATED;
-            } elseif ($exception instanceof HttpForbiddenException) {
-                $type = self::UNAUTHENTICATED;
-            } elseif ($exception instanceof HttpBadRequestException) {
-                $type = self::BAD_REQUEST;
-            } elseif ($exception instanceof HttpNotImplementedException) {
-                $type = self::NOT_IMPLEMENTED;
-            }
-        }
-
-        if (
-            !($exception instanceof HttpException)
-            && ($exception instanceof Exception || $exception instanceof Throwable)
-            && $this->displayErrorDetails
-        ) {
-            $description = $exception->getMessage();
-        }
-
-        $error = [
-            'statusCode' => $statusCode,
-            'error' => [
-                'type' => $type,
-                'description' => $description,
-            ],
-        ];
-        
-        $payload = json_encode($error, JSON_PRETTY_PRINT);
-        
-        $response = $this->responseFactory->createResponse($statusCode);        
-        $response->getBody()->write($payload);
-        
-        return $response;
-    }
-}
\ No newline at end of file
diff --git a/src/flextype/core/Handlers/ShutdownHandler.php b/src/flextype/core/Handlers/ShutdownHandler.php
deleted file mode 100644
index 3bdceb3d..00000000
--- a/src/flextype/core/Handlers/ShutdownHandler.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Flextype\Handlers;
-
-use Flextype\Handlers\HttpErrorHandler;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Exception\HttpInternalServerErrorException;
-use Slim\ResponseEmitter;
-
-class ShutdownHandler
-{
-    /**
-     * @var Request
-     */
-    private $request;
-
-    /**
-     * @var HttpErrorHandler
-     */
-    private $errorHandler;
-
-    /**
-     * @var bool
-     */
-    private $displayErrorDetails;
-
-    /**
-     * ShutdownHandler constructor.
-     *
-     * @param Request           $request
-     * @param HttpErrorHandler  $errorHandler
-     * @param bool              $displayErrorDetails
-     */
-    public function __construct(Request $request, HttpErrorHandler $errorHandler, bool $displayErrorDetails) {
-        $this->request = $request;
-        $this->errorHandler = $errorHandler;
-        $this->displayErrorDetails = $displayErrorDetails;
-    }
-
-    public function __invoke()
-    {
-        $error = error_get_last();
-        if ($error) {
-            $errorFile = $error['file'];
-            $errorLine = $error['line'];
-            $errorMessage = $error['message'];
-            $errorType = $error['type'];
-            $message = 'An error while processing your request. Please try again later.';
-
-            if ($this->displayErrorDetails) {
-                switch ($errorType) {
-                    case E_USER_ERROR:
-                        $message = "FATAL ERROR: {$errorMessage}. ";
-                        $message .= " on line {$errorLine} in file {$errorFile}.";
-                        break;
-
-                    case E_USER_WARNING:
-                        $message = "WARNING: {$errorMessage}";
-                        break;
-
-                    case E_USER_NOTICE:
-                        $message = "NOTICE: {$errorMessage}";
-                        break;
-
-                    default:
-                        $message = "ERROR: {$errorMessage}";
-                        $message .= " on line {$errorLine} in file {$errorFile}.";
-                        break;
-                }
-            }
-
-            $exception = new HttpInternalServerErrorException($this->request, $message);
-            $response = $this->errorHandler->__invoke($this->request, $exception, $this->displayErrorDetails, false, false);
-            
-            if (ob_get_length()) {
-              ob_clean();
-            }
-
-            $responseEmitter = new ResponseEmitter();
-            $responseEmitter->emit($response);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/flextype/core/Media.php b/src/flextype/core/Media.php
deleted file mode 100644
index 30daccc4..00000000
--- a/src/flextype/core/Media.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype\Media;
-
-use Atomastic\Macroable\Macroable;
-use Flextype\Entries;
-use Sirius\Upload\Handler as UploadHandler;
-use Throwable;
-
-use function emitter;
-use function filesystem;
-use function getimagesize;
-use function image;
-use function is_array;
-use function is_string;
-use function media;
-use function registry;
-use function strings;
-
-class Media
-{
-    /**
-     * Constructor.
-     *
-     * @param array $options Media options.
-     *
-     * @access public
-     */
-    public function __construct(array $options = [])
-    {
-        filesystem()
-            ->directory(PATH['project'] . registry()->get('flextype.settings.upload.directory') . '/media')
-            ->ensureExists(0755, true);
-            
-        container()->get('emitter')->addListener('onEntriesCreate', static function (): void {
-            entries()->registy()->get('collections');
-        });
-    }
-
-    /**
-     * Create media entry.
-     *
-     * @param string $id   Unique identifier of the media entry.
-     * @param array  $data Data to create for the media entry.
-     *
-     * @return bool True on success, false on failure.
-     *
-     * @access public
-     */
-    public function create(string $id, array $data = []): bool
-    {
-        $data['resource'] = $data['resource'] ?? '';
-
-        if (is_array($data['resource'])) {
-        
-            $media = upload($data['resource'], $id);
-        
-            if ($media->name) {
-
-                //$mediaFile = $uploadFolder . '/media.' . filesystem()->file($media->name)->extension();
-                //filesystem()->file($uploadFolder . '/' . $media->name)->move($mediaFile);
-
-                
-                $data['resource'] = strings($id . '/media.' . filesystem()->file($media->name)->extension())->reduceSlashes()->toString();
-            } else {
-                $data['resource'] = '';
-            }
-        }
-    }
-
-    /**
-     * Move media entry.
-     *
-     * @param string $id    Unique identifier of the media entry.
-     * @param string $newID New Unique identifier of the media entry.
-     *
-     * @return bool True on success, false on failure.
-     *
-     * @access public
-     */
-    public function move(string $id, string $newID): bool
-    {
-        $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-        $mediaResourceDirectoryNewLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $newID;
-       
-        if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-            filesystem()->directory($mediaResourceDirectoryCurrentLocation)->move($mediaResourceDirectoryNewLocation);
-        }
-    }
-
-    /**
-     * Copy media entry.
-     *
-     * @param string $id    Unique identifier of the media entry.
-     * @param string $newID New Unique identifier of the media entry.
-     *
-     * @return bool|null True on success, false on failure.
-     *
-     * @access public
-     */
-    public function copy(string $id, string $newID): bool
-    {
-        $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-        $mediaResourceDirectoryNewLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $newID;
-       
-        if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-            filesystem()->directory($mediaResourceDirectoryCurrentLocation)->copy($mediaResourceDirectoryNewLocation);
-        }
-    }
-
-    /**
-     * Delete media entry.
-     *
-     * @param string $id Unique identifier of the media entry.
-     *
-     * @return bool True on success, false on failure.
-     *
-     * @access public
-     */
-    public function delete(string $id): bool
-    {
-        $mediaResourceDirectoryCurrentLocation = PATH['project'] . registry()->get('flextype.settings.media.upload.directory') . '/' . $id;
-        
-        if (filesystem()->directory($mediaResourceDirectoryCurrentLocation)->exists()) {
-            filesystem()->directory($mediaResourceDirectoryCurrentLocation)->delete();
-        } 
-    }
-}
diff --git a/src/flextype/core/Middlewares/CsrfMiddleware.php b/src/flextype/core/Middlewares/CsrfMiddleware.php
index c4825cd7..94d15e54 100644
--- a/src/flextype/core/Middlewares/CsrfMiddleware.php
+++ b/src/flextype/core/Middlewares/CsrfMiddleware.php
@@ -9,8 +9,9 @@ declare(strict_types=1);
 
 namespace Flextype\Middlewares;
 
-use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
+use Slim\Psr7\Response;
 
 class CsrfMiddleware
 {
@@ -21,7 +22,7 @@ class CsrfMiddleware
      * @param Response $response PSR7 response
      * @param callable $next     Next middleware
      */
-    public function __invoke(Request $request, Response $response, callable $next) : Response
+    /*public function __invoke(Request $request, Response $response, callable $next) : Response
     {
         $data = $request->getParsedBody();
 
@@ -35,6 +36,33 @@ class CsrfMiddleware
             $response = $next($request, $response);
         }
 
+        return $response;
+    }*/
+
+
+    /**
+     * Invoke
+     *
+     * @param  ServerRequest  $request PSR-7 request
+     * @param  RequestHandler $handler PSR-15 request handler
+     *
+     * @return Response
+     */
+    public function __invoke(Request $request, RequestHandler $handler): Response
+    {
+        $response = $handler->handle($request);
+        $data = $request->getParsedBody();
+    
+        if (isset($data[csrf()->getTokenName()])) {
+            if (csrf()->isValid($data[csrf()->getTokenName()])) {
+                return $response;
+            } else {
+                $response = new Response();
+                $response->getBody()->write('This looks like a cross-site request forgery!');
+                return $response;
+            }
+        }
+
         return $response;
     }
 }
diff --git a/src/flextype/core/Middlewares/WhoopsMiddleware.php b/src/flextype/core/Middlewares/WhoopsMiddleware.php
new file mode 100644
index 00000000..913d879b
--- /dev/null
+++ b/src/flextype/core/Middlewares/WhoopsMiddleware.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Flextype (https://flextype.org)
+ * Founded by Sergey Romanenko and maintained by Flextype Community.
+ */
+
+namespace Flextype\Middlewares;
+
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Flextype\Whoops;
+
+class WhoopsMiddleware implements MiddlewareInterface 
+{
+
+    protected $settings = [];
+    protected $handlers = [];
+
+    /**
+     * Instance the whoops middleware object
+     *
+     * @param array $settings
+     * @param array $handlers
+     */
+    public function __construct(array $settings = [], array $handlers = []) 
+    {
+        $this->settings = $settings;
+        $this->handlers = $handlers;
+    }
+
+    /**
+     * Handle the requests
+     *
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface 
+    {
+        $whoopsGuard = new Whoops($this->settings);
+        $whoopsGuard->setRequest($request);
+        $whoopsGuard->setHandlers($this->handlers);
+        $whoopsGuard->install();
+
+        return $handler->handle($request);
+    }
+
+}
\ No newline at end of file
diff --git a/src/flextype/core/Parsers/Shortcodes/MediaShortcode.php b/src/flextype/core/Parsers/Shortcodes/MediaShortcode.php
deleted file mode 100644
index ec306ac8..00000000
--- a/src/flextype/core/Parsers/Shortcodes/MediaShortcode.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype\Parsers\Shortcodes;
-
-use Thunder\Shortcode\Shortcode\ShortcodeInterface;
-
-use function arrays;
-use function flextype;
-use function parsers;
-use function registry;
-
-// Shortcode: [media_files_fetch id="media-id" field="field-name" default="default-value"]
-parsers()->shortcodes()->addHandler('media_files_fetch', static function (ShortcodeInterface $s) {
-    if (! registry()->get('flextype.settings.parsers.shortcodes.shortcodes.media.enabled')) {
-        return '';
-    }
-
-    return arrays(flextype('media')->files()->fetch($s->getParameter('id')))->get($s->getParameter('field'), $s->getParameter('default'));
-});
diff --git a/src/flextype/core/Plugins.php b/src/flextype/core/Plugins.php
index 5e929cfb..9cee310a 100755
--- a/src/flextype/core/Plugins.php
+++ b/src/flextype/core/Plugins.php
@@ -44,6 +44,7 @@ class Plugins
     public function __construct()
     {
         $this->locales = serializers()->yaml()->decode(filesystem()->file(ROOT_DIR . '/src/flextype/locales.yaml')->get());
+        $this->init();
     }
 
     /**
@@ -61,9 +62,9 @@ class Plugins
     /**
      * Init Plugins
      *
-     * @access public
+     * @access protected
      */
-    public function init(): void
+    protected function init(): void
     {
         // Set empty plugins item
         registry()->set('plugins', []);
@@ -74,7 +75,7 @@ class Plugins
         // Get plugins list
         $pluginsList = $this->getPluginsList();
         
-        $pluginsList = arrays($pluginsList)->only(['box'])->toArray();
+       // $pluginsList = arrays($pluginsList)->only(['twig', 'blueprints'])->toArray();
 
         // Get plugins Cache ID
         $pluginsCacheID = $this->getPluginsCacheID($pluginsList);
@@ -185,8 +186,6 @@ class Plugins
 
         $this->includeEnabledPlugins();
 
-       
-
         emitter()->emit('onPluginsInitialized');
     }
 
@@ -393,7 +392,7 @@ class Plugins
                 continue;
             }
 
-            include_once PATH['project'] . '/plugins/' . $pluginName . '/plugin.php';
+            require_once PATH['project'] . '/plugins/' . $pluginName . '/plugin.php';
         }
     }
 }
diff --git a/src/flextype/core/Whoops.php b/src/flextype/core/Whoops.php
new file mode 100644
index 00000000..fd24bdf0
--- /dev/null
+++ b/src/flextype/core/Whoops.php
@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Flextype (https://flextype.org)
+ * Founded by Sergey Romanenko and maintained by Flextype Community.
+ */
+
+namespace Flextype;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Whoops\Run as WhoopsRun;
+use Whoops\Util\Misc;
+use Whoops\Handler\PrettyPageHandler;
+use Whoops\Handler\PlainTextHandler;
+use Whoops\Handler\JsonResponseHandler;
+use Whoops\Handler\XmlResponseHandler;
+
+class Whoops
+{
+
+    protected $settings = [];
+    protected $request  = null;
+    protected $handlers = [];
+
+    /**
+     * Instance the whoops guard object
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings = []) 
+    {
+        $this->settings = array_merge([
+            'enable' => true,
+            'editor' => 'vscode',
+            'title'  => 'Error!',
+            'hadler' => 'plain'
+        ], $settings);
+    }
+
+    /**
+     * Set the server request object
+     *
+     * @param ServerRequestInterface $request
+     * @return void
+     */
+    public function setRequest(ServerRequestInterface $request): void 
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Set the custom handlers for whoops
+     *
+     * @param array $handlers
+     * @return void
+     */
+    public function setHandlers(array $handlers): void 
+    {
+        $this->handlers = $handlers;
+    }
+
+    /**
+     * Install the whoops guard object
+     *
+     * @return WhoopsRun|null
+     */
+    public function install(): ?WhoopsRun 
+    {
+        if ($this->settings['enable'] === false) {
+            return null;
+        }
+
+        // Set Whoops to default exception handler
+        $whoops = new \Whoops\Run;
+
+        switch ($this->settings['handler']) {
+            case 'json':
+                $whoops->pushHandler(new JsonResponseHandler());
+                break;
+
+            case 'xml':
+                $whoops->pushHandler(new XmlResponseHandler());
+                break;
+
+            case 'plain':
+                $whoops->pushHandler(new PlainTextHandler());
+                break;
+
+            case 'pretty':
+            default:
+                $prettyPageHandler = new PrettyPageHandler();
+
+                if (empty($this->settings['editor']) === false) {
+                    $prettyPageHandler->setEditor($this->settings['editor']);
+                }
+
+                if (empty($this->settings['title']) === false) {
+                    $prettyPageHandler->setPageTitle($this->settings['title']);
+                }
+
+                // Add more information to the PrettyPageHandler
+                $contentCharset = '<none>';
+                if (
+                    method_exists($this->request, 'getContentCharset') === true &&
+                    $this->request->getContentCharset() !== null
+                ) {
+                    $contentCharset = $this->request->getContentCharset();
+                }
+
+                $prettyPageHandler->addDataTable('Flextype', [
+                    'Version'         => Flextype::VERSION,
+                    'Accept Charset'  => $this->request->getHeader('ACCEPT_CHARSET') ?: '<none>',
+                    'Content Charset' => $contentCharset,
+                    'HTTP Method'     => $this->request->getMethod(),
+                    'Path'            => $this->request->getUri()->getPath(),
+                    'Query String'    => $this->request->getUri()->getQuery() ?: '<none>',
+                    'Base URL'        => (string) $this->request->getUri(),
+                    'Scheme'          => $this->request->getUri()->getScheme(),
+                    'Port'            => $this->request->getUri()->getPort(),
+                    'Host'            => $this->request->getUri()->getHost(),
+                ]);
+                
+                $whoops->pushHandler($prettyPageHandler);
+                break;
+        }
+
+        // Enable JsonResponseHandler when request is AJAX
+        if (Misc::isAjaxRequest() === true){
+            $whoops->pushHandler(new JsonResponseHandler());
+        }
+
+        // Add each custom handler to whoops handler stack
+        if (empty($this->handlers) === false) {
+            foreach($this->handlers as $handler) {
+                $whoops->pushHandler($handler);
+            }
+        }
+
+        $whoops->register();
+
+        return $whoops;
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/flextype.php b/src/flextype/flextype.php
index b77a8724..0e78a589 100644
--- a/src/flextype/flextype.php
+++ b/src/flextype/flextype.php
@@ -16,7 +16,6 @@ use DateTimeZone;
 use Flextype\Entries\Entries;
 use Flextype\Handlers\HttpErrorHandler;
 use Flextype\Handlers\ShutdownHandler;
-use Flextype\Media\Media;
 use Flextype\Parsers\Parsers;
 use Flextype\Serializers\Serializers;
 use Flextype\Tokens\Tokens;
@@ -24,23 +23,6 @@ use Intervention\Image\ImageManager;
 use League\Event\Emitter;
 use League\Flysystem\Filesystem as Flysystem;
 use League\Flysystem\Local\LocalFilesystemAdapter as Local;
-use League\Glide\Api\Api;
-use League\Glide\Manipulators\Background;
-use League\Glide\Manipulators\Blur;
-use League\Glide\Manipulators\Border;
-use League\Glide\Manipulators\Brightness;
-use League\Glide\Manipulators\Contrast;
-use League\Glide\Manipulators\Crop;
-use League\Glide\Manipulators\Encode;
-use League\Glide\Manipulators\Filter;
-use League\Glide\Manipulators\Gamma;
-use League\Glide\Manipulators\Orientation;
-use League\Glide\Manipulators\Pixelate;
-use League\Glide\Manipulators\Sharpen;
-use League\Glide\Manipulators\Size;
-use League\Glide\Manipulators\Watermark;
-use League\Glide\Responses\PsrResponseFactory;
-use League\Glide\ServerFactory;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Phpfastcache\Drivers\Apcu\Config;
@@ -57,6 +39,7 @@ use Slim\Psr7\Factory\StreamFactory;
 use Slim\Psr7\Response;
 use Slim\Psr7\Stream;
 use Symfony\Component\Yaml\Yaml as SymfonyYaml;
+use Flextype\Middlewares\WhoopsMiddleware;
 
 use function app;
 use function array_replace_recursive;
@@ -87,13 +70,16 @@ use function sys_get_temp_dir;
 use function trim;
 use function var_export;
 
-// Init Flextype Instance
-// Creates $app Application and $container Container objects
+// Init Flextype Instance.
+// Creates $app Application and $container Container objects.
 flextype();
 
-// Add Registry Service
+// Add Registry Service.
 container()->set('registry', registry());
 
+// Add Actions Service.
+container()->set('actions', Actions::getInstance());
+
 // Init Flextype config (manifest and settings)
 $flextypeManifestFilePath        = ROOT_DIR . '/src/flextype/flextype.yaml';
 $defaultFlextypeSettingsFilePath = ROOT_DIR . '/src/flextype/settings.yaml';
@@ -108,7 +94,7 @@ $f1 = file_exists($flextypeManifestFilePath) ? filemtime($flextypeManifestFilePa
 $f2 = file_exists($defaultFlextypeSettingsFilePath) ? filemtime($defaultFlextypeSettingsFilePath) : '';
 $f3 = file_exists($customFlextypeSettingsFilePath) ? filemtime($customFlextypeSettingsFilePath) : '';
 
-// Create Unique Cache ID
+// Create Unique Cache ID.
 $cacheID = md5($flextypeManifestFilePath . $defaultFlextypeSettingsFilePath . $customFlextypeSettingsFilePath . $f1 . $f2 . $f3);
 
 if (filesystem()->file($preflightFlextypePath . '/' . $cacheID . '.php')->exists()) {
@@ -161,8 +147,8 @@ if (filesystem()->file($preflightFlextypePath . '/' . $cacheID . '.php')->exists
 // Store flextype merged data in the flextype registry.
 registry()->set('flextype', $flextypeData);
 
-// Set Flextype base path
-app()->setBasePath(registry()->get('flextype.settings.url'));
+// Set Flextype Aplication base path
+setBasePath(registry()->get('flextype.settings.base_path'));
 
 // Add Routing Middleware
 app()->add(new RoutingMiddleware(app()->getRouteResolver(), app()->getRouteCollector()->getRouteParser()));
@@ -194,15 +180,6 @@ if (registry()->get('flextype.settings.cache.routes')) {
     app()->getRouteCollector()->setCacheFile(PATH['tmp'] . '/routes/routes.php');
 }
 
-$callableResolver     = app()->getCallableResolver();
-$responseFactory      = app()->getResponseFactory();
-$serverRequestCreator = ServerRequestCreatorFactory::create();
-$request              = $serverRequestCreator->createServerRequestFromGlobals();
-
-$errorHandler    = new HttpErrorHandler($callableResolver, $responseFactory);
-$shutdownHandler = new ShutdownHandler($request, $errorHandler, registry()->get('flextype.settings.errors.display'));
-register_shutdown_function($shutdownHandler);
-
 // Add Session Service
 container()->set('session', new Session());
 
@@ -216,8 +193,8 @@ container()->set('emitter', new Emitter());
 container()->set('slugify', new Slugify([
     'separator' => registry()->get('flextype.settings.slugify.separator'),
     'lowercase' => registry()->get('flextype.settings.slugify.lowercase'),
-    'trim' => registry()->get('flextype.settings.slugify.trim'),
-    'regexp' => registry()->get('flextype.settings.slugify.regexp'),
+    'trim'      => registry()->get('flextype.settings.slugify.trim'),
+    'regexp'    => registry()->get('flextype.settings.slugify.regexp'),
     'lowercase_after_regexp' => registry()->get('flextype.settings.slugify.lowercase_after_regexp'),
     'strip_tags' => registry()->get('flextype.settings.slugify.strip_tags'),
 ]));
@@ -344,75 +321,9 @@ parsers()->shortcodes()->initShortcodes();
 // Add Serializers Service
 container()->set('serializers', new Serializers());
 
-// Add Image Service
-container()->set('images', static function () {
-    // Get image settings
-    $imagesSettings = ['driver' => registry()->get('flextype.settings.images.driver')];
-
-    // Set source filesystem
-    $source = new Flysystem(
-        new Local(PATH['project'] . '/uploads/')
-    );
-
-    // Set cache filesystem
-    $cache = new Flysystem(
-        new Local(PATH['tmp'] . '/glide')
-    );
-
-    // Set watermarks filesystem
-    $watermarks = new Flysystem(
-        new Local(PATH['project'] . '/watermarks')
-    );
-
-    // Set image manager
-    $imageManager = new ImageManager($imagesSettings);
-
-    // Set manipulators
-    $manipulators = [
-        new Orientation(),
-        new Crop(),
-        new Size(),
-        new Brightness(),
-        new Contrast(),
-        new Gamma(),
-        new Sharpen(),
-        new Filter(),
-        new Blur(),
-        new Pixelate(),
-        new Watermark($watermarks),
-        new Background(),
-        new Border(),
-        new Encode(),
-    ];
-
-    // Set API
-    $api = new Api($imageManager, $manipulators);
-
-    // Setup Glide server
-    $server = ServerFactory::create([
-        'source' => $source,
-        'cache' => $cache,
-        'api' => $api,
-    ]);
-
-    $server->setResponseFactory(
-        new PsrResponseFactory(
-            new Response(),
-            static function ($stream) {
-                return new Stream($stream);
-            }
-        )
-    );
-
-    return $server;
-});
-
 // Add Entries Service
 container()->set('entries', new Entries(registry()->get('flextype.settings.entries')));
 
-// Add Plugins Service
-container()->set('plugins', new Plugins());
-
 // Set session options before you start the session
 // Standard PHP session configuration options
 // https://secure.php.net/manual/en/session.configuration.php
@@ -434,12 +345,11 @@ if (in_array(registry()->get('flextype.settings.timezone'), DateTimeZone::listId
     date_default_timezone_set(registry()->get('flextype.settings.timezone'));
 }
 
-// Init Plugins
-plugins()->init();
+// Add Plugins Service
+container()->set('plugins', new Plugins());
 
 // Api Endpoints
 require_once ROOT_DIR . '/src/flextype/routes/endpoints/utils.php';
-require_once ROOT_DIR . '/src/flextype/routes/endpoints/images.php';
 require_once ROOT_DIR . '/src/flextype/routes/endpoints/entries.php';
 require_once ROOT_DIR . '/src/flextype/routes/endpoints/registry.php';
 
@@ -477,11 +387,16 @@ if (registry()->get('flextype.settings.cors.enabled')) {
 // Add Routing Middleware
 app()->addRoutingMiddleware();
 
-// Add Error Handling Middleware
-app()->addErrorMiddleware(registry()->get('flextype.settings.errors.display'), false, false)->setDefaultErrorHandler($errorHandler);
-
 // Run high priority event: onFlextypeBeforeRun before Flextype Application starts.
 emitter()->emit('onFlextypeBeforeRun');
 
+// Add Whoops Error Handling Middleware
+app()->add(new WhoopsMiddleware([
+    'enable'  => registry()->get('flextype.settings.errors.display'),
+    'editor'  => registry()->get('flextype.settings.errors.editor'),
+    'title'   => registry()->get('flextype.settings.errors.page_title'),
+    'handler' => registry()->get('flextype.settings.errors.handler'),
+]));
+
 // Run Flextype Application
 app()->run();
diff --git a/src/flextype/helpers/arrays.php b/src/flextype/helpers/arrays.php
new file mode 100644
index 00000000..3b8df304
--- /dev/null
+++ b/src/flextype/helpers/arrays.php
@@ -0,0 +1,86 @@
+<?php 
+
+declare(strict_types=1);
+
+if (! function_exists('filterCollection')) {
+    /**
+     * Filter collection.
+     *
+     * @param  mixed $items   Items.
+     * @param  array $options Options array.
+     *
+     * @return array
+     */
+    function filterCollection($items = [], array $options = []): array
+    {
+        $collection = arrays($items);
+
+        ! isset($options['return']) and $options['return'] = 'all';
+
+        if (isset($options['only'])) {
+            $collection->only($options['only']);
+        }
+
+        if (isset($options['except'])) {
+            $collection->except($options['except']);
+        }
+
+        if (isset($options['where'])) {
+            if (is_array($options['where'])) {
+                foreach ($options['where'] as $key => $value) {
+                    if (
+                        ! isset($value['key']) ||
+                        ! isset($value['operator']) ||
+                        ! isset($value['value'])
+                    ) {
+                        continue;
+                    }
+
+                    $collection->where($value['key'], $value['operator'], $value['value']);
+                }
+            }
+        }
+
+        if (isset($options['group_by'])) {
+            $collection->groupBy($options['group_by']);
+        }
+
+        if (isset($options['sort_by'])) {
+            if (isset($options['sort_by']['key']) && isset($options['sort_by']['direction'])) {
+                $collection->sortBy($options['sort_by']['key'], $options['sort_by']['direction']);
+            }
+        }
+
+        if (isset($options['offset'])) {
+            $collection->offset(isset($options['offset']) ? (int) $options['offset'] : 0);
+        }
+
+        if (isset($options['limit'])) {
+            $collection->limit(isset($options['limit']) ? (int) $options['limit'] : 0);
+        }
+
+        switch ($options['return']) {
+            case 'first':
+                $result = $collection->first();
+                break;
+            case 'last':
+                $result = $collection->last();
+                break;
+            case 'next':
+                $result = $collection->next();
+                break;
+            case 'random':
+                $result = $collection->random(isset($options['random']) ? (int) $options['random'] : null);
+                break;
+            case 'shuffle':
+                $result = $collection->shuffle()->toArray();
+                break;
+            case 'all':
+            default:
+                $result = $collection->all();
+                break;
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/helpers/finder.php b/src/flextype/helpers/finder.php
new file mode 100644
index 00000000..c2d7d500
--- /dev/null
+++ b/src/flextype/helpers/finder.php
@@ -0,0 +1,36 @@
+<?php 
+
+declare(strict_types=1);
+
+use Symfony\Component\Finder\Finder;
+
+if (! function_exists('find')) {
+    /**
+     * Create a Finder instance with predefined filter params or without them.
+     *
+     * @param  string $path     Path.
+     * @param  array  $options  Options array.
+     * @param  string $searchIn Search in 'files' or 'directories'. Default is 'files'.
+     * 
+     * @return Finder Finder instance.
+     */
+    function find(string $path = '', array $options = [], string $searchIn = 'files'): Finder
+    {
+        $find = filesystem()->find()->in($path);
+
+        isset($options['depth']) and $find->depth($options['depth']) or $find->depth(1);
+        isset($options['date']) and $find->date($options['date']);
+        isset($options['size']) and $find->size($options['size']);
+        isset($options['exclude']) and $find->exclude($options['exclude']);
+        isset($options['contains']) and $find->contains($options['contains']);
+        isset($options['not_contains']) and $find->notContains($options['not_contains']);
+        isset($options['filter']) and $find->filter($options['filter']);
+        isset($options['sort']) and $find->sort($options['sort']);
+        isset($options['path']) and $find->path($options['path']);
+        isset($options['sort_by']) && $options['sort_by'] === 'atime' and $find->sortByAccessedTime();
+        isset($options['sort_by']) && $options['sort_by'] === 'mtime' and $find->sortByModifiedTime();
+        isset($options['sort_by']) && $options['sort_by'] === 'ctime' and $find->sortByChangedTime();
+
+        return $searchIn === 'directories' ? $find->directories() : $find->files();
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/helpers/helpers.php b/src/flextype/helpers/helpers.php
index 068eef87..441cf71b 100644
--- a/src/flextype/helpers/helpers.php
+++ b/src/flextype/helpers/helpers.php
@@ -2,557 +2,10 @@
 
 declare(strict_types=1);
 
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-use Flextype\Flextype;
-use Intervention\Image\ImageManagerStatic as Image;
-use Symfony\Component\Finder\Finder;
-use Sirius\Upload\Handler as UploadHandler;
-use Sirius\Upload\Result\File as UploadResultFile;
-
-if (! function_exists('flextype')) {
-    /**
-     * Get the available Flextype instance.
-     */
-    function flextype($container = null)
-    {
-        return Flextype::getInstance($container);
-    }
-}
-
-if (! function_exists('app')) {
-    /**
-     * Get Flextype App.
-     */
-    function app()
-    {
-        return flextype()->app();
-    }
-}
-
-if (! function_exists('container')) {
-    /**
-     * Get Flextype Container.
-     */
-    function container()
-    {
-        return flextype()->container();
-    }
-}
-
-if (! function_exists('emitter')) {
-    /**
-     * Get Flextype Emitter Service.
-     */
-    function emitter()
-    {
-        return flextype()->container()->get('emitter');
-    }
-}
-
-if (! function_exists('cache')) {
-    /**
-     * Get Flextype Cache Service.
-     */
-    function cache()
-    {
-        return flextype()->container()->get('cache');
-    }
-}
-
-if (! function_exists('entries')) {
-    /**
-     * Get Flextype Entries Service.
-     */
-    function entries()
-    {
-        return flextype()->container()->get('entries');
-    }
-}
-
-if (! function_exists('parsers')) {
-    /**
-     * Get Flextype Parsers Service.
-     */
-    function parsers()
-    {
-        return flextype()->container()->get('parsers');
-    }
-}
-
-if (! function_exists('serializers')) {
-    /**
-     * Get Flextype Serializers Service.
-     */
-    function serializers()
-    {
-        return flextype()->container()->get('serializers');
-    }
-}
-
-if (! function_exists('logger')) {
-    /**
-     * Get Flextype Logger Service.
-     */
-    function logger()
-    {
-        return flextype()->container()->get('logger');
-    }
-}
-
-if (! function_exists('session')) {
-    /**
-     * Get Flextype Session Service.
-     */
-    function session()
-    {
-        return flextype()->container()->get('session');
-    }
-}
-
-if (! function_exists('registry')) {
-    /**
-     * Get Flextype Registry Service.
-     */
-    function registry()
-    {
-        return flextype()->container()->get('registry');
-    }
-}
-
-if (! function_exists('csrf')) {
-    /**
-     * Get Flextype CSRF Service.
-     */
-    function csrf()
-    {
-        return flextype()->container()->get('csrf');
-    }
-}
-
-if (! function_exists('slugify')) {
-    /**
-     * Get Flextype Slugify Service.
-     */
-    function slugify()
-    {
-        return flextype()->container()->get('slugify');
-    }
-}
-
-if (! function_exists('plugins')) {
-    /**
-     * Get Flextype Plugins Service.
-     */
-    function plugins()
-    {
-        return flextype()->container()->get('plugins');
-    }
-}
-
-if (! function_exists('find')) {
-    /**
-     * Create a Finder instance with predefined filter params or without them.
-     *
-     * @param  string $path     Path.
-     * @param  array  $options  Options array.
-     * @param  string $searchIn Search in 'files' or 'directories'. Default is 'files'.
-     * 
-     * @return Finder Finder instance.
-     */
-    function find(string $path = '', array $options = [], string $searchIn = 'files'): Finder
-    {
-        $find = filesystem()->find()->in($path);
-
-        isset($options['depth']) and $find->depth($options['depth']) or $find->depth(1);
-        isset($options['date']) and $find->date($options['date']);
-        isset($options['size']) and $find->size($options['size']);
-        isset($options['exclude']) and $find->exclude($options['exclude']);
-        isset($options['contains']) and $find->contains($options['contains']);
-        isset($options['not_contains']) and $find->notContains($options['not_contains']);
-        isset($options['filter']) and $find->filter($options['filter']);
-        isset($options['sort']) and $find->sort($options['sort']);
-        isset($options['path']) and $find->path($options['path']);
-        isset($options['sort_by']) && $options['sort_by'] === 'atime' and $find->sortByAccessedTime();
-        isset($options['sort_by']) && $options['sort_by'] === 'mtime' and $find->sortByModifiedTime();
-        isset($options['sort_by']) && $options['sort_by'] === 'ctime' and $find->sortByChangedTime();
-
-        return $searchIn === 'directories' ? $find->directories() : $find->files();
-    }
-}
-
-if (! function_exists('filterCollection')) {
-    /**
-     * Filter collection.
-     *
-     * @param  mixed $items   Items.
-     * @param  array $options Options array.
-     *
-     * @return array
-     */
-    function filterCollection($items = [], array $options = []): array
-    {
-        $collection = arrays($items);
-
-        ! isset($options['return']) and $options['return'] = 'all';
-
-        if (isset($options['only'])) {
-            $collection->only($options['only']);
-        }
-
-        if (isset($options['except'])) {
-            $collection->except($options['except']);
-        }
-
-        if (isset($options['where'])) {
-            if (is_array($options['where'])) {
-                foreach ($options['where'] as $key => $value) {
-                    if (
-                        ! isset($value['key']) ||
-                        ! isset($value['operator']) ||
-                        ! isset($value['value'])
-                    ) {
-                        continue;
-                    }
-
-                    $collection->where($value['key'], $value['operator'], $value['value']);
-                }
-            }
-        }
-
-        if (isset($options['group_by'])) {
-            $collection->groupBy($options['group_by']);
-        }
-
-        if (isset($options['sort_by'])) {
-            if (isset($options['sort_by']['key']) && isset($options['sort_by']['direction'])) {
-                $collection->sortBy($options['sort_by']['key'], $options['sort_by']['direction']);
-            }
-        }
-
-        if (isset($options['offset'])) {
-            $collection->offset(isset($options['offset']) ? (int) $options['offset'] : 0);
-        }
-
-        if (isset($options['limit'])) {
-            $collection->limit(isset($options['limit']) ? (int) $options['limit'] : 0);
-        }
-
-        switch ($options['return']) {
-            case 'first':
-                $result = $collection->first();
-                break;
-            case 'last':
-                $result = $collection->last();
-                break;
-            case 'next':
-                $result = $collection->next();
-                break;
-            case 'random':
-                $result = $collection->random(isset($options['random']) ? (int) $options['random'] : null);
-                break;
-            case 'shuffle':
-                $result = $collection->shuffle()->toArray();
-                break;
-            case 'all':
-            default:
-                $result = $collection->all();
-                break;
-        }
-
-        return $result;
-    }
-}
-
-if (! function_exists('images')) {
-    /**
-     * Get Flextype Images Service.
-     */
-    function images()
-    {
-        return flextype()->container()->get('images');
-    }
-}
-
-if (! function_exists('imageFile')) {
-    /**
-     * Create a new image instance.
-     *
-     * @param  string $file    Image file.
-     * @param  array  $options Options array.
-     *
-     * @return Image|void
-     */
-    function imageFile(string $file, array $options = [])
-    {
-        $image = Image::make($file);
-
-        if (count($options) === 0) {
-            return $image;
-        }
-
-        if (isset($options['driver'])) {
-            if (in_array($options['driver'], ['imagick', 'gd'])) {
-                Image::configure(['driver' => $options['driver']]);
-            }
-        }
-
-        if (isset($options['blur'])) {
-            $image->blur($options['blur']);
-        }
-
-        if (isset($options['brightness'])) {
-            $image->brightness($options['brightness']);
-        }
-
-        if (
-            isset($options['colorize']) &&
-            isset($options['colorize']['red']) &&
-            isset($options['colorize']['green']) &&
-            isset($options['colorize']['blue'])
-        ) {
-            $image->colorize(
-                $options['colorize']['red'],
-                $options['colorize']['green'],
-                $options['colorize']['blue']
-            );
-        }
-
-        if (isset($options['contrast'])) {
-            $image->contrast($options['contrast']);
-        }
-
-        if (isset($options['flip'])) {
-            $image->flip($options['flip']);
-        }
-
-        if (isset($options['gamma'])) {
-            $image->gamma($options['gamma']);
-        }
-
-        if (isset($options['rotate'])) {
-            $image->rotate($options['rotate']);
-        }
-
-        if (isset($options['pixelate'])) {
-            $image->pixelate($options['pixelate']);
-        }
-
-        if (isset($options['heighten'])) {
-            $image->heighten($options['heighten']['height'],
-                            function ($constraint) use ($options) {
-                                if (isset($options['heighten']['constraint']) &&
-                                    is_array($options['heighten']['constraint'])) {
-                                        foreach ($options['heighten']['constraint'] as $method) {
-                                            if (in_array($method, ['upsize'])) {
-                                                $constraint->{$method}();
-                                            }
-                                        }
-                                }
-                            });
-        }
-
-        if (isset($options['widen'])) {
-            $image->heighten($options['widen']['width'], 
-                            function ($constraint) use ($options) {
-                                if (isset($options['widen']['constraint']) &&
-                                    is_array($options['widen']['constraint'])) {
-                                        foreach ($options['widen']['constraint'] as $method) {
-                                            if (in_array($method, ['upsize'])) {
-                                                $constraint->{$method}();
-                                            }
-                                        }
-                                }
-                            });
-        }
-
-        if (isset($options['fit']) &&
-            isset($options['fit']['width'])) {
-            $image->fit($options['fit']['width'], 
-                        $options['fit']['height'] ?? null,
-                        function ($constraint) use ($options) {
-                            if (isset($options['fit']['constraint']) &&
-                                is_array($options['fit']['constraint'])) {
-                                    foreach ($options['fit']['constraint'] as $method) {
-                                        if (in_array($method, ['upsize'])) {
-                                            $constraint->{$method}();
-                                        }
-                                    }
-                            }
-                        },
-                        $options['fit']['position'] ?? 'center');
-        }
-
-        if (isset($options['crop']) &&
-            isset($options['crop']['width']) &&
-            isset($options['crop']['height'])) {
-            $image->crop($options['crop']['width'], 
-                                $options['crop']['height'],
-                                $options['crop']['x'] ?? null,
-                                $options['crop']['y'] ?? null);
-        }
-
-        
-        if (isset($options['invert']) &&
-            $options['invert'] == true) {
-            $image->invert();
-        }
-
-        if (isset($options['sharpen'])) {
-            $image->sharpen($options['sharpen']);
-        }
-
-        if (isset($options['resize'])) {
-            $image->resize($options['resize']['width'] ?? null,
-                            $options['resize']['height'] ?? null,
-                            function ($constraint) use ($options) {
-                                if (isset($options['resize']['constraint']) &&
-                                    is_array($options['resize']['constraint'])) {
-                                        foreach ($options['resize']['constraint'] as $method) {
-                                            if (in_array($method, ['aspectRatio', 'upsize'])) {
-                                                $constraint->{$method}();
-                                            }
-                                        }
-                                }
-                            });
-        }
-
-        $image->save($file, $options['quality'] ?? 70);
-        $image->destroy();
-    }
-}
-
-if (! function_exists('imageCanvas')) {
-    /**
-     * Create a new image canvas instance.
-     *
-     * @param  int   $width      Canvas width.
-     * @param  int   $height     Canvas height.
-     * @param  mixed $background Canvas background.
-     * 
-     * @return Image Image canvas instance.
-     */
-    function imageCanvas(int $width, int $height, $background = null): Image
-    {
-        return Image::canvas($width, $height, $background);
-    }
-}
-
-if (! function_exists('imageCache')) {
-    /**
-     * Create a new cached image instance.
-     *
-     * @param  Closure $callback   A closure containing the operations on an image, defining the cached image.
-     * @param  int     $lifetime   The lifetime in minutes of the image callback in the cache.
-     * @param  bool    $returnObj  Decide if you want the method to return an Intervention Image instance or (by default) the image stream.
-     *
-     * @return mixed Intervention Image instance as return value or just receive the image stream.
-     */
-    function imageCache(Closure $callback, int $lifetime = 5, bool $returnObj = false)
-    {
-        return Image::cache($callback, $lifetime, $returnObj);
-    }
-}
-
-if (! function_exists('upload')) {
-    /**
-     * Upload file.
-     *
-     * @param array  $file   Raw file data (multipart/form-data).
-     * @param string $folder The folder you're targetting.
-     *
-     * @return UploadResultFile Result file.
-     */
-    function upload(array $file, string $folder): UploadResultFile
-    {
-        $settings = registry()->get('flextype.settings.upload');
-
-        $uploadFolder = strings(PATH['project']  . '/' . $settings['directory'] . '/' . $folder . '/')->reduceSlashes()->toString();
-
-        filesystem()->directory($uploadFolder)->ensureExists(0755, true);
-
-        $uploadHandler = new UploadHandler($uploadFolder);
-        $uploadHandler->setOverwrite($settings['overwrite']);
-        $uploadHandler->setAutoconfirm($settings['autoconfirm']);
-        $uploadHandler->setPrefix($settings['prefix']);
-
-        // Set the validation rules
-        $uploadHandler->addRule('extension', ['allowed' => $settings['validation']['allowed_file_extensions']], 'Should be a valid image');
-        $uploadHandler->addRule('size', ['max' => $settings['validation']['max_file_size']], 'Should have less than {max}');
-        $uploadHandler->addRule('imagewidth', 'min=' . $settings['validation']['image']['width']['min'] . '&max=' . $settings['validation']['image']['width']['max']);
-        $uploadHandler->addRule('imageheight', 'min=' . $settings['validation']['image']['height']['min'] . '&max=' . $settings['validation']['image']['width']['max']);
-
-        if (isset($settings['validation']['image']['ratio'])) {
-            $uploadHandler->addRule('imageratio', 'ratio=' . $settings['validation']['image']['ratio']['size'] . '&error_margin=' . $settings['validation']['image']['ratio']['error_margin']);
-        }
-
-        $result = $uploadHandler->process($_FILES['file']);
-
-        if (! $result->isValid()) {
-            return $result->getMessages();
-        }
-
-        try {
-            $result->confirm();
-
-            // If upload file is image, do image file processing  
-            if (isset($result->name)) {
-                if (getimagesize($mediaFile)) {
-                    imageFile($mediaFile, $settings['process']['image']);
-                }
-            }
-        } catch (Throwable $e) {
-            $result->clear();
-
-            throw $e;
-        }
-
-        return $result;
-    }
-}
-
-if (! function_exists('token')) {
-    /**
-     * Token.
-     *
-     * @param int $length Token string length.
-     * 
-     * @return strings Token string.
-     */
-    function token(int $length = 16): string
-    {
-        return bin2hex(random_bytes($length));
-    }
-}
-
-if (! function_exists('tokenHash')) {
-    /**
-     * Token hash.
-     *
-     * @param int $length Token string length.
-     * 
-     * @return string Token string.
-     */
-    function tokenHash(int $length = 16): string
-    {
-        return password_hash(token($length), PASSWORD_BCRYPT);
-    }
-}
-
-if (! function_exists('tokenHashValidate')) {
-    /**
-     * Token hash validate.
-     *
-     * @param string $token       Token string length.
-     * @param string $tokenHashed Token string length.
-     * 
-     * @return bool Token string.
-     */
-    function tokenHashValidate(string $token, string $tokenHashed): bool
-    {
-        return password_verify($token, $tokenHashed);
-    }
-}
+require_once __DIR__ . '/services.php';
+require_once __DIR__ . '/arrays.php';
+require_once __DIR__ . '/finder.php';
+require_once __DIR__ . '/image.php';
+require_once __DIR__ . '/upload.php';
+require_once __DIR__ . '/tokens.php';
+require_once __DIR__ . '/urls.php';
\ No newline at end of file
diff --git a/src/flextype/helpers/image.php b/src/flextype/helpers/image.php
new file mode 100644
index 00000000..65369dea
--- /dev/null
+++ b/src/flextype/helpers/image.php
@@ -0,0 +1,185 @@
+<?php 
+
+declare(strict_types=1);
+
+use Intervention\Image\ImageManagerStatic as Image;
+
+if (! function_exists('imageFile')) {
+    /**
+     * Create a new image instance for image file.
+     *
+     * @param  string $file    Image file.
+     * @param  array  $options Options array.
+     *
+     * @return Image|void
+     */
+    function imageFile(string $file, array $options = [])
+    {
+        $image = Image::make($file);
+
+        if (count($options) === 0) {
+            return $image;
+        }
+
+        if (isset($options['driver'])) {
+            if (in_array($options['driver'], ['imagick', 'gd'])) {
+                Image::configure(['driver' => $options['driver']]);
+            }
+        }
+
+        if (isset($options['blur'])) {
+            $image->blur($options['blur']);
+        }
+
+        if (isset($options['brightness'])) {
+            $image->brightness($options['brightness']);
+        }
+
+        if (
+            isset($options['colorize']) &&
+            isset($options['colorize']['red']) &&
+            isset($options['colorize']['green']) &&
+            isset($options['colorize']['blue'])
+        ) {
+            $image->colorize(
+                $options['colorize']['red'],
+                $options['colorize']['green'],
+                $options['colorize']['blue']
+            );
+        }
+
+        if (isset($options['contrast'])) {
+            $image->contrast($options['contrast']);
+        }
+
+        if (isset($options['flip'])) {
+            $image->flip($options['flip']);
+        }
+
+        if (isset($options['gamma'])) {
+            $image->gamma($options['gamma']);
+        }
+
+        if (isset($options['rotate'])) {
+            $image->rotate($options['rotate']);
+        }
+
+        if (isset($options['pixelate'])) {
+            $image->pixelate($options['pixelate']);
+        }
+
+        if (isset($options['heighten'])) {
+            $image->heighten($options['heighten']['height'],
+                            function ($constraint) use ($options) {
+                                if (isset($options['heighten']['constraint']) &&
+                                    is_array($options['heighten']['constraint'])) {
+                                        foreach ($options['heighten']['constraint'] as $method) {
+                                            if (in_array($method, ['upsize'])) {
+                                                $constraint->{$method}();
+                                            }
+                                        }
+                                }
+                            });
+        }
+
+        if (isset($options['widen'])) {
+            $image->heighten($options['widen']['width'], 
+                            function ($constraint) use ($options) {
+                                if (isset($options['widen']['constraint']) &&
+                                    is_array($options['widen']['constraint'])) {
+                                        foreach ($options['widen']['constraint'] as $method) {
+                                            if (in_array($method, ['upsize'])) {
+                                                $constraint->{$method}();
+                                            }
+                                        }
+                                }
+                            });
+        }
+
+        if (isset($options['fit']) &&
+            isset($options['fit']['width'])) {
+            $image->fit($options['fit']['width'], 
+                        $options['fit']['height'] ?? null,
+                        function ($constraint) use ($options) {
+                            if (isset($options['fit']['constraint']) &&
+                                is_array($options['fit']['constraint'])) {
+                                    foreach ($options['fit']['constraint'] as $method) {
+                                        if (in_array($method, ['upsize'])) {
+                                            $constraint->{$method}();
+                                        }
+                                    }
+                            }
+                        },
+                        $options['fit']['position'] ?? 'center');
+        }
+
+        if (isset($options['crop']) &&
+            isset($options['crop']['width']) &&
+            isset($options['crop']['height'])) {
+            $image->crop($options['crop']['width'], 
+                                $options['crop']['height'],
+                                $options['crop']['x'] ?? null,
+                                $options['crop']['y'] ?? null);
+        }
+
+        
+        if (isset($options['invert']) &&
+            $options['invert'] == true) {
+            $image->invert();
+        }
+
+        if (isset($options['sharpen'])) {
+            $image->sharpen($options['sharpen']);
+        }
+
+        if (isset($options['resize'])) {
+            $image->resize($options['resize']['width'] ?? null,
+                            $options['resize']['height'] ?? null,
+                            function ($constraint) use ($options) {
+                                if (isset($options['resize']['constraint']) &&
+                                    is_array($options['resize']['constraint'])) {
+                                        foreach ($options['resize']['constraint'] as $method) {
+                                            if (in_array($method, ['aspectRatio', 'upsize'])) {
+                                                $constraint->{$method}();
+                                            }
+                                        }
+                                }
+                            });
+        }
+
+        $image->save($file, $options['quality'] ?? 70);
+        $image->destroy();
+    }
+}
+
+if (! function_exists('imageCanvas')) {
+    /**
+     * Create a new image canvas instance.
+     *
+     * @param  int   $width      Canvas width.
+     * @param  int   $height     Canvas height.
+     * @param  mixed $background Canvas background.
+     * 
+     * @return Image Image canvas instance.
+     */
+    function imageCanvas(int $width, int $height, $background = null): Image
+    {
+        return Image::canvas($width, $height, $background);
+    }
+}
+
+if (! function_exists('imageCache')) {
+    /**
+     * Create a new cached image instance.
+     *
+     * @param  Closure $callback   A closure containing the operations on an image, defining the cached image.
+     * @param  int     $lifetime   The lifetime in minutes of the image callback in the cache.
+     * @param  bool    $returnObj  Decide if you want the method to return an Intervention Image instance or (by default) the image stream.
+     *
+     * @return mixed Intervention Image instance as return value or just receive the image stream.
+     */
+    function imageCache(Closure $callback, int $lifetime = 5, bool $returnObj = false)
+    {
+        return Image::cache($callback, $lifetime, $returnObj);
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/helpers/services.php b/src/flextype/helpers/services.php
new file mode 100644
index 00000000..e5454df8
--- /dev/null
+++ b/src/flextype/helpers/services.php
@@ -0,0 +1,155 @@
+<?php 
+
+declare(strict_types=1);
+
+use Flextype\Flextype;
+
+if (! function_exists('flextype')) {
+    /**
+     * Get the available Flextype instance.
+     */
+    function flextype($container = null)
+    {
+        return Flextype::getInstance($container);
+    }
+}
+
+if (! function_exists('app')) {
+    /**
+     * Get Flextype App.
+     */
+    function app()
+    {
+        return flextype()->app();
+    }
+}
+
+if (! function_exists('container')) {
+    /**
+     * Get Flextype Container.
+     */
+    function container()
+    {
+        return flextype()->container();
+    }
+}
+
+if (! function_exists('emitter')) {
+    /**
+     * Get Flextype Emitter Service.
+     */
+    function emitter()
+    {
+        return flextype()->container()->get('emitter');
+    }
+}
+
+if (! function_exists('cache')) {
+    /**
+     * Get Flextype Cache Service.
+     */
+    function cache()
+    {
+        return flextype()->container()->get('cache');
+    }
+}
+
+if (! function_exists('entries')) {
+    /**
+     * Get Flextype Entries Service.
+     */
+    function entries()
+    {
+        return flextype()->container()->get('entries');
+    }
+}
+
+if (! function_exists('parsers')) {
+    /**
+     * Get Flextype Parsers Service.
+     */
+    function parsers()
+    {
+        return flextype()->container()->get('parsers');
+    }
+}
+
+if (! function_exists('serializers')) {
+    /**
+     * Get Flextype Serializers Service.
+     */
+    function serializers()
+    {
+        return flextype()->container()->get('serializers');
+    }
+}
+
+if (! function_exists('logger')) {
+    /**
+     * Get Flextype Logger Service.
+     */
+    function logger()
+    {
+        return flextype()->container()->get('logger');
+    }
+}
+
+if (! function_exists('session')) {
+    /**
+     * Get Flextype Session Service.
+     */
+    function session()
+    {
+        return flextype()->container()->get('session');
+    }
+}
+
+if (! function_exists('registry')) {
+    /**
+     * Get Flextype Registry Service.
+     */
+    function registry()
+    {
+        return flextype()->container()->get('registry');
+    }
+}
+
+if (! function_exists('actions')) {
+    /**
+     * Get Flextype Actions Service.
+     */
+    function actions()
+    {
+        return flextype()->container()->get('actions');
+    }
+}
+
+if (! function_exists('csrf')) {
+    /**
+     * Get Flextype CSRF Service.
+     */
+    function csrf()
+    {
+        return flextype()->container()->get('csrf');
+    }
+}
+
+if (! function_exists('slugify')) {
+    /**
+     * Get Flextype Slugify Service.
+     */
+    function slugify()
+    {
+        return flextype()->container()->get('slugify');
+    }
+}
+
+if (! function_exists('plugins')) {
+    /**
+     * Get Flextype Plugins Service.
+     */
+    function plugins()
+    {
+        return flextype()->container()->get('plugins');
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/helpers/tokens.php b/src/flextype/helpers/tokens.php
new file mode 100644
index 00000000..66eaab5e
--- /dev/null
+++ b/src/flextype/helpers/tokens.php
@@ -0,0 +1,46 @@
+<?php 
+
+declare(strict_types=1);
+
+if (! function_exists('token')) {
+    /**
+     * Token.
+     *
+     * @param int $length Token string length.
+     * 
+     * @return strings Token string.
+     */
+    function token(int $length = 16): string
+    {
+        return bin2hex(random_bytes($length));
+    }
+}
+
+if (! function_exists('tokenHash')) {
+    /**
+     * Token hash.
+     *
+     * @param int $length Token string length.
+     * 
+     * @return string Token string.
+     */
+    function tokenHash(int $length = 16): string
+    {
+        return password_hash(token($length), PASSWORD_BCRYPT);
+    }
+}
+
+if (! function_exists('tokenHashValidate')) {
+    /**
+     * Token hash validate.
+     *
+     * @param string $token       Token string length.
+     * @param string $tokenHashed Token string length.
+     * 
+     * @return bool Token string.
+     */
+    function tokenHashValidate(string $token, string $tokenHashed): bool
+    {
+        return password_verify($token, $tokenHashed);
+    }
+}
diff --git a/src/flextype/helpers/upload.php b/src/flextype/helpers/upload.php
new file mode 100644
index 00000000..4a1e88d4
--- /dev/null
+++ b/src/flextype/helpers/upload.php
@@ -0,0 +1,66 @@
+<?php 
+
+declare(strict_types=1);
+
+use Sirius\Upload\Handler as UploadHandler;
+use Sirius\Upload\Result\File as UploadResultFile;
+
+if (! function_exists('upload')) {
+    /**
+     * Upload file.
+     *
+     * @param array  $file   Raw file data (multipart/form-data).
+     * @param string $folder The folder you're targetting.
+     *
+     * @return UploadResultFile Result file.
+     */
+    function upload(array $file, string $folder): UploadResultFile
+    {
+        $settings = registry()->get('flextype.settings.upload');
+
+        $uploadFolder = strings(PATH['project']  . '/' . $settings['directory'] . '/' . $folder . '/')->reduceSlashes()->toString();
+
+        filesystem()->directory($uploadFolder)->ensureExists(0755, true);
+
+        $uploadHandler = new UploadHandler($uploadFolder);
+        $uploadHandler->setOverwrite($settings['overwrite']);
+        $uploadHandler->setAutoconfirm($settings['autoconfirm']);
+        $uploadHandler->setPrefix($settings['prefix']);
+
+        // Set the validation rules
+        $uploadHandler->addRule('extension', ['allowed' => $settings['validation']['allowed_file_extensions']], 'Should be a valid image');
+        $uploadHandler->addRule('size', ['max' => $settings['validation']['max_file_size']], 'Should have less than {max}');
+        $uploadHandler->addRule('imagewidth', 'min=' . $settings['validation']['image']['width']['min'] . '&max=' . $settings['validation']['image']['width']['max']);
+        $uploadHandler->addRule('imageheight', 'min=' . $settings['validation']['image']['height']['min'] . '&max=' . $settings['validation']['image']['width']['max']);
+
+        if (isset($settings['validation']['image']['ratio'])) {
+            $uploadHandler->addRule('imageratio', 'ratio=' . $settings['validation']['image']['ratio']['size'] . '&error_margin=' . $settings['validation']['image']['ratio']['error_margin']);
+        }
+
+        $result = $uploadHandler->process($_FILES['file']);
+
+        if (! $result->isValid()) {
+            return $result->getMessages();
+        }
+
+        try {
+            $result->confirm();
+            
+            // If upload file is image, do image file processing  
+            if ($result->name) {
+                
+                $mediaFile = $uploadFolder . '/' . $result->name;
+                
+                if (getimagesize($mediaFile)) {
+                    imageFile($mediaFile, $settings['process']['image']);
+                }
+            }
+        } catch (Throwable $e) {
+            $result->clear();
+
+            throw $e;
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/helpers/urls.php b/src/flextype/helpers/urls.php
new file mode 100644
index 00000000..60bdcef4
--- /dev/null
+++ b/src/flextype/helpers/urls.php
@@ -0,0 +1,212 @@
+<?php 
+
+declare(strict_types=1);
+
+use Slim\Interfaces\RouteParserInterface;
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Slim\Psr7\Response;
+
+if (! function_exists('urlFor')) {
+    /**
+     * Get the url for a named route.
+     *
+     * @param string                $routeName   Route name.
+     * @param array<string, string> $data        Route placeholders.
+     * @param array<string, string> $queryParams Query parameters.
+     *
+     * @return string Url for a named route.
+     */
+    function urlFor(string $routeName, array $data = [], array $queryParams = []): string
+    {
+        return app()->getRouteCollector()->getRouteParser()->urlFor($routeName, $data, $queryParams);
+    }
+}
+
+if (! function_exists('fullUrlFor')) {
+    /**
+     * Get the full url for a named route.
+     *
+     * @param ServerRequestInterface $request     Servert request interface.
+     * @param string                 $routeName   Route name.
+     * @param array<string, string>  $data        Route placeholders.
+     * @param array<string, string>  $queryParams Query parameters.
+     *
+     * @return string Full url for a named route.
+     */
+    function fullUrlFor(ServerRequestInterface $request, string $routeName, array $data = [], array $queryParams = []): string
+    {
+        return app()->getRouteCollector()->getRouteParser()->fullUrlFor($request->getUri(), $routeName, $data, $queryParams);
+    }
+}
+
+if (! function_exists('isCurrentUrl')) {
+    /**
+     * Determine is current url equal to route name.
+     * 
+     * @param ServerRequestInterface $request     Servert request interface.
+     * @param string                 $routeName   Route name.
+     * @param array<string, string>  $data        Route placeholders.
+     *
+     * @return bool
+     */
+    function isCurrentUrl(ServerRequestInterface $request, string $routeName, array $data = []): bool
+    {
+        $currentUrl = getBasePath() . $request->getUri()->getPath();
+        $result = app()->getRouteCollector()->getRouteParser()->urlFor($routeName, $data);
+
+        return $result === $currentUrl;
+    }
+}
+
+if (! function_exists('getCurrentUrl')) {
+    /**
+     * Get current path on given Uri.
+     *
+     * @param ServerRequestInterface $request         Servert request interface.
+     * @param bool                   $withQueryString Get query string for current path.
+     *
+     * @return string
+     */
+    function getCurrentUrl(ServerRequestInterface $request, bool $withQueryString = false): string
+    {
+        $currentUrl = getBasePath() . $request->getUri()->getPath();
+        $query = $request->getUri()->getQuery();
+
+        if ($withQueryString && !empty($query)) {
+            $currentUrl .= '?'.$query;
+        }
+
+        return $currentUrl;
+    }
+}
+
+if (! function_exists('getBasePath')) {
+    /**
+     * Get the base path.
+     *
+     * @return string Base Path.
+     */
+    function getBasePath(): string
+    {
+        return app()->getBasePath();
+    }
+}
+
+if (! function_exists('setBasePath')) {
+    /**
+     * Set the base path.
+     *
+     * @param string $basePath Base path.
+     *
+     * @return void
+     */
+    function setBasePath(string $basePath)
+    {
+        app()->setBasePath($basePath);
+    }
+}
+
+if (! function_exists('getBaseUrl')) {
+    /**
+     * Get the application base url.
+     *
+     * @return string Application base url.
+     */
+    function getBaseUrl(): string
+    {
+        $baseUrl  = registry()->get('flextype.settings.base_url') ?? '';
+        $basePath = registry()->get('flextype.settings.base_path') ?? '';
+
+        if ($baseUrl != '') {
+            return $baseUrl . $basePath;
+        }
+
+        $getAuth = static function (): string {
+            $result = '';
+            if ($user = $_SERVER['PHP_AUTH_USER'] ?? '') {
+                $result .= $user;
+
+                if ($password = $_SERVER['PHP_AUTH_PW'] ?? '') {
+                    $result .= ':' . $password;
+                }
+
+                $result .= '@';
+            }
+
+            return $result;
+        };
+
+        $isHttps = static function (): bool {
+            if (array_key_exists('HTTPS', $_SERVER)) {
+                return !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
+            }
+    
+            return false;
+        };
+
+        $url = '';
+
+        $isHttps = $isHttps();
+
+        $url .= $getAuth();
+      
+        $serverData = arrays($_SERVER);
+
+        $host = (string) $serverData->get('HTTP_HOST');
+        $port = (int) $serverData->get('SERVER_PORT');
+        $url .= str_replace(':' . $port, '', $host);
+
+        if ($isHttps && $port !== 443) {
+            $url .= $port ? ":{$port}" : '';
+        } elseif (!$isHttps && $port !== 80) {
+            $url .= $port ? ":{$port}" : '';
+        }
+
+        if ($url) {
+            if ($isHttps) {
+                $url = 'https://' . $url;
+            } else {
+                $url = 'http://' . $url;
+            }
+        }
+
+        $url .= $basePath;
+
+        return $url;
+    }
+}
+
+if (! function_exists('getAbsoluteUrl')) {
+    /**
+     * Get the application absolute url.
+     *
+     * @return string Application absolute url.
+     */
+    function getAbsoluteUrl(): string
+    {
+        $url  = getBaseUrl();
+        $url .= $_SERVER['REQUEST_URI'];
+
+        return $url;
+    }
+}
+
+if (! function_exists('redirect')) {
+    /**
+     * Redirect.
+     *
+     * @param string                $routeName   Route name
+     * @param array<string, string> $data        Route placeholders
+     * @param array<string, string> $queryParams Query parameters
+     *
+     * @return Response 
+     */
+    function redirect(string $routeName, array $data = [], array $queryParams = []): Response
+    {
+        $response = new Response();
+        $response = $response->withHeader('Location', urlFor($routeName, $data, $queryParams));
+
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/src/flextype/macros/arrays.php b/src/flextype/macros/arrays.php
new file mode 100644
index 00000000..b4dff6d0
--- /dev/null
+++ b/src/flextype/macros/arrays.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+use Atomastic\Arrays\Arrays;
+
+if (! Arrays::hasMacro('onlyFromCollection')) {
+    /**
+     * Return slice of an array with just a given keys.
+     *
+     * @param array $keys List of keys to return.
+     *
+     * @return Arrays Returns instance of The Arrays class.
+     */
+    Arrays::macro('onlyFromCollection', function (array $keys) {
+        $result = [];
+
+        foreach ($this->toArray() as $key => $value) {
+            $result[$key] = arrays($value)->only($keys)->toArray();
+        }
+
+        return arrays($result);
+    });
+}
+
+if (! Arrays::hasMacro('exceptFromCollection')) {
+    /**
+     * Return slice of an array except given keys.
+     *
+     * @param array $keys List of keys to except.
+     *
+     * @return Arrays Returns instance of The Arrays class.
+     */
+    Arrays::macro('exceptFromCollection', function (array $keys) {
+        $result = [];
+
+        foreach ($this->toArray() as $key => $value) {
+            $result[$key] = arrays($value)->except($keys)->toArray();
+        }
+
+        return arrays($result);
+    });
+}
diff --git a/src/flextype/macros/macros.php b/src/flextype/macros/macros.php
index 498f2297..a9c66666 100644
--- a/src/flextype/macros/macros.php
+++ b/src/flextype/macros/macros.php
@@ -2,47 +2,4 @@
 
 declare(strict_types=1);
 
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-use Atomastic\Arrays\Arrays;
-
-if (! Arrays::hasMacro('onlyFromCollection')) {
-    /**
-     * Return slice of an array with just a given keys.
-     *
-     * @param array $keys List of keys to return.
-     *
-     * @return Arrays Returns instance of The Arrays class.
-     */
-    Arrays::macro('onlyFromCollection', function (array $keys) {
-        $result = [];
-
-        foreach ($this->toArray() as $key => $value) {
-            $result[$key] = arrays($value)->only($keys)->toArray();
-        }
-
-        return arrays($result);
-    });
-}
-
-if (! Arrays::hasMacro('exceptFromCollection')) {
-    /**
-     * Return slice of an array except given keys.
-     *
-     * @param array $keys List of keys to except.
-     *
-     * @return Arrays Returns instance of The Arrays class.
-     */
-    Arrays::macro('exceptFromCollection', function (array $keys) {
-        $result = [];
-
-        foreach ($this->toArray() as $key => $value) {
-            $result[$key] = arrays($value)->except($keys)->toArray();
-        }
-
-        return arrays($result);
-    });
-}
+require_once __DIR__ . '/arrays.php';
\ No newline at end of file
diff --git a/src/flextype/routes/endpoints/entries.php b/src/flextype/routes/endpoints/entries.php
index a03922a2..d67b3798 100644
--- a/src/flextype/routes/endpoints/entries.php
+++ b/src/flextype/routes/endpoints/entries.php
@@ -35,8 +35,7 @@ app()->get('/api/entries', [Entries::class, 'fetch']);
  *
  * Body:
  * id            - [REQUIRED] - Unique identifier of the entry.
- * token         -
- *  [REQUIRED] - Valid public token.
+ * token         - [REQUIRED] - Valid public token.
  * access_token  - [REQUIRED] - Valid access token.
  * data          - [REQUIRED] - Data to store for the entry.
  *
diff --git a/src/flextype/routes/endpoints/images.php b/src/flextype/routes/endpoints/images.php
deleted file mode 100644
index d17323c3..00000000
--- a/src/flextype/routes/endpoints/images.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype;
-
-use Flextype\Endpoints\Images;
-
-use function app;
-
-/**
- * Fetch image
- *
- * endpoint: GET /api/images
- *
- * Parameters:
- * path - [REQUIRED] - The file path with valid params for image manipulations.
- *
- * Query:
- * token - [REQUIRED] - Valid public token.
- *
- * Returns:
- * Image file
- */
-app()->get('/api/images/{path:.+}', [Images::class, 'fetch']);
diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index 443b904e..1810fd60 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -16,25 +16,30 @@ charset: UTF-8
 # Available locales to use: src/flextype/config/locales.yaml
 locale: en_US
 
-# Application URL
+# Application Base url
 #
-# Define custom application url
-url: '/flextype'
+# Define application base url
+base_url: ''
+
+# Application Base Path
+#
+# Define application base path if application located in subdirectory
+base_path: '/flextype'
 
 # Valid date format
 #
-# - date_format: Valid date format
-#
-# - date_display_format: Valid date format to display
-#
 # Date format variants:
 #
-# d-m-Y H:i" - 02-02-2020 09:41
-# Y-m-d H:i" - 2020-02-02 09:41
-# m/d/Y h:i a - 02/02/2020 09:41 pm
-# H:i d-m-Y - 09:41 02-02-2020
-# h:i a m/d/Y - 09:41 pm 02/02/2020
+#   d-m-Y H:i" - 02-02-2020 09:41
+#   Y-m-d H:i" - 2020-02-02 09:41
+#   m/d/Y h:i a - 02/02/2020 09:41 pm
+#   H:i d-m-Y - 09:41 02-02-2020
+#   h:i a m/d/Y - 09:41 pm 02/02/2020
+
+# Valid date format
 date_format: 'd-m-Y H:i'
+
+# Valid date format to display
 date_display_format: 'd-m-Y H:i'
 
 # Display errors
@@ -48,13 +53,23 @@ date_display_format: 'd-m-Y H:i'
 # - Detailed error messages for login failures could leak information to attackers
 #
 # In a production environment, always log errors to your PHP error logs.
-#
-# - display: Display errors or not.
 errors:
+
+  # Set true to display errors.
   display: true
 
+  # Editor (emacs, idea, macvim, phpstorm, sublime, textmate, xdebug, vscode, atom, espresso)
+  editor: atom
+
+  # Error page title
+  page_title: Error!
+
+  # Handler (pretty, plain, json, xml)
+  handler: pretty
+
 # Entries
 entries:
+  directory: '/entries'
   collections:
     default:
       filename: entry
@@ -153,61 +168,6 @@ entries:
         state:
           enabled: true
           path: "/src/flextype/core/Entries/Fields/Tokens/Items/StateField.php"
-    media:
-      pattern: media
-      filename: media
-      extension: yaml
-      serializer: yaml
-      fields:
-        modified_at:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php"
-        created_at:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/CreatedAtField.php"
-        created_by:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/CreatedByField.php"
-        uuid:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
-        id:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
-    media_item:
-      pattern: media/(.*)
-      filename: media
-      extension: yaml
-      serializer: yaml
-      actions:
-        create:
-          enabled: true
-          path: "/src/flextype/core/Entries/Actions/Media/CreateAction.php"
-        move:
-          enabled: true
-          path: "/src/flextype/core/Entries/Actions/Media/MoveAction.php"
-        copy:
-          enabled: true
-          path: "/src/flextype/core/Entries/Actions/Media/CopyAction.php"
-        delete:
-          enabled: true
-          path: "/src/flextype/core/Entries/Actions/Media/DeleteAction.php"
-      fields:
-        modified_at:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/ModifiedAtField.php"
-        created_at:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/CreatedAtField.php"
-        created_by:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/CreatedByField.php"
-        uuid:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/UuidField.php"
-        id:
-          enabled: true
-          path: "/src/flextype/core/Entries/Fields/Default/IdField.php"
 
 
 # Cache
@@ -378,22 +338,8 @@ cache:
     zenddisk: {}
     zendshm: {}
 
-# Whoops
-#
-# Error handler framework for PHP.
-#
-# - editor: emacs, idea, macvim, phpstorm, sublime, textmate, xdebug, vscode, atom, espresso
-#
-# - page_title: page title
-whoops:
-  editor: atom
-  page_title: Error!
-
 # Slim
 #
-# - display_error_details: When true, additional information about exceptions are
-#                          displayed by the default error handler.
-#
 # - add_content_length_header: When true, Slim will add a Content-Length header to
 #                              the response. If you are using a runtime analytics tool,
 #                              such as New Relic, then this should be disabled.
@@ -412,42 +358,43 @@ whoops:
 #                     If 'append' or 'prepend', then any echo or print statements
 #                     are captured and are either appended or prepended to the Response
 #                     returned from the route callable.
-display_error_details: true
 add_content_length_header: true
 router_cache_file: false
 determine_route_before_app_middleware: false
 output_buffering: append
 
 # Slugify
-#
-# - separator: By default Slugify will use dashes as separators.
-#              If you want to use a different default separator,
-#              you can set the separator option.
-#
-# - lowercase: By default Slugify will convert the slug to lowercase.
-#              If you want to preserve the case of the string you can set the
-#              lowercase option to false.
-#
-# - trim:      By default Slugify will remove leading and trailing separators before
-#              returning the slug. If you do not want the slug to be trimmed you can
-#              set the trim option to false.
-#
-# - regexp:    You can also change the regular expression that is used to replace
-#              characters with the separator.
-#
-# - lowercase_after_regexp: Lowercasing is done before using the regular expression.
-#                           If you want to keep the lowercasing behavior but your
-#                           regular expression needs to match uppercase letters,
-#                           you can set the lowercase_after_regexp option to true.
-#
-# - strip_tags: Adds in an option to go through strip_tags() in case the string contains HTML etc.
 slugify:
+
+  # Set true to enable slugify.
   enabled: true
+
+  # By default Slugify will use dashes as separators.
+  # If you want to use a different default separator,
+  # you can set the separator option.
   separator: "-"
+
+  # By default Slugify will convert the slug to lowercase.
+  # If you want to preserve the case of the string you can set the
+  # lowercase option to false.
   lowercase: true
+
+  # By default Slugify will remove leading and trailing separators before
+  # returning the slug. If you do not want the slug to be trimmed you can
+  # set the trim option to false.
   trim: true
+
+  # You can also change the regular expression that is used to replace
+  # characters with the separator.
   regexp: "/[^A-Za-z0-9]+/"
+
+  # Lowercasing is done before using the regular expression.
+  # If you want to keep the lowercasing behavior but your
+  # regular expression needs to match uppercase letters,
+  # you can set the lowercase_after_regexp option to true.
   lowercase_after_regexp: false
+
+  # Adds in an option to go through strip_tags() in case the string contains HTML etc.
   strip_tags: false
 
 # Serializers
@@ -492,7 +439,7 @@ serializers:
       native: true
       flags: 0
     encode:    
-      inline: 5
+      inline: 10
       indent: 2
       flags: 0
   frontmatter:
@@ -519,19 +466,31 @@ serializers:
 
 # Parsers
 #
-# markdown.cache: Cache result data or no. Default is true.
-# markdown.commonmark.renderer.block_separator: String to use for separating renderer block elements.
-# markdown.commonmark.renderer.inner_separator: String to use for separating inner block contents.
-# markdown.commonmark.renderer.soft_break: String to use for rendering soft breaks.
-# markdown.commonmark.commonmark.enable_em: Disable <em> parsing by setting to false; enable with true (default: true)
-# markdown.commonmark.commonmark.enable_strong: Disable <strong> parsing by setting to false; enable with true (default: true)
-# markdown.commonmark.commonmark.use_asterisk: Disable parsing of * for emphasis by setting to false; enable with true (default: true)
-# markdown.commonmark.commonmark.use_underscore: Disable parsing of _ for emphasis by setting to false; enable with true (default: true)
-# markdown.commonmark.commonmark.unordered_list_markers: Array of characters that can be used to indicate a bulleted list.
-# markdown.commonmark.html_input: `strip` all HTML (equivalent to 'safe' => true). `allow` all HTML input as-is (default value; equivalent to `‘safe’ => false) `escape` Escape all HTML.
-# markdown.commonmark.allow_unsafe_links: Remove risky link and image URLs by setting this to false (default: true).
-# markdown.commonmark.max_nesting_level: The maximum nesting level for blocks (default: PHP_INT_MAX). Setting this to a positive integer can help protect against long parse times and/or segfaults if blocks are too deeply-nested.
-# markdown.commonmark.slug_normalizer.max_length: Limits the size of generated slugs (defaults to 255 characters)
+# - markdown.cache:                                 Cache result data or no. Default is true.
+#
+# - markdown.commonmark.renderer.block_separator:   String to use for separating renderer block elements.
+#
+# - markdown.commonmark.renderer.inner_separator:   String to use for separating inner block contents.
+#
+# - markdown.commonmark.renderer.soft_break:        String to use for rendering soft breaks.
+#
+# - markdown.commonmark.commonmark.enable_em:       Disable <em> parsing by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.enable_strong:   Disable <strong> parsing by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.use_asterisk:    Disable parsing of * for emphasis by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.use_underscore:  Disable parsing of _ for emphasis by setting to false; enable with true (default: true)
+#
+# - markdown.commonmark.commonmark.unordered_list_markers: Array of characters that can be used to indicate a bulleted list.
+#
+# - markdown.commonmark.html_input:                `strip` all HTML (equivalent to 'safe' => true). `allow` all HTML input as-is (default value; equivalent to `‘safe’ => false) `escape` Escape all HTML.
+#
+# - markdown.commonmark.allow_unsafe_links:         Remove risky link and image URLs by setting this to false (default: true).
+#
+# - markdown.commonmark.max_nesting_level:          The maximum nesting level for blocks (default: PHP_INT_MAX). Setting this to a positive integer can help protect against long parse times and/or segfaults if blocks are too deeply-nested.
+#
+# - markdown.commonmark.slug_normalizer.max_length: Limits the size of generated slugs (defaults to 255 characters)
 parsers:
   markdown:
     cache: true
@@ -554,9 +513,6 @@ parsers:
   shortcodes:
     cache: true
     shortcodes:
-      media:
-        enabled: true
-        path: "/src/flextype/core/Parsers/Shortcodes/MediaShortcode.php"
       entries:
         enabled: true
         path: "/src/flextype/core/Parsers/Shortcodes/EntriesShortcode.php"
@@ -575,100 +531,125 @@ parsers:
 # CORS (Cross-origin resource sharing) allows JavaScript web apps to make HTTP requests to other domains.
 # This is important for third party web apps using Flextype, as without CORS, a JavaScript app hosted on example.com
 # couldn't access our APIs because they're hosted on another.com which is a different domain.
-#
-# - enabled: Set to true to enable cors
-#
-# - origin:   The Access-Control-Allow-Origin response header indicates whether
-#             the response can be shared with requesting code from the given origin.
-#             read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
-#
-# - headers:  The Access-Control-Allow-Headers response header is used in response
-#             to a preflight request which includes the Access-Control-Request-Headers
-#             to indicate which HTTP headers can be used during the actual request.
-#             read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
-#
-# - methods: The Access-Control-Allow-Methods response header specifies the method
-#            or methods allowed when accessing the resource in response to a preflight request.
-#            read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
-#
-# - expose:  The Access-Control-Expose-Headers response header indicates which headers
-#            can be exposed as part of the response by listing their names.
-#            read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
-#
-# - credentials: The Access-Control-Allow-Credentials response header tells browsers whether
-#                to expose the response to frontend JavaScript code when the request's credentials
-#                mode (Request.credentials) is include.
-#                read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
 cors:
+
+  # Set to true to enable cors
   enabled: true
+
+  # The Access-Control-Allow-Origin response header indicates whether
+  # the response can be shared with requesting code from the given origin.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
   origin: "*"
+
+  # The Access-Control-Allow-Headers response header is used in response
+  # to a preflight request which includes the Access-Control-Request-Headers
+  # to indicate which HTTP headers can be used during the actual request.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
   headers: ["X-Requested-With", "Content-Type", "Accept", "Origin", "Authorization"]
+  
+  # The Access-Control-Allow-Methods response header specifies the method
+  # or methods allowed when accessing the resource in response to a preflight request.
+  #
+  # read more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
   methods: [GET, POST, PUT, DELETE, PATCH, OPTIONS]
+  
+  # The Access-Control-Expose-Headers response header indicates which headers
+  # can be exposed as part of the response by listing their names.
+  #
+  # read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
   expose: []
+
+  # The Access-Control-Allow-Credentials response header tells browsers whether
+  # to expose the response to frontend JavaScript code when the request's credentials
+  # mode (Request.credentials) is include.
+  #
+  # read more: https://developer.mozilla.org/ru/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
   credentials: false
 
 # Upload
-#
-# - directory: Uploads directory
-#
-# - overwrite: Overwrite existing files.
-#
-# - autoconfirm: Auto-confirm uploads.
-#
-# - prefix: Prefixing uploads.
-#
-# - validation.allowed_file_extensions: Allowed file extensions.
-#
-# - validation.max_file_size: Maximum file size.
-#
-# - validation.image.width.max: Image maxiumum width.
-#
-# - validation.image.width.min: Image minimum width.
-#
-# - validation.image.height.max: Image maxiumum height.
-#
-# - validation.image.height.min: Image minimum height.
-#
-# - validation.image.ratio.size: The option can be a number (eg: 1.3) or a ratio-like string (eg: 4:3, 16:9). 
-#
-# - validation.image.ratio.error_margin: The option error_margin specifies how much the image is allowed to 
-#                                               deviate from the target ratio. Default value is 0.
-#  
-# - process.image.quality: 
 upload:
+
+  # Uploads directory
   directory: '/uploads'
+
+  # Overwrite existing files.
   overwrite: true
+
+  # Auto-confirm uploads.
   autoconfirm: false
+
+  # Prefixing uploads.
   prefix: ''
+
+  # Validation options
   validation:
+
+    # Allowed file extensions.
     allowed_file_extensions: ['gif', 'jpg', 'jpeg', 'png', 'ico', 'webm', 'svg']
+
+    # Maximum file size.
     max_file_size: '24M'
+
+    # Image validation options
     image:
+    
+      # Image maxiumum and minimum width
       width:
         max: 4920
         min: 100
+
+      # Image maxiumum and minimum height
       height: 
         max: 3264
         min: 100
-  process:
-    image:
-      quality: 70
+    
+      # Image ratio
+      #ratio:
+      #  The option can be a number (eg: 1.3) or a ratio-like string (eg: 4:3, 16:9).
+      #  size: 1.3
 
+      #  The option error_margin specifies how much the image is allowed to 
+      #  deviate from the target ratio. Default value is 0.
+      #  error_margin: 0
+
+  # Process uploaded files
+  process:
+
+    # Images process settings
+    image:
+
+      # Image quality
+      quality: 70
+    
 # Session
 #
 # Set session options before you start the session
 # Standard PHP session configuration options
 # https://secure.php.net/manual/en/session.configuration.php
 session:
+
+  # Session name
   name: Flextype
 
 # Flextype Rest APIs
 api:
+
+  # Entries API
   entries:
+
+    # Set to true to enable Entries API
     enabled: true
+
+  # Registry API
   registry:
+
+    # Set to true to enable Registry API
     enabled: true
-  images:
-    enabled: true
+
+  # Utils API
   utils:
+
+    # Set to true to enable Utils API
     enabled: true
\ No newline at end of file