diff --git a/docs/team/teamler.json b/docs/team/teamler.json
index eb53b7a7..3d85612b 100644
--- a/docs/team/teamler.json
+++ b/docs/team/teamler.json
@@ -232,8 +232,8 @@
     "uuid": "94fa217d-6e68-4b87-86ff-6156765c4a17",
     "sex": "male",
     "responsibilities_main": [
-      "Zu Unrecht gebannt",
-      "Community-Discord"
+      "Community-Discord",
+      "Freebuild Organization"
     ],
     "fields": [
       "Plugin Development"
@@ -578,6 +578,9 @@
     "name": "Karolux_",
     "uuid": "b225d9b4-e90e-486e-a195-06915092eecc",
     "sex": "male",
+    "responsibilities_main": [
+      "Translations"
+    ],
     "rank_history": {
       "initial": "pro",
       "21.09.2020": "supporter",
@@ -2699,8 +2702,6 @@
     "uuid": "f56499d5-d48f-4390-9e0e-58dc834e29fa",
     "sex": "male",
     "responsibilities_main": [
-      "Entschuldigungen",
-      "Zu Unrecht gebannt",
       "Management des Development-Teams",
       "Teamlerauswahl Development"
     ],
@@ -2788,6 +2789,9 @@
     "name": "HicXD",
     "uuid": "14a13257-f1a3-4802-bd1e-73f077f0143a",
     "sex": "male",
+    "responsibilities_secondary": [
+      "Castles Organization"
+    ],
     "rank_history": {
       "initial": "expert",
       "14.05.2021": "supporter",
@@ -2857,10 +2861,6 @@
     "name": "DevMoritz",
     "uuid": "9bc330fa-0e99-4c85-9396-cb63fb82297c",
     "sex": "male",
-    "responsibilities_secondary": [
-      "Gewinnspielorganisation",
-      "Youtuber-Ränge"
-    ],
     "fields": [
       "Systemadministration",
       "Web Development"
@@ -2877,6 +2877,9 @@
     "name": "Seeraeuber",
     "uuid": "9bac5789-9029-4fe0-8bb4-c75d0f4de4d3",
     "sex": "male",
+    "responsibilities_main": [
+      "Castles Organization"
+    ],
     "rank_history": {
       "initial": "expert",
       "22.11.2021": "supporter",
@@ -3233,9 +3236,7 @@
     "sex": "female",
     "responsibilities_main": [
       "Social Media",
-      "Management des Content-Teams"
-    ],
-    "responsibilities_secondary": [
+      "Management des Content-Teams",
       "Teamlerauswahl Content"
     ],
     "rank_history": {
@@ -3259,10 +3260,8 @@
     "uuid": "5ba5d816-9642-4cd5-b79c-118ee62953b0",
     "sex": "male",
     "responsibilities_secondary": [
-      "JumpWorld Organisation",
-      "Youtuber-Ränge",
-      "Zu Unrecht gebannt",
-      "Entschuldigungen"
+      "JumpWorld Organization",
+      "Youtuber-Ränge"
     ],
     "rank_history": {
       "initial": "expert",
@@ -3285,7 +3284,7 @@
     "uuid": "55034041-35c1-4ba7-848d-6bcb21675738",
     "sex": "male",
     "responsibilities_main": [
-      "JumpWorld Organisation"
+      "JumpWorld Organization"
     ],
     "fields": [
       "Plugin Development"
@@ -3325,7 +3324,8 @@
     "uuid": "8cfeae05-b100-4543-89cb-e8adf07f86b8",
     "sex": "male",
     "responsibilities_main": [
-      "Grafikdesign"
+      "Grafikdesign", 
+      "Castles Organization"
     ],
     "rank_history": {
       "initial": "expert",
@@ -3353,11 +3353,16 @@
     "sex": "male",
     "responsibilities_main": [
       "Community-Discord",
-      "JumpWorld Organisation",
-      "Management des Content-Teams"
+      "JumpWorld Organization",
+      "Management des Content-Teams",
+      "Teamlerauswahl Content",
+      "Teamlerauswahl Support",
+      "Management des Support-Teams",
+      "Freebuild Organization",
+      "Gamedesign"
     ],
     "responsibilities_secondary": [
-      "Teamlerauswahl Content"
+      "Translations"
     ],
     "rank_history": {
       "initial": "expert",
@@ -3371,9 +3376,12 @@
     "uuid": "156d070c-5737-4db6-a8bb-cfedf1370117",
     "sex": "male",
     "responsibilities_main": [
-      "JumpWorld Organisation",
+      "JumpWorld Organization",
       "Gamedesign"
     ],
+    "responsibilities_secondary": [
+      "Translations"
+    ],
     "rank_history": {
       "initial": "expert",
       "19.09.2024": "content",
@@ -3394,7 +3402,7 @@
     "name": "obsessiiv",
     "uuid": "332eab0b-2ba4-4f5b-a3e3-3a7000f9a58f",
     "sex": "female",
-    "responsibilities_secondary": [
+    "responsibilities_main": [
       "Social Media"
     ],
     "rank_history": {
@@ -3406,9 +3414,11 @@
     "name": "Joschiiiiii",
     "uuid": "b02ebfc4-3bc3-4d18-8830-e6ead231e80b",
     "sex": "male",
+    "responsibilities_main": [
+      "Social Media"
+    ],
     "responsibilities_secondary": [
-      "Social Media",
-      "JumpWorld Organisation"
+      "JumpWorld Organization"
     ],
     "rank_history": {
       "initial": "expert",
@@ -3419,6 +3429,9 @@
     "name": "icefear",
     "uuid": "77831b28-01db-44fb-8c1e-5568b8e83710",
     "sex": "male",
+    "responsibilities_main": [
+      "Castles Organization"
+    ],
     "fields": [
       "Plugin Development"
     ],
@@ -3432,7 +3445,9 @@
     "uuid": "340f4d15-6993-4081-b751-69f4038c50a5",
     "sex": "male",
     "responsibilities_secondary": [
-      "JumpWorld Organisation"
+      "JumpWorld Organization",
+      "Translations",
+      "Gamedesign"
     ],
     "rank_history": {
       "initial": "spieler",
@@ -3462,7 +3477,7 @@
     "uuid": "af629224-11ec-4f7d-8782-05b2465e856c",
     "sex": "female",
       "responsibilities_secondary": [
-        "JumpWorld Organisation"
+        "JumpWorld Organization"
       ],
     "rank_history": {
       "initial": "expert",
@@ -3499,7 +3514,7 @@
     "uuid": "02692628-882b-4b26-952d-a0a0a89bd0b6",
     "sex": "male",
     "responsibilities_secondary": [
-      "JumpWorld Organisation"
+      "JumpWorld Organization"
     ],
     "rank_history": {
       "initial": "mvp_plus",
@@ -3511,8 +3526,6 @@
     "uuid": "38f2c240-f67f-4701-98e6-fef256080d2c",
     "sex": "male",
     "responsibilities_secondary": [
-      "Zu Unrecht gebannt",
-      "Entschuldigungen",
       "Timolia Turnier Organisation"
     ],
     "rank_history": {
@@ -3567,7 +3580,11 @@
     "uuid": "0be087a7-4be2-4792-bb50-ae0432453160",
     "sex": "female",
     "responsibilities_main": [
-      "Gamedesign"
+      "Gamedesign",
+      "Freebuild Organization"
+    ],
+    "responsibilities_secondary": [
+      "Translations"
     ],
     "rank_history": {
       "initial": "mvp",
@@ -3602,6 +3619,9 @@
     "name": "VhecheslavMaer",
     "uuid": "be0f1762-bed5-403a-92f4-1fe3eda2a76d",
     "sex": "male",
+    "responsibilities_secondary": [
+      "Castles Organization"
+    ],
     "fields": [
       "Plugin Development"
     ],
diff --git a/docs/team/translate/de.properties b/docs/team/translate/de.properties
index ed02d64a..e38d781e 100644
--- a/docs/team/translate/de.properties
+++ b/docs/team/translate/de.properties
@@ -49,18 +49,21 @@ page.responsibilities.project-team-orga.uhc= UHC
 page.responsibilities.project-team-orga.uhc.desc= Diese Teammitglieder kümmern sich um die Organisation und den reibungslosen Ablauf aller Timolia UHCs.
 page.responsibilities.project-team-orga.youtuber= Youtuber-Ränge
 page.responsibilities.project-team-orga.youtuber.desc= Wenn sich ein YouTuber für einen Rang auf Timolia interessiert, werden die Anfragen von diesem Team bearbeitet.
-page.responsibilities.project-team-orga.jumpworld= JumpWorld Organisation
+page.responsibilities.project-team-orga.jumpworld= JumpWorld Organization
 page.responsibilities.project-team-orga.jumpworld.desc= Dieses Team übernimmt Planung für Events und Updates, Vergeben von Tags an Jump and Runs und kümmert sich um das Beheben von kaputten Jump and Runs
+page.responsibilities.project-team-orga.castles= Castles Organization
+page.responsibilities.project-team-orga.castles.desc= Dieses Team kümmert sich um die Plannung von Updates und Events sowie Balancing von Items
+page.responsibilities.project-team-orga.freebuild= Freebuild Organization
+page.responsibilities.project-team-orga.freebuild.desc= Dieses Team übernimmt Planung für Events und Updates und kümmert sich um Anliegen von Spielern bezüglich dieses Spielmodus
 page.responsibilities.communication-platforms= Kommunikationsplattformen
 page.responsibilities.communication-platforms.community-discord= Community-Discord
 page.responsibilities.communication-platforms.community-discord.desc= Der Community-Discord von Timolia ist unter [https://timolia.de/discord](https://timolia.de/discord) zu erreichen. Er wird betreut von diesen Teamlern.
 page.responsibilities.communication-platforms.bug-reports= Bug Reports
-page.responsibilities.communication-platforms.appeal= Entschuldigungen
-page.responsibilities.communication-platforms.falsely-banned= Zu Unrecht gebannt
 page.responsibilities.communication-platforms.socialmedia= Social Media
 page.responsibilities.communication-platforms.socialmedia.desc= Für einen ständigen Support und Content auf Twitter und anderen sozialen Medien sorgen diese Teamler.
 page.responsibilities.other-responsibilities= Sonstige Aufgaben
-page.responsibilities.other-responsibilities.translation= Translation und Content creation
+page.responsibilities.other-responsibilities.translations= Translation
+page.responsibilities.other-responsibilities.gamedesign= Gamedesign
 page.responsibilities.other-responsibilities.map-submissions= Map-Einsendungen
 page.responsibilities.other-responsibilities.graphicdesign= Grafikdesign
 page.responsibilities.other-responsibilities.announcements= Ankündigungen
diff --git a/docs/team/translate/en.properties b/docs/team/translate/en.properties
index 6d397c6c..ab3ff6da 100644
--- a/docs/team/translate/en.properties
+++ b/docs/team/translate/en.properties
@@ -52,18 +52,21 @@ page.responsibilities.project-team-orga.youtuber= YouTuber Ranks
 page.responsibilities.project-team-orga.youtuber.desc= If a YouTuber is interested in a rank on Timolia, the requests are processed by this team.
 page.responsibilities.project-team-orga.jumpworld= JumpWorld Organization
 page.responsibilities.project-team-orga.jumpworld.desc= This team is responsible for planning events and updates, assigning tags to jump and runs, and fixing broken jump and runs
+page.responsibilities.project-team-orga.castles= Castles Organization
+page.responsibilities.project-team-orga.castles.desc= This team is responsible for planning updates and events, as well as balancing items
+page.responsibilities.project-team-orga.freebuild= Freebuild Organization
+page.responsibilities.project-team-orga.freebuild.desc= This team handles event planning and updates, and addresses player concerns regarding this game mode
 page.responsibilities.communication-platforms= Communication platforms
 page.responsibilities.communication-platforms.community-discord= Community-Discord
 page.responsibilities.communication-platforms.community-discord.desc= The Community-Discord of Timolia can be reached at [https://timolia.de/discord](https://timolia.de/discord). It is maintained by these team members.
 page.responsibilities.communication-platforms.bug-reports= Bug Reports
-page.responsibilities.communication-platforms.appeal= Appeals
-page.responsibilities.communication-platforms.falsely-banned= Falsely banned
 page.responsibilities.communication-platforms.socialmedia= Social Media
 page.responsibilities.communication-platforms.socialmedia.desc= These team members provide ongoing support and content on Twitter and other social media.
 page.responsibilities.other-responsibilities= Other responsibilites
-page.responsibilities.other-responsibilities.translation= Translation and Content creation
+page.responsibilities.other-responsibilities.translations= Translation
 page.responsibilities.other-responsibilities.map-submissions= Map submissions
 page.responsibilities.other-responsibilities.graphicdesign= Graphic design
+page.responsibilities.other-responsibilities.gamedesign= Gamedesign
 page.responsibilities.other-responsibilities.announcements= Announcements
 page.responsibilities.other-responsibilities.monthly-winner= Monthly winner
 page.responsibilities.info= The various areas of responsibility of the Timolia team members are listed here.
diff --git a/howto-dapp/src/main/java/de/timolia/howto/generator/PageResponsibilities.kt b/howto-dapp/src/main/java/de/timolia/howto/generator/PageResponsibilities.kt
index 51f3f370..1c5d3582 100644
--- a/howto-dapp/src/main/java/de/timolia/howto/generator/PageResponsibilities.kt
+++ b/howto-dapp/src/main/java/de/timolia/howto/generator/PageResponsibilities.kt
@@ -21,20 +21,22 @@ object PageResponsibilities {
                         put("%page.responsibilities.project-team-orga.howto%", "%page.responsibilities.project-team-orga.howto.desc%")
                         put("%page.responsibilities.project-team-orga.tournament%", "%page.responsibilities.project-team-orga.tournament.desc%")
                         put("%page.responsibilities.project-team-orga.jumpworld%", "%page.responsibilities.project-team-orga.jumpworld.desc%")
+                        put("%page.responsibilities.project-team-orga.castles%", "%page.responsibilities.project-team-orga.castles.desc%")
+                        put("%page.responsibilities.project-team-orga.freebuild%", "%page.responsibilities.project-team-orga.freebuild.desc%")
                         put("%page.responsibilities.project-team-orga.youtuber%", "%page.responsibilities.project-team-orga.youtuber.desc%")
                     }
                 })
                 put("%page.responsibilities.communication-platforms%", object : LinkedHashMap<String, String?>() {
                     init {
                         put("%page.responsibilities.communication-platforms.community-discord%", "%page.responsibilities.communication-platforms.community-discord.desc%")
-                        put("%page.responsibilities.communication-platforms.appeal%", null)
-                        put("%page.responsibilities.communication-platforms.falsely-banned%", null)
                         put("%page.responsibilities.communication-platforms.socialmedia%", "%page.responsibilities.communication-platforms.socialmedia.desc%")
                     }
                 })
                 put("%page.responsibilities.other-responsibilities%", object : LinkedHashMap<String, String?>() {
                     init {
                         put("%page.responsibilities.other-responsibilities.graphicdesign%", null)
+                        put("%page.responsibilities.other-responsibilities.gamedesign%", null)
+                        put("%page.responsibilities.other-responsibilities.translations%", null)
                     }
                 })
             }