diff --git a/daten/owo-stundenplan-master.json b/daten/owo-stundenplan-master.json
index d966272..156805b 100644
--- a/daten/owo-stundenplan-master.json
+++ b/daten/owo-stundenplan-master.json
@@ -34,6 +34,14 @@
 			},
 			"colour": "#fdf7cb"
 		},
+		{
+			"id": "bachelor",
+			"name": {
+				"de": "Bachelor",
+				"en": "Bachelor"
+			},
+			"colour": "#ffd6af"
+		},
 		{
 			"id": "optional",
 			"name": {
@@ -49,140 +57,169 @@
 			"en": "This event is open end."
 		},
 		{
-			"de": "Parallel dazu findet die Account-Aktivierung in C005 statt.",
-			"en": "Parallel to this, account activation takes place in C005."
+			"de": "Parallel dazu findet die Account-Aktivierung in S2|02 C110 statt.",
+			"en": "Parallel to this, account activation takes place in S2|02 C110."
 		}
 	],
 	"days": [
 		{
-			"dayOfWeek": 3,
+			"dayOfWeek": 2,
 			"slots": [
 				{
 					"category": "optional",
-					"from": "09:30",
-					"to": "11:00",
-					"name": {
-						"de": "Frühstück",
-						"en": "Breakfast"
-					},
-					"room": "S2|02 A020 (LZI)"
-				},
-				{
-					"category": "department",
-					"from": "11:00",
-					"to": "11:30",
-					"name": {
-						"de": "Begrüßung",
-						"en": "Welcome meeting"
-					},
-					"room": "S2|02 C205"
-				},
-				{
-					"category": "tud",
-					"from": "11:30",
-					"to": "13:00",
-					"name": {
-						"de": "Studienberatung",
-						"en": "Student Advisory Talk"
-					},
-					"room": "S2|02 C205"
-				},
-				{
-					"category": "leisure",
-					"from": "13:00",
-					"to": "14:30",
-					"name": {
-						"de": "ULB Tour & Mittagessen",
-						"en": "ULB Tour & Lunch"
-					},
-					"room": "ULB & Mensa"
-				},
-				{
-					"category": "tud",
-					"from": "14:30",
-					"to": "16:00",
-					"name": {
-						"de": "IT-Infrastruktur",
-						"en": "IT infrastructure"
-					},
-					"room": "S2|02 C205"
-				},
-				{
-					"category": "leisure",
-					"from": "16:00",
-					"to": "17:00",
-					"name": {
-						"de": "Get-together",
-						"en": "Get-together"
-					},
-					"room": "S2|02 A020 (LZI)"
-				},
-				{
-					"category": "optional",
-					"from": "17:00",
-					"to": "19:30",
-					"name": {
-						"de": "GnoM (Spieleabend)",
-						"en": "GnoM (Games evening)"
-					},
-					"room": "S2|02 A020 (LZI)",
-					"notes": [1]
-				}
-			]
-		},
-		{
-			"dayOfWeek": 4,
-			"slots": [
-				{
-					"category": "optional",
-					"from": "08:30",
+					"from": "09:00",
 					"to": "10:00",
 					"name": {
 						"de": "Frühstück",
 						"en": "Breakfast"
 					},
-					"room": "S2|02 A020 (LZI)",
-					"notes": [2]
-				},
-				{
-					"category": "tud",
-					"from": "10:00",
-					"to": "11:30",
-					"name": {
-						"de": "AStA, Beschwerdemanagement",
-						"en": "AStA, complaint management"
-					},
-					"room": "S2|02 C205"
+					"room": "S2|02 A020 (LZI)"
 				},
 				{
 					"category": "department",
-					"from": "11:30",
-					"to": "13:30",
+					"from": "10:00",
+					"to": "10:30",
 					"name": {
-						"de": "Fachvortrag-Speed-Dating",
-						"en": "Scientific-Speed-Dating"
+						"de": "Begrüßung",
+						"en": "Welcome Meeting"
 					},
 					"room": "S2|02 C205"
 				},
+				{
+					"category": "tud",
+					"from": "10:30",
+					"to": "12:00",
+					"name": {
+						"de": "Fachstudienberatung und Studieren\nan der TU Darmstadt",
+						"en": "Student Advisory Talk and\nStudying at TU Darmstadt"
+					},
+					"room": "S2|02 C205"
+				},
+				{
+					"category": "tud",
+					"from": "12:00",
+					"to": "13:30",
+					"name": {
+						"de": "ULB Tour",
+						"en": "ULB Tour"
+					},
+					"room": "ULB"
+				},
 				{
 					"category": "leisure",
-					"from": "13:30",
-					"to": "14:15",
+					"from": "12:00",
+					"to": "13:30",
 					"name": {
 						"de": "Mittagessen",
 						"en": "Lunch"
 					},
 					"room": "Mensa"
 				},
+				{
+					"category": "department",
+					"from": "13:30",
+					"to": "14:30",
+					"name": {
+						"de": "Studieren im Ausland",
+						"en": "Studying Abroad"
+					},
+					"room": "S2|02 C110"
+				},
 				{
 					"category": "department",
 					"from": "14:30",
+					"to": "15:30",
+					"name": {
+						"de": "Kurzvortäge",
+						"en": "Lighning-Round talks"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "leisure",
+					"from": "15:30",
+					"to": "16:30",
+					"name": {
+						"de": "Get-Together",
+						"en": "Get-Together"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "leisure",
+					"from": "16:30",
+					"to": "19:00",
+					"name": {
+						"de": "Brettspielabend",
+						"en": "Gnom"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "leisure",
+					"from": "16:30",
+					"to": "19:00",
+					"name": {
+						"de": "Stadtour",
+						"en": "City Tour"
+					},
+					"room": "S2|02 C110"
+				}
+			]
+		},
+		{
+			"dayOfWeek": 3,
+			"slots": [
+				{
+					"category": "optional",
+					"from": "09:00",
+					"to": "10:30",
+					"name": {
+						"de": "Frühstück / Account-Aktivierung",
+						"en": "Breakfast / Account Activation"
+					},
+					"room": "S2|02 A020 (LZI)",
+					"notes": [2]
+				},
+				{
+					"category": "tud",
+					"from": "10:30",
+					"to": "12:00",
+					"name": {
+						"de": "IT Systeme",
+						"en": "IT Systems"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "leisure",
+					"from": "12:00",
+					"to": "13:30",
+					"name": {
+						"de": "Mittagessen",
+						"en": "Lunch"
+					},
+					"room": "Mensa"
+				},
+				{
+					"category": "tud",
+					"from": "13:30",
+					"to": "14:00",
+					"name": {
+						"de": "Fachschaft",
+						"en": "Student council"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "germany",
+					"from": "14:00",
 					"to": "16:00",
 					"name": {
-						"de": "Auslandssemester",
-						"en": "Studying abroad"
+						"de": "Intercultural Talk",
+						"en": "Intercultural Talk"
 					},
-					"room": "S2|02 C205"
+					"room": "S2|02 C110"
 				},
 				{
 					"category": "leisure",
@@ -192,27 +229,27 @@
 						"de": "Unirallye",
 						"en": "Unirallye"
 					},
-					"room": "S2|02 C205"
+					"room": "S2|02 C110"
 				},
 				{
 					"category": "leisure",
 					"from": "19:00",
-					"to": "20:00",
+					"to": "21:00",
 					"name": {
 						"de": "Kneipentour",
-						"en": "Bar Tour"
+						"en": "Bartour"
 					},
-					"room": "S2|02 C205",
+					"room": "S2|02 C110",
 					"notes": [1]
 				}
 			]
 		},
 		{
-			"dayOfWeek": 5,
+			"dayOfWeek": 4,
 			"slots": [
 				{
 					"category": "optional",
-					"from": "08:30",
+					"from": "09:00",
 					"to": "10:00",
 					"name": {
 						"de": "Frühstück",
@@ -221,67 +258,64 @@
 					"room": "S2|02 A020 (LZI)"
 				},
 				{
-					"category": "germany",
+					"category": "tud",
 					"from": "10:00",
-					"to": "11:30",
+					"to": "11:45",
 					"name": {
-						"de": "Intercultural Talk",
-						"en": "Intercultural Talk"
+						"de": "Anti-Diskriminierung, AStA,\nBeschwerdemanagement, Gleichstellungs-\nTeam, Unite!",
+						"en": "Anti Discrimination, AStA,\nImprovement Management, Gender Equality\nTeam, Unite!"
 					},
-					"room": "S2|02 C205"
+					"room": "S2|02 C110"
 				},
 				{
 					"category": "department",
-					"from": "11:30",
+					"from": "11:45",
 					"to": "13:00",
 					"name": {
-						"de": "Master und Dr. Panel (mit Q&A)",
-						"en": "Master and PhD Panel (with Q&A)"
+						"de": "Wissenschaftlicher Vortrag\nvon Prof. Ulmann",
+						"en": "Scientific Talk\nby Prof. Ulmann"
 					},
-					"room": "S2|02 C205"
+					"room": "S2|02 C110"
 				},
 				{
 					"category": "department",
 					"from": "13:00",
 					"to": "14:00",
 					"name": {
-						"de": "Fachschaft & Abschluss",
-						"en": "Student council & Closing"
+						"de": "Master/Doktor-Panel",
+						"en": "Master and Doctorate Panel"
 					},
-					"room": "S2|02 C205"
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "bachelor",
+					"from": "13:00",
+					"to": "14:00",
+					"name": {
+						"de": "Fachstudienberatung Q&A Bachelor",
+						"en": "Student Advisory Q&A Bachelor"
+					},
+					"room": "S2|02 C110"
+				},
+				{
+					"category": "department",
+					"from": "14:00",
+					"to": "14:30",
+					"name": {
+						"de": "Abschlussvotrag",
+						"en": "Feedback and Closing"
+					},
+					"room": "S2|02 C110"
 				},
 				{
 					"category": "leisure",
-					"from": "14:00",
-					"to": "16:00",
+					"from": "14:30",
+					"to": "17:30",
 					"name": {
-						"de": "Master Grill",
-						"en": "Master BBQ"
+						"de": "Abschlussgrillen",
+						"en": "Master-BBQ"
 					},
-					"room": "S2|02 A020 (LZI)",
-					"notes": [1]
-				},
-				{
-					"category": "optional",
-					"from": "16:00",
-					"to": "19:00",
-					"name": {
-						"de": "Universitäts- und Stadtführung",
-						"en": "University / city tour"
-					},
-					"room": "S2|02 Foyer",
-					"notes": [1]
-				},
-				{
-					"category": "optional",
-					"from": "20:00",
-					"to": "21:00",
-					"name": {
-						"de": "FB20 Party",
-						"en": "FB20 Party"
-					},
-					"room": "Goldene Krone",
-					"notes": [1]
+					"room": "S2|02 A020"
 				}
 			]
 		}
diff --git a/stundenplan.sty b/stundenplan.sty
index 590890f..830e234 100644
--- a/stundenplan.sty
+++ b/stundenplan.sty
@@ -56,7 +56,7 @@
 		return (\t + \o) * daywidth(\n);
 	};
 	function ypos(\s) {
-		return -0.1 - (\s - 480) / \scaling * 1.15;
+		return -0.1 - (\s - 540) / \scaling * 1.15;
 	};
 }
 
@@ -111,6 +111,7 @@
 		\fi
 	}
 
+	% slots
 	\sffamily
 	\foreach \s in {1,...,\theslotcounter}{
 		\ifnum \csname theslottag\s \endcsname=1 \normalsize \else \footnotesize \fi
@@ -128,6 +129,7 @@
 		};
 	}
 
+	% header
 	\draw[very thick,fill=black] (
 		{xpos(\thetagcounter, 1, 0.4)},
 		1.0
@@ -164,6 +166,7 @@
 		};
 	}
 
+	% thicc left line
 	\draw[very thick] (
 		{xpos(\thetagcounter, 1, 0.4)},
 		{ypos(\minslotstart)}
@@ -180,6 +183,7 @@
 			{ypos(\maxslotend)}
 		);
 	}
+	% thicc bottom line
 	\draw[very thick] (
 		{xpos(\thetagcounter, 1, 0.4)},
 		{ypos(\maxslotend)}
@@ -188,6 +192,7 @@
 		{ypos(\maxslotend)}
 	);
 
+	% colors / categories
 	\footnotesize
 	\foreach \i in {1,...,\thefarbcounter}{
 		\draw[thin,fill=\csname slotfarbe\i \endcsname] (
@@ -201,6 +206,7 @@
 		};
 	}
 
+	% notes
 	\ifnum \thenotizcounter>1\relax
 		\linespread{0.8}\selectfont
 		\foreach \i in {1,...,\thenotizcounter}{