diff --git a/Writerside/labels.list b/Writerside/labels.list
index 62576582..306d9c35 100644
--- a/Writerside/labels.list
+++ b/Writerside/labels.list
@@ -1,100 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE labels SYSTEM "https://resources.jetbrains.com/writerside/1.0/labels-list.dtd">
 <labels xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/labels.xsd">
+        xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/labels.xsd">
 
-  <primary-label id="event-held" short-name="S" name="Bereits stattgefunden" color="blue">
-    Dieses Event hat bereits stattgefunden.
-  </primary-label>
-  <primary-label id="event-upcoming" short-name="N" name="Bevorstehend" color="tangerine">
-    Dieses Event wird noch stattfinden.
-  </primary-label>
-  <primary-label id="event-running" short-name="L" name="Läuft">
-    Dieses Event läuft gerade.
-  </primary-label>
-  <primary-label id="survival-closed" short-name="G" name="Geschlossen" color="red">
-    Der Survival Server ist derzeit geschlossen.
-  </primary-label>
-  <primary-label id="under-development" short-name="E" name="In Entwicklung" color="purple">
-    Dieses Feature befindet sich noch in Entwicklung.
-  </primary-label>
-  <primary-label id="survival-server" short-name="O" name="Survival Server" color="purple">
-    Willkommen auf dem Survival Server!
-  </primary-label>
-  <primary-label id="skills" short-name="S" name="Skillsystem" color="tangerine">
-  </primary-label>
+    <primary-label id="event-held" short-name="S" name="Bereits stattgefunden" color="blue">
+        Dieses Event hat bereits stattgefunden.
+    </primary-label>
+    <primary-label id="event-upcoming" short-name="N" name="Bevorstehend" color="tangerine">
+        Dieses Event wird noch stattfinden.
+    </primary-label>
+    <primary-label id="event-running" short-name="L" name="Läuft">
+        Dieses Event läuft gerade.
+    </primary-label>
+    <primary-label id="survival-closed" short-name="G" name="Geschlossen" color="red">
+        Der Survival Server ist derzeit geschlossen.
+    </primary-label>
+    <primary-label id="under-development" short-name="E" name="In Entwicklung" color="purple">
+        Dieses Feature befindet sich noch in Entwicklung.
+    </primary-label>
+    <primary-label id="survival-server" short-name="O" name="Survival Server" color="purple">
+        Willkommen auf dem Survival Server!
+    </primary-label>
+    <primary-label id="skills" short-name="S" name="Skillsystem" color="tangerine">
+    </primary-label>
 
-<!-- SECONDARY EVENT LABELS -->
-  <secondary-label id="diamond-date" name="12.10.2024 bis 13.10.2024" color="blue">Das Event läuft
-    ab dem 12.10.2024 bis zum Erreichen der 400.000 Diamanterze
-  </secondary-label>
-  <secondary-label id="diamond-version" name="1.21" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21 stattfinden.
-  </secondary-label>
-  <secondary-label id="skyblock-date" name="01.08.2024 - 03.08.2024" color="blue">Das Event läuft
-    vom 01.08.2024 bis zum 03.08.2024.
-  </secondary-label>
-  <secondary-label id="skyblock-mc-version" name="1.21" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21 stattfinden.
-  </secondary-label>
-  <secondary-label id="one-block-date" name="15.10.2024 - 17.10.2024" color="blue">Das Event läuft
-    vom 01.08.2024 bis zum 03.08.2024.
-  </secondary-label>
-  <secondary-label id="civilisation-date" name="10.08.2024 - 11.08.2024" color="blue">
-    Das Event läuft vom 10.08.2024 um 14:00 Uhr bis 11.08.2024 um 14:00 Uhr.
-  </secondary-label>
-  <secondary-label id="civilisation-mc-version" name="1.21" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21 stattfinden.
-  </secondary-label>
-  <secondary-label id="one-block-mc-version" name="1.21" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21 stattfinden.
-  </secondary-label>
-  <secondary-label id="tilted-world-mc-version" name="1.21.4" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
-  </secondary-label>
-  <secondary-label id="tilted-world-date" name="26.01.2025 - 28.01.2025" color="blue">Das Event
-    läuft
-    vom 26.01.2025 bis zum 28.01.2025.
-  </secondary-label>
-  <secondary-label id="limitless-hights-date" name="08.02.2025 - 10.02.2025" color="blue">Das Event
-    läuft
-    vom 08.02.2025 bis zum 10.02.2025.
-  </secondary-label>
-  <secondary-label id="limitless-hights-mc-version" name="1.21.4" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
-  </secondary-label>
-  <secondary-label id="creative2-date" name="15.02.2025 - 22.02.2025" color="blue">Das Event
-    läuft
-    vom 15.02.2025 bis zum 22.02.2025.
-  </secondary-label>
-  <secondary-label id="creative2-mc-version" name="1.21.4" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
-  </secondary-label>
-  <secondary-label id="nether-event-date" name="21.03.2025 - 23.03.2025" color="blue">Das Event
-    läuft
-    vom 21.03.2025 bis zum 23.03.2025.
-  </secondary-label>
-  <secondary-label id="nether-event-mc-version" name="1.21.4" color="purple">
-    Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
-  </secondary-label>
+    <!-- SECONDARY EVENT LABELS -->
+    <secondary-label id="no-date" name="Kein Datum" color="red">
+        Aktuell steht noch kein Datum für dieses Event fest.
+    </secondary-label>
+    <secondary-label id="anarchy-event-date" name="8.10.2023 - 15.10.2023" color="blue">Das Event läuft
+        vom 8.10.2023 bis zum 15.10.2023.
+    </secondary-label>
+    <secondary-label id="anarchy-event-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="stoneblock-event-date" name="26.05.2024 - 28.05.2024" color="blue">Das Event läuft
+        vom 26.05.2024 bis zum 28.05.2024.
+    </secondary-label>
+    <secondary-label id="stoneblock-event-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="flatworld-event-date" name="07.06.2024 - 09.06.2024" color="blue">Das Event läuft
+        vom 07.06.2024 bis zum 09.06.2024.
+    </secondary-label>
+    <secondary-label id="flatworld-event-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="oceanblock-event-date" name="21.06.2024 - 21.06.2024" color="blue">Das Event läuft
+        vom 21.06.2024 bis zum 21.06.2024.
+    </secondary-label>
+    <secondary-label id="oceanblock-event-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="diamond-date" name="12.10.2024 bis 13.10.2024" color="blue">Das Event läuft
+        ab dem 12.10.2024 bis zum Erreichen der 400.000 Diamanterze
+    </secondary-label>
+    <secondary-label id="diamond-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="skyblock-date" name="01.08.2024 - 03.08.2024" color="blue">Das Event läuft
+        vom 01.08.2024 bis zum 03.08.2024.
+    </secondary-label>
+    <secondary-label id="skyblock-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="one-block-date" name="15.10.2024 - 17.10.2024" color="blue">Das Event läuft
+        vom 01.08.2024 bis zum 03.08.2024.
+    </secondary-label>
+    <secondary-label id="civilisation-date" name="10.08.2024 - 11.08.2024" color="blue">
+        Das Event läuft vom 10.08.2024 um 14:00 Uhr bis 11.08.2024 um 14:00 Uhr.
+    </secondary-label>
+    <secondary-label id="civilisation-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="one-block-mc-version" name="1.21" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21 stattfinden.
+    </secondary-label>
+    <secondary-label id="tilted-world-mc-version" name="1.21.4" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
+    </secondary-label>
+    <secondary-label id="tilted-world-date" name="26.01.2025 - 28.01.2025" color="blue">Das Event
+        läuft
+        vom 26.01.2025 bis zum 28.01.2025.
+    </secondary-label>
+    <secondary-label id="limitless-hights-date" name="08.02.2025 - 10.02.2025" color="blue">Das Event
+        läuft
+        vom 08.02.2025 bis zum 10.02.2025.
+    </secondary-label>
+    <secondary-label id="limitless-hights-mc-version" name="1.21.4" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
+    </secondary-label>
+    <secondary-label id="creative2-date" name="15.02.2025 - 22.02.2025" color="blue">Das Event
+        läuft
+        vom 15.02.2025 bis zum 22.02.2025.
+    </secondary-label>
+    <secondary-label id="creative2-mc-version" name="1.21.4" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
+    </secondary-label>
+    <secondary-label id="nether-event-date" name="21.03.2025 - 23.03.2025" color="blue">Das Event
+        läuft
+        vom 21.03.2025 bis zum 23.03.2025.
+    </secondary-label>
+    <secondary-label id="nether-event-mc-version" name="1.21.4" color="purple">
+        Das Event wird in der Minecraft Java Version 1.21.4 stattfinden.
+    </secondary-label>
 
 
+    <secondary-label id="max-skill-level-50" name="Maximales Level: 50" color="blue">
+        Das maximal erreichbare Level dieses Skills beträgt 50.
+    </secondary-label>
 
+    <secondary-label id="current-minecraft-version" name="%required_game_version%" color="blue">Du
+        benötigst die Java-Edition in der Version %required_game_version%, um auf dem Server spielen zu
+        können.
+    </secondary-label>
 
-  <secondary-label id="max-skill-level-50" name="Maximales Level: 50" color="blue">
-    Das maximal erreichbare Level dieses Skills beträgt 50.
-  </secondary-label>
+    <secondary-label id="wip" name="WIP" color="purple">Work in progress</secondary-label>
+    <secondary-label id="beta" name="β" color="tangerine">Beta</secondary-label>
 
-  <secondary-label id="current-minecraft-version" name="%required_game_version%" color="blue">Du
-    benötigst die Java-Edition in der Version %required_game_version%, um auf dem Server spielen zu
-    können.
-  </secondary-label>
-
-  <secondary-label id="wip" name="WIP" color="purple">Work in progress</secondary-label>
-  <secondary-label id="beta" name="β" color="tangerine">Beta</secondary-label>
-
-  <secondary-label id="experimental" name="Experimental" color="purple">This is an experimental
-    feature
-  </secondary-label>
-  <secondary-label id="2023.3" name="2023.3" color="blue">New in version 2023.3</secondary-label>
+    <secondary-label id="experimental" name="Experimental" color="purple">This is an experimental
+        feature
+    </secondary-label>
+    <secondary-label id="2023.3" name="2023.3" color="blue">New in version 2023.3</secondary-label>
 </labels>
\ No newline at end of file
diff --git a/Writerside/topics/event-server/events/anarchy/anarchy-event.md b/Writerside/topics/event-server/events/anarchy/anarchy-event.md
index 4f2523b0..dc367a76 100644
--- a/Writerside/topics/event-server/events/anarchy/anarchy-event.md
+++ b/Writerside/topics/event-server/events/anarchy/anarchy-event.md
@@ -1,14 +1,13 @@
-<primary-label ref="event-held" />
+<primary-label ref="event-held"/>
+<secondary-label ref="anarchy-event-mc-version"/>
+<secondary-label ref="anarchy-event-date"/>
 
 # Anarchy
 
-<video src="https://www.youtube.com/watch?v=eJ3wrRLPGIs" />
+<video src="https://www.youtube.com/watch?v=eJ3wrRLPGIs"/>
 
 [Map Download](https://1drv.ms/u/s!Ajc2CthqxhPDiRuchitpjDBO2NQr?e=w8Tx33&v=eJ3wrRLPGIs)
 
-> Das Event läuft vom **8.10.2023** um **17:00 Uhr** bis zum **15.10.2023** um **18:00 Uhr**.
-> 
-
 ## Über das Event {id="general-info"}
 
 Das Anarchy Event ist ein Event, bei dem es darum geht, in einer Welt ohne Regeln zu überleben. Das Event dauert 7 Tage
diff --git a/Writerside/topics/event-server/events/building/building-event.md b/Writerside/topics/event-server/events/building/building-event.md
index b4285d7a..d1f12a22 100644
--- a/Writerside/topics/event-server/events/building/building-event.md
+++ b/Writerside/topics/event-server/events/building/building-event.md
@@ -1,10 +1,8 @@
-<primary-label ref="event-upcoming" />
+<primary-label ref="event-upcoming"/>
+<secondary-label ref="no-date"/>
 
 # Vorbau Event
 
-> Aktuell steht noch kein Starttermin für das Event fest.
-> 
-
 ## Über das Event {id="general-info"}
 
 Das Ziel des Events ist es, talentierte Builder für unser Team zu rekrutieren. Dazu veranstalten wir ein Bau-Event, bei
diff --git a/Writerside/topics/event-server/events/civilisation/civilisation-event.md b/Writerside/topics/event-server/events/civilisation/civilisation-event.md
index 1c37acad..0f986ada 100644
--- a/Writerside/topics/event-server/events/civilisation/civilisation-event.md
+++ b/Writerside/topics/event-server/events/civilisation/civilisation-event.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="civilisation-mc-version" />
-<secondary-label ref="civilisation-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="civilisation-mc-version"/>
+<secondary-label ref="civilisation-date"/>
 
 # Zivilisationsprojekt
 
diff --git a/Writerside/topics/event-server/events/creative2/creative2.md b/Writerside/topics/event-server/events/creative2/creative2.md
index 592d7fa7..f2d489d1 100644
--- a/Writerside/topics/event-server/events/creative2/creative2.md
+++ b/Writerside/topics/event-server/events/creative2/creative2.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="creative2-mc-version" />
-<secondary-label ref="creative2-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="creative2-mc-version"/>
+<secondary-label ref="creative2-date"/>
 
 # Creative 2.0
 
diff --git a/Writerside/topics/event-server/events/diamond/diamondevent.md b/Writerside/topics/event-server/events/diamond/diamondevent.md
index 5fcd2a40..260177af 100644
--- a/Writerside/topics/event-server/events/diamond/diamondevent.md
+++ b/Writerside/topics/event-server/events/diamond/diamondevent.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="diamond-version" />
-<secondary-label ref="diamond-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="diamond-version"/>
+<secondary-label ref="diamond-date"/>
 
 # Diamond-Event (400k Special)
 
diff --git a/Writerside/topics/event-server/events/flatworld/flatworld.md b/Writerside/topics/event-server/events/flatworld/flatworld.md
index ee5e9328..8b3c1030 100644
--- a/Writerside/topics/event-server/events/flatworld/flatworld.md
+++ b/Writerside/topics/event-server/events/flatworld/flatworld.md
@@ -1,15 +1,14 @@
-<primary-label ref="event-held" />
+<primary-label ref="event-held"/>
+<secondary-label ref="flatworld-event-mc-version"/>
+<secondary-label ref="flatworld-event-date"/>
 
 # Flatworld
 
 
-<video src="https://www.youtube.com/watch?v=l96KwwMBWzw" />
+<video src="https://www.youtube.com/watch?v=l96KwwMBWzw"/>
 
 [Map Download](https://drive.google.com/file/d/1F3PMXmnfSsb2l-OxLV8HLBev5E0jb4MU/)
 
-> Das Event läuft vom **07.06.2024** um **19:00 Uhr** bis **09.06.2024** um **19:00 Uhr**.
->
-
 ## Über das Event {id="general-info"}
 
 In dem Flatworld-Event tretet ihr in einer kompletten Flatworld an. Sowohl die Overworld, als auch der Nether und das End sind komplett flach.
diff --git a/Writerside/topics/event-server/events/nether/nether-event.md b/Writerside/topics/event-server/events/nether/nether-event.md
index c4f75eb3..f3fd28ac 100644
--- a/Writerside/topics/event-server/events/nether/nether-event.md
+++ b/Writerside/topics/event-server/events/nether/nether-event.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-upcoming" />
-<secondary-label ref="nether-event-mc-version" />
-<secondary-label ref="nether-event-date" />
+<primary-label ref="event-upcoming"/>
+<secondary-label ref="nether-event-mc-version"/>
+<secondary-label ref="nether-event-date"/>
 
 # Nether Event
 
diff --git a/Writerside/topics/event-server/events/oceanblock/oceanblock.md b/Writerside/topics/event-server/events/oceanblock/oceanblock.md
index bd0e725b..32ecc801 100644
--- a/Writerside/topics/event-server/events/oceanblock/oceanblock.md
+++ b/Writerside/topics/event-server/events/oceanblock/oceanblock.md
@@ -1,15 +1,13 @@
-<primary-label ref="event-held" />
+<primary-label ref="event-held"/>
+<secondary-label ref="oceanblock-event-mc-version"/>
+<secondary-label ref="oceanblock-event-date"/>
 
 # Oceanblock
 
-
-<video src="https://www.youtube.com/watch?v=5LmDttvPDg4" />
+<video src="https://www.youtube.com/watch?v=5LmDttvPDg4"/>
 
 [Map Download](https://drive.google.com/file/d/10FxOaIS7NX0H81DoFieOtLrr9Oq9Ki8W/)
 
-> Das Event läuft voraussichtlich vom **21.06.2024** bis zum **23.06.2024**.
->
-
 ## Über das Event {id="general-info"}
 
 In dem Oceanblock-Event tretet ihr in einer speziellen Welt an, die hauptsächlich aus Wasser besteht. 
diff --git a/Writerside/topics/event-server/events/onechunk/one-chunk.md b/Writerside/topics/event-server/events/onechunk/one-chunk.md
index 4325b28d..79997728 100644
--- a/Writerside/topics/event-server/events/onechunk/one-chunk.md
+++ b/Writerside/topics/event-server/events/onechunk/one-chunk.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="one-block-mc-version" />
-<secondary-label ref="one-block-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="one-block-mc-version"/>
+<secondary-label ref="one-block-date"/>
 
 # OneChunk
 
diff --git a/Writerside/topics/event-server/events/skyblock/skyblock.md b/Writerside/topics/event-server/events/skyblock/skyblock.md
index 5d2ebc77..ee51e02a 100644
--- a/Writerside/topics/event-server/events/skyblock/skyblock.md
+++ b/Writerside/topics/event-server/events/skyblock/skyblock.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="skyblock-mc-version" />
-<secondary-label ref="skyblock-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="skyblock-mc-version"/>
+<secondary-label ref="skyblock-date"/>
 
 # Skyblock
 
diff --git a/Writerside/topics/event-server/events/stoneblock/stoneblock-event.md b/Writerside/topics/event-server/events/stoneblock/stoneblock-event.md
index 8264d229..b76dbfb2 100644
--- a/Writerside/topics/event-server/events/stoneblock/stoneblock-event.md
+++ b/Writerside/topics/event-server/events/stoneblock/stoneblock-event.md
@@ -1,4 +1,6 @@
-<primary-label ref="event-held" />
+<primary-label ref="event-held"/>
+<secondary-label ref="stoneblock-event-mc-version"/>
+<secondary-label ref="stoneblock-event-date"/>
 
 # Stoneblock
 
@@ -8,9 +10,6 @@
 
 {style="warning" title="Hinweis"}
 
-> Das Event läuft voraussichtlich vom **26.05.2024** um **15:00 Uhr** bis **28.05.2024** um **20:00 Uhr**.
->
-
 ## Über das Event {id="general-info"}
 
 In dem Stoneblock-Event tretet ihr in einer speziellen Welt an, die hauptsächlich aus Stein besteht. Ihr könnt euch
diff --git a/Writerside/topics/event-server/events/tilted/tilted.md b/Writerside/topics/event-server/events/tilted/tilted.md
index 6d49a411..45ab633a 100644
--- a/Writerside/topics/event-server/events/tilted/tilted.md
+++ b/Writerside/topics/event-server/events/tilted/tilted.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="tilted-world-mc-version" />
-<secondary-label ref="tilted-world-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="tilted-world-mc-version"/>
+<secondary-label ref="tilted-world-date"/>
 
 # Tilted World
 
diff --git a/Writerside/topics/limitless-heights.md b/Writerside/topics/limitless-heights.md
index c5e1976a..52dd5362 100644
--- a/Writerside/topics/limitless-heights.md
+++ b/Writerside/topics/limitless-heights.md
@@ -1,6 +1,6 @@
-<primary-label ref="event-held" />
-<secondary-label ref="limitless-hights-mc-version" />
-<secondary-label ref="limitless-hights-date" />
+<primary-label ref="event-held"/>
+<secondary-label ref="limitless-hights-mc-version"/>
+<secondary-label ref="limitless-hights-date"/>
 
 # Limitless Heights