diff --git a/site/themes/default/templates/default.html b/site/themes/default/templates/default.html
index 30e769a1..dbf6da85 100644
--- a/site/themes/default/templates/default.html
+++ b/site/themes/default/templates/default.html
@@ -1,5 +1,5 @@
-{% extends 'themes/' ~ registry.settings.theme ~  '/templates/partials/base.html' %}
-
-{% block content %}
-    {{ entry.content|shortcode|raw}}
-{% endblock %}
+{% extends 'themes/' ~ registry.flextype.theme ~ '/templates/partials/base.html' %}
+
+{% block content %}
+    {{ entry.content|shortcode|raw}}
+{% endblock %}
\ No newline at end of file
diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index 7ecc2716..a22ef847 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -19,7 +19,7 @@
 
             <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">
 
-            {% set build_css = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/css/build.min.css' %}
+            {% set build_css = base_url() ~ '/site/themes/' ~ registry.flextype.theme ~ '/assets/dist/css/build.min.css' %}
             {% do 
                 assets.add('css', build_css, 'site', 1) %}
             {% for assets_site in assets.get('css', 'site') %}