diff --git a/.gitignore b/.gitignore
index 559e515..8b1024b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 *.tsbuildinfo
+docs/praesi_2_context.md
+docs/*.png
diff --git a/docs/Backend Klassendiagramm.png b/docs/Backend Klassendiagramm.png
deleted file mode 100644
index 2fa437d..0000000
Binary files a/docs/Backend Klassendiagramm.png and /dev/null differ
diff --git a/docs/Frontend Klassendiagramm.png b/docs/Frontend Klassendiagramm.png
deleted file mode 100644
index 4259039..0000000
Binary files a/docs/Frontend Klassendiagramm.png and /dev/null differ
diff --git a/docs/System Komponenten.png b/docs/System Komponenten.png
deleted file mode 100644
index 068df39..0000000
Binary files a/docs/System Komponenten.png and /dev/null differ
diff --git a/docs/architecture-class-diagram.puml b/docs/architecture-class-diagram.puml
index 27aadcb..87f4f78 100644
--- a/docs/architecture-class-diagram.puml
+++ b/docs/architecture-class-diagram.puml
@@ -142,6 +142,15 @@ package "Utils" #DDA0DD {
         ' +hash()
         ' +compare()
     }
+
+    class RecurrenceExpander {
+        ' +expandRecurringEvents()
+    }
+
+    class EventFormatters {
+        ' +getWeeksOverview()
+        ' +getMonthOverview()
+    }
 }
 
 ' Controller -> Service
@@ -161,4 +170,8 @@ EventService --> EventRepository
 AuthService --> JWT
 AuthService --> Password
 
+' Event/Chat uses Utils
+EventService --> RecurrenceExpander
+ChatService --> EventFormatters
+
 @enduml
diff --git a/docs/component-diagram.puml b/docs/component-diagram.puml
index bd74d95..f930788 100644
--- a/docs/component-diagram.puml
+++ b/docs/component-diagram.puml
@@ -26,13 +26,14 @@ package "apps/client (Expo React Native)" #87CEEB {
 
     package "Components" {
         [EventCard] as EventCard
-        [ChatBubble] as ChatBubble
+        [ProposedEventCard] as ProposedEventCard
         [ConfirmDialog] as ConfirmDialog
     }
 
     package "Stores" {
         [Auth Store] as AuthStore
         [Events Store] as EventsStore
+        [Chat Store] as ChatStore
     }
 }
 
@@ -90,6 +91,7 @@ ClientChat --> ApiClient
 
 ApiClient --> AuthStore
 ClientEvent --> EventsStore
+ClientChat --> ChatStore
 
 ' Frontend -> Shared
 ApiClient ..> SharedDTOs
diff --git a/docs/frontend-class-diagram.puml b/docs/frontend-class-diagram.puml
index 3e8230c..c07b815 100644
--- a/docs/frontend-class-diagram.puml
+++ b/docs/frontend-class-diagram.puml
@@ -25,9 +25,8 @@ package "Screens" #87CEEB {
 ' ===== COMPONENTS =====
 package "Components" #FFA07A  {
     class EventCard
-    class ChatBubble
+    class ProposedEventCard
     class EventConfirmDialog
-    class MonthSelector
 }
 
 ' ===== SERVICES =====
@@ -52,6 +51,9 @@ package "Stores" #FFD700 {
     class EventsStore {
         ' +events
     }
+    class ChatStore {
+        ' +messages
+    }
 }
 
 ' ===== MODELS =====
@@ -71,7 +73,7 @@ NoteScreen --> EventService
 
 ' Screens -> Components
 CalendarScreen --> EventCard
-ChatScreen --> ChatBubble
+ChatScreen --> ProposedEventCard
 ChatScreen --> EventConfirmDialog
 
 ' Services -> ApiClient
@@ -79,8 +81,9 @@ AuthService --> ApiClient
 EventService --> ApiClient
 ChatService --> ApiClient
 
-' Services -> Stores
+' Services/Screens -> Stores
 AuthService --> AuthStore
 EventService --> EventsStore
+ChatScreen --> ChatStore
 
 @enduml