diff --git a/flextype/core/Entries.php b/flextype/core/Entries.php
index baccb658..a79c80aa 100755
--- a/flextype/core/Entries.php
+++ b/flextype/core/Entries.php
@@ -268,9 +268,9 @@ class Entries
                     // Whether the requested entry is a director and whether the file entry is in this directory.
                     if ($current_entry['type'] === 'dir' && (
                         // @todo refactoring this
-                        Filesystem::has($current_entry['path'] . '/entry.md') ||
-                        Filesystem::has($current_entry['path'] . '/entry.json') ||
-                        Filesystem::has($current_entry['path'] . '/entry.yaml')
+                        Filesystem::has($current_entry['path'] . '/entry' . '.' . Parser::$parsers['frontmatter']['ext']) ||
+                        Filesystem::has($current_entry['path'] . '/entry' . '.' . Parser::$parsers['json']['ext']) ||
+                        Filesystem::has($current_entry['path'] . '/entry' . '.' . Parser::$parsers['yaml']['ext'])
                         )) {
                         // Get entry uid
                         // 1. Remove entries path
diff --git a/flextype/parsers/Parser.php b/flextype/parsers/Parser.php
index fec18d71..95e65117 100644
--- a/flextype/parsers/Parser.php
+++ b/flextype/parsers/Parser.php
@@ -26,7 +26,7 @@ class Parser
     public static $parsers = [
         'frontmatter' => [
             'name' => 'frontmatter',
-            'ext' => 'md',
+            'ext' => 'html',
         ],
         'json' => [
             'name' => 'json',
diff --git a/site/entries/about/entry.md b/site/entries/about/entry.html
similarity index 100%
rename from site/entries/about/entry.md
rename to site/entries/about/entry.html
diff --git a/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.md b/site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.html
similarity index 100%
rename from site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.md
rename to site/entries/blog/allamco-laboris-nisi-ut-aliquip/entry.html
diff --git a/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.md b/site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.html
similarity index 100%
rename from site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.md
rename to site/entries/blog/cillum-dolore-eu-fugiat-nulla-pariatur/entry.html
diff --git a/site/entries/blog/entry.md b/site/entries/blog/entry.html
similarity index 100%
rename from site/entries/blog/entry.md
rename to site/entries/blog/entry.html
diff --git a/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.md b/site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.html
similarity index 100%
rename from site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.md
rename to site/entries/blog/excepteur-sint-occaecat-cupidatat-non-proident/entry.html
diff --git a/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.md b/site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.html
similarity index 100%
rename from site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.md
rename to site/entries/blog/lorem-ipsum-dolor-sit-amet-consectetur-adipisicing-elit/entry.html
diff --git a/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.md b/site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.html
similarity index 100%
rename from site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.md
rename to site/entries/blog/ullamco-laboris-nisi-ut-aliquip/entry.html
diff --git a/site/entries/gallery/entry.md b/site/entries/gallery/entry.html
similarity index 95%
rename from site/entries/gallery/entry.md
rename to site/entries/gallery/entry.html
index 850add5e..806ff942 100644
--- a/site/entries/gallery/entry.md
+++ b/site/entries/gallery/entry.html
@@ -1,13 +1,14 @@
----
-title: Gallery
-template: gallery
-description: ''
-menu_item_title: Gallery
-menu_item_url: gallery
-menu_item_target: _self
-menu_item_order: '3'
-fieldset: gallery
-published_at: 1564409150
-created_at: 1564409150
-uuid: 9c36d0d1-3c4c-4c93-ad96-cae39e1966ec
----
+---
+title: Gallery
+template: gallery
+description: ''
+menu_item_title: Gallery
+menu_item_url: gallery
+menu_item_target: _self
+menu_item_order: '3'
+fieldset: gallery
+published_at: 1564409150
+created_at: 1564409150
+uuid: 9c36d0d1-3c4c-4c93-ad96-cae39e1966ec
+---
+
diff --git a/site/entries/gallery/nature/entry.md b/site/entries/gallery/nature/entry.html
similarity index 100%
rename from site/entries/gallery/nature/entry.md
rename to site/entries/gallery/nature/entry.html
diff --git a/site/entries/home/entry.md b/site/entries/home/entry.html
similarity index 100%
rename from site/entries/home/entry.md
rename to site/entries/home/entry.html