diff --git a/assets/js/theme.js b/assets/js/theme.js
index b19871a..ae3d255 100644
--- a/assets/js/theme.js
+++ b/assets/js/theme.js
@@ -88,7 +88,8 @@ document.addEventListener('DOMContentLoaded', (event) => {
     function openSearchForm() {
         searchContainer.classList.add('is-pre-active');
         window.setTimeout(() => {
-            searchContainer.setAttribute('aria-expanded', 'true');
+            document.getElementById('openWebsiteSearchButton').setAttribute('aria-expanded', 'true');
+            document.getElementById('closeWebsiteSearchButton').setAttribute('aria-expanded', 'true');
             searchContainer.classList.add('is-active');
             searchContainer.classList.remove('is-pre-active');
         }, 100);
@@ -96,7 +97,8 @@ document.addEventListener('DOMContentLoaded', (event) => {
 
     // Close search form
     function closeSearchForm() {
-        searchContainer.setAttribute('aria-expanded', 'false');
+        document.getElementById('openWebsiteSearchButton').setAttribute('aria-expanded', 'false');
+        document.getElementById('closeWebsiteSearchButton').setAttribute('aria-expanded', 'false');
         searchContainer.classList.remove('is-active');
         searchContainer.classList.remove('is-pre-active');
     }
diff --git a/contao/templates/custom-section/mod_custom_section_header_sac_pilatus.html.twig b/contao/templates/custom-section/mod_custom_section_header_sac_pilatus.html.twig
index d0581df..f367971 100644
--- a/contao/templates/custom-section/mod_custom_section_header_sac_pilatus.html.twig
+++ b/contao/templates/custom-section/mod_custom_section_header_sac_pilatus.html.twig
@@ -65,13 +65,13 @@
                 <a href="{{ insert_tag('link_url::kurse') }}" class="d-none d-md-block btn btn-danger ms-2 me-2"><i style="width:20px;font-size:1rem !important;" class="fa-regular fa-signal"></i> Kurse</a>
 
                 <!-- Searchbar toggler -->
-                <button id="openWebsiteSearchButton" class="btn btn-lg btn-link ps-2 ps-sm-3 pe-2 pe-2 pe-sm-3 ms-3 search-toggler" data-action="search-bar-toggle" aria-controls="websiteSearch" aria-label="Suche öffnen">
+                <button id="openWebsiteSearchButton" class="btn btn-lg btn-link ps-2 ps-sm-3 pe-2 pe-2 pe-sm-3 ms-3 search-toggler" data-action="search-bar-toggle" aria-expanded="false" aria-controls="websiteSearch" aria-label="Suche öffnen">
                     <i class="fa-light fa-search" aria-label="Suche" title="Suche"></i>
                 </button>
                 <!-- End Searchbar toggler -->
 
                 <!-- Navbar toggler mobile -->
-                <button class="navigation-toggler d-xl-none btn btn-lg btn-link ps-2 ps-sm-3 pe-2 pe-2 pe-sm-3 ms-2" aria-controls="sidebar" aria-label="Navigation öffnen">
+                <button class="navigation-toggler d-xl-none btn btn-lg btn-link ps-2 ps-sm-3 pe-2 pe-2 pe-sm-3 ms-2" aria-expanded="false" aria-controls="sidebar" aria-label="Navigation öffnen">
                     <i class="fa-light fa-lg fa-bars"></i>
                 </button>
                 <!-- End Navbar toggler mobile -->
diff --git a/contao/templates/mod_search_overlay.html5 b/contao/templates/mod_search_overlay.html5
index 32e1c64..3fc8a38 100644
--- a/contao/templates/mod_search_overlay.html5
+++ b/contao/templates/mod_search_overlay.html5
@@ -1,5 +1,5 @@
-<div id="websiteSearch" class="mod_search_overlay" aria-expanded="false" aria-labelledby="websiteSearchLabel" role="dialog">
-  <button id="closeWebsiteSearchButton" type="button" class="close-button" aria-controls="websiteSearch" aria-label="Suche Schliessen">
+<div id="websiteSearch" class="mod_search_overlay" aria-labelledby="websiteSearchLabel" role="dialog">
+  <button id="closeWebsiteSearchButton" type="button" class="close-button" aria-expanded="false" aria-controls="websiteSearch" aria-label="Suche Schliessen">
     <i class="fa-light fa-times" focusable="false" aria-hidden="true"></i>
   </button>
   <form<?php if ($this->action): ?> action="<?= $this->action ?>"<?php endif; ?> method="get">
diff --git a/contao/templates/nav/mod_navigation_sidebar.html.twig b/contao/templates/nav/mod_navigation_sidebar.html.twig
index ce3af74..b16f237 100644
--- a/contao/templates/nav/mod_navigation_sidebar.html.twig
+++ b/contao/templates/nav/mod_navigation_sidebar.html.twig
@@ -62,14 +62,18 @@
                 // Toggle the sidebar with the mobile navigation
                 document.addEventListener('sidebar::open', (e) => {
                     document.body.classList.add('sidebar-open');
-                    e.detail.sidebar.setAttribute('aria-expanded', 'true');
-                    e.detail.sidebar.querySelector('.navigation-toggler').focus();
+                    document.querySelector('#sidebar').classList.add('open');
+                    document.querySelector('#sidebar .navigation-toggler').setAttribute('aria-expanded', 'true');
+                    document.querySelector('#header .navigation-toggler').setAttribute('aria-expanded', 'true');
+                    document.querySelector('#sidebar navigation-toggler').focus();
                 });
 
                 // Toggle the sidebar with the mobile navigation
                 document.addEventListener('sidebar::close', (e) => {
-                    e.detail.sidebar.querySelector('.navigation-toggler').focus();
-                    e.detail.sidebar.setAttribute('aria-expanded', 'false');
+                    document.querySelector('#sidebar .navigation-toggler').focus();
+                    document.querySelector('#sidebar .navigation-toggler').setAttribute('aria-expanded', 'false');
+                    document.querySelector('#header .navigation-toggler').setAttribute('aria-expanded', 'false');
+                    document.querySelector('#sidebar').classList.remove('open');
                     document.body.classList.remove('sidebar-open');
                 });
 
diff --git a/public/js/theme.2c039f45.js b/public/js/theme.2c039f45.js
deleted file mode 100644
index 43e4864..0000000
--- a/public/js/theme.2c039f45.js
+++ /dev/null
@@ -1 +0,0 @@
-document.addEventListener("DOMContentLoaded",(e=>{[...document.querySelectorAll('[data-bs-toggle="tooltip"]')].map((e=>{e.hasAttribute("data-title")?(title=e.getAttribute("data-title"),e.setAttribute("data-bs-title",title),e.setAttribute("title",title),new bootstrap.Tooltip(e)):new bootstrap.Tooltip(e)}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("input.custom-input-file").each((function(){var e=jQuery(this).siblings("label.custom-input-file"),t=jQuery(e).html();jQuery(this).change((function(n){var o="";(o=this.files&&this.files.length>1?(this.getAttribute("data-multiple-caption")||"").replace("{count}",this.files.length):n.target.value.split("\\").pop())?jQuery(e).html(o):jQuery(e).html(t)}))}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{const t=["load","resize","orientationchange","vueupdate"];for(const e of t)window.addEventListener(e,(e=>{equalheight(".equal-height",".card")}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{if(null===document.getElementById("websiteSearch"))return;const t=document.getElementById("websiteSearch");function n(){t.setAttribute("aria-expanded","false"),t.classList.remove("is-active"),t.classList.remove("is-pre-active")}t.parentElement.removeChild(t),document.querySelector("body").prepend(t),document.getElementById("openWebsiteSearchButton").addEventListener("click",(e=>{e.preventDefault(),e.stopPropagation(),t.classList.add("is-pre-active"),window.setTimeout((()=>{t.setAttribute("aria-expanded","true"),t.classList.add("is-active"),t.classList.remove("is-pre-active")}),100)})),document.getElementById("closeWebsiteSearchButton").addEventListener("click",(e=>{e.preventDefault(),e.stopPropagation(),n()})),document.addEventListener("keyup",(e=>{"Escape"!==e.code&&"Esc"!==e.code&&"Escape"!==e.key&&"Esc"!==e.key||n()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery(".mod_navigation ul.level_2 > li.page-container > a").click((function(e){e.preventDefault(),e.stopPropagation()})),jQuery(".mod_navigation.sidebar-navigation li.page-container > a").click((function(e){e.preventDefault(),e.stopPropagation()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("body").append('<div class="scroll-to-top"><a href="#"><span class="fa-regular fa-chevron-up"></span></a></div>'),jQuery(window).on("scroll",(function(){jQuery(this).scrollTop()>100?jQuery(".scroll-to-top").fadeIn():jQuery(".scroll-to-top").fadeOut()})),jQuery(".scroll-to-top").click((function(){return jQuery("html, body").animate({scrollTop:0},800),!1}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{if(jQuery(".widget.error").length)var t=window.setInterval((function(){jQuery("body.loaded").length&&(clearInterval(t),window.setTimeout((function(){window.scrollTo(0,jQuery(".widget.error").first().offset().top)}),100))}),100)}),!1),document.addEventListener("DOMContentLoaded",(e=>{let t=window.innerWidth;t<300&&(t=300);const n=Math.ceil(.06*t),o=Math.min(n,100);$.each([".content-downloads a",".content-download a"],(function(e,t){jQuery(t).each((function(e,t){const n=t.text;if(n.length>o){const e=n.substring(0,o)+" … ";t.text=e}}))}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("#header .header-navbar ul.dropdown-menu").on("click",(function(e){e.stopPropagation()})),jQuery(".close-header-navigation-dropdown").click((function(e){e.target.closest(".dropdown").querySelector('[data-bs-toggle="dropdown"]').click()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{[...document.querySelectorAll(".content-download a, .content-downloads a")].map((e=>{if(e.parentElement){let t=e.parentElement.querySelector("figure");t&&(t.setAttribute("style","cursor:pointer"),t.setAttribute("onclick","javascript:location.href='"+e.getAttribute("href")+"'"))}}))}),!1);
\ No newline at end of file
diff --git a/public/js/theme.efc72292.js b/public/js/theme.efc72292.js
new file mode 100644
index 0000000..1e5de21
--- /dev/null
+++ b/public/js/theme.efc72292.js
@@ -0,0 +1 @@
+document.addEventListener("DOMContentLoaded",(e=>{[...document.querySelectorAll('[data-bs-toggle="tooltip"]')].map((e=>{e.hasAttribute("data-title")?(title=e.getAttribute("data-title"),e.setAttribute("data-bs-title",title),e.setAttribute("title",title),new bootstrap.Tooltip(e)):new bootstrap.Tooltip(e)}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("input.custom-input-file").each((function(){var e=jQuery(this).siblings("label.custom-input-file"),t=jQuery(e).html();jQuery(this).change((function(n){var o="";(o=this.files&&this.files.length>1?(this.getAttribute("data-multiple-caption")||"").replace("{count}",this.files.length):n.target.value.split("\\").pop())?jQuery(e).html(o):jQuery(e).html(t)}))}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{const t=["load","resize","orientationchange","vueupdate"];for(const e of t)window.addEventListener(e,(e=>{equalheight(".equal-height",".card")}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{if(null===document.getElementById("websiteSearch"))return;const t=document.getElementById("websiteSearch");function n(){document.getElementById("openWebsiteSearchButton").setAttribute("aria-expanded","false"),document.getElementById("closeWebsiteSearchButton").setAttribute("aria-expanded","false"),t.classList.remove("is-active"),t.classList.remove("is-pre-active")}t.parentElement.removeChild(t),document.querySelector("body").prepend(t),document.getElementById("openWebsiteSearchButton").addEventListener("click",(e=>{e.preventDefault(),e.stopPropagation(),t.classList.add("is-pre-active"),window.setTimeout((()=>{document.getElementById("openWebsiteSearchButton").setAttribute("aria-expanded","true"),document.getElementById("closeWebsiteSearchButton").setAttribute("aria-expanded","true"),t.classList.add("is-active"),t.classList.remove("is-pre-active")}),100)})),document.getElementById("closeWebsiteSearchButton").addEventListener("click",(e=>{e.preventDefault(),e.stopPropagation(),n()})),document.addEventListener("keyup",(e=>{"Escape"!==e.code&&"Esc"!==e.code&&"Escape"!==e.key&&"Esc"!==e.key||n()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery(".mod_navigation ul.level_2 > li.page-container > a").click((function(e){e.preventDefault(),e.stopPropagation()})),jQuery(".mod_navigation.sidebar-navigation li.page-container > a").click((function(e){e.preventDefault(),e.stopPropagation()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("body").append('<div class="scroll-to-top"><a href="#"><span class="fa-regular fa-chevron-up"></span></a></div>'),jQuery(window).on("scroll",(function(){jQuery(this).scrollTop()>100?jQuery(".scroll-to-top").fadeIn():jQuery(".scroll-to-top").fadeOut()})),jQuery(".scroll-to-top").click((function(){return jQuery("html, body").animate({scrollTop:0},800),!1}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{if(jQuery(".widget.error").length)var t=window.setInterval((function(){jQuery("body.loaded").length&&(clearInterval(t),window.setTimeout((function(){window.scrollTo(0,jQuery(".widget.error").first().offset().top)}),100))}),100)}),!1),document.addEventListener("DOMContentLoaded",(e=>{let t=window.innerWidth;t<300&&(t=300);const n=Math.ceil(.06*t),o=Math.min(n,100);$.each([".content-downloads a",".content-download a"],(function(e,t){jQuery(t).each((function(e,t){const n=t.text;if(n.length>o){const e=n.substring(0,o)+" … ";t.text=e}}))}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{jQuery("#header .header-navbar ul.dropdown-menu").on("click",(function(e){e.stopPropagation()})),jQuery(".close-header-navigation-dropdown").click((function(e){e.target.closest(".dropdown").querySelector('[data-bs-toggle="dropdown"]').click()}))}),!1),document.addEventListener("DOMContentLoaded",(e=>{[...document.querySelectorAll(".content-download a, .content-downloads a")].map((e=>{if(e.parentElement){let t=e.parentElement.querySelector("figure");t&&(t.setAttribute("style","cursor:pointer"),t.setAttribute("onclick","javascript:location.href='"+e.getAttribute("href")+"'"))}}))}),!1);
\ No newline at end of file
diff --git a/public/manifest.json b/public/manifest.json
index 25c32c2..2679f9f 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -28,7 +28,7 @@
   "flatpickr/dist/flatpickr.css": "/bundles/markocupiccontaothemesacpilatus/flatpickr/dist/flatpickr.122272e5.css",
   "aos/aos.js": "/bundles/markocupiccontaothemesacpilatus/aos/aos.b3b7b3c9.js",
   "jquery-touchswipe/jquery.touchSwipe.js": "/bundles/markocupiccontaothemesacpilatus/jquery-touchswipe/jquery.touchSwipe.fdd62fa8.js",
-  "js/theme.js": "/bundles/markocupiccontaothemesacpilatus/js/theme.2c039f45.js",
+  "js/theme.js": "/bundles/markocupiccontaothemesacpilatus/js/theme.efc72292.js",
   "fonts/open-sans.css": "/bundles/markocupiccontaothemesacpilatus/fonts/open-sans.css",
   "fonts/roboto-slab.css": "/bundles/markocupiccontaothemesacpilatus/fonts/roboto-slab.css",
   "flatpickr/dist/l10n/de.js": "/bundles/markocupiccontaothemesacpilatus/flatpickr/dist/l10n/de.f6a08010.js",
diff --git a/symlink_stuff/files/theme-sac-pilatus/scss/components/_sidebar-and-navigation.scss b/symlink_stuff/files/theme-sac-pilatus/scss/components/_sidebar-and-navigation.scss
index a15aaae..2d4cf50 100644
--- a/symlink_stuff/files/theme-sac-pilatus/scss/components/_sidebar-and-navigation.scss
+++ b/symlink_stuff/files/theme-sac-pilatus/scss/components/_sidebar-and-navigation.scss
@@ -93,7 +93,7 @@ $nav-bg-color: #FFFFFF;
 }
 
 @include media-breakpoint-down(xl) {
-  #sidebar[aria-expanded="true"] {
+  #sidebar.open {
     left: 0 !important;
     display: block !important;
     visibility: visible !important;