diff --git a/templates/dynamics/popup.html.tera b/templates/dynamics/popup.html.tera
new file mode 100644
index 0000000..e69de29
diff --git a/templates/dynamics/sidebar.html.tera b/templates/dynamics/sidebar.html.tera
new file mode 100644
index 0000000..e69de29
diff --git a/templates/forms/event.html.tera b/templates/forms/event.html.tera
new file mode 100644
index 0000000..8c80a83
--- /dev/null
+++ b/templates/forms/event.html.tera
@@ -0,0 +1,14 @@
+{% import "includes/macros" as macros %}
+
+<div class="hidden">
+  <form action="/admin/planned-event" method="post" class="grid gap-3" id="addEventForm">
+    <input class="day-js" type="hidden" name="day" value="" />
+    {{ macros::input(label='Titel (z.B. Firmenrudern)', name='name', type='input', required=true) }}
+    {{ macros::input(label='Startzeit', name='planned_starting_time', type='time', required=true) }}
+    {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', required=true, min='0') }}
+    {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
+    {{ macros::checkbox(label='Gäste erlauben', name='max_allow_guestspeople') }}
+    {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
+    <input value="Erstellen" class="w-full btn btn-primary" type="submit" />
+  </form>
+</div>
\ No newline at end of file
diff --git a/templates/forms/trip.html.tera b/templates/forms/trip.html.tera
new file mode 100644
index 0000000..ae6e1d2
--- /dev/null
+++ b/templates/forms/trip.html.tera
@@ -0,0 +1,11 @@
+{% import "includes/macros" as macros %}
+
+<div class="hidden">
+    <form action="/cox/trip" method="post" class="grid gap-3" id="sidebarForm">
+        <input class="day-js" type="hidden" name="day" value="" />
+        {{ macros::input(label='Startzeit (zB "10:00")', name='planned_starting_time', type='time', required=true) }}
+        {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
+        {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
+        <input value="Erstellen" class="w-full btn btn-primary" type="submit" />
+    </form>
+</div>
\ No newline at end of file
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 5d13103..b284e75 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -273,31 +273,7 @@
 <div class="sidebar-overlay" data-trigger="sidebar"></div>
 {# --- END Add Trip Sidebar --- #}
 
-{# --- START Form Add Trip --- #}
-<div class="hidden">
-  <form action="/cox/trip" method="post" class="grid gap-3" id="sidebarForm">
-    <input class="day-js" type="hidden" name="day" value="" />
-    {{ macros::input(label='Startzeit (zB "10:00")', name='planned_starting_time', type='time', required=true) }}
-    {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
-    {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
-    <input value="Erstellen" class="w-full btn btn-primary" type="submit" />
-  </form>
-</div>
-{# --- END Form Add Trip --- #}
-
-{# --- START Form Add Event --- #}
-<div class="hidden">
-  <form action="/admin/planned-event" method="post" class="grid gap-3" id="addEventForm">
-    <input class="day-js" type="hidden" name="day" value="" />
-    {{ macros::input(label='Titel (z.B. Firmenrudern)', name='name', type='input', required=true) }}
-    {{ macros::input(label='Startzeit', name='planned_starting_time', type='time', required=true) }}
-    {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', required=true, min='0') }}
-    {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
-    {{ macros::checkbox(label='Gäste erlauben', name='max_allow_guestspeople') }}
-    {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
-    <input value="Erstellen" class="w-full btn btn-primary" type="submit" />
-  </form>
-</div>
-{# --- END Form Add Event --- #}
+{% include "forms/trip" %}
+{% include "forms/event" %}
 
 {% endblock content %}