diff --git a/app/build.gradle b/app/build.gradle
index 5ce95fe..cab2e11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'org.jetbrains:annotations-java5:15.0'
-    implementation 'com.github.alamkanak:android-week-view:1.2.6'
+    implementation 'com.github.quivr:android-week-view:2.0.2'//com.github.alamkanak:android-week-view:1.2.6
     implementation 'com.ms-square:expandableTextView:0.1.4'
     // https://github.com/bignerdranch/expandable-recycler-view
     implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
index 42f1160..a3ef16c 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
@@ -138,6 +138,7 @@ public class ScheduleFragment extends Fragment implements WeekView.EventClickLis
                     Iterator<Event> it_modEvents = mod.events.getEventsOfMonth(newYear, newMonth);
                     while (it_modEvents.hasNext()) {
                         Event e = it_modEvents.next();
+                        //log.d("Event in while", e.toString());
 
                         Calendar ende = Calendar.getInstance();
                         ende.setTimeInMillis(e.getEndDate());
@@ -148,6 +149,7 @@ public class ScheduleFragment extends Fragment implements WeekView.EventClickLis
                     }
                 }
             }
+
         }
 
         return events;
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index 0f38460..cfba93e 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -24,7 +24,9 @@
         app:headerRowBackgroundColor="#ffefefef"
         app:dayBackgroundColor="#05000000"
         app:todayBackgroundColor="#1848adff"
-        app:headerColumnBackground="#ffffffff"/>
+        app:headerColumnBackground="#ffffffff"
+        app:firstDayOfWeek="monday"
+        app:futureWeekendBackgroundColor="@color/colorFUPrimary"/>
 
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ba3f9bf..b5609b9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,4 +2,29 @@
 <resources>
     <string name="navigation_drawer_open">Navigationsmenü öffnen</string>
     <string name="action_settings">Einstellungen</string>
+    <string name="navigation_drawer_close">Navigationsmenü schließen</string>
+    <string name="overview">Übersicht</string>
+    <string name="announcements">Ankündigungen</string>
+    <string name="description">Beschreibung</string>
+    <string name="announcements_count">Ankündigungen (%1$d)</string>
+    <string name="cd_ic_launcher">App-Symbol</string>
+    <string name="schedule">Stundenplan</string>
+    <string name="events">Kurse</string>
+    <string name="canteen_plan">Mensaplan</string>
+    <string name="settings">Einstellungen</string>
+    <string name="options">Optionen</string>
+    <string name="log_out">Logout</string>
+    <string name="share">Teilen</string>
+    <string name="log_in">Login</string>
+    <string name="username">Nutzername</string>
+    <string name="password">Passwort</string>
+    <string name="show_all">Zeige alle</string>
+    <string name="assignments_count">Aufgaben (%1$d)</string>
+    <string name="assignments">Aufgaben</string>
+    <string name="upcoming_events_count">Nächste Veranstaltungen (%1$d)</string>
+    <string name="upcoming_events">Nächste Veranstaltungen</string>
+    <string name="date_scale">%1$s - %2$s</string>
+    <string name="open">Offen</string>
+    <string name="close">Geschlossen</string>
+    <string name="enter_offline_mode">Starte Offline-Modus</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c256c34..61fb7b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="announcements_count">Announcements (%1$d)</string>
     <string name="cd_ic_launcher">App Icon</string>
     <string name="schedule">Schedule</string>
-    <string name="events">Events</string>
+    <string name="events">Courses</string>
     <string name="canteen_plan">Canteen Plan</string>
     <string name="settings">Settings</string>
     <string name="options">Options</string>
@@ -33,6 +33,6 @@
     <string name="close">Close</string>
 
     <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
     <string name="enter_offline_mode">Enter Offline Mode (%1$s)</string>
 </resources>