diff --git a/src/plainui/jinja2/plainui/assemblies.html b/src/plainui/jinja2/plainui/assemblies.html
index cf90119f6b94bf6d6c2ab61809f40b921a655c87..2607eecebaa41552cd99a4156576756007fbe9c7 100644
--- a/src/plainui/jinja2/plainui/assemblies.html
+++ b/src/plainui/jinja2/plainui/assemblies.html
@@ -40,21 +40,21 @@
     <hr class="my-5">
 
     <h2>{{ _("upcoming events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
     </div>
 
     <hr class="my-5">
 
     <h2>{{ _("recommended events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         TODO: implement recommendation algo. Actual displayes faved events
         {{ list_events.grid(events_recommended, is_favorite_events, is_scheduled_events ) }}
     </div>
 
     <hr class="my-5">
 
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         Idea / TODO: Maybe list of assemblies which hosting the running / upcoming events?
         {{ list_assm.list(assemblies, my_favorite_assemblies) }}
     </div>
diff --git a/src/plainui/jinja2/plainui/assemblies_all.html b/src/plainui/jinja2/plainui/assemblies_all.html
index bca09a48550720cbc4d2b835cf7e2170e4c04736..5795466b0b9246c3290169bc0ee353ff942dd986 100644
--- a/src/plainui/jinja2/plainui/assemblies_all.html
+++ b/src/plainui/jinja2/plainui/assemblies_all.html
@@ -34,7 +34,7 @@
             {% endif %}
         </div> #}
     </div>
-    <div class="border border-tertiary p-6 my-8">
+    <div class="border p-6 my-8">
         {{ list_assm.list(assemblies, my_favorite_assemblies) }}
     </div>
 
diff --git a/src/plainui/jinja2/plainui/assemblies_events.html b/src/plainui/jinja2/plainui/assemblies_events.html
index 1bcc85cd3fa2933f43bcb1fcfe50edf9c6d19d07..f2163a752ef677c9e139cefb1039221edd000b53 100644
--- a/src/plainui/jinja2/plainui/assemblies_events.html
+++ b/src/plainui/jinja2/plainui/assemblies_events.html
@@ -9,14 +9,14 @@
     }}
 
     <h2>{{ _("Running and Upcoming Events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
     </div>
 
     <hr class="my-8">
 
     <h2>{{ _("All Assemblies Events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.list(events_from_assemblies, is_favorite_events, is_scheduled_events ) }}
     </div>
 
diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index 5ca3ce53ba0bb0cec19491455e2e880b6b2db43e..b1b2abbe848d9673ab9b9420415e036d8561d2de 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -29,7 +29,7 @@
     {% endif %}
     {% if assembly.description != None and assembly.description != "" -%}
         {{- markdownMacro.markdown(markdown=assembly.description_html | safe) -}}
-        <hr class="my-8 border-tertiary">
+        <hr class="my-8">
     {% endif %}
 
 
@@ -42,31 +42,34 @@
         </div>
     </div>
 
-    <hr class="my-8 border-tertiary">
+    <hr class="my-8">
 
     <h2>{{ _("assembly rooms") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_rooms.list(assembly.rooms.all() ) }}
     </div>
 
-    <hr class="my-8 border-tertiary">
+    <hr class="my-8">
 
     <h2>{{ _("assembly events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.grid(events, is_favorite_events, is_scheduled_events ) }}
     </div>
 
-    <hr class="my-8 border-tertiary">
+    <hr class="my-8">
 
     <h2 class="">{{ _("Self-organized Sessions") }}</h2>
     {% if can_create_sos -%}
         <a class="btn btn-secondary mb-2 " href="{{ url('plainui:sos_new', conf_slug=conf.slug, assembly_slug=assembly.slug) }}">{{ _("new Self-organized Session") }}</a>
     {%- endif %}
-    <div class="border border-tertiary p-6 mb-8">
+    <div class="border p-6 mb-8">
         {{ list_events.list(sos, is_favorite_events, is_scheduled_events ) }}
         {% if sos_private %}
             <h3 class="mt-4 bg bg-info p-2 px-5 text-white text-center">non public Selforganized Sessions</h3>
             {{ list_events.list(sos_private, is_favorite_events, is_scheduled_events ) }}
         {% endif %}
     </div>
+
+    <hr class="my-11 border-top-0">
+
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/board.html b/src/plainui/jinja2/plainui/board.html
index 8967c215fe2d59e6d4f5ca08b0fb1816ff264255..a055f645afea9477028bba8e4ee0a12d4ae8a559 100644
--- a/src/plainui/jinja2/plainui/board.html
+++ b/src/plainui/jinja2/plainui/board.html
@@ -7,7 +7,7 @@
         share_url = url('plainui:board', conf_slug=conf.slug),
         report_url = url('plainui:board', conf_slug=conf.slug)) }}
 
-    <div class="border border-tertiary my-8 p-6">
+    <div class="border my-8 p-6">
         <ul class="row mb-0 list-unstyled mw-664 mx-auto">
             {#<li class="col-12 mb-3">
                 <form class="input-group" id="search_board" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
@@ -75,4 +75,7 @@
             {% endif %}
         {% endfor -%}
     </ul>
+
+    <hr class="my-11 border-top-0">
+
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/board_edit.html b/src/plainui/jinja2/plainui/board_edit.html
index aa6aff935eea32185d45333c458713239a49a4bd..5686dba594d8f1a073a0c2eae1c92a3d77e606fb 100644
--- a/src/plainui/jinja2/plainui/board_edit.html
+++ b/src/plainui/jinja2/plainui/board_edit.html
@@ -5,7 +5,7 @@
 
     <form
         method="POST"
-        class="border p-6 my-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}"
+        class="border p-6 my-11{% if form.errors %} border-danger{% endif %}"
     >
         <h1 class="text-center bg-info p-3 text-white h3">{{_("Edit Board Entry")}}</h1>
 
diff --git a/src/plainui/jinja2/plainui/board_entry.html b/src/plainui/jinja2/plainui/board_entry.html
index 6ee33fd9ca39084e587cf1c248c228e9686da700..2775229fff4dda3657cbaacbf66d3abb0f9f0d33 100644
--- a/src/plainui/jinja2/plainui/board_entry.html
+++ b/src/plainui/jinja2/plainui/board_entry.html
@@ -4,7 +4,7 @@
 {% block title %}{{conf.name}} - {{ entry.title }}{% endblock %}
 
 {% block content %}
-    <article class="pb-11">
+    <article class="mb-11">
         {{ titleMacro.title(title=entry.title,
             share_url = url('plainui:board_entry', conf_slug=conf.slug, id=entry.id),
             report_url = entry.id,
diff --git a/src/plainui/jinja2/plainui/board_private.html b/src/plainui/jinja2/plainui/board_private.html
index 27dbce78e0a97abe3636f435b0be7577519f7247..bfdac5c668987b6ba8323b824a06b4cde8928f64 100644
--- a/src/plainui/jinja2/plainui/board_private.html
+++ b/src/plainui/jinja2/plainui/board_private.html
@@ -6,7 +6,7 @@
 {% block content %}
     {{ titleMacro.title(_("My Bulletin Board")) }}
 
-    <div class="border border-tertiary my-8 p-6">
+    <div class="border my-8 p-6">
         <ul class="row mb-0 list-unstyled mw-664 mx-auto">
             {# <li class="col-12 mb-3">
                 <form class="input-group" id="search_board" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
@@ -68,4 +68,7 @@
             </li>
         {% endfor -%}
     </ul>
+
+    <hr class="my-11 border-top-0">
+
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/ccc_events.html b/src/plainui/jinja2/plainui/ccc_events.html
index b8d9d15c7c6f14245a25e341b9fb350d3afb1a36..db005daf07a8498c7402b6901bc68c9302c5ea6b 100644
--- a/src/plainui/jinja2/plainui/ccc_events.html
+++ b/src/plainui/jinja2/plainui/ccc_events.html
@@ -13,11 +13,12 @@
     <hr class="my-8">
     {{ markdownMacro.markdown(markdown="TODO: explain what ccc curated events are/ content team?") }}
 
-    <hr class="my-5 border-tertiary">
+    <hr class="my-8">
 
     <h2>{{ _("curated events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.list(events_ccc, is_favorite_events, is_scheduled_events ) }}
     </div>
 
+    <hr class="my-11 border-top-0">
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/components/livestream.html b/src/plainui/jinja2/plainui/components/livestream.html
index 1f55752913c442718f470867eedc836c04ee56b4..ccd6e44d5c8795ad9b29831bdf950a7b3afb9761 100644
--- a/src/plainui/jinja2/plainui/components/livestream.html
+++ b/src/plainui/jinja2/plainui/components/livestream.html
@@ -1,7 +1,7 @@
 {% macro livestream(title, event, upcomingEvents, recommendedEvents) -%}
 <div>
     <h2 class="mb-5">{{ title }}</h2>
-    <div class="row border border-tertiary p-6 text-center mx-0">
+    <div class="row border p-6 text-center mx-0">
         <div class="col-5">
             <h3 class="mb-5">{{_("Live Stream")}}<br> TODO: Streaming Data</h3>
             <div>
diff --git a/src/plainui/jinja2/plainui/components/markdown.html b/src/plainui/jinja2/plainui/components/markdown.html
index f7ffeeea2768015435c1ef663a15d2d96ea5b5f5..8f6c6f9ab604cf4e64dd1197a683ae4cd040ac91 100644
--- a/src/plainui/jinja2/plainui/components/markdown.html
+++ b/src/plainui/jinja2/plainui/components/markdown.html
@@ -1,5 +1,5 @@
 {% macro markdown(markdown) -%}
-    <section class="rc3-markdown border border-tertiary py-5 px-8">
+    <section class="rc3-markdown border p-6">
         {{- markdown -}}
     </section>
 {%- endmacro %}
diff --git a/src/plainui/jinja2/plainui/components/resourcesbox.html b/src/plainui/jinja2/plainui/components/resourcesbox.html
index 89c80decba0203a7ea81477799c18250226bad63..d50697d5397c84968b8422dd0a9034e18bd5f220 100644
--- a/src/plainui/jinja2/plainui/components/resourcesbox.html
+++ b/src/plainui/jinja2/plainui/components/resourcesbox.html
@@ -1,7 +1,7 @@
 {% macro resourcesbox(resources) -%}
 <div>
     <h4 class="h2 mb-5">{{_("External Ressources")}}</h4>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         <ul class="border border-secondary p-3 pl-6 mb-0">
             <li class="pr-2"><a href="/foo" title="title">TODO: </a></li>
             <li class="pr-2"><a href="/foo" title="title">loop</a></li>
diff --git a/src/plainui/jinja2/plainui/components/slider.html b/src/plainui/jinja2/plainui/components/slider.html
index 0558439e0bda24d99540f4cf77456b30bbad0bdd..17b6baf10fc2e4a82482cd1a061018e403e1e131 100644
--- a/src/plainui/jinja2/plainui/components/slider.html
+++ b/src/plainui/jinja2/plainui/components/slider.html
@@ -1,5 +1,5 @@
 {% macro slider(items) -%}
-    <section class="rc3-slider border border-tertiary p-6">
+    <section class="rc3-slider border p-6">
         {% if items %}
             <ul class="rc3-slider__container row row-cols-1 row-cols-sm-2 row-cols-lg-3 flex-nowrap mb-0 list-unstyled">
                 {% for item in items %}
diff --git a/src/plainui/jinja2/plainui/components/tagbox.html b/src/plainui/jinja2/plainui/components/tagbox.html
index d966409259fe34665793b3fd868b1391efa7bce2..0a167f767761bd3d01b855f081363ccac8bd2bb5 100644
--- a/src/plainui/jinja2/plainui/components/tagbox.html
+++ b/src/plainui/jinja2/plainui/components/tagbox.html
@@ -1,7 +1,7 @@
 {% macro tagbox(conf_slug, tags) -%}
     <div>
         <h4 class="h2 mb-5">{{_("Tags")}}</h4>
-        <ul class="border border-tertiary px-6 pt-6 pb-5 list-unstyled mb-0 d-flex flex-row flex-wrap justify-content-center align-items-center">
+        <ul class="border px-6 pt-6 pb-5 list-unstyled mb-0 d-flex flex-row flex-wrap justify-content-center align-items-center">
         {%- for tag in tags %}
             <li class="pr-2 mb-2">
                 <a href="{{ url('plainui:tag', conf_slug=conf_slug, tag_slug=tag.tag.slug) }}" class="btn btn-tag-secondary">{{tag.tag.slug}}</a>
diff --git a/src/plainui/jinja2/plainui/components/three_cards.html b/src/plainui/jinja2/plainui/components/three_cards.html
index fdf87b7c77f681c53ef6fb3c09c642f1c7ce0bef..163a2f11c84cd263d083ef9c0a9b71f7f4195105 100644
--- a/src/plainui/jinja2/plainui/components/three_cards.html
+++ b/src/plainui/jinja2/plainui/components/three_cards.html
@@ -1,6 +1,6 @@
 {% macro three_cards(cards) -%}
 {% if cards %}
-    <div class="border border-tertiary p-6 text-light text-center mx-0">
+    <div class="border p-6 text-light text-center mx-0">
         <div class="card-deck">
             {% for card in cards %}
                 <article class="card">
diff --git a/src/plainui/jinja2/plainui/conferences.html b/src/plainui/jinja2/plainui/conferences.html
index 2543fa037e8282bb4633749b39b652d1f1ffe344..83291fe879f0f182412003cc9c438361a251ffe2 100644
--- a/src/plainui/jinja2/plainui/conferences.html
+++ b/src/plainui/jinja2/plainui/conferences.html
@@ -2,7 +2,7 @@
 {% block title %}{{ _("Conferences") }}{% endblock %}
 {% block content %}
     {{ titleMacro.title(_("Conferences")) }}
-    <ul>
+    <ul class="my-11">
         {% for conf in conferences %}
         <li><a href="{{ url('plainui:landing', conf_slug=conf.slug) }}">{{conf.name}}</a></li>
         {% endfor %}
diff --git a/src/plainui/jinja2/plainui/dereferrer.html b/src/plainui/jinja2/plainui/dereferrer.html
index e070c78871697cc631c5d8aaba933c4e6402190c..39a59f907081e681b4c08b3da0cb537abc9a8816 100644
--- a/src/plainui/jinja2/plainui/dereferrer.html
+++ b/src/plainui/jinja2/plainui/dereferrer.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <article class="d-flex justify-content-center align-items-center my-11">
-    <section class="p-5 border border-primary text-center mw-810">
+    <section class="p-5 border text-center mw-810">
         <h1>{{ _("Hey") }}</h1>
 
         <p>{{ _("You are leaving the »RC3-area«. For external sites, streams and applications the actual owners are completely and solely responsible regarding data protection, copyright, youth protection, etc.!")}}</p>
diff --git a/src/plainui/jinja2/plainui/event.html b/src/plainui/jinja2/plainui/event.html
index af73b7fc8b26280b17c6e34a83042cee5ed8f017..c54ace95a0d484be03291e4f2c93dba0f70fc8ff 100644
--- a/src/plainui/jinja2/plainui/event.html
+++ b/src/plainui/jinja2/plainui/event.html
@@ -42,13 +42,14 @@
         </div>
     </aside>
 
-    <hr class="my-5 border-tertiary">
+    <hr class="my-8">
 
     <h2>{{ _("upcoming events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border p-6">
         {{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
     </div>
 
+    <hr class="my-11 border-top-0">
 </article>
 
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/fahrplan.html b/src/plainui/jinja2/plainui/fahrplan.html
index b7a5351cef6d88907915aa23bfa3d3604b1e7d8f..bf80cf662fea877703031b88932a78ea0fecce26 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html
+++ b/src/plainui/jinja2/plainui/fahrplan.html
@@ -11,14 +11,14 @@
 
     {# TODO: Download options
     <h2>{{ _("download") }}</h2>
-    <div class="row border border-tertiary p-5 text-center mx-0">
+    <div class="row border p-5 text-center mx-0">
             <a href="#" class="btn btn-primary m-2">{{ _("Xcal") }}</a>
             <a href="#" class="btn btn-primary m-2">{{ _("Xml") }}</a>
             <a href="#" class="btn btn-primary m-2">{{ _("Json") }}</a>
             <a href="#" class="btn btn-primary m-2">{{ _("QR-Code") }}</a>
     </div> #}
 
-    <form method="GET" class="border border-tertiary p-5">
+    <form method="GET" class="border p-5">
         <input type="hidden" name="mode" value="{{mode}}">
         {% if show_day_filters %}<input type="hidden" name="show_day_filters" value="y">{% endif %}
         {% if show_assembly_filters %}<input type="hidden" name="show_assembly_filters" value="y">{% endif %}
@@ -66,11 +66,14 @@
         {% endif %}
     </form>
 
-    <hr class="my-5 border-primary">
+    <hr class="my-8">
 
     {% if mode == 'list' %}
         {{ list_events.list(events, my_favorite_events, my_scheduled_events) }}
     {% elif mode == 'calendar' %}
         {{ calendar(events) }}
     {% endif %}
+
+    <hr class="my-11 border-top-0">
+
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/header.html b/src/plainui/jinja2/plainui/header.html
index 3d421a8372f0bf6527d283cc9e9bb59ad1714dc2..078af6fd8b035f168d4ce5022cc1c39f0df51f10 100644
--- a/src/plainui/jinja2/plainui/header.html
+++ b/src/plainui/jinja2/plainui/header.html
@@ -14,7 +14,7 @@
         </a>
         <form class="rc3-header__main-search input-group" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
             {{ csrf_input }}
-            <input class="form-control col rc3-header__main-search-input border border-secondary" name="q" type="text" placeholder="{{ _("search") }}" value="{% if search_query is defined %}{{ search_query }}{% endif %}">
+            <input class="form-control col rc3-header__main-search-input" name="q" type="text" placeholder="{{ _("search") }}" value="{% if search_query is defined %}{{ search_query }}{% endif %}">
             <button class="rc3-header__main-search-btn input-group-append btn btn-secondary">
                 <svg width="1em" height="1em" viewBox="0 0 16 16" class=" bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                     <title>{{ _("search") }}</title>
diff --git a/src/plainui/jinja2/plainui/index.html b/src/plainui/jinja2/plainui/index.html
index 51be43df237e046d647c2f19482731fb15552c06..790286c2a9df0cc308859f2c0f959e82f8d28bae 100644
--- a/src/plainui/jinja2/plainui/index.html
+++ b/src/plainui/jinja2/plainui/index.html
@@ -46,7 +46,7 @@
 
 <hr class="my-8">
 
-<div class="border border-tertiary p-6 my-8">
+<div class="border p-6 mt-8 mb-11">
         TODO: Tracks...
 </div>
 
diff --git a/src/plainui/jinja2/plainui/login.html b/src/plainui/jinja2/plainui/login.html
index 4792e98dd358d89c9962de135e03efdb3a263355..546bf579173aa472133370aaf9d0287a2129690e 100644
--- a/src/plainui/jinja2/plainui/login.html
+++ b/src/plainui/jinja2/plainui/login.html
@@ -11,7 +11,7 @@
 <form
     method="POST"
     id="login"
-    class="mw-810 border p-6 mx-auto mb-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}"
+    class="mw-810 border p-6 mx-auto mb-11{% if form.errors %} border-danger{% endif %}"
 >
     <h1 class="text-center bg-info p-3 text-white h3">{{ _("login") }}</h1>
     <input type="hidden" name="next" value="{{next}}">
diff --git a/src/plainui/jinja2/plainui/password_change.html b/src/plainui/jinja2/plainui/password_change.html
index 571eedb99a46f06557d00c70ee64e3d731437ed0..dc959b26e82c26a4e288d4bcae14655b04a08e44 100644
--- a/src/plainui/jinja2/plainui/password_change.html
+++ b/src/plainui/jinja2/plainui/password_change.html
@@ -9,7 +9,7 @@
     </div>
 </div>
 
-<form method="POST" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %} mt-6">
+<form method="POST" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %} mt-6">
 
     <h1 class="text-center bg-info p-3 text-white h3">{{ _("Change password") }}</h1>
 
diff --git a/src/plainui/jinja2/plainui/password_reset_complete.html b/src/plainui/jinja2/plainui/password_reset_complete.html
index a853a36417f2a4691a5abc16425f671d24231af7..6b8a6e37565e19c5d5e87be812ab4359fa576c6d 100644
--- a/src/plainui/jinja2/plainui/password_reset_complete.html
+++ b/src/plainui/jinja2/plainui/password_reset_complete.html
@@ -8,7 +8,7 @@
     </div>
 </div>
 
-<div class="border-tertiary p-6 mw-810 border p-6 mx-auto mb-11">
+<div class="p-6 mw-810 border p-6 mx-auto mb-11">
     <h1 class="text-center bg-info p-3 text-white h3">{{ title }}</h1>
 
     <p class="my-5 font-headings text-white text-center">{{ _("Your password has been set. You may go ahead and log in now.") }}</p>
diff --git a/src/plainui/jinja2/plainui/password_reset_confirm.html b/src/plainui/jinja2/plainui/password_reset_confirm.html
index 0d880e319eeead2d04d74828b050e7f2b63c2b3a..8a5271ccc676be14385d15f4e688ce9ee590e9b5 100644
--- a/src/plainui/jinja2/plainui/password_reset_confirm.html
+++ b/src/plainui/jinja2/plainui/password_reset_confirm.html
@@ -8,7 +8,7 @@
     </div>
 </div>
 
-<form method="POST" id="login-change" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %} mt-6">
+<form method="POST" id="login-change" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %} mt-6">
 
     <h1 class="text-center bg-info p-3 text-white h3">{{ _("enter new password") }}</h1>
 
diff --git a/src/plainui/jinja2/plainui/password_reset_done.html b/src/plainui/jinja2/plainui/password_reset_done.html
index 2253a283394aea1951a42e99ff5e3530c37604ad..3784b21bab6f232abc786afcf99851de5556188c 100644
--- a/src/plainui/jinja2/plainui/password_reset_done.html
+++ b/src/plainui/jinja2/plainui/password_reset_done.html
@@ -8,7 +8,7 @@
     </div>
 </div>
 
-<div class="border-tertiary p-6 mw-810 border p-6 mx-auto mb-11">
+<div class="p-6 mw-810 border p-6 mx-auto mb-11">
     <h1 class="text-center bg-info p-3 text-white h3">{{ title }}</h1>
 
     <p class="mt-5 mb-3 font-headings text-white text-center">{{ _("We’ve emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.") }}</p>
diff --git a/src/plainui/jinja2/plainui/password_reset_form.html b/src/plainui/jinja2/plainui/password_reset_form.html
index f6630da668a8d63b402b19900ed2cfdabe255d27..12438d6c1595b2e9579e0a7593d00e1ec6902f3a 100644
--- a/src/plainui/jinja2/plainui/password_reset_form.html
+++ b/src/plainui/jinja2/plainui/password_reset_form.html
@@ -9,7 +9,7 @@
     </div>
 </div>
 
-<form method="POST" id="login-reset" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %}">
+<form method="POST" id="login-reset" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %}">
 
     <h1 class="text-center bg-info p-3 text-white h3">{{ _("reset password") }}</h1>
     <input type="hidden" name="next" value="{{next}}">
diff --git a/src/plainui/jinja2/plainui/profile.html b/src/plainui/jinja2/plainui/profile.html
index 58d6ac531663c1077df9d8b2b94d278443875e3e..a6af9a4c13fa9f143ff9bab29684b1f2bf20830f 100644
--- a/src/plainui/jinja2/plainui/profile.html
+++ b/src/plainui/jinja2/plainui/profile.html
@@ -69,7 +69,7 @@
 <hr class="my-8">
 
 <h2>{{ _("My Favorites") }}</h2>
-<div class="border border-tertiary p-6">
+<div class="border p-6">
     <h3 class="bg bg-info p-2 px-5 text-white text-center">{{ ("Events") }}</h3>
     {{ list_events.list(my_favorite_events, is_favorite_events, is_fahrplan_events ) }}
     <h3 class="bg bg-info p-2 px-5 text-white text-center mt-8">{{ _("Assemblies") }}</h3>
@@ -79,7 +79,7 @@
 <hr class="my-8">
 
 <h2>{{ _("My Fahrplan") }}</h2>
-<div class="border border-tertiary p-6">
+<div class="border p-6">
     {{ list_events.list(my_fahrplan_events, is_favorite_events, is_fahrplan_events ) }}
 </div>
 
diff --git a/src/plainui/jinja2/plainui/redeem_token.html b/src/plainui/jinja2/plainui/redeem_token.html
index db67733415c0386103c6b088929f9d94d08efc2c..96cb168eafae02adbd40284a3b83f161faf2372b 100644
--- a/src/plainui/jinja2/plainui/redeem_token.html
+++ b/src/plainui/jinja2/plainui/redeem_token.html
@@ -13,7 +13,7 @@
         <button type="submit" class="btn btn-primary">{{ _("Yes")}}</button>
     </form>
     {% elif step == 'token' %}
-    <form class="border p-6 my-8 border-tertiary" method="GET" action="{{ url('plainui:redeem_token', conf_slug=conf.slug) }}">
+    <form class="border p-6 my-8" method="GET" action="{{ url('plainui:redeem_token', conf_slug=conf.slug) }}">
         {{ form_elements.errors(form) }}
         {{ form_elements.text(form, 'jwt') }}
         <div class="d-flex">
@@ -22,7 +22,7 @@
     </form>
     {%- else %}
     <div>
-        <form class="border p-6 my-8 border-tertiary" method="POST" action="{{ url('plainui:redeem_token_create_user', conf_slug=conf.slug) }}">
+        <form class="border p-6 my-8" method="POST" action="{{ url('plainui:redeem_token_create_user', conf_slug=conf.slug) }}">
             <h2 class="text-center bg-info p-3 text-white h3">{{ _("Create new Account") }}</h2>
             {% if footnote %}<small>{{ _("Use the next form if you already have an account") }}<small>{% endif %}
             {{ csrf_input }}
@@ -38,7 +38,7 @@
     </div>
 
     <div>
-        <form class="border p-6 my-8 border-tertiary" method="POST" action="{{ url('plainui:redeem_token_add_to_user', conf_slug=conf.slug) }}">
+        <form class="border p-6 my-8" method="POST" action="{{ url('plainui:redeem_token_add_to_user', conf_slug=conf.slug) }}">
             <h2  class="text-center bg-info p-3 text-white h3" id="#login">{{ _("Got an Account already? Login here") }}</h2>
             {{ csrf_input }}
             {{ form_elements.errors(form_add) }}
diff --git a/src/plainui/jinja2/plainui/report_content.html b/src/plainui/jinja2/plainui/report_content.html
index 755a6de3202b86a6be9ee61c3a70ad0fbe14f1d2..4a171fc05a56a8ba3f414cf2df98263f7fbcc4f4 100644
--- a/src/plainui/jinja2/plainui/report_content.html
+++ b/src/plainui/jinja2/plainui/report_content.html
@@ -37,7 +37,7 @@
         <p>{{ _("Your message will be read and processed by one of our angels. We assure you to keep your personal data safe and hidden if not needed to solve your problem.") }}</p>
     </form>
 
-    <hr class="my-8 border-secondary">
+    <hr class="my-8">
 
     {{ markdownMacro.markdown(markdown=page.rendered_body|safe) }}
 
diff --git a/src/plainui/jinja2/plainui/room.html b/src/plainui/jinja2/plainui/room.html
index c09107bf8480f042aacb3b2583b7b89df143dc21..d2dd77024104a2dc4f0d12493587247b2e01fc29 100644
--- a/src/plainui/jinja2/plainui/room.html
+++ b/src/plainui/jinja2/plainui/room.html
@@ -23,7 +23,7 @@
     <p>{{ markdownMacro.markdown(markdown=room.description | safe) }}</p>
     {% endif %}
 
-    <div class="mt-4">
+    <div class="mt-4 mb-11">
         <h4>{{ _("Links") }}</h4>
         <ul>
         {% for link in room.links.all() %}
diff --git a/src/plainui/jinja2/plainui/rooms.html b/src/plainui/jinja2/plainui/rooms.html
index a8a3082d1853c4ec6785cd7516b5f2c05edcb959..af545cc56483b9c27c3638831be2e87e0ef7798e 100644
--- a/src/plainui/jinja2/plainui/rooms.html
+++ b/src/plainui/jinja2/plainui/rooms.html
@@ -5,7 +5,7 @@
         share_url = url('plainui:rooms', conf_slug=conf.slug),
         report_url = url('plainui:rooms', conf_slug=conf.slug)) }}
 
-    <ul>
+    <ul class="mt-8 mb-11">
     {% for room in rooms %}
         <li><a href="{{ url('plainui:room', conf_slug=conf.slug, room_id=room.id) }}">{{room.name}}</a>
             <ul>
diff --git a/src/plainui/jinja2/plainui/search.html b/src/plainui/jinja2/plainui/search.html
index aef6015616fab8356d221a736f82be20e805955a..ed2195ca3d4ca8822b883ce0541018fc4a7a7769 100644
--- a/src/plainui/jinja2/plainui/search.html
+++ b/src/plainui/jinja2/plainui/search.html
@@ -1,7 +1,7 @@
 {% extends "plainui/base.html" %}
 {% block title %}{{conf.name}} - {{ _("Search Results") }}{% endblock %}
 {% block content %}
-<div>
+<div class="mb-11">
     <div class="row justify-content-center">
         <div class="col-auto"><h1>{{ _("Search Results") }}</h1></div>
         <div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/sos_edit.html b/src/plainui/jinja2/plainui/sos_edit.html
index 2fb083cd05996ddaa80f01cd305cb373c7b10082..86a80b1ddd0ccf7d2fa91c63056204b7b6ed277b 100644
--- a/src/plainui/jinja2/plainui/sos_edit.html
+++ b/src/plainui/jinja2/plainui/sos_edit.html
@@ -2,7 +2,7 @@
 {% extends "plainui/base.html" %}
 {% block title %}{{conf.name}} - Edit Self-organized Session{% endblock %}
 {% block content %}
-    <form method="POST" class="border p-6 mx-auto my-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}">
+    <form method="POST" class="border p-6 mx-auto my-11{% if form.errors %} border-danger{% endif %}">
         <h1 class="text-center bg-info p-3 text-white h3">{{ _("Self-organized Session") }}</h1>
 
         {{ csrf_input }}
diff --git a/src/plainui/jinja2/plainui/stream.html b/src/plainui/jinja2/plainui/stream.html
index b5720ea9b7465b98b3ce08bf4c3f5e84f8977ba1..7d6cdfd5061d86b8749959f9738498b5db2a115a 100644
--- a/src/plainui/jinja2/plainui/stream.html
+++ b/src/plainui/jinja2/plainui/stream.html
@@ -7,12 +7,13 @@
         share_url = url('plainui:stream', conf_slug=conf.slug, room_id=room.id, link_id=link.id),
         report_url = url('plainui:stream', conf_slug=conf.slug, room_id=room.id, link_id=link.id)
         ) }}
-    <figure class="border border-tertiary p-6 my-8">
+    <figure class="border p-6 my-8">
         <p>TODO: Stream</p>
     </figure>
 
-    <div class="my-8">
+    <div class="mt-8 mb-11">
         <h2 class="mb-5">{{_("External Ressources")}}</h2>
         {{ markdownMacro.markdown(markdown="TODO: add some notes as markdown for the livestream event") }}
     </div>
+
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/tag.html b/src/plainui/jinja2/plainui/tag.html
index 38c676337c17ef6c35ee6c33b4ec79e44e650dc7..09d4d9c5701d8608784b2fe8b16ac63f84eab082 100644
--- a/src/plainui/jinja2/plainui/tag.html
+++ b/src/plainui/jinja2/plainui/tag.html
@@ -1,7 +1,7 @@
 {% extends "plainui/base.html" %}
 {% block title %}{{conf.name}} - {{ _("Tag %(name)s", name=tag.slug) }}{% endblock %}
 {% block content %}
-<div>
+<div class="mb-11">
     <div class="row justify-content-center">
         <div class="col-auto"><h1>{{ _("Tag %(name)s", name=tag.slug) }}</h1></div>
         <div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/upcoming.html b/src/plainui/jinja2/plainui/upcoming.html
index 9b0e45e3fcba73d1c5671e1dc2f6cd171eae373a..434e7e578d09faf272d7fff5e0d93d82dccbddf1 100644
--- a/src/plainui/jinja2/plainui/upcoming.html
+++ b/src/plainui/jinja2/plainui/upcoming.html
@@ -5,8 +5,7 @@
 {% block content %}
     {{ titleMacro.title(_("Upcoming events")) }}
 
-    <h2>{{ _("upcoming events") }}</h2>
-    <div class="border border-tertiary p-6">
+    <div class="border mt-8 mb-11 p-6">
         {{ list_events.slider(events, my_favorite_events, my_scheduled_events ) }}
     </div>
 {% endblock %}
diff --git a/src/plainui/jinja2/plainui/user.html b/src/plainui/jinja2/plainui/user.html
index 395b177b6813df4a9b40d8bae3a2da50c6a19dfb..08405936e6942e53be57cc40376ed055af0cdeec 100644
--- a/src/plainui/jinja2/plainui/user.html
+++ b/src/plainui/jinja2/plainui/user.html
@@ -7,7 +7,7 @@
 {% block title %}{{ _("%(conf)s - User %(name)s", conf=conf.name, name=display_user.username) }}{% endblock %}
 {% block content %}
 
-<div class="border my-5 p-6">
+<div class="border mt-8 mb-11 p-6">
     <div class="row">
         <div class="col">
             <h2 class="w-100 text-center bg-secondary p-2">{{ display_user.username }}</h2>
@@ -26,7 +26,7 @@
     </div>
 </div>
 
-<div class="border my-5 p-6">
+<div class="border my-8 p-6">
     <div class="row">
         <div class="col">
             <h2 class="bg-secondary text-center p-2">{{ _("badges") }}</h2>