diff --git a/partials/landingpages/modules/setup.php b/partials/landingpages/modules/setup.php
index 9f0aeaf..f989c8c 100644
--- a/partials/landingpages/modules/setup.php
+++ b/partials/landingpages/modules/setup.php
@@ -835,10 +835,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     </section>
   <?php endif; ?>
 
-  <section class="section-box">
-    <h2><?= e($module['title']) ?> – <?= e($sectionTitles[$currentSection] ?? 'Allgemein') ?></h2>
-    <p class="muted">Trage die benötigten Informationen für das Modul ein.</p>
-    <form method="post" class="setup-form" style="margin-top:1rem;">
+    <form method="post" class="setup-form">
       <input type="hidden" name="setup_section" value="<?= e($currentSection) ?>">
       <datalist id="timezone-options">
         <?php foreach ($timezoneOptions as $timezoneOption): ?>
@@ -846,7 +843,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
         <?php endforeach; ?>
       </datalist>
     <?php if ($currentSection === 'general' && $generalSetupFields !== []): ?>
-      <section class="setup-panel" id="setup-general">
+      <section class="section-box setup-panel" id="setup-general">
         <div class="setup-panel__head">
           <div>
             <span class="pill">Allgemein</span>
@@ -862,7 +859,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'access'): ?>
-    <section class="setup-panel" id="setup-access">
+    <section class="section-box setup-panel" id="setup-access">
       <div class="setup-panel__head">
         <div>
           <span class="pill">Zugriffsrechte</span>
@@ -925,7 +922,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'cron'): ?>
-    <section class="setup-panel" id="setup-cron">
+    <section class="section-box setup-panel" id="setup-cron">
       <div class="setup-panel__head">
         <div>
           <span class="pill">Cron Einstellungen</span>
@@ -946,7 +943,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'cron' && $intervalTaskStatuses !== []): ?>
-      <section class="setup-panel">
+      <section class="section-box setup-panel">
         <div class="setup-panel__head">
           <div>
             <span class="pill">Automationen</span>
@@ -975,7 +972,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'cron' && $cronTaskDefinitions !== []): ?>
-      <section class="setup-panel">
+      <section class="section-box setup-panel">
         <div class="setup-panel__head">
           <div>
             <span class="pill">Automationen</span>
@@ -1054,7 +1051,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'database' && ($databaseSectionActions !== [] || is_array($moduleStatusPanel))): ?>
-      <section class="setup-panel">
+      <section class="section-box setup-panel">
         <div class="setup-panel__head">
           <div>
             <span class="pill">Datenbank</span>
@@ -1114,7 +1111,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'custom' && $customSectionActions !== []): ?>
-      <section class="setup-panel"<?= $customSetupFields === [] ? ' id="setup-custom"' : '' ?>>
+      <section class="section-box setup-panel"<?= $customSetupFields === [] ? ' id="setup-custom"' : '' ?>>
         <div class="setup-panel__head">
           <div>
             <span class="pill">Aktionen</span>
@@ -1150,7 +1147,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
 
 
     <?php if ($currentSection === 'database' && $dbGroups !== []): ?>
-      <section class="setup-panel"<?= $databaseSetupFields === [] ? ' id="setup-general"' : '' ?>>
+      <section class="section-box setup-panel"<?= $databaseSetupFields === [] ? ' id="setup-general"' : '' ?>>
         <div class="setup-panel__head">
           <div>
             <span class="pill">Datenbank</span>
@@ -1190,7 +1187,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
               $panelHint = $dbConfigHint($group, $panelConfig, $panelDefaults);
               $defaultDescription = $describeDbDefaults($panelDefaults);
             ?>
-            <section class="setup-db-panel" id="setup-db-<?= e($group) ?>" <?= (count($dbGroups) === 1 || $group === $activeDbGroup) ? '' : 'hidden' ?>>
+            <section class="section-box setup-db-panel" id="setup-db-<?= e($group) ?>" <?= (count($dbGroups) === 1 || $group === $activeDbGroup) ? '' : 'hidden' ?>>
               <div class="setup-panel__head">
                 <div>
                   <span class="pill"><?= e($label) ?></span>
@@ -1231,7 +1228,7 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
     <?php endif; ?>
 
     <?php if ($currentSection === 'custom' && $customSetupFields !== []): ?>
-      <section class="setup-panel" id="setup-custom">
+      <section class="section-box setup-panel" id="setup-custom">
         <div class="setup-panel__head">
           <div>
             <span class="pill">Custom Settings</span>
@@ -1250,7 +1247,6 @@ $GLOBALS['layout_header_context'] = 'Setup / ' . ($sectionTitles[$currentSection
       <button class="cta-button" type="submit">Setup speichern</button>
     </div>
     </form>
-  </section>
     <div class="scheduler-modal" data-scheduler-modal hidden>
       <div class="scheduler-modal__backdrop" data-scheduler-close></div>
       <div class="scheduler-modal__dialog" role="dialog" aria-modal="true" aria-labelledby="scheduler-modal-title">
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index 3bd1d75..0d88520 100644
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -806,11 +806,7 @@ body.has-modal-open {
 
 .setup-panel,
 .setup-db-panel {
-  border: 1px solid var(--line);
-  border-radius: 8px;
-  background: color-mix(in srgb, var(--surface) 92%, transparent);
-  padding: 16px;
-  box-shadow: 0 10px 24px rgba(1, 22, 32, 0.06);
+  padding: 18px 20px;
 }
 
 .setup-panel--flat {