diff --git a/config/packages/sylius_twig_hooks.yaml b/config/packages/sylius_twig_hooks.yaml
new file mode 100644
index 00000000..bd7f3ad2
--- /dev/null
+++ b/config/packages/sylius_twig_hooks.yaml
@@ -0,0 +1,26 @@
+sylius_twig_hooks:
+    hooks:
+        'sylius_shop.base.offcanvas':
+            info_box:
+                template: "blocks/info_box.html.twig"
+                priority: 100
+
+        'sylius_admin.security.login':
+            info_box:
+                template: "blocks/info_box.html.twig"
+                priority: 100
+
+        'sylius_admin.security.login.content':
+            info_box:
+                template: "blocks/admin_demo_credentials.html.twig"
+                priority: 150
+
+        'sylius_admin.common.index':
+            info_box:
+                template: "blocks/info_box.html.twig"
+                priority: 100
+
+        'sylius_shop.base#javascripts':
+            analytics:
+                template: "blocks/analytics.html.twig"
+                priority: 100
diff --git a/config/packages/sylius_ui.yaml b/config/packages/sylius_ui.yaml
deleted file mode 100644
index 6cbf7551..00000000
--- a/config/packages/sylius_ui.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-sylius_ui:
-#    events:
-#        sylius.shop.layout.header:
-#            blocks:
-#                after_menu:
-#                    template: "Blocks/_infoBox.html.twig"
-#                    priority: 12
-#        sylius.shop.layout.head:
-#            blocks:
-#                analistics:
-#                    template: "Blocks/_analytics.html.twig"
-#                    priority: 10
-#        sylius.admin.login.content:
-#            blocks:
-#                info_box:
-#                    template: "Blocks/_infoBox.html.twig"
-#                    priority: 0
-#        sylius.admin.layout.topbar_right:
-#            blocks:
-#                info_box:
-#                    template: "Blocks/_infoBox.html.twig"
-#                    priority: 0
diff --git a/templates/Admin/Security/Login/testCredentials.html.twig b/templates/Admin/Security/Login/testCredentials.html.twig
deleted file mode 100644
index ad7201ab..00000000
--- a/templates/Admin/Security/Login/testCredentials.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="ui icon info message">
-    <i class="info icon"></i>
-    <div class="content">
-        <div class="header">Test credentials</div>
-        <p>
-            Username: sylius@example.com<br>
-            Password: sylius
-        </p>
-    </div>
-</div>
diff --git a/templates/Blocks/_aboutUs.html.twig b/templates/Blocks/_aboutUs.html.twig
deleted file mode 100644
index ca105bfe..00000000
--- a/templates/Blocks/_aboutUs.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="ui very padded center aligned secondary segment">
-    <div class="ui centered grid">
-        <div class="sixteen wide tablet twelve wide computer center aligned column">
-            <h2 class="ui huge header">
-                {{ 'sylius.homepage.about_us'|trans }}
-            </h2>
-            <p>
-                {{ bitbag_cms_render_block('about_us') }}
-            </p>
-        </div>
-    </div>
-</div>
diff --git a/templates/Blocks/_banner.html.twig b/templates/Blocks/_banner.html.twig
deleted file mode 100644
index be3d6e21..00000000
--- a/templates/Blocks/_banner.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ bitbag_cms_render_media('homepage_banner') }}
-<div class="ui hidden divider"></div>
diff --git a/templates/blocks/admin_demo_credentials.html.twig b/templates/blocks/admin_demo_credentials.html.twig
new file mode 100644
index 00000000..5ccecd29
--- /dev/null
+++ b/templates/blocks/admin_demo_credentials.html.twig
@@ -0,0 +1,13 @@
+{#<div class="ui icon info message">#}
+{#    <i class="info icon"></i>#}
+{#    <div class="content">#}
+{#        <div class="header">Test credentials</div>#}
+{#        <p>#}
+{#            Username: sylius@example.com<br>#}
+{#            Password: sylius#}
+{#        </p>#}
+{#    </div>#}
+{#</div>#}
+<div class="alert alert-info" role="alert">
+    A simple info alert—check it out!
+</div>
diff --git a/templates/Blocks/_analytics.html.twig b/templates/blocks/analytics.html.twig
similarity index 100%
rename from templates/Blocks/_analytics.html.twig
rename to templates/blocks/analytics.html.twig
diff --git a/templates/Blocks/_infoBox.html.twig b/templates/blocks/info_box.html.twig
similarity index 100%
rename from templates/Blocks/_infoBox.html.twig
rename to templates/blocks/info_box.html.twig
diff --git a/templates/bundles/SyliusAdminBundle/Order/Label/State/fully_refunded.html.twig b/templates/bundles/SyliusAdminBundle/Order/Label/State/fully_refunded.html.twig
deleted file mode 100644
index 645068ff..00000000
--- a/templates/bundles/SyliusAdminBundle/Order/Label/State/fully_refunded.html.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-<span class="ui purple label">
-    <i class="check icon"></i>
-    {{ value|trans }}
-</span>
diff --git a/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig b/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig
deleted file mode 100644
index dd157bc2..00000000
--- a/templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig
+++ /dev/null
@@ -1,44 +0,0 @@
-{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %}
-{% import '@SyliusUi/Macro/labels.html.twig' as label %}
-
-<div class="item">
-    <div class="right floated content">
-        {{ label.default(('sylius.ui.'~payment.state)|trans) }}
-    </div>
-    <i class="large payment icon"></i>
-    <div class="content">
-        <div class="header">
-            {{ payment.method }}
-        </div>
-        <div class="description">
-            {{ money.format(payment.amount, payment.order.currencyCode) }}
-        </div>
-    </div>
-    {% if sm_can(payment, 'complete', 'sylius_payment') %}
-        <div class="ui segment">
-            <form action="{{ path('sylius_admin_order_payment_complete', {'orderId': order.id, 'id': payment.id}) }}" method="post" novalidate>
-                <input type="hidden" name="_method" value="PUT">
-                <input type="hidden" name="_csrf_token" value="{{ csrf_token(payment.id) }}" />
-                <button type="submit" class="ui icon labeled tiny blue fluid loadable button"><i class="check icon"></i> {{ 'sylius.ui.complete'|trans }}</button>
-            </form>
-        </div>
-        {% if payment.details['payment-link'] is defined %}
-            <div class="ui segment">
-                <a href="{{ payment.details['payment-link'] }}">
-                    <button type="submit" id="payment-link" class="ui icon labeled tiny yellow fluid loadable button"><i class="money icon"></i> {{ 'sylius.ui.pay'|trans }}</button>
-                </a>
-            </div>
-        {% endif %}
-    {% endif %}
-    {% if
-        payment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and
-        payment.state == 'refunded'
-    %}
-        <div class="ui icon mini message">
-            <i class="paypal icon"></i>
-            <div class="content">
-                <p>{{ 'sylius.pay_pal.tender_type'|trans }}</p>
-            </div>
-        </div>
-    {% endif %}
-</div>
diff --git a/templates/bundles/SyliusAdminBundle/PaymentMethod/Gateways/paymentGateways.html.twig b/templates/bundles/SyliusAdminBundle/PaymentMethod/Gateways/paymentGateways.html.twig
deleted file mode 100644
index ea0e1d4b..00000000
--- a/templates/bundles/SyliusAdminBundle/PaymentMethod/Gateways/paymentGateways.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% for name, gateway in gatewayFactories %}
-    <a href="{{ url('sylius_admin_payment_method_create', { 'factory': name }) }}" id="{{ name }}" class="item" {% if name == 'sylius.pay_pal' %}data-confirm-pay-pal-consent{% endif %}>
-        {{ gateway|trans }}
-    </a>
-{% endfor %}
diff --git a/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig
deleted file mode 100644
index ece6954b..00000000
--- a/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="item" {{ sylius_test_html_attribute('payment-item') }}>
-    <div class="field">
-        <div class="ui radio checkbox" {{ sylius_test_html_attribute('payment-method-checkbox') }}>
-            {{ form_widget(form, sylius_test_form_attribute('payment-method-select')) }}
-        </div>
-    </div>
-    <div class="content">
-        <a class="header">{{ form_label(form, null, {'label_attr': {'data-test-payment-method-label': ''}}) }}</a>
-        {% if method.description is not null %}
-            <div class="description">
-                <p>{{ method.description }}</p>
-            </div>
-        {% endif %}
-        {% if method.gatewayConfig.factoryName == 'sylius.pay_pal' %}
-            {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController:renderPaymentPageButtonsAction', {'orderId': order.id})) }}
-        {% endif %}
-    </div>
-</div>
diff --git a/templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig
deleted file mode 100644
index 1591a7df..00000000
--- a/templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
-
-{% set state = order.paymentState %}
-
-{% if state != 'cart' %}
-    {% include "@SyliusShop/Common/Order/Label/PaymentState/orderPaymentState.html.twig" %}
-{% endif %}
-
-{% for payment in order.payments %}
-    {% set state = payment.state %}
-
-    <div class="ui small icon message">
-        <i class="payment icon"></i>
-        <div class="content">
-            <div class="header" id="sylius-payment-method" {{ sylius_test_html_attribute('payment-method') }}>
-                {{ payment.method }}
-            </div>
-            <p {{ sylius_test_html_attribute('payment-price') }}>{{ money.format(payment.amount, payment.currencyCode) }}</p>
-            {% if payment.amount != payment.order.total and state == 'processing' %}
-                <i>{{ 'sylius.pay_pal.different_amount'|trans }}</i>
-            {% endif %}
-            {% if state != 'cart' %}
-                <p id="payment-status" {{ sylius_test_html_attribute('payment-state') }}>
-                    {% include "@SyliusShop/Common/Order/Label/PaymentState/singlePaymentState.html.twig" with { 'state': state } %}
-                </p>
-            {% endif %}
-        </div>
-    </div>
-{% endfor %}
diff --git a/templates/bundles/SyliusShopBundle/Order/thankYou.html.twig b/templates/bundles/SyliusShopBundle/Order/thankYou.html.twig
deleted file mode 100644
index 3c29c3ab..00000000
--- a/templates/bundles/SyliusShopBundle/Order/thankYou.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends '@SyliusShop/layout.html.twig' %}
-
-{% block content %}
-    <div class="ui hidden divider"></div>
-    <div class="ui grid">
-        <div class="center aligned sixteen wide column">
-            <h1 class="ui icon header">
-                {% set lastPayment = order.payments.last() %}
-                <i class="circular rocket icon"></i>
-                <div class="content" id="sylius-thank-you" {{ sylius_test_html_attribute('thank-you') }}>
-                    {{ 'sylius.ui.thank_you'|trans }}
-                    <div class="sub header">{{ 'sylius.ui.placed_an_order'|trans }}</div>
-                </div>
-            </h1>
-
-            {{ sylius_template_event('sylius.shop.order.thank_you.after_message', {'order': order}) }}
-
-            {% if lastPayment != false %}
-                {%  if lastPayment.method.instructions is not null %}
-                    <div id="sylius-payment-method-instructions" class="ui segment" {{ sylius_test_html_attribute('payment-method-instructions') }}>
-                        {{ lastPayment.method.instructions }}
-                    </div>
-                {% endif %}
-                <div class="ui hidden divider"></div>
-            {% endif %}
-
-            {% if order.customer.user is not null %}
-                <a href="{{ path('sylius_shop_account_order_show', {'number': order.number}) }}" id="sylius-show-order-in-account" class="ui large blue button" {{ sylius_test_html_attribute('show-order-in-account') }}>{{ 'sylius.ui.view_order'|trans }}</a>
-            {% else %}
-                {% if lastPayment.state != 'completed' %}
-                    <a href="{{ path('sylius_shop_order_show', {'tokenValue': order.tokenValue}) }}" id="payment-method-page" class="ui large blue button" {{ sylius_test_html_attribute('payment-method-page') }}>{{ 'sylius.ui.change_payment_method'|trans }}</a>
-                {% endif %}
-                <a href="{{ path('sylius_shop_register_after_checkout', {'tokenValue': order.tokenValue}) }}" class="ui large green button" {{ sylius_test_html_attribute('create-an-account') }}>
-                    <i class="signup icon"></i>
-                    {{ 'sylius.ui.create_an_account'|trans }}
-                </a>
-            {% endif %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/templates/bundles/SyliusUiBundle/Layout/sidebar.html.twig b/templates/bundles/SyliusUiBundle/Layout/sidebar.html.twig
deleted file mode 100644
index e884c588..00000000
--- a/templates/bundles/SyliusUiBundle/Layout/sidebar.html.twig
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-    <title>{% block title %}Sylius{% endblock %}</title>
-
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-
-    {% block metatags %}
-    {% endblock %}
-
-    {% block stylesheets %}
-        <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-        <![endif]-->
-    {% endblock %}
-    {% block analytics %}
-        <!-- Global site tag (gtag.js) - Google Analytics -->
-        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-42730941-5"></script>
-        <script>
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-
-            gtag('config', 'UA-42730941-5');
-        </script>
-    {% endblock %}
-</head>
-
-<body class="pushable">
-<div class="ui sidebar vertical inverted menu visible left" id="sidebar">
-    {% block sidebar %}
-    {% endblock %}
-</div>
-<div class="ui borderless fixed menu">
-    {% block topbar %}
-    {% endblock %}
-</div>
-<div class="pusher">
-    <div class="full height" id="wrapper">
-        <div id="content">
-            {% block flash_messages %}
-                {% include '@SyliusUi/_flashes.html.twig' %}
-            {% endblock %}
-
-            {% block pre_content %}
-            {% endblock %}
-
-            {% block content %}
-            {% endblock %}
-
-            {% block post_content %}
-            {% endblock %}
-        </div>
-
-        <div class="sylius-footer">
-            {% block footer %}
-            {% endblock %}
-        </div>
-    </div>
-</div>
-
-{% include '@SyliusUi/Modal/_confirmation.html.twig' %}
-
-{% block javascripts %}
-{% endblock %}
-</body>
-</html>