diff --git a/CHANGELOG.md b/CHANGELOG.md
index 542b4b5..65157ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="1.11.0"></a>
+# [1.11.0](https://github.com/flextype-plugins/site/compare/v1.10.0...v1.11.0) (2021-01-14)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.16
+
+### Bug Fixes
+
+* **bootstrap** fix and improve bootstrap loading.
+
 <a name="1.10.0"></a>
 # [1.10.0](https://github.com/flextype-plugins/site/compare/v1.9.0...v1.10.0) (2021-01-07)
 
diff --git a/README.md b/README.md
index 188e2ea..78468ff 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Site Plugin for <a href="https://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/github/downloads/flextype-plugins/site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.15-green.svg" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/site"><img src="https://img.shields.io/github/downloads/flextype-plugins/site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.16-green.svg" 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>
 
 Site plugin to display entries content on the website frontend.
@@ -14,7 +14,7 @@ The following dependencies need to be downloaded and installed for Site Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.15 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.16 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=2.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [noir](https://github.com/flextype-themes/noir) | >=1.0.0 | [download](https://github.com/flextype-themes/noir/releases) |
 
@@ -64,7 +64,7 @@ version: 1.0.0
 description: Noir theme for Flextype
 author:
   name: Sergey Romanenko
-  email: support@flextype.org
+  email: sergey.romanenko@flextype.org
   url: https://flextype.org
 homepage: https://github.com/flextype-themes/noir
 bugs: https://github.com/flextype-themes/noir/issues
diff --git a/app/Controllers/SiteController.php b/app/Controllers/SiteController.php
index 06dc945..79cc10b 100644
--- a/app/Controllers/SiteController.php
+++ b/app/Controllers/SiteController.php
@@ -75,10 +75,6 @@ public function index(Request $request, Response $response, array $args) : Respo
             return $response->withJson($entry);
         }
 
-
-        $themeBootstrapPath = PATH['project']. '/themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/theme.php';
-        filesystem()->file($themeBootstrapPath)->exists() and include_once $themeBootstrapPath;
-        
         // Set template path for current entry
         $path = 'themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/' . (empty($entry['template']) ? 'templates/default' : 'templates/' . $entry['template']) . '.html';
 
diff --git a/composer.json b/composer.json
index c545bf3..b1371ca 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "authors": [
         {
             "name": "Sergey Romanenko",
-            "email": "support@flextype.org",
+            "email": "sergey.romanenko@flextype.org",
             "homepage": "https://flextype.org"
         }
     ],
diff --git a/dependencies.php b/dependencies.php
index 526a4ac..642db71 100644
--- a/dependencies.php
+++ b/dependencies.php
@@ -22,3 +22,9 @@
  * Init themes
  */
 flextype()->container()['themes']->init();
+
+/**
+ * Init current activated theme
+ */
+$themeBootstrapPath = PATH['project']. '/themes/' . flextype('registry')->get('plugins.site.settings.theme') . '/theme.php';
+filesystem()->file($themeBootstrapPath)->exists() and include_once $themeBootstrapPath;
diff --git a/plugin.yaml b/plugin.yaml
index 000fbe1..bcacaa0 100755
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -1,17 +1,17 @@
 name: Site
-version: 1.10.0
+version: 1.11.0
 description: Site plugin to display entries content on the website frontend.
 icon:
   name: globe
   set: "fontawesome|solid"
 author:
   name: Sergey Romanenko
-  email: support@flextype.org
+  email: sergey.romanenko@flextype.org
   url: https://flextype.org
 homepage: https://github.com/flextype-plugins/site
 bugs: https://github.com/flextype-plugins/site/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.15
+  flextype: 0.9.16
   twig: '>=2.0.0'