diff --git a/flextype/bootstrap.php b/flextype/bootstrap.php
index 3a0fc8e7..9a56a021 100755
--- a/flextype/bootstrap.php
+++ b/flextype/bootstrap.php
@@ -213,12 +213,14 @@ $flextype['view'] = function ($container) {
     $uri = \Slim\Http\Uri::createFromEnvironment(new \Slim\Http\Environment($_SERVER));
 
     $view->addExtension(new \Slim\Views\TwigExtension($router, $uri));
-    $view->addExtension(new EntriesTwigExtension());
-    $view->addExtension(new RegistryTwigExtension());
 
     return $view;
 };
 
+$flextype['view']->addExtension(new EntriesTwigExtension($flextype));
+$flextype['view']->addExtension(new RegistryTwigExtension());
+
+
 /**
  * Init plugins
  */
diff --git a/flextype/twig/EntriesTwigExtension.php b/flextype/twig/EntriesTwigExtension.php
index 8a71adf6..333f14df 100644
--- a/flextype/twig/EntriesTwigExtension.php
+++ b/flextype/twig/EntriesTwigExtension.php
@@ -10,6 +10,20 @@ namespace Flextype;
 
 class EntriesTwigExtension extends \Twig_Extension
 {
+
+    /**
+     * Flextype Dependency Container
+     */
+    private $flextype;
+
+    /**
+     * __construct
+     */
+    public function __construct($flextype)
+    {
+        $this->flextype = $flextype;
+    }
+
     public function getFunctions()
     {
         return [
@@ -20,11 +34,11 @@ class EntriesTwigExtension extends \Twig_Extension
 
     public function fetch(string $entry)
     {
-        return Entries::fetch($entry);
+        return $this->flextype['entries']->fetch($entry);
     }
 
     public function fetchAll(string $entry, string $order_by = 'date', string $order_type = 'DESC', int $offset = null, int $length = null) : array
     {
-        return Entries::fetchAll($entry, $order_by, $order_type, $offset, $length);
+        return $this->flextype['entries']->fetchAll($entry, $order_by, $order_type, $offset, $length);
     }
 }
diff --git a/site/plugins/a/a.php b/site/plugins/a/a.php
index f8474b12..f96d4ab0 100644
--- a/site/plugins/a/a.php
+++ b/site/plugins/a/a.php
@@ -19,7 +19,4 @@ include 'ATwigExtension.php';
 
 //Flextype::container()['view']->addExtension(new ATwigExtension());
 
-echo '@@@';
-
-
 //Flextype::flextype()->version();
diff --git a/site/plugins/site/site.php b/site/plugins/site/site.php
index 24d68976..5c6b9f77 100644
--- a/site/plugins/site/site.php
+++ b/site/plugins/site/site.php
@@ -56,7 +56,7 @@ $app->get('{uri:.+}', function (Request $request, Response $response, array $arg
         $entry['template']    = Registry::get('settings.entries.error404.template');
     }
 
-    $path = 'themes/' . Registry::get('settings.theme') . '/' . (empty($entry['template']) ? 'templates/default' : 'templates/' . $entry['template']) . '.twig';
+    $path = 'themes/' . Registry::get('settings.theme') . '/' . (empty($entry['template']) ? 'templates/default' : 'templates/' . $entry['template']) . '.html';
 
     return $this->view->render($response,
                                $path, [
diff --git a/site/themes/default/templates/default.twig b/site/themes/default/templates/default.html
similarity index 60%
rename from site/themes/default/templates/default.twig
rename to site/themes/default/templates/default.html
index 6372a157..f5f921af 100644
--- a/site/themes/default/templates/default.twig
+++ b/site/themes/default/templates/default.html
@@ -1,6 +1,4 @@
-{% extends "partials/base.twig" %}
-
-{% block title %}{{ entry.title }}{% endblock %}
+{% extends "themes/default/templates/partials/base.html" %}
 
 {% block content %}
     <h1>{{ entry.title }}</h1>
diff --git a/site/themes/default/templates/home.html b/site/themes/default/templates/home.html
new file mode 100644
index 00000000..c8efb178
--- /dev/null
+++ b/site/themes/default/templates/home.html
@@ -0,0 +1,13 @@
+{% extends "themes/default/templates/partials/base.html" %}
+
+{% block content %}
+
+    {{ entry.content|raw }}
+
+    {% for entry in entries_fetch_all('blog', 'date', 'DESC', 0, 3) %}
+        <h3>{{ entry.title }}</h3>
+        <p>{{ entry.summary|raw }}</p>
+        <div>{{ entry.date }}</div>
+    {% endfor %}
+
+{% endblock %}
diff --git a/site/themes/default/templates/home.twig b/site/themes/default/templates/home.twig
deleted file mode 100644
index 2ebe610a..00000000
--- a/site/themes/default/templates/home.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "themes/default/templates/partials/base.twig" %}
-
-{% block title %}{{ entry.title }}{% endblock %}
-
-{% block content %}
-    <h1>{{ entry.title }}</h1>
-    {{ entry.content|raw }}
-{% endblock %}
diff --git a/site/themes/default/templates/partials/base.twig b/site/themes/default/templates/partials/base.html
similarity index 100%
rename from site/themes/default/templates/partials/base.twig
rename to site/themes/default/templates/partials/base.html