diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index 8c5fe412..4d4d2c3d 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,5 +1,7 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+    paths:
+        - '%kernel.project_dir%/templates'
+        - '%kernel.project_dir%/templates/legacy'
     debug: '%kernel.debug%'
     strict_variables: '%kernel.debug%'
     exception_controller: null
diff --git a/templates/admin/_admin_layout.html.twig b/templates/legacy/admin/_admin_layout.html.twig
similarity index 91%
rename from templates/admin/_admin_layout.html.twig
rename to templates/legacy/admin/_admin_layout.html.twig
index 4608aeb7..a72d4692 100644
--- a/templates/admin/_admin_layout.html.twig
+++ b/templates/legacy/admin/_admin_layout.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block head_closing %}
     <link rel="stylesheet" href="{{ asset('admin.css') }}">
diff --git a/templates/admin/logs.html.twig b/templates/legacy/admin/logs.html.twig
similarity index 92%
rename from templates/admin/logs.html.twig
rename to templates/legacy/admin/logs.html.twig
index e8b65c07..d920d4a6 100644
--- a/templates/admin/logs.html.twig
+++ b/templates/legacy/admin/logs.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>
diff --git a/templates/admin/radio_tables.html.twig b/templates/legacy/admin/radio_tables.html.twig
similarity index 97%
rename from templates/admin/radio_tables.html.twig
rename to templates/legacy/admin/radio_tables.html.twig
index 663243e4..47e8ae77 100644
--- a/templates/admin/radio_tables.html.twig
+++ b/templates/legacy/admin/radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>
diff --git a/templates/admin/users.html.twig b/templates/legacy/admin/users.html.twig
similarity index 96%
rename from templates/admin/users.html.twig
rename to templates/legacy/admin/users.html.twig
index 9e8106b3..b561e773 100644
--- a/templates/admin/users.html.twig
+++ b/templates/legacy/admin/users.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>
diff --git a/templates/general/about_service.html.twig b/templates/legacy/general/about_service.html.twig
similarity index 99%
rename from templates/general/about_service.html.twig
rename to templates/legacy/general/about_service.html.twig
index 97d7612f..6d0b05ae 100644
--- a/templates/general/about_service.html.twig
+++ b/templates/legacy/general/about_service.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.about_service'|trans }}{% endblock %}
 
diff --git a/templates/general/all_radio_tables.html.twig b/templates/legacy/general/all_radio_tables.html.twig
similarity index 94%
rename from templates/general/all_radio_tables.html.twig
rename to templates/legacy/general/all_radio_tables.html.twig
index e81e7e29..fc0d79c4 100644
--- a/templates/general/all_radio_tables.html.twig
+++ b/templates/legacy/general/all_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.all_radio_tables.title'|trans }}{% endblock %}
 
diff --git a/templates/general/contact.html.twig b/templates/legacy/general/contact.html.twig
similarity index 99%
rename from templates/general/contact.html.twig
rename to templates/legacy/general/contact.html.twig
index eaaea0a3..09705d64 100644
--- a/templates/general/contact.html.twig
+++ b/templates/legacy/general/contact.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.contact'|trans }}{% endblock %}
 
diff --git a/templates/general/homepage.html.twig b/templates/legacy/general/homepage.html.twig
similarity index 98%
rename from templates/general/homepage.html.twig
rename to templates/legacy/general/homepage.html.twig
index 3b7c2ffb..6d314046 100644
--- a/templates/general/homepage.html.twig
+++ b/templates/legacy/general/homepage.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% macro print_date(date) %}
     <time datetime="{{ date.format('Y-m-d') }}">
diff --git a/templates/general/search_radio_tables.html.twig b/templates/legacy/general/search_radio_tables.html.twig
similarity index 94%
rename from templates/general/search_radio_tables.html.twig
rename to templates/legacy/general/search_radio_tables.html.twig
index 1868e8ee..d060eab7 100644
--- a/templates/general/search_radio_tables.html.twig
+++ b/templates/legacy/general/search_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.search_radio_tables.title'|trans }}{% endblock %}
 
diff --git a/templates/general/terms_of_service.html.twig b/templates/legacy/general/terms_of_service.html.twig
similarity index 98%
rename from templates/general/terms_of_service.html.twig
rename to templates/legacy/general/terms_of_service.html.twig
index bb309f38..47a83626 100644
--- a/templates/general/terms_of_service.html.twig
+++ b/templates/legacy/general/terms_of_service.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.terms_of_service'|trans }}{% endblock %}
 
diff --git a/templates/layout.html.twig b/templates/legacy/legacy_layout.html.twig
similarity index 98%
rename from templates/layout.html.twig
rename to templates/legacy/legacy_layout.html.twig
index abc165c4..f6fece19 100644
--- a/templates/layout.html.twig
+++ b/templates/legacy/legacy_layout.html.twig
@@ -1,5 +1,7 @@
 <!doctype html>
 
+{% deprecated 'This page uses old layout which is deprecated. Page must be ported to new layout.' %}
+
 {% set current_locale = app.request.locale %}
 {% set route_name = app.request.attributes.get('_route') %}
 {% set route_params = app.request.attributes.get('_route_params') %}
diff --git a/templates/radio_station/_radio_station_tabs.html.twig b/templates/legacy/radio_station/_radio_station_tabs.html.twig
similarity index 100%
rename from templates/radio_station/_radio_station_tabs.html.twig
rename to templates/legacy/radio_station/_radio_station_tabs.html.twig
diff --git a/templates/radio_station/_radio_station_tabs_theme.html.twig b/templates/legacy/radio_station/_radio_station_tabs_theme.html.twig
similarity index 97%
rename from templates/radio_station/_radio_station_tabs_theme.html.twig
rename to templates/legacy/radio_station/_radio_station_tabs_theme.html.twig
index 773cc867..ea46f2e9 100644
--- a/templates/radio_station/_radio_station_tabs_theme.html.twig
+++ b/templates/legacy/radio_station/_radio_station_tabs_theme.html.twig
@@ -1,4 +1,4 @@
-{% use 'form_div_layout.html.twig' %}
+{% use 'form_div_legacy_layout.html.twig' %}
 {% use 'common/form/overwritten_types.html.twig' %}
 {% use 'common/form/custom_types.html.twig' %}
 
diff --git a/templates/radio_station/add.html.twig b/templates/legacy/radio_station/add.html.twig
similarity index 96%
rename from templates/radio_station/add.html.twig
rename to templates/legacy/radio_station/add.html.twig
index 02f2ee31..8be0a570 100644
--- a/templates/radio_station/add.html.twig
+++ b/templates/legacy/radio_station/add.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_station.add.title'|trans }}{% endblock %}
 
diff --git a/templates/radio_station/edit.html.twig b/templates/legacy/radio_station/edit.html.twig
similarity index 97%
rename from templates/radio_station/edit.html.twig
rename to templates/legacy/radio_station/edit.html.twig
index 2f177afd..60fe662d 100644
--- a/templates/radio_station/edit.html.twig
+++ b/templates/legacy/radio_station/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_station.edit.title'|trans }}{% endblock %}
 
diff --git a/templates/radio_table/create.html.twig b/templates/legacy/radio_table/create.html.twig
similarity index 95%
rename from templates/radio_table/create.html.twig
rename to templates/legacy/radio_table/create.html.twig
index 9b972a39..85a686d7 100644
--- a/templates/radio_table/create.html.twig
+++ b/templates/legacy/radio_table/create.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.create.title'|trans }}{% endblock %}
 
diff --git a/templates/radio_table/remove.html.twig b/templates/legacy/radio_table/remove.html.twig
similarity index 98%
rename from templates/radio_table/remove.html.twig
rename to templates/legacy/radio_table/remove.html.twig
index 35f219c5..cb423040 100644
--- a/templates/radio_table/remove.html.twig
+++ b/templates/legacy/radio_table/remove.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.remove.title'|trans }}{% endblock %}
 
diff --git a/templates/radio_table/settings.html.twig b/templates/legacy/radio_table/settings.html.twig
similarity index 99%
rename from templates/radio_table/settings.html.twig
rename to templates/legacy/radio_table/settings.html.twig
index 27752158..d6abee34 100644
--- a/templates/radio_table/settings.html.twig
+++ b/templates/legacy/radio_table/settings.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.settings.title'|trans }}{% endblock %}
 
diff --git a/templates/radio_table/show.html.twig b/templates/legacy/radio_table/show.html.twig
similarity index 99%
rename from templates/radio_table/show.html.twig
rename to templates/legacy/radio_table/show.html.twig
index ccf97e24..309b5993 100644
--- a/templates/radio_table/show.html.twig
+++ b/templates/legacy/radio_table/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% set appearance = radio_table.appearance %}
 
diff --git a/templates/radio_table/standalone.html.twig b/templates/legacy/radio_table/standalone.html.twig
similarity index 100%
rename from templates/radio_table/standalone.html.twig
rename to templates/legacy/radio_table/standalone.html.twig
diff --git a/templates/radio_table/table/radio_table.csv.twig b/templates/legacy/radio_table/table/radio_table.csv.twig
similarity index 100%
rename from templates/radio_table/table/radio_table.csv.twig
rename to templates/legacy/radio_table/table/radio_table.csv.twig
diff --git a/templates/radio_table/table/radio_table.html.twig b/templates/legacy/radio_table/table/radio_table.html.twig
similarity index 100%
rename from templates/radio_table/table/radio_table.html.twig
rename to templates/legacy/radio_table/table/radio_table.html.twig
diff --git a/templates/radio_table/table/radio_table.twig b/templates/legacy/radio_table/table/radio_table.twig
similarity index 100%
rename from templates/radio_table/table/radio_table.twig
rename to templates/legacy/radio_table/table/radio_table.twig
diff --git a/templates/security/login.html.twig b/templates/legacy/security/login.html.twig
similarity index 92%
rename from templates/security/login.html.twig
rename to templates/legacy/security/login.html.twig
index e1b0df9b..a19df290 100644
--- a/templates/security/login.html.twig
+++ b/templates/legacy/security/login.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'session.login.title'|trans }}{% endblock %}
 
diff --git a/templates/user/_register_theme.html.twig b/templates/legacy/user/_register_theme.html.twig
similarity index 89%
rename from templates/user/_register_theme.html.twig
rename to templates/legacy/user/_register_theme.html.twig
index ab888638..c309afaf 100644
--- a/templates/user/_register_theme.html.twig
+++ b/templates/legacy/user/_register_theme.html.twig
@@ -1,4 +1,4 @@
-{# This ugly copy-paste from `form_label` in 'form_div_layout.html.twig' #}
+{# This ugly copy-paste from `form_label` in 'form_div_legacy_layout.html.twig' #}
 {# is needed to be able to use HTML code in `label_translation_parameters`. #}
 {% block _user_register_acceptServiceTerms_label %}
     {% set label_attr = label_attr|merge({'for': id}) %}
diff --git a/templates/user/my_account_settings.html.twig b/templates/legacy/user/my_account_settings.html.twig
similarity index 98%
rename from templates/user/my_account_settings.html.twig
rename to templates/legacy/user/my_account_settings.html.twig
index f83b82ee..1be0bdc1 100644
--- a/templates/user/my_account_settings.html.twig
+++ b/templates/legacy/user/my_account_settings.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.settings.title_long'|trans }}{% endblock %}
 
diff --git a/templates/user/my_radio_tables.html.twig b/templates/legacy/user/my_radio_tables.html.twig
similarity index 95%
rename from templates/user/my_radio_tables.html.twig
rename to templates/legacy/user/my_radio_tables.html.twig
index 413505a5..8e7da02e 100644
--- a/templates/user/my_radio_tables.html.twig
+++ b/templates/legacy/user/my_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.my_radio_tables.title'|trans }}{% endblock %}
 
@@ -25,4 +25,3 @@
         </p>
     {% endif %}
 {% endblock %}
-
diff --git a/templates/user/public_profile.html.twig b/templates/legacy/user/public_profile.html.twig
similarity index 97%
rename from templates/user/public_profile.html.twig
rename to templates/legacy/user/public_profile.html.twig
index 16aed249..dd430aee 100644
--- a/templates/user/public_profile.html.twig
+++ b/templates/legacy/user/public_profile.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ user.name }}{% endblock %}
 
diff --git a/templates/user/register.html.twig b/templates/legacy/user/register.html.twig
similarity index 94%
rename from templates/user/register.html.twig
rename to templates/legacy/user/register.html.twig
index d89e4119..95c87df4 100644
--- a/templates/user/register.html.twig
+++ b/templates/legacy/user/register.html.twig
@@ -1,6 +1,6 @@
 {% form_theme form 'user/_register_theme.html.twig' %}
 
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.register.title'|trans }}{% endblock %}