diff --git a/Features/Templates/README.md b/Features/Templates/README.md
deleted file mode 100644
index 5d212759..00000000
--- a/Features/Templates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Templates (Flynt Feature)
-
-Sets the config path for templates to `config/templates/` instead of the default `config/`.
diff --git a/Features/Templates/functions.php b/Features/Templates/functions.php
deleted file mode 100644
index f2a4c65c..00000000
--- a/Features/Templates/functions.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Flynt\Features\Templates;
-
-// Set Config Path
-add_filter('Flynt/configPath', function ($filePath, $fileName) {
-    return get_template_directory() . '/config/templates/' . $fileName;
-}, 10, 2);
diff --git a/config/templates/.gitkeep b/config/templates/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/templates/404.json b/config/templates/404.json
deleted file mode 100644
index 7769bc38..00000000
--- a/config/templates/404.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "DocumentDefault",
-  "areas": {
-    "layout": [
-      {
-        "name": "LayoutSinglePost",
-        "areas": {
-          "mainHeader": [
-            {
-              "name": "NavigationMain",
-              "customData": {
-                "menuSlug": "navigation_main"
-              }
-            }
-          ],
-          "pageComponents": [
-            {
-              "name": "BlockNotFound"
-            }
-          ],
-          "mainFooter": []
-        }
-      }
-    ]
-  }
-}
diff --git a/config/templates/archive.json b/config/templates/archive.json
deleted file mode 100644
index 6400863d..00000000
--- a/config/templates/archive.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "DocumentDefault",
-  "areas": {
-    "layout": [
-      {
-        "name": "LayoutMultiplePosts",
-        "areas": {
-          "mainHeader": [
-            {
-              "name": "NavigationMain",
-              "customData": {
-                "menuSlug": "navigation_main"
-              }
-            }
-          ],
-          "pageComponents": [
-            {
-              "name": "ListPosts"
-            }
-          ],
-          "mainFooter": []
-        }
-      }
-    ]
-  }
-}
diff --git a/config/templates/default.json b/config/templates/default.json
deleted file mode 100644
index 99ad57b6..00000000
--- a/config/templates/default.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "DocumentDefault",
-  "areas": {
-    "layout": [
-      {
-        "name": "LayoutSinglePost",
-        "areas": {
-          "mainHeader": [
-            {
-              "name": "NavigationMain",
-              "customData": {
-                "menuSlug": "navigation_main"
-              }
-            }
-          ],
-          "pageComponents": [
-            {
-              "name": "ComponentLoaderFlexible",
-              "customData": {
-                "fieldGroup": "pageComponents"
-              }
-            }
-          ],
-          "mainFooter": []
-        }
-      }
-    ]
-  }
-}
diff --git a/lib/Init.php b/lib/Init.php
index 5b155bd1..9ae5cc77 100644
--- a/lib/Init.php
+++ b/lib/Init.php
@@ -46,9 +46,6 @@ function initTheme()
     // enable admin notices
     add_theme_support('flynt-admin-notices');
 
-    // set correct config dir (+ more?)
-    add_theme_support('flynt-templates');
-
     // use timber rendering
     add_theme_support('flynt-timber-loader');
 
diff --git a/templates/404.php b/templates/404.php
index f93640c1..9f5dbd2c 100644
--- a/templates/404.php
+++ b/templates/404.php
@@ -1,3 +1,28 @@
 <?php
 
-Flynt\echoHtmlFromConfigFile('404.json');
+Flynt\echoHtmlFromConfig([
+    'name' => 'DocumentDefault',
+    'areas' => [
+        'layout' => [
+            [
+                'name' => 'LayoutSinglePost',
+                'areas' => [
+                    'mainHeader' => [
+                        [
+                            'name' => 'NavigationMain',
+                            'customData' => [
+                                'menuSlug' => 'navigation_main',
+                            ],
+                        ],
+                    ],
+                    'pageComponents' => [
+                        [
+                            'name' => 'BlockNotFound',
+                        ],
+                    ],
+                    'mainFooter' => [],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/templates/archive.php b/templates/archive.php
index 46b35205..91be20d6 100644
--- a/templates/archive.php
+++ b/templates/archive.php
@@ -1,3 +1,28 @@
 <?php
 
-Flynt\echoHtmlFromConfigFile('archive.json');
+Flynt\echoHtmlFromConfig([
+    "name" => "DocumentDefault",
+    "areas" => [
+        "layout" => [
+            [
+                "name" => "LayoutMultiplePosts",
+                "areas" => [
+                    "mainHeader" => [
+                        [
+                            "name" => "NavigationMain",
+                            "customData" => [
+                                "menuSlug" => "navigation_main"
+                            ]
+                        ]
+                    ],
+                    "pageComponents" => [
+                        [
+                            "name" => "ListPosts"
+                        ]
+                    ],
+                    "mainFooter" => []
+                ]
+            ]
+        ]
+    ]
+]);
diff --git a/templates/home.php b/templates/home.php
index 46b35205..91be20d6 100644
--- a/templates/home.php
+++ b/templates/home.php
@@ -1,3 +1,28 @@
 <?php
 
-Flynt\echoHtmlFromConfigFile('archive.json');
+Flynt\echoHtmlFromConfig([
+    "name" => "DocumentDefault",
+    "areas" => [
+        "layout" => [
+            [
+                "name" => "LayoutMultiplePosts",
+                "areas" => [
+                    "mainHeader" => [
+                        [
+                            "name" => "NavigationMain",
+                            "customData" => [
+                                "menuSlug" => "navigation_main"
+                            ]
+                        ]
+                    ],
+                    "pageComponents" => [
+                        [
+                            "name" => "ListPosts"
+                        ]
+                    ],
+                    "mainFooter" => []
+                ]
+            ]
+        ]
+    ]
+]);
diff --git a/templates/index.php b/templates/index.php
index dca5fab9..c38e2860 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,3 +1,31 @@
 <?php
 
-Flynt\echoHtmlFromConfigFile('default.json');
+Flynt\echoHtmlFromConfig([
+    "name" => "DocumentDefault",
+    "areas" => [
+        "layout" => [
+            [
+                "name" => "LayoutSinglePost",
+                "areas" => [
+                    "mainHeader" => [
+                        [
+                            "name" => "NavigationMain",
+                            "customData" => [
+                                "menuSlug" => "navigation_main"
+                            ]
+                        ]
+                    ],
+                    "pageComponents" => [
+                        [
+                            "name" => "ComponentLoaderFlexible",
+                            "customData" => [
+                                "fieldGroup" => "pageComponents"
+                            ]
+                        ]
+                    ],
+                    "mainFooter" => []
+                ]
+            ]
+        ]
+    ]
+]);