diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce2922ba..cad32112 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,7 +98,7 @@ jobs:
           command: yes | sdkmanager --licenses && yes | sdkmanager --update
       - run:
           name: Setup emulator
-          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
       - run:
           name: Launch emulator
           command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@@ -116,7 +116,7 @@ jobs:
             adb shell input keyevent 82
       - run:
           name: Run instrumented tests
-          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
diff --git a/.gitignore b/.gitignore
index 5c98a4cf..6cb549fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,5 +110,4 @@ Thumbs.db
 
 ### AndroidStudio Patch ###
 
-!/gradle/wrapper/gradle-wrapper.jar
-.idea/jarRepositories.xml
+!/gradle/wrapper/gradle-wrapper.jar
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 15a4246b..d66c3361 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/.travis.yml b/.travis.yml
index bf6f72f7..1baa9238 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.13.0
+    - 0.10.1
 
 android:
  licenses:
@@ -34,12 +34,12 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-22
-    - sys-img-armeabi-v7a-android-22
+    - android-19
+    - sys-img-armeabi-v7a-android-19
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
     - adb shell input keyevent 82 &
@@ -50,7 +50,7 @@ script:
   - fossa --no-ansi || true
   #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
   - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createPlayDebugCoverageReport --stacktrace --daemon
   - ./gradlew jacocoTestReport --stacktrace --daemon
   - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
       git fetch --unshallow;
diff --git a/README.en.md b/README.en.md
index 29da5586..9e158515 100644
--- a/README.en.md
+++ b/README.en.md
@@ -4,8 +4,8 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
 
 Unofficial android VULCAN UONET+ register client for student and parent
 
diff --git a/README.md b/README.md
index 59b74b3e..559c8f44 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
 
 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
diff --git a/app/build.gradle b/app/build.gradle
index 177f15b7..725316f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,16 +9,16 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 48
-        versionName "0.13.0"
+        targetSdkVersion 28
+        versionCode 44
+        versionName "0.10.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -28,10 +28,8 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
-                ]
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
+                             "room.incremental"   : "true"]
             }
         }
     }
@@ -63,6 +61,7 @@ android {
             versionNameSuffix "-dev"
             testCoverageEnabled = true
             ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
+            multiDexKeepProguard file('proguard-multidex-rules.pro')
         }
     }
 
@@ -110,36 +109,38 @@ play {
 }
 
 ext {
-    work_manager = "2.3.0-beta01"
-    room = "2.2.2"
-    dagger = "2.25.2"
+    work_manager = "2.2.0"
+    room = "2.2.0-beta01"
+    dagger = "2.24"
     chucker = "2.0.4"
     mockk = "1.9.2"
+    mockito_core = "3.0.6"
 }
 
 configurations.all {
     resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:api:0.13.0"
+    implementation "io.github.wulkanowy:api:0.10.1"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-rc01"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
+    implementation "androidx.core:core-ktx:1.1.0"
+    implementation "androidx.activity:activity-ktx:1.0.0"
     implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc03"
+    implementation "androidx.fragment:fragment-ktx:1.1.0"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta03"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0-beta02"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
+    implementation "com.google.android.material:material:1.1.0-alpha07"
     implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
@@ -156,28 +157,26 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.1.0"
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.15"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.12"
 
-    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
-    implementation "com.mikepenz:aboutlibraries:7.0.4"
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.3"
+    implementation "com.mikepenz:aboutlibraries:7.0.3"
 
-    playImplementation "com.google.firebase:firebase-core:17.2.1"
+    playImplementation "com.google.firebase:firebase-core:17.2.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
@@ -188,7 +187,10 @@ dependencies {
     testImplementation "junit:junit:4.12"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-inline:3.2.0"
+    testImplementation "org.mockito:mockito-core:$mockito_core"
+    testImplementation("org.mockito:mockito-inline:3.0.6") {
+        exclude group: "org.mockito", module: "mockito-core"
+    }
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -196,7 +198,10 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.2.0"
+    androidTestImplementation "org.mockito:mockito-core:$mockito_core"
+    androidTestImplementation("org.mockito:mockito-android:3.0.6") {
+        exclude group: 'org.mockito', module: 'mockito-core'
+    }
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-multidex-rules.pro b/app/proguard-multidex-rules.pro
new file mode 100644
index 00000000..9ee1737f
--- /dev/null
+++ b/app/proguard-multidex-rules.pro
@@ -0,0 +1,3 @@
+-keep class android.support.test.internal** { *; }
+-keep class org.junit.** { *; }
+-keep public class io.github.wulkanowy** { *; }
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
deleted file mode 100644
index 34df45eb..00000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
+++ /dev/null
@@ -1,1480 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 16,
-    "identityHash": "1eccdcb09adc922713ef67f298ec77a7",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "endpoint",
-            "columnName": "endpoint",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "loginType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` INTEGER NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1eccdcb09adc922713ef67f298ec77a7')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
deleted file mode 100644
index 8b777b7b..00000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
+++ /dev/null
@@ -1,1530 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 17,
-    "identityHash": "8bcb3c86f1ddbdf7e20cfa8050525b95",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "endpoint",
-            "columnName": "endpoint",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "loginType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` INTEGER NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8bcb3c86f1ddbdf7e20cfa8050525b95')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
deleted file mode 100644
index 4f7497fe..00000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
+++ /dev/null
@@ -1,1592 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 18,
-    "identityHash": "73b1dcfe0cf84170ba102b2818dd0191",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `endpoint` TEXT NOT NULL, `loginType` TEXT NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "endpoint",
-            "columnName": "endpoint",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginType",
-            "columnName": "loginType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "symbol",
-            "columnName": "symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentName",
-            "columnName": "student_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolSymbol",
-            "columnName": "school_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolName",
-            "columnName": "school_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "className",
-            "columnName": "class_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registrationDate",
-            "columnName": "registration_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Students_email_symbol_student_id_school_id_class_id",
-            "unique": true,
-            "columnNames": [
-              "email",
-              "symbol",
-              "student_id",
-              "school_id",
-              "class_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Semesters",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryName",
-            "columnName": "diary_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "schoolYear",
-            "columnName": "school_year",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterName",
-            "columnName": "semester_name",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isCurrent",
-            "columnName": "is_current",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_Semesters_student_id_diary_id_semester_id",
-            "unique": true,
-            "columnNames": [
-              "student_id",
-              "diary_id",
-              "semester_id"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Exams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Timetable",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "start",
-            "columnName": "start",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "end",
-            "columnName": "end",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectOld",
-            "columnName": "subjectOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "group",
-            "columnName": "group",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "room",
-            "columnName": "room",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomOld",
-            "columnName": "roomOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherOld",
-            "columnName": "teacherOld",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "changes",
-            "columnName": "changes",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "canceled",
-            "columnName": "canceled",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Attendance",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "excused",
-            "columnName": "excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deleted",
-            "columnName": "deleted",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "AttendanceSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subjectId",
-            "columnName": "subject_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "month",
-            "columnName": "month",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presence",
-            "columnName": "presence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceExcused",
-            "columnName": "absence_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absenceForSchoolReasons",
-            "columnName": "absence_for_school_reasons",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lateness",
-            "columnName": "lateness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latenessExcused",
-            "columnName": "lateness_excused",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "exemption",
-            "columnName": "exemption",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Grades",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` INTEGER NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entry",
-            "columnName": "entry",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "modifier",
-            "columnName": "modifier",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gradeSymbol",
-            "columnName": "grade_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weight",
-            "columnName": "weight",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "weightValue",
-            "columnName": "weightValue",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesSummary",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "predictedGrade",
-            "columnName": "predicted_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalGrade",
-            "columnName": "final_grade",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "proposedPoints",
-            "columnName": "proposed_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "finalPoints",
-            "columnName": "final_points",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pointsSum",
-            "columnName": "points_sum",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "average",
-            "columnName": "average",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GradesPointsStatistics",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "others",
-            "columnName": "others",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "student",
-            "columnName": "student",
-            "affinity": "REAL",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sender",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "recipient",
-            "columnName": "recipient_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "folderId",
-            "columnName": "folder_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "removed",
-            "columnName": "removed",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Notes",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isRead",
-            "columnName": "is_read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Homework",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semesterId",
-            "columnName": "semester_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "entryDate",
-            "columnName": "entry_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "content",
-            "columnName": "content",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Subjects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LuckyNumbers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isNotified",
-            "columnName": "is_notified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "luckyNumber",
-            "columnName": "lucky_number",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "CompletedLesson",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "number",
-            "columnName": "number",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacher",
-            "columnName": "teacher",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "teacherSymbol",
-            "columnName": "teacher_symbol",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "substitution",
-            "columnName": "substitution",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "absence",
-            "columnName": "absence",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "resources",
-            "columnName": "resources",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "ReportingUnits",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "sender_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderName",
-            "columnName": "sender_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roles",
-            "columnName": "roles",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Recipients",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realId",
-            "columnName": "real_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "realName",
-            "columnName": "real_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "loginId",
-            "columnName": "login_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unitId",
-            "columnName": "unit_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hash",
-            "columnName": "hash",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "MobileDevices",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "deviceId",
-            "columnName": "device_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Teachers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "shortName",
-            "columnName": "short_name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "School",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classId",
-            "columnName": "class_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contact",
-            "columnName": "contact",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "headmaster",
-            "columnName": "headmaster",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pedagogue",
-            "columnName": "pedagogue",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '73b1dcfe0cf84170ba102b2818dd0191')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
index 74cac078..f720663b 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -22,7 +22,12 @@ abstract class AbstractMigrationTest {
     fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
             AppDatabase::class.java, dbName)
-            .addMigrations(*AppDatabase.getMigrations())
+            .addMigrations(
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15()
+            )
             .build()
         // close the database and release any stream resources when the test finishes
         helper.closeWhenFinished(database)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 8311f94b..eb9d02a5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -3,14 +3,10 @@ package io.github.wulkanowy.data.db.migrations
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import io.github.wulkanowy.data.db.Converters
-import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
 import org.junit.Test
-import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
-import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class Migration13Test : AbstractMigrationTest() {
@@ -101,9 +97,11 @@ class Migration13Test : AbstractMigrationTest() {
             close()
         }
 
-        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
-        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
+        val db = getMigratedRoomDatabase()
+
+        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
         assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
             assertFalse(isCurrent)
@@ -121,7 +119,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, diaryId)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertEquals(1970, it[0].schoolYear)
             assertEquals(of(1970, 1, 1), it[0].end)
@@ -132,7 +130,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertTrue(it[3].isCurrent)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertFalse(it[0].isCurrent)
             assertFalse(it[1].isCurrent)
@@ -141,30 +139,6 @@ class Migration13Test : AbstractMigrationTest() {
         }
     }
 
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
-        val semesters = mutableListOf<Semester>()
-
-        val cursor = db.query(query)
-        if (cursor.moveToFirst()) {
-            do {
-                semesters.add(Semester(
-                    studentId = cursor.getInt(1),
-                    diaryId = cursor.getInt(2),
-                    diaryName = cursor.getString(3),
-                    semesterId = cursor.getInt(4),
-                    semesterName = cursor.getInt(5),
-                    isCurrent = cursor.getInt(6) == 1,
-                    classId = cursor.getInt(7),
-                    unitId = cursor.getInt(8),
-                    schoolYear = cursor.getInt(9),
-                    start = Converters().timestampToDate(cursor.getLong(10))!!,
-                    end = Converters().timestampToDate(cursor.getLong(11))!!
-                ))
-            } while (cursor.moveToNext())
-        }
-        return semesters.toList()
-    }
-
     private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
         db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
             put("endpoint", "https://fakelog.cf")
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
index f8aa5815..0057a26e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -4,7 +4,6 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.After
@@ -25,7 +24,7 @@ class GradeStatisticsLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
     }
 
     @After
@@ -64,52 +63,7 @@ class GradeStatisticsLocalTest {
         assertEquals(stats[0].subject, "Wszystkie")
     }
 
-    @Test
-    fun saveAndRead_points() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
-            getGradePointsStatistics("Matematyka", 2, 1),
-            getGradePointsStatistics("Chemia", 2, 1),
-            getGradePointsStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        with(stats) {
-            assertEquals(subject, "Matematyka")
-            assertEquals(others, 5.0)
-            assertEquals(student, 5.0)
-        }
-    }
-
-    @Test
-    fun saveAndRead_subjectEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
-    @Test
-    fun saveAndRead_allEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }
-
-    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
-        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
-    }
 }
diff --git a/app/src/debug/res/values-pl/strings.xml b/app/src/debug/res/values-pl/strings.xml
new file mode 100644
index 00000000..c90641dd
--- /dev/null
+++ b/app/src/debug/res/values-pl/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Wulkanowy DEV</string>
+</resources>
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index eee70891..72969059 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -6,13 +6,10 @@ import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
 import com.jakewharton.threetenabp.AndroidThreeTen
-import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
-import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
@@ -35,9 +32,6 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
     @Inject
     lateinit var themeManager: ThemeManager
 
-    @Inject
-    lateinit var sharedPrefProvider: SharedPrefProvider
-
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -50,9 +44,7 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
-        Lingver.init(this)
         themeManager.applyDefaultTheme()
-        migrateSharedPreferences()
 
         initLogging()
         initCrashlytics(this, appInfo)
@@ -68,13 +60,6 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun migrateSharedPreferences() {
-        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1) < 48) { // #596
-            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_plus))
-            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_minus))
-        }
-    }
-
     private fun onError(error: Throwable) {
         //RxJava's too deep stack traces may cause SOE on older android devices
         val cause = error.cause
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 9c89d507..97da6bb8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -85,10 +85,6 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
 
-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
-
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -140,12 +136,4 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
-
-    @Singleton
-    @Provides
-    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
-
-    @Singleton
-    @Provides
-    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index b1896c75..a97a3042 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -6,13 +6,11 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
@@ -22,18 +20,15 @@ import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
@@ -43,11 +38,9 @@ import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
@@ -55,9 +48,6 @@ import io.github.wulkanowy.data.db.migrations.Migration12
 import io.github.wulkanowy.data.db.migrations.Migration13
 import io.github.wulkanowy.data.db.migrations.Migration14
 import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@@ -80,7 +70,6 @@ import javax.inject.Singleton
         Grade::class,
         GradeSummary::class,
         GradeStatistics::class,
-        GradePointsStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
@@ -89,9 +78,7 @@ import javax.inject.Singleton
         CompletedLesson::class,
         ReportingUnit::class,
         Recipient::class,
-        MobileDevice::class,
-        Teacher::class,
-        School::class
+        MobileDevice::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -100,36 +87,29 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 18
-
-        fun getMigrations(): Array<Migration> {
-            return arrayOf(
-                Migration2(),
-                Migration3(),
-                Migration4(),
-                Migration5(),
-                Migration6(),
-                Migration7(),
-                Migration8(),
-                Migration9(),
-                Migration10(),
-                Migration11(),
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15(),
-                Migration16(),
-                Migration17(),
-                Migration18()
-            )
-        }
+        const val VERSION_SCHEMA = 15
 
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
                 .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                 .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(*getMigrations())
+                .addMigrations(
+                    Migration2(),
+                    Migration3(),
+                    Migration4(),
+                    Migration5(),
+                    Migration6(),
+                    Migration7(),
+                    Migration8(),
+                    Migration9(),
+                    Migration10(),
+                    Migration11(),
+                    Migration12(),
+                    Migration13(),
+                    Migration14(),
+                    Migration15()
+                )
                 .build()
         }
     }
@@ -152,8 +132,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeStatistics: GradeStatisticsDao
 
-    abstract val gradePointsStatistics: GradePointsStatisticsDao
-
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -171,8 +149,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val recipientDao: RecipientDao
 
     abstract val mobileDeviceDao: MobileDeviceDao
-
-    abstract val teacherDao: TeacherDao
-
-    abstract val schoolDao: SchoolDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
index 6a953395..a6d0a067 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -8,10 +8,6 @@ import javax.inject.Singleton
 @Singleton
 class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
 
-    companion object {
-        const val APP_VERSION_CODE_KEY = "app_version_code"
-    }
-
     fun putLong(key: String, value: Long, sync: Boolean = false) {
         sharedPref.edit(sync) { putLong(key, value) }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
index 3eb57473..d3c4f146 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.reactivex.Maybe
@@ -9,7 +11,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface AttendanceDao : BaseDao<Attendance> {
+interface AttendanceDao {
+
+    @Insert
+    fun insertAll(exams: List<Attendance>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<Attendance>)
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
index fd58533f..a7413de5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
@@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.reactivex.Maybe
 
 @Dao
-interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
+interface AttendanceSummaryDao {
+
+    @Insert
+    fun insertAll(exams: List<AttendanceSummary>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<AttendanceSummary>)
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
     fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
deleted file mode 100644
index 32dbadb8..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Update
-
-interface BaseDao<T> {
-
-    @Insert
-    fun insertAll(items: List<T>): List<Long>
-
-    @Update
-    fun updateAll(items: List<T>)
-
-    @Delete
-    fun deleteAll(items: List<T>)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
index e13e569b..6816ceaa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.reactivex.Maybe
@@ -9,7 +11,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface CompletedLessonsDao : BaseDao<CompletedLesson> {
+interface CompletedLessonsDao {
+
+    @Insert
+    fun insertAll(exams: List<CompletedLesson>)
+
+    @Delete
+    fun deleteAll(exams: List<CompletedLesson>)
 
     @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
index ca6b32df..06cd5613 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
 import io.reactivex.Maybe
@@ -9,7 +11,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ExamDao : BaseDao<Exam> {
+interface ExamDao {
+
+    @Insert
+    fun insertAll(exams: List<Exam>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<Exam>)
 
     @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index c74d1937..0bd210b0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -1,14 +1,26 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Grade
 import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeDao : BaseDao<Grade> {
+interface GradeDao {
+
+    @Insert
+    fun insertAll(grades: List<Grade>)
+
+    @Update
+    fun updateAll(grade: List<Grade>)
+
+    @Delete
+    fun deleteAll(grades: List<Grade>)
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
deleted file mode 100644
index 37609286..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
-
-    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
-
-    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
index 6faa35d0..338c369f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.reactivex.Maybe
@@ -8,7 +10,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeStatisticsDao : BaseDao<GradeStatistics> {
+interface GradeStatisticsDao {
+
+    @Insert
+    fun insertAll(gradesStatistics: List<GradeStatistics>)
+
+    @Delete
+    fun deleteAll(gradesStatistics: List<GradeStatistics>)
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
     fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index 1165ef07..3f2e87bd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.reactivex.Maybe
@@ -8,7 +10,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeSummaryDao : BaseDao<GradeSummary> {
+interface GradeSummaryDao {
+
+    @Insert
+    fun insertAll(gradesSummary: List<GradeSummary>)
+
+    @Delete
+    fun deleteAll(gradesSummary: List<GradeSummary>)
 
     @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 1947a0df..253bdb11 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Homework
 import io.reactivex.Maybe
@@ -9,7 +11,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface HomeworkDao : BaseDao<Homework> {
+interface HomeworkDao {
+
+    @Insert
+    fun insertAll(homework: List<Homework>)
+
+    @Delete
+    fun deleteAll(homework: List<Homework>)
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
index f16c28d9..afd7905c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -1,7 +1,10 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -9,8 +12,18 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface LuckyNumberDao : BaseDao<LuckyNumber> {
+interface LuckyNumberDao {
+
+    @Insert
+    fun insert(luckyNumber: LuckyNumber)
+
+    @Update
+    fun update(luckyNumber: LuckyNumber)
+
+    @Delete
+    fun delete(luckyNumber: LuckyNumber)
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
     fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
+
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 6d14ad01..4f72c6c9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -1,12 +1,24 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Message
 import io.reactivex.Maybe
 
 @Dao
-interface MessagesDao : BaseDao<Message> {
+interface MessagesDao {
+
+    @Insert
+    fun insertAll(messages: List<Message>)
+
+    @Delete
+    fun deleteAll(messages: List<Message>)
+
+    @Update
+    fun updateAll(messages: List<Message>)
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index b05b2d9c..d6b97f6a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.reactivex.Maybe
 
 @Dao
-interface MobileDeviceDao : BaseDao<MobileDevice> {
+interface MobileDeviceDao {
+
+    @Insert
+    fun insertAll(devices: List<MobileDevice>)
+
+    @Delete
+    fun deleteAll(devices: List<MobileDevice>)
 
     @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
     fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index ea2fc6eb..867e06a2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -1,15 +1,28 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Note
 import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface NoteDao : BaseDao<Note> {
+interface NoteDao {
+
+    @Insert
+    fun insertAll(notes: List<Note>)
+
+    @Update
+    fun updateAll(notes: List<Note>)
+
+    @Delete
+    fun deleteAll(notes: List<Note>)
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Maybe<List<Note>>
+
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index afb941b1..7c5fd6ca 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.reactivex.Maybe
@@ -8,7 +10,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface RecipientDao : BaseDao<Recipient> {
+interface RecipientDao {
+
+    @Insert
+    fun insertAll(messages: List<Recipient>)
+
+    @Delete
+    fun deleteAll(messages: List<Recipient>)
 
     @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
     fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
index 6ddfd494..1898390a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.reactivex.Maybe
@@ -8,7 +10,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ReportingUnitDao : BaseDao<ReportingUnit> {
+interface ReportingUnitDao {
+
+    @Insert
+    fun insertAll(reportingUnits: List<ReportingUnit>)
+
+    @Delete
+    fun deleteAll(reportingUnits: List<ReportingUnit>)
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
     fun load(studentId: Int): Maybe<List<ReportingUnit>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
deleted file mode 100644
index e9bd6755..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.School
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface SchoolDao : BaseDao<School> {
-
-    @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Maybe<School>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index 654b80f3..01841fb6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -8,7 +10,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface SemesterDao : BaseDao<Semester> {
+interface SemesterDao {
+
+    @Insert
+    fun insertAll(semester: List<Semester>)
+
+    @Delete
+    fun deleteAll(semester: List<Semester>)
 
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
     fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
index 525a7129..725a371a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
@@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Subject
 import io.reactivex.Maybe
 
 @Dao
-interface SubjectDao : BaseDao<Subject> {
+interface SubjectDao {
+
+    @Insert
+    fun insertAll(subjects: List<Subject>): List<Long>
+
+    @Delete
+    fun deleteAll(subjects: List<Subject>)
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
     fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
deleted file mode 100644
index 5ea237a8..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface TeacherDao : BaseDao<Teacher> {
-
-    @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 6b62cc82..abe21361 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.reactivex.Maybe
@@ -9,7 +11,13 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface TimetableDao : BaseDao<Timetable> {
+interface TimetableDao {
+
+    @Insert
+    fun insertAll(exams: List<Timetable>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<Timetable>)
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
deleted file mode 100644
index 407f18bd..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradesPointsStatistics")
-data class GradePointsStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    val others: Double,
-
-    val student: Double
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
deleted file mode 100644
index 20fae450..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "School")
-data class School(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val name: String,
-
-    val address: String,
-
-    val contact: String,
-
-    val headmaster: String,
-
-    val pedagogue: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
deleted file mode 100644
index 52c96f8a..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "Teachers")
-data class Teacher(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val subject: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "short_name")
-    val shortName: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
deleted file mode 100644
index 7f40c0f8..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration16 : Migration(15, 16) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Teachers (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                class_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                name TEXT NOT NULL,
-                short_name TEXT NOT NULL
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
deleted file mode 100644
index e2a2574d..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration17 : Migration(16, 17) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createGradesPointsStatisticsTable(database)
-        truncateSemestersTable(database)
-    }
-
-    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                others REAL NOT NULL,
-                student REAL NOT NULL
-            )
-        """)
-    }
-
-    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Semesters")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
deleted file mode 100644
index 6c5e56c6..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration18 : Migration(17, 18) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS School (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                class_id INTEGER NOT NULL,
-                name TEXT NOT NULL,
-                address TEXT NOT NULL,
-                contact TEXT NOT NULL,
-                headmaster TEXT NOT NULL,
-                pedagogue TEXT NOT NULL
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
index d636b91a..581ac2f8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -10,57 +8,27 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsLocal @Inject constructor(
-    private val gradeStatisticsDb: GradeStatisticsDao,
-    private val gradePointsStatisticsDb: GradePointsStatisticsDao
-) {
+class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+            .filter { !it.isEmpty() }
     }
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        return when (subjectName) {
-            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
-                list.groupBy { it.grade }.map {
-                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
-                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                }
+        return (if ("Wszystkie" == subjectName) gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+            list.groupBy { it.grade }.map {
+                GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key, it.value.fold(0) { acc, e -> acc + e.amount }, false)
             }
-            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
-        }.filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
-        return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
-                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
-                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
-                    list.fold(.0) { acc, e -> acc + e.others },
-                    list.fold(.0) { acc, e -> acc + e.student })
-                )
-            }
-            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
         }
+        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
     }
 
     fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
-    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
-    }
-
     fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
-
-    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
index 74c1f735..fa3b951f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Single
@@ -13,10 +12,7 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
 
     fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
         return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap {
-                if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
-                else it.getGradesPartialStatistics(semester.semesterId)
-            }
+            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
             .map { gradeStatistics ->
                 gradeStatistics.map {
                     GradeStatistics(
@@ -30,20 +26,4 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
                 }
             }
     }
-
-    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesPointsStatistics(semester.semesterId) }
-            .map { gradePointsStatistics ->
-                gradePointsStatistics.map {
-                    GradePointsStatistics(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        subject = it.subject,
-                        others = it.others,
-                        student = it.student
-                    )
-                }
-            }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 9335d1d2..9617cdd6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -2,11 +2,9 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -33,19 +31,4 @@ class GradeStatisticsRepository @Inject constructor(
                         }
                 }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
     }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
-        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMapMaybe {
-                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
-                    else Maybe.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
-                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
index b461ca22..115c8965 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -12,15 +12,15 @@ import javax.inject.Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
     fun saveLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.insertAll(listOf(luckyNumber))
+        luckyNumberDb.insert(luckyNumber)
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.updateAll(listOf(luckyNumber))
+        luckyNumberDb.update(luckyNumber)
     }
 
     fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.deleteAll(listOf(luckyNumber))
+        luckyNumberDb.delete(luckyNumber)
     }
 
     fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index 90c510ef..b2bff1e7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -11,6 +11,7 @@ import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.api.messages.Message as ApiMessage
 import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
 
 @Singleton
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
index 473ffa7f..8f0efa5b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 07a3654a..bb9a39b1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -12,64 +12,52 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
 
     val isShowPresent: Boolean
-        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
 
     val gradeAverageMode: String
-        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
 
     val gradeAverageForceCalc: Boolean
-        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
 
     val isGradeExpandable: Boolean
-        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
+        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
 
-    val appThemeKey = context.getString(R.string.pref_key_app_theme)
+    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
-        get() = getString(appThemeKey, R.string.pref_default_app_theme)
+        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
 
     val gradeColorTheme: String
-        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
 
-    val appLanguageKey = context.getString(R.string.pref_key_app_language)
-    val appLanguage
-        get() = getString(appLanguageKey, R.string.pref_default_app_language)
-
-    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
+    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
     val isServiceEnabled: Boolean
-        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
+        get() = sharedPref.getBoolean(serviceEnableKey, true)
 
-    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
     val servicesInterval: Long
-        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
+        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
 
-    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
-        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
+        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)
 
     val isNotificationsEnable: Boolean
-        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
 
-    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
-        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
+        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
 
     val gradePlusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
 
     val gradeMinusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
 
     val fillMessageContent: Boolean
-        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
-
-    private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
-
-    private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
-
-    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
-
-    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default))
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
index 9b1d4ac2..6b8328ec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -15,7 +15,7 @@ class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao)
         return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
     }
 
-    fun saveRecipients(recipients: List<Recipient>): List<Long> {
+    fun saveRecipients(recipients: List<Recipient>) {
         return recipientDb.insertAll(recipients)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
index 6f9eec3f..b4281cbf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -18,7 +18,7 @@ class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: Report
         return reportingUnitDb.loadOne(student.studentId, unitId)
     }
 
-    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>) {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
deleted file mode 100644
index d8727287..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import javax.inject.Inject
-
-class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
-
-    fun saveSchool(school: School) {
-        schoolDb.insertAll(listOf(school))
-    }
-
-    fun deleteSchool(school: School) {
-        schoolDb.deleteAll(listOf(school))
-    }
-
-    fun getSchool(semester: Semester): Maybe<School> {
-        return schoolDb.load(semester.studentId, semester.classId)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
deleted file mode 100644
index 86e05f0f..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Single
-import javax.inject.Inject
-
-class SchoolRemote @Inject constructor(private val api: Api) {
-
-    fun getSchoolInfo(semester: Semester): Single<School> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getSchool() }
-            .map {
-                School(
-                    studentId = semester.studentId,
-                    classId = semester.classId,
-                    name = it.name,
-                    address = it.address,
-                    contact = it.contact,
-                    headmaster = it.headmaster,
-                    pedagogue = it.pedagogue
-                )
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
deleted file mode 100644
index a352324d..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SchoolRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: SchoolLocal,
-    private val remote: SchoolRemote
-) {
-
-    fun getSchoolInfo(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
-        return local.getSchool(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSchoolInfo(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMapMaybe { new ->
-                    local.getSchool(semester)
-                        .doOnSuccess { old ->
-                            if (new != old) {
-                                local.deleteSchool(old)
-                                local.saveSchool(new)
-                            }
-                        }
-                        .doOnComplete {
-                            local.saveSchool(new)
-                        }
-                }.flatMap({ local.getSchool(semester) }, { Maybe.error(it) },
-                    { local.getSchool(semester) })
-            )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index f27199f2..e6d74421 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -24,7 +24,7 @@ class StudentLocal @Inject constructor(
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
             .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
-            .filter { it.isNotEmpty() }
+            .filter { !it.isEmpty() }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
deleted file mode 100644
index dd2be5e5..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
-import javax.inject.Inject
-
-class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
-
-    fun saveTeachers(teachers: List<Teacher>) {
-        teacherDb.insertAll(teachers)
-    }
-
-    fun deleteTeachers(teachers: List<Teacher>) {
-        teacherDb.deleteAll(teachers)
-    }
-
-    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
-        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
deleted file mode 100644
index 0ae1cdb1..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRemote @Inject constructor(private val api: Api) {
-
-    fun getTeachers(semester: Semester): Single<List<Teacher>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getTeachers() }
-            .map { teachers ->
-                teachers.map {
-                    Teacher(
-                        studentId = semester.studentId,
-                        name = it.name,
-                        subject = it.subject,
-                        shortName = it.short,
-                        classId = semester.classId
-                    )
-                }
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
deleted file mode 100644
index 19e7a32b..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: TeacherLocal,
-    private val remote: TeacherRemote
-) {
-
-    fun getTeachers(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
-        return local.getTeachers(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getTeachers(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getTeachers(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteTeachers(old.uniqueSubtract(new))
-                            local.saveTeachers(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index 4f568385..42e50fa4 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.di
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -33,8 +32,4 @@ internal class AppModule {
     @Singleton
     @Provides
     fun provideAppInfo() = AppInfo()
-
-    @Singleton
-    @Provides
-    fun provideLingver() = Lingver.getInstance()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index 78bdbd8c..3816856b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -21,7 +21,6 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
-import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
@@ -29,15 +28,17 @@ import javax.inject.Singleton
 
 @Suppress("unused")
 @AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
+@Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
 
     @Module
-    object Static {
+    companion object {
 
+        @JvmStatic
         @Provides
         fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
+        @JvmStatic
         @Singleton
         @Provides
         fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
@@ -74,10 +75,6 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideTimetableWork(work: TimetableWork): Work
 
-    @Binds
-    @IntoSet
-    abstract fun provideTeacherWork(work: TeacherWork): Work
-
     @Binds
     @IntoSet
     abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 6b046977..98fc3522 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -11,7 +11,6 @@ import androidx.work.NetworkType.UNMETERED
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
@@ -33,6 +32,10 @@ class SyncManager @Inject constructor(
     appInfo: AppInfo
 ) {
 
+    companion object {
+        private const val APP_VERSION_CODE_KEY = "app_version_code"
+    }
+
     init {
         if (now().isHolidays) stopSyncWorker()
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
deleted file mode 100644
index 18178d2d..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.services.sync.works
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
-import io.reactivex.Completable
-import javax.inject.Inject
-
-class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
-
-    override fun create(student: Student, semester: Semester): Completable {
-        return teacherRepository.getTeachers(semester, true).ignoreElement()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index ab67d8ac..f0e51e31 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -22,8 +22,7 @@ import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
-    HasAndroidInjector {
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView, HasAndroidInjector {
 
     @Inject
     lateinit var androidInjector: DispatchingAndroidInjector<Any>
@@ -54,15 +53,13 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
     override fun showError(text: String, error: Throwable) {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) { showErrorDetailsDialog(error) }
+                .setAction(R.string.all_details) {
+                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
+                }
                 .show()
         } else showMessage(text)
     }
 
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-    }
-
     override fun showMessage(text: String) {
         if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
         else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
deleted file mode 100644
index fdc46371..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.widget.Toast
-import dagger.android.support.DaggerAppCompatDialogFragment
-
-abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
-
-    override fun showError(text: String, error: Throwable) {
-        showMessage(text)
-    }
-
-    override fun showMessage(text: String) {
-        Toast.makeText(context, text, Toast.LENGTH_LONG).show()
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
-    }
-
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 2f5878d0..4b2ad053 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -13,17 +13,15 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
     override fun showError(text: String, error: Throwable) {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
+                .setAction(R.string.all_details) {
+                    if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+                }
                 .show()
         } else {
             (activity as? BaseActivity<*>)?.showError(text, error)
         }
     }
 
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
     override fun showMessage(text: String) {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
index 0f4df92c..7681263b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
@@ -9,6 +9,4 @@ interface BaseView {
     fun showExpiredDialog()
 
     fun openClearLoginView()
-
-    fun showErrorDetailsDialog(error: Throwable)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 3255ea68..b74af6c5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -43,17 +43,16 @@ class ErrorDialog : DialogFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
+        StringWriter().let { writer ->
+            error.printStackTrace(PrintWriter(writer))
 
-        val stringWriter = StringWriter().apply {
-            error.printStackTrace(PrintWriter(this))
-        }
-
-        errorDialogContent.text = stringWriter.toString()
-        errorDialogCopy.setOnClickListener {
-            val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
-            activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
-
-            Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+            errorDialogContent.text = writer.toString()
+            errorDialogCopy.setOnClickListener {
+                ClipData.newPlainText("wulkanowyError", writer.toString()).let { clip ->
+                    activity?.getSystemService<ClipboardManager>()?.primaryClip = clip
+                }
+                Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+            }
         }
         errorDialogCancel.setOnClickListener { dismiss() }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index 50134861..5b347fe8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.base
 import android.content.pm.PackageManager.GET_ACTIVITIES
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
@@ -23,12 +22,8 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
 
     fun applyDefaultTheme() {
         AppCompatDelegate.setDefaultNightMode(
-            when (val theme = preferencesRepository.appTheme) {
-                "light" -> MODE_NIGHT_NO
-                "dark", "black" -> MODE_NIGHT_YES
-                "system" -> MODE_NIGHT_FOLLOW_SYSTEM
-                else -> throw IllegalArgumentException("Wrong theme: $theme")
-            }
+            if (preferencesRepository.appTheme == "light") MODE_NIGHT_NO
+            else MODE_NIGHT_YES
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 22276bdf..46dc5cfe 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -47,11 +47,6 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
             Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
         }
 
-    override val faqRes: Triple<String, String, Drawable?>?
-        get() = context?.run {
-            Triple(getString(R.string.about_faq), getString(R.string.about_faq_summary), getCompatDrawable(R.drawable.ic_about_faq))
-        }
-
     override val discordRes: Triple<String, String, Drawable?>?
         get() = context?.run {
             Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
@@ -135,10 +130,6 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         }
     }
 
-    override fun openFaqPage() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania", ::showMessage)
-    }
-
     override fun openLicenses() {
         (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 8087c955..5303d361 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -28,15 +28,10 @@ class AboutPresenter @Inject constructor(
         view?.run {
             when (item.title) {
                 feedbackRes?.first -> {
-                    Timber.i("Opening email client")
+                    Timber.i("Opening email client ")
                     openEmailClient()
                     analytics.logEvent("about_open", "name" to "feedback")
                 }
-                faqRes?.first -> {
-                    Timber.i("Opening faq page")
-                    openFaqPage()
-                    analytics.logEvent("about_open", "name" to "faq")
-                }
                 discordRes?.first -> {
                     Timber.i("Opening discord")
                     openDiscordInvite()
@@ -66,7 +61,6 @@ class AboutPresenter @Inject constructor(
             updateData(AboutScrollableHeader(), listOfNotNull(
                 versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
                 feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                faqRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
                 discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
                 homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
                 licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 34850bae..318a75e4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -9,8 +9,6 @@ interface AboutView : BaseView {
 
     val feedbackRes: Triple<String, String, Drawable?>?
 
-    val faqRes: Triple<String, String, Drawable?>?
-
     val discordRes: Triple<String, String, Drawable?>?
 
     val homepageRes: Triple<String, String, Drawable?>?
@@ -27,8 +25,6 @@ interface AboutView : BaseView {
 
     fun openEmailClient()
 
-    fun openFaqPage()
-
     fun openHomepage()
 
     fun openLicenses()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index cfff31c9..f23a1eb5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -7,17 +7,18 @@ import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
+import dagger.android.support.DaggerAppCompatDialogFragment
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
 
-class AccountDialog : BaseDialogFragment(), AccountView {
+class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
@@ -76,6 +77,14 @@ class AccountDialog : BaseDialogFragment(), AccountView {
         }
     }
 
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*>)?.openClearLoginView()
+    }
+
     override fun showConfirmDialog() {
         context?.let {
             AlertDialog.Builder(it)
@@ -96,3 +105,4 @@ class AccountDialog : BaseDialogFragment(), AccountView {
         super.onDestroy()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index bc7c1cac..fb6309f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -6,11 +6,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
@@ -21,11 +17,9 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
-import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
@@ -76,11 +70,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         }
 
         attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
-        attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
         attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        attendanceNavDate.setOnClickListener { presenter.onPickDate() }
         attendanceNextButton.setOnClickListener { presenter.onNextDay() }
 
         attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
@@ -120,19 +110,11 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        attendanceError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        attendanceErrorMessage.text = message
+        attendanceEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceProgress.visibility = if (show) VISIBLE else GONE
+        attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -140,7 +122,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showContent(show: Boolean) {
-        attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun hideRefresh() {
@@ -148,32 +130,17 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showPreButton(show: Boolean) {
-        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendancePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
         (activity as? MainActivity)?.showDialogFragment(AttendanceDialog.newInstance(lesson))
     }
 
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            show(this@AttendanceFragment.parentFragmentManager, null)
-        }
-    }
-
     override fun openSummaryView() {
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 1490ee6e..df311f78 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import android.annotation.SuppressLint
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -38,13 +37,10 @@ class AttendancePresenter @Inject constructor(
     lateinit var currentDate: LocalDate
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Attendance view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
@@ -60,32 +56,11 @@ class AttendancePresenter @Inject constructor(
         reloadView()
     }
 
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        loadData(LocalDate.of(year, month, day))
-        reloadView()
-    }
-
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the attendance")
         loadData(currentDate, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onViewReselected() {
         Timber.i("Attendance view is reselected")
         view?.also { view ->
@@ -155,29 +130,18 @@ class AttendancePresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
-                        showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
                     analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading attendance result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 }
             )
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun reloadView() {
         Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
         view?.apply {
@@ -185,18 +149,16 @@ class AttendancePresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
-            showErrorView(false)
             clearData()
             reloadNavigation()
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun reloadNavigation() {
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index a6d0d4ba..04fe94a4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
 
 interface AttendanceView : BaseView {
 
@@ -24,10 +23,6 @@ interface AttendanceView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -40,8 +35,6 @@ interface AttendanceView : BaseView {
 
     fun showAttendanceDialog(lesson: Attendance)
 
-    fun showDatePickerDialog(currentDate: LocalDate)
-
     fun openSummaryView()
 
     fun popView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index fc360184..4109bbea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -57,8 +57,6 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         }
 
         attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-        attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
@@ -82,7 +80,7 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
         with(attendanceSummaryAdapter) {
             updateDataSet(data, true)
-            removeAllScrollableHeaders()
+            removeAllScrollableFooters()
             addScrollableHeader(header)
         }
     }
@@ -95,14 +93,6 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showErrorView(show: Boolean) {
-        attendanceSummaryError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        attendanceSummaryErrorMessage.text = message
-    }
-
     override fun showProgress(show: Boolean) {
         attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index 3ce85d81..40339299 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -33,13 +33,10 @@ class AttendanceSummaryPresenter @Inject constructor(
     var currentSubjectId = -1
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Attendance summary view was initialized with subject id ${subjectId ?: -1}")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(subjectId ?: -1)
         loadSubjects()
     }
@@ -49,26 +46,12 @@ class AttendanceSummaryPresenter @Inject constructor(
         loadData(currentSubjectId, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentSubjectId, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onSubjectSelected(name: String?) {
         Timber.i("Select attendance summary subject $name")
         view?.run {
             showContent(false)
             showProgress(true)
             enableSwipe(false)
-            showEmpty(false)
-            showErrorView(false)
             clearView()
         }
         (subjects.singleOrNull { it.name == name }?.realId ?: -1).let {
@@ -105,23 +88,13 @@ class AttendanceSummaryPresenter @Inject constructor(
                     analytics.logEvent("load_attendance_summary", "items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId)
                 }) {
                     Timber.i("Loading attendance summary result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 }
             )
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun loadSubjects() {
         Timber.i("Loading attendance summary subjects started")
         disposable.add(studentRepository.getCurrentStudent()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index b86f6590..50f03e20 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -18,10 +18,6 @@ interface AttendanceSummaryView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
 
     fun updateSubjects(data: ArrayList<String>)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index b880f465..c762fa15 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -61,9 +61,6 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
         }
 
         examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        examErrorRetry.setOnClickListener { presenter.onRetry() }
-        examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
         examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
         examNextButton.setOnClickListener { presenter.onNextWeek() }
 
@@ -98,14 +95,6 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
         examEmpty.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showErrorView(show: Boolean) {
-        examError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        examErrorMessage.text = message
-    }
-
     override fun showProgress(show: Boolean) {
         examProgress.visibility = if (show) VISIBLE else GONE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 35cf5b94..93109922 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -36,13 +36,10 @@ class ExamPresenter @Inject constructor(
     lateinit var currentDate: LocalDate
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: ExamView, date: Long?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Exam view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
@@ -63,18 +60,6 @@ class ExamPresenter @Inject constructor(
         loadData(currentDate, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is ExamItem) {
             Timber.i("Select exam item ${item.exam.id}")
@@ -131,28 +116,17 @@ class ExamPresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
-                        showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
                     analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading exam result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
         return items.flatMap {
             ExamHeader(it.key).let { header ->
@@ -168,7 +142,6 @@ class ExamPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
-            showErrorView(false)
             clearData()
             reloadNavigation()
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index 5f4a7430..888cb05e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -21,10 +21,6 @@ interface ExamView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 884b9f8c..68ae57ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -13,7 +13,6 @@ import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
 import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
@@ -84,8 +83,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             setElevationCompat(context.dpToPx(4f))
         }
 
-        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        gradeSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -106,18 +104,22 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
         gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showErrorView(show: Boolean) {
-        gradeError.visibility = if (show) VISIBLE else INVISIBLE
+    override fun showEmpty(show: Boolean) {
+        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun setErrorDetails(message: String) {
-        gradeErrorMessage.text = message
+    override fun showRefresh(show: Boolean) {
+        gradeSwipe.isRefreshing = show
     }
 
     override fun showSemesterSwitch(show: Boolean) {
         semesterSwitchMenu?.isVisible = show
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        gradeSwipe.isEnabled = enable
+    }
+
     override fun showSemesterDialog(selectedIndex: Int) {
         val choices = arrayOf(
             getString(R.string.grade_semester, 1),
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
index 6e6ca2d6..52cf087b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -11,12 +11,13 @@ import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Suppress("unused")
-@Module(includes = [GradeModule.Static::class])
+@Module
 abstract class GradeModule {
 
     @Module
-    object Static {
+    companion object {
 
+        @JvmStatic
         @PerFragment
         @Provides
         fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index d8c20238..2ee69480 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -25,14 +25,14 @@ class GradePresenter @Inject constructor(
 
     private val loadedSemesterId = mutableMapOf<Int, Int>()
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
         selectedIndex = savedIndex ?: 0
-        view.initView()
+        view.run {
+            initView()
+            enableSwipe(false)
+        }
         Timber.i("Grade view was initialized with $selectedIndex index")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -71,7 +71,7 @@ class GradePresenter @Inject constructor(
         view?.apply {
             showContent(true)
             showProgress(false)
-            showErrorView(false)
+            showEmpty(false)
             loadedSemesterId[currentPageIndex] = semesterId
         }
     }
@@ -80,18 +80,10 @@ class GradePresenter @Inject constructor(
         if (semesters.isNotEmpty()) loadChild(index)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
+    fun onSwipeRefresh() {
         loadData()
     }
 
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     private fun loadData() {
         Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -104,28 +96,25 @@ class GradePresenter @Inject constructor(
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .doFinally { view?.showProgress(false) }
+            .doFinally { view?.showRefresh(false) }
             .subscribe({
                 view?.run {
                     Timber.i("Loading grade result: Attempt load index $currentPageIndex")
                     loadChild(currentPageIndex)
-                    showErrorView(false)
+                    enableSwipe(false)
                     showSemesterSwitch(true)
                 }
             }) {
                 Timber.i("Loading grade result: An exception occurred")
                 errorHandler.dispatch(it)
+                view?.run {
+                    showProgress(false)
+                    showEmpty(true)
+                    enableSwipe(true)
+                }
             })
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        lastError = error
-        view?.run {
-            showErrorView(true)
-            setErrorDetails(message)
-        }
-    }
-
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
index bbdbc32e..a37e6d67 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@@ -12,14 +12,16 @@ interface GradeView : BaseView {
 
     fun showProgress(show: Boolean)
 
-    fun showErrorView(show: Boolean)
+    fun showEmpty(show: Boolean)
 
-    fun setErrorDetails(message: String)
+    fun showRefresh(show: Boolean)
 
     fun showSemesterSwitch(show: Boolean)
 
     fun showSemesterDialog(selectedIndex: Int)
 
+    fun enableSwipe(enable: Boolean)
+
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
     fun notifyChildParentReselected(index: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index b3dd3587..d50fd057 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -18,7 +18,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -34,8 +33,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     @Inject
     lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
-    private var gradeDetailsMenu: Menu? = null
-
     companion object {
         fun newInstance() = GradeDetailsFragment()
     }
@@ -72,8 +69,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.action_menu_grade_details, menu)
-        gradeDetailsMenu = menu
-        presenter.updateMarkAsDoneButton()
     }
 
     override fun initView() {
@@ -91,8 +86,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
             )
         }
         gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -144,14 +137,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
         gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showErrorView(show: Boolean) {
-        gradeDetailsError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeDetailsErrorMessage.text = message
-    }
-
     override fun showRefresh(show: Boolean) {
         gradeDetailsSwipe.isRefreshing = show
     }
@@ -180,10 +165,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
         (parentFragment as? GradeFragment)?.onChildRefresh()
     }
 
-    override fun enableMarkAsDoneButton(enable: Boolean) {
-        gradeDetailsMenu?.findItem(R.id.gradeDetailsMenuRead)?.isEnabled = enable
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         presenter.onDetachView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 647047c6..29911a54 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -26,16 +26,11 @@ class GradeDetailsPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {
 
-    private var newGradesAmount: Int = 0
-
     private var currentSemesterId = 0
 
-    private lateinit var lastError: Throwable
-
     override fun onAttachView(view: GradeDetailsView) {
         super.onAttachView(view)
         view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -57,8 +52,6 @@ class GradeDetailsPresenter @Inject constructor(
                             updateItem(header)
                         }
                     }
-                    newGradesAmount--
-                    updateMarkAsDoneButton()
                     updateGrade(item.grade)
                 }
             }
@@ -92,18 +85,6 @@ class GradeDetailsPresenter @Inject constructor(
         view?.notifyParentRefresh()
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onParentViewReselected() {
         view?.run {
             if (!isViewEmpty) {
@@ -125,10 +106,6 @@ class GradeDetailsPresenter @Inject constructor(
         disposable.clear()
     }
 
-    fun updateMarkAsDoneButton() {
-        view?.enableMarkAsDoneButton(newGradesAmount > 0)
-    }
-
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade details data started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -154,32 +131,19 @@ class GradeDetailsPresenter @Inject constructor(
             }
             .subscribe({
                 Timber.i("Loading grade details result: Success")
-                newGradesAmount = it.sumBy { gradeDetailsHeader -> gradeDetailsHeader.newGrades }
-                updateMarkAsDoneButton()
                 view?.run {
                     showEmpty(it.isEmpty())
-                    showErrorView(false)
                     showContent(it.isNotEmpty())
                     updateData(it)
                 }
                 analytics.logEvent("load_grade_details", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading grade details result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
         val isGradeExpandable = preferencesRepository.isGradeExpandable
         val gradeColorTheme = preferencesRepository.gradeColorTheme
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index dad4ac6e..88b83bda 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -38,10 +38,6 @@ interface GradeDetailsView : BaseView {
 
     fun showProgress(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun enableSwipe(enable: Boolean)
 
     fun showRefresh(show: Boolean)
@@ -50,8 +46,6 @@ interface GradeDetailsView : BaseView {
 
     fun notifyParentRefresh()
 
-    fun enableMarkAsDoneButton(enable: Boolean)
-
     fun getGradeNumberString(number: Int): String
 
     fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index 5bcf167e..4b6c1675 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import android.graphics.Color
 import android.graphics.Color.WHITE
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,15 +10,11 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarDataSet
-import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.PieData
 import com.github.mikephil.charting.data.PieDataSet
 import com.github.mikephil.charting.data.PieEntry
 import com.github.mikephil.charting.formatter.ValueFormatter
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
@@ -43,9 +38,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isPieViewEmpty get() = gradeStatisticsChart.isEmpty
-
-    override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
+    override val isViewEmpty get() = gradeStatisticsChart.isEmpty
 
     private lateinit var gradeColors: List<Pair<Int, Int>>
 
@@ -67,11 +60,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         1 to R.color.grade_material_one
     )
 
-    private val gradePointsColors = listOf(
-        Color.parseColor("#37c69c"),
-        Color.parseColor("#d8b12a")
-    )
-
     private val gradeLabels = listOf(
         "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
     )
@@ -82,8 +70,8 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeStatisticsSwipe
-        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
+        messageContainer = gradeStatisticsChart
+        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
     }
 
     override fun initView() {
@@ -96,13 +84,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
             legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
         }
 
-        with(gradeStatisticsChartPoints) {
-            description.isEnabled = false
-
-            animateXY(1000, 1000)
-            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-        }
-
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
@@ -111,11 +92,9 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
-
         gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -126,25 +105,23 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         }
     }
 
-    override fun updatePieData(items: List<GradeStatistics>, theme: String) {
+    override fun updateData(items: List<GradeStatistics>, theme: String) {
         gradeColors = when (theme) {
             "vulcan" -> vulcanGradeColors
             else -> materialGradeColors
         }
 
-        val dataset = PieDataSet(items.map {
-            PieEntry(it.amount.toFloat(), it.grade.toString())
-        }, "Legenda").apply {
-            valueTextSize = 12f
-            sliceSpace = 1f
-            valueTextColor = WHITE
-            setColors(items.map {
-                gradeColors.single { color -> color.first == it.grade }.second
-            }.toIntArray(), context)
-        }
-
-        with(gradeStatisticsChart) {
-            data = PieData(dataset).apply {
+        gradeStatisticsChart.run {
+            data = PieData(PieDataSet(items.map {
+                PieEntry(it.amount.toFloat(), it.grade.toString())
+            }, "Legenda").apply {
+                valueTextSize = 12f
+                sliceSpace = 1f
+                valueTextColor = WHITE
+                setColors(items.map {
+                    gradeColors.single { color -> color.first == it.grade }.second
+                }.toIntArray(), context)
+            }).apply {
                 setTouchEnabled(false)
                 setValueFormatter(object : ValueFormatter() {
                     override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
@@ -167,47 +144,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         }
     }
 
-    override fun updateBarData(item: GradePointsStatistics) {
-        val dataset = BarDataSet(listOf(
-            BarEntry(1f, item.others.toFloat()),
-            BarEntry(2f, item.student.toFloat())
-        ), "Legenda").apply {
-            valueTextSize = 12f
-            valueTextColor = requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
-            valueFormatter = object : ValueFormatter() {
-                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
-            }
-            colors = gradePointsColors
-        }
-
-        with(gradeStatisticsChartPoints) {
-            data = BarData(dataset).apply {
-                barWidth = 0.5f
-                setFitBars(true)
-            }
-            setTouchEnabled(false)
-            xAxis.setDrawLabels(false)
-            xAxis.setDrawGridLines(false)
-            requireContext().getThemeAttrColor(android.R.attr.textColorPrimary).let {
-                axisLeft.textColor = it
-                axisRight.textColor = it
-            }
-            legend.setCustom(listOf(
-                LegendEntry().apply {
-                    label = "Średnia klasy"
-                    formColor = gradePointsColors[0]
-                    form = Legend.LegendForm.SQUARE
-                },
-                LegendEntry().apply {
-                    label = "Uczeń"
-                    formColor = gradePointsColors[1]
-                    form = Legend.LegendForm.SQUARE
-                }
-            ))
-            invalidate()
-        }
-    }
-
     override fun showSubjects(show: Boolean) {
         gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
         gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
@@ -215,29 +151,16 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun clearView() {
         gradeStatisticsChart.clear()
-        gradeStatisticsChartPoints.clear()
     }
 
-    override fun showPieContent(show: Boolean) {
+    override fun showContent(show: Boolean) {
         gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
     }
 
-    override fun showBarContent(show: Boolean) {
-        gradeStatisticsChartPoints.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
     override fun showEmpty(show: Boolean) {
         gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
-    override fun showErrorView(show: Boolean) {
-        gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeStatisticsErrorMessage.text = message
-    }
-
     override fun showProgress(show: Boolean) {
         gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -273,17 +196,13 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     override fun onResume() {
         super.onResume()
         gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            presenter.onTypeChange(when (checkedId) {
-                R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
-                R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
-                else -> ViewType.POINTS
-            })
+            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)
+        outState.putBoolean(SAVED_CHART_TYPE, presenter.currentIsSemester)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index 9795c130..0259557a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -30,22 +30,19 @@ class GradeStatisticsPresenter @Inject constructor(
 
     private var currentSubjectName: String = "Wszystkie"
 
-    private lateinit var lastError: Throwable
-
-    var currentType: ViewType = ViewType.PARTIAL
+    var currentIsSemester = false
         private set
 
-    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
+    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
         super.onAttachView(view)
-        currentType = type ?: ViewType.PARTIAL
+        currentIsSemester = isSemester ?: false
         view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
+        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
     }
 
     fun onParentViewChangeSemester() {
@@ -53,8 +50,7 @@ class GradeStatisticsPresenter @Inject constructor(
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
-            showBarContent(false)
-            showErrorView(false)
+            showContent(false)
             showEmpty(false)
             clearView()
         }
@@ -66,47 +62,31 @@ class GradeStatisticsPresenter @Inject constructor(
         view?.notifyParentRefresh()
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
         view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
-            showErrorView(false)
             clearView()
         }
         (subjects.singleOrNull { it.name == name }?.name)?.let {
-            if (it != currentSubjectName) loadDataByType(currentSemesterId, it, currentType)
+            if (it != currentSubjectName) loadData(currentSemesterId, it, currentIsSemester)
         }
     }
 
-    fun onTypeChange(type: ViewType) {
-        Timber.i("Select grade stats semester: $type")
+    fun onTypeChange(isSemester: Boolean) {
+        Timber.i("Select grade stats semester: $isSemester")
         disposable.clear()
         view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
-            showErrorView(false)
             clearView()
         }
-        loadDataByType(currentSemesterId, currentSubjectName, type)
+        loadData(currentSemesterId, currentSubjectName, isSemester)
     }
 
     private fun loadSubjects() {
@@ -131,18 +111,10 @@ class GradeStatisticsPresenter @Inject constructor(
         )
     }
 
-    private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
-        currentSubjectName = subjectName
-        currentType = type
-        when (type) {
-            ViewType.SEMESTER -> loadData(semesterId, subjectName, true, forceRefresh)
-            ViewType.PARTIAL -> loadData(semesterId, subjectName, false, forceRefresh)
-            ViewType.POINTS -> loadPointsData(semesterId, subjectName, forceRefresh)
-        }
-    }
-
     private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
         Timber.i("Loading grade stats data started")
+        currentSubjectName = subjectName
+        currentIsSemester = isSemester
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
             .flatMap { gradeStatisticsRepository.getGradesStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, isSemester, forceRefresh) }
@@ -162,64 +134,14 @@ class GradeStatisticsPresenter @Inject constructor(
                 Timber.i("Loading grade stats result: Success")
                 view?.run {
                     showEmpty(it.isEmpty())
-                    showBarContent(false)
-                    showPieContent(it.isNotEmpty())
-                    showErrorView(false)
-                    updatePieData(it, preferencesRepository.gradeColorTheme)
+                    showContent(it.isNotEmpty())
+                    updateData(it, preferencesRepository.gradeColorTheme)
                 }
                 analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.e("Loading grade stats result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
-
-    private fun loadPointsData(semesterId: Int, subjectName: String, forceRefresh: Boolean = false) {
-        Timber.i("Loading grade points stats data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMapMaybe { gradeStatisticsRepository.getGradesPointsStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, forceRefresh) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
-                }
-            }
-            .subscribe({
-                Timber.i("Loading grade points stats result: Success")
-                view?.run {
-                    showEmpty(false)
-                    showPieContent(false)
-                    showBarContent(true)
-                    showErrorView(false)
-                    updateBarData(it)
-                }
-                analytics.logEvent("load_grade_points_statistics", "force_refresh" to forceRefresh)
-            }, {
-                Timber.e("Loading grade points stats result: An exception occurred")
-                errorHandler.dispatch(it)
-            }, {
-                Timber.d("Loading grade points stats result: No point stats found")
-                view?.run {
-                    showBarContent(false)
-                    showEmpty(true)
-                }
-            })
-        )
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isBarViewEmpty || isPieViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
index a214744c..edb2552e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -1,22 +1,17 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeStatisticsView : BaseView {
 
-    val isPieViewEmpty: Boolean
-
-    val isBarViewEmpty: Boolean
+    val isViewEmpty: Boolean
 
     fun initView()
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updatePieData(items: List<GradeStatistics>, theme: String)
-
-    fun updateBarData(item: GradePointsStatistics)
+    fun updateData(items: List<GradeStatistics>, theme: String)
 
     fun showSubjects(show: Boolean)
 
@@ -26,16 +21,10 @@ interface GradeStatisticsView : BaseView {
 
     fun clearView()
 
-    fun showPieContent(show: Boolean)
-
-    fun showBarContent(show: Boolean)
+    fun showContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
deleted file mode 100644
index 08c37d58..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.statistics
-
-enum class ViewType {
-    SEMESTER,
-    PARTIAL,
-    POINTS
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 05fde522..7699a641 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -56,8 +56,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
             adapter = gradeSummaryAdapter
         }
         gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
@@ -84,14 +82,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
         gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showErrorView(show: Boolean) {
-        gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeSummaryErrorMessage.text = message
-    }
-
     override fun showProgress(show: Boolean) {
         gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 1aaa9d09..3f8fd0ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -25,12 +25,9 @@ class GradeSummaryPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
 
-    private lateinit var lastError: Throwable
-
     override fun onAttachView(view: GradeSummaryView) {
         super.onAttachView(view)
         view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -59,44 +56,21 @@ class GradeSummaryPresenter @Inject constructor(
                 view?.run {
                     showEmpty(gradeSummaryItems.isEmpty())
                     showContent(gradeSummaryItems.isNotEmpty())
-                    showErrorView(false)
                     updateData(gradeSummaryItems, gradeSummaryHeader)
                 }
                 analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading grade summary result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the grade summary")
         view?.notifyParentRefresh()
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onParentViewReselected() {
         view?.run {
             if (!isViewEmpty) resetView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index cf318487..9e9c6e58 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -26,10 +26,6 @@ interface GradeSummaryView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showEmpty(show: Boolean)
 
     fun notifyParentDataLoaded(semesterId: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index 3f8f1359..8195dd20 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -3,8 +3,6 @@ package io.github.wulkanowy.ui.modules.homework
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
@@ -36,8 +34,6 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     override val titleStringId get() = R.string.homework_title
 
-    override val isViewEmpty get() = homeworkAdapter.isEmpty
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_homework, container, false)
     }
@@ -45,7 +41,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         messageContainer = homeworkRecycler
-        presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
+        presenter.onAttachView(this, savedInstanceState?.getLong(HomeworkFragment.SAVED_DATE_KEY))
     }
 
     override fun initView() {
@@ -60,9 +56,6 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         }
 
         homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
-        homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
         homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
         homeworkNextButton.setOnClickListener { presenter.onNextDay() }
 
@@ -81,24 +74,18 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         homeworkNavDate.text = date
     }
 
+    override fun isViewEmpty() = homeworkAdapter.isEmpty
+
     override fun hideRefresh() {
         homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        homeworkEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        homeworkError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        homeworkErrorMessage.text = message
+        homeworkEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showProgress(show: Boolean) {
-        homeworkProgress.visibility = if (show) VISIBLE else GONE
+        homeworkProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -106,15 +93,15 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
     }
 
     override fun showContent(show: Boolean) {
-        homeworkRecycler.visibility = if (show) VISIBLE else GONE
+        homeworkRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(homework: Homework) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 7e1da314..6829031c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -35,13 +35,10 @@ class HomeworkPresenter @Inject constructor(
     lateinit var currentDate: LocalDate
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: HomeworkView, date: Long?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Homework view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
@@ -62,18 +59,6 @@ class HomeworkPresenter @Inject constructor(
         loadData(currentDate, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is HomeworkItem) {
             Timber.i("Select homework item ${item.homework.id}")
@@ -120,29 +105,17 @@ class HomeworkPresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
-                        showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
                     analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading homework result: An exception occurred")
-
+                    view?.run { showEmpty(isViewEmpty()) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
         return items.flatMap {
             HomeworkHeader(it.key).let { header ->
@@ -158,7 +131,6 @@ class HomeworkPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
-            showErrorView(false)
             clearData()
             reloadNavigation()
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 1d241df4..977a5b73 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -5,8 +5,6 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface HomeworkView : BaseView {
 
-    val isViewEmpty: Boolean
-
     fun initView()
 
     fun updateData(data: List<HomeworkItem>)
@@ -15,14 +13,12 @@ interface HomeworkView : BaseView {
 
     fun updateNavigationWeek(date: String)
 
+    fun isViewEmpty(): Boolean
+
     fun hideRefresh()
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 6043d50e..5e707b8a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.login
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -24,28 +23,22 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
     lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
-
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
 
-    override val currentViewIndex get() = loginViewpager.currentItem
+    override val currentViewIndex: Int
+        get() = loginViewpager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
-        setSupportActionBar(loginToolbar)
         messageContainer = loginContainer
 
         presenter.onAttachView(this)
     }
 
-    override fun initView() {
-        with(requireNotNull(supportActionBar)) {
-            setDisplayHomeAsUpEnabled(true)
-            setDisplayShowTitleEnabled(false)
-        }
-
-        with(loginAdapter) {
+    override fun initAdapter() {
+        loginAdapter.apply {
             containerId = loginViewpager.id
             addFragments(listOf(
                 LoginFormFragment.newInstance(),
@@ -54,24 +47,19 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
             ))
         }
 
-        with(loginViewpager) {
+        loginViewpager.run {
             offscreenPageLimit = 2
             adapter = loginAdapter
-            setOnSelectPageListener(presenter::onViewSelected)
+            setOnSelectPageListener { presenter.onViewSelected(it) }
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) onBackPressed()
-        return true
-    }
-
     override fun switchView(index: Int) {
         loginViewpager.setCurrentItem(index, false)
     }
 
     override fun showActionBar(show: Boolean) {
-        supportActionBar?.run { if (show) show() else hide() }
+        supportActionBar?.apply { if (show) show() else hide() }
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 76832bda..a70ff2d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -28,6 +28,5 @@ class LoginErrorHandler @Inject constructor(
     override fun clear() {
         super.clear()
         onBadCredentials = {}
-        onStudentDuplicate = {}
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
index 8bcf042b..a0b98be7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -11,12 +11,13 @@ import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFrag
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
 @Suppress("unused")
-@Module(includes = [LoginModule.Static::class])
+@Module
 internal abstract class LoginModule {
 
     @Module
-    object Static {
+    companion object {
 
+        @JvmStatic
         @PerActivity
         @Provides
         fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 8ff5e4da..87827152 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -16,8 +16,8 @@ class LoginPresenter @Inject constructor(
 
     override fun onAttachView(view: LoginView) {
         super.onAttachView(view)
-        with(view) {
-            initView()
+        view.run {
+            initAdapter()
             showActionBar(false)
         }
         Timber.i("Login view was initialized")
@@ -48,8 +48,8 @@ class LoginPresenter @Inject constructor(
     fun onViewSelected(index: Int) {
         view?.apply {
             when (index) {
-                0 -> showActionBar(false)
-                1, 2 -> showActionBar(true)
+                0, 1 -> showActionBar(false)
+                2 -> showActionBar(true)
             }
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 9c98a1d8..58d356bb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -7,7 +7,7 @@ interface LoginView : BaseView {
 
     val currentViewIndex: Int
 
-    fun initView()
+    fun initAdapter()
 
     fun switchView(index: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index a3e70489..94259aa8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -9,6 +9,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
+import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
@@ -16,7 +17,6 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_form.*
@@ -38,7 +38,8 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
 
     override val formPassValue get() = loginFormPass.text.toString()
 
-    override val formHostValue get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
+    override val formHostValue
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
 
     private lateinit var hostKeys: Array<String>
 
@@ -54,24 +55,26 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
-        hostKeys = resources.getStringArray(R.array.hosts_keys)
-        hostValues = resources.getStringArray(R.array.hosts_values)
+        hostKeys = resources.getStringArray(R.array.endpoints_keys)
+        hostValues = resources.getStringArray(R.array.endpoints_values)
 
         loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
         loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
         loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
         loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
         loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
-        loginFormFaq.setOnClickListener { presenter.onFaqClick() }
-        loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
 
         loginFormPass.setOnEditorActionListener { _, id, _ ->
             if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
         with(loginFormHost) {
+            //Bug with filter in ExposedDropdownMenu on restoring state
+            isSaveEnabled = false
+
             setText(hostKeys.getOrElse(0) { "" })
-            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setAdapter(ArrayAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            keyListener = null
         }
     }
 
@@ -144,33 +147,21 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         loginFormPrivacyLink.visibility = VISIBLE
     }
 
-    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students,
+            Triple(
+                loginFormName.text.toString(),
+                loginFormPass.text.toString(),
+                resources.getStringArray(R.array.endpoints_values)[1]
+            ))
     }
 
     override fun openPrivacyPolicyPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
     }
 
-    override fun showContact(show: Boolean) {
-        loginFormContact.visibility = if (show) VISIBLE else GONE
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         presenter.onDetachView()
     }
-
-    override fun openFaqPage() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/dlaczego-nie-moge-sie-zalogowac", ::showMessage)
-    }
-
-    override fun openEmail() {
-        context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
-        )
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 10c0a663..6949200c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -22,7 +22,6 @@ class LoginFormPresenter @Inject constructor(
         super.onAttachView(view)
         view.run {
             initView()
-            showContact(false)
             if (appInfo.isDebug) showVersion() else showPrivacyPolicy()
 
             loginErrorHandler.onBadCredentials = {
@@ -41,9 +40,7 @@ class LoginFormPresenter @Inject constructor(
         view?.apply {
             clearPassError()
             clearNameError()
-            if (formHostValue?.contains("fakelog") == true) {
-                setCredentials("jan@fakelog.cf", "jan123")
-            }
+            if (formHostValue?.contains("fakelog") == true) setCredentials("jan@fakelog.cf", "jan123")
         }
     }
 
@@ -82,23 +79,14 @@ class LoginFormPresenter @Inject constructor(
             .subscribe({
                 Timber.i("Login result: Success")
                 analytics.logEvent("registration_form", "success" to true, "students" to it.size, "endpoint" to endpoint, "error" to "No error")
-                view?.notifyParentAccountLogged(it, Triple(email, password, endpoint))
+                view?.notifyParentAccountLogged(it)
             }, {
                 Timber.i("Login result: An exception occurred")
                 analytics.logEvent("registration_form", "success" to false, "students" to -1, "endpoint" to endpoint, "error" to it.message.ifNullOrBlank { "No message" })
                 loginErrorHandler.dispatch(it)
-                view?.showContact(true)
             }))
     }
 
-    fun onFaqClick() {
-        view?.openFaqPage()
-    }
-
-    fun onEmailClick() {
-        view?.openEmail()
-    }
-
     private fun validateCredentials(login: String, password: String): Boolean {
         var isCorrect = true
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 91e8d86e..2532547a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -39,13 +39,7 @@ interface LoginFormView : BaseView {
 
     fun showPrivacyPolicy()
 
-    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun openPrivacyPolicyPage()
-
-    fun showContact(show: Boolean)
-
-    fun openFaqPage()
-
-    fun openEmail()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginSymbolAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginSymbolAdapter.kt
deleted file mode 100644
index 87fa038e..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginSymbolAdapter.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.form
-
-import android.content.Context
-import android.widget.ArrayAdapter
-import android.widget.Filter
-
-class LoginSymbolAdapter(context: Context, resource: Int, objects: Array<out String>) :
-    ArrayAdapter<String>(context, resource, objects) {
-
-    override fun getFilter() = object : Filter() {
-
-        override fun performFiltering(constraint: CharSequence?) = null
-
-        override fun publishResults(constraint: CharSequence?, results: FilterResults?) {}
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 8478f7cc..5c48cf2f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -13,9 +13,6 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.openEmailClient
-import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_login_student_select.*
 import java.io.Serializable
@@ -29,9 +26,6 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     @Inject
     lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     companion object {
         const val SAVED_STUDENTS = "STUDENTS"
 
@@ -50,8 +44,6 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     override fun initView() {
         loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
         loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
-        loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
-        loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
 
         loginStudentSelectRecycler.apply {
             adapter = loginAdapter
@@ -88,25 +80,8 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
         outState.putSerializable(SAVED_STUDENTS, presenter.students as Serializable)
     }
 
-    override fun showContact(show: Boolean) {
-        loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
-    }
-
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
     }
-
-    override fun openDiscordInvite() {
-        context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
-    }
-
-    override fun openEmail() {
-        context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
-        )
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index 288531dc..e02227cb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -27,7 +27,6 @@ class LoginStudentSelectPresenter @Inject constructor(
         super.onAttachView(view)
         view.run {
             initView()
-            showContact(false)
             enableSignIn(false)
             loginErrorHandler.onStudentDuplicate = {
                 showMessage(it)
@@ -89,16 +88,7 @@ class LoginStudentSelectPresenter @Inject constructor(
                 view?.apply {
                     showProgress(false)
                     showContent(true)
-                    showContact(true)
                 }
             }))
     }
-
-    fun onDiscordClick() {
-        view?.openDiscordInvite()
-    }
-
-    fun onEmailClick() {
-        view?.openEmail()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 23877100..3967313c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -15,10 +15,4 @@ interface LoginStudentSelectView : BaseView {
     fun showContent(show: Boolean)
 
     fun enableSignIn(enable: Boolean)
-
-    fun showContact(show: Boolean)
-
-    fun openDiscordInvite()
-
-    fun openEmail()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 5e9ce3ba..f4f0eb9e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -14,10 +14,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.openEmailClient
-import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_symbol.*
 import javax.inject.Inject
@@ -27,9 +24,6 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     @Inject
     lateinit var presenter: LoginSymbolPresenter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     companion object {
         private const val SAVED_LOGIN_DATA = "LOGIN_DATA"
 
@@ -50,8 +44,6 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
 
     override fun initView() {
         loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
-        loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
-        loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
         loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
@@ -117,25 +109,8 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
         outState.putSerializable(SAVED_LOGIN_DATA, presenter.loginData)
     }
 
-    override fun showContact(show: Boolean) {
-        loginSymbolContact.visibility = if (show) VISIBLE else GONE
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         presenter.onDetachView()
     }
-
-    override fun openFaqPage() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/co-to-jest-symbol", ::showMessage)
-    }
-
-    override fun openEmail() {
-        context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
-        )
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 49aabc92..5a7a3777 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -23,10 +23,7 @@ class LoginSymbolPresenter @Inject constructor(
     @Suppress("UNCHECKED_CAST")
     fun onAttachView(view: LoginSymbolView, savedLoginData: Serializable?) {
         super.onAttachView(view)
-        view.run {
-            initView()
-            showContact(false)
-        }
+        view.initView()
         if (savedLoginData is Triple<*, *, *>) {
             loginData = savedLoginData as Triple<String, String, String>
         }
@@ -67,7 +64,6 @@ class LoginSymbolPresenter @Inject constructor(
                         if (it.isEmpty()) {
                             Timber.i("Login with symbol result: Empty student list")
                             setErrorSymbolIncorrect()
-                            view?.showContact(true)
                         } else {
                             Timber.i("Login with symbol result: Success")
                             notifyParentAccountLogged(it)
@@ -77,7 +73,6 @@ class LoginSymbolPresenter @Inject constructor(
                     Timber.i("Login with symbol result: An exception occurred")
                     analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "endpoint" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
                     loginErrorHandler.dispatch(it)
-                    view?.showContact(true)
                 }))
     }
 
@@ -88,12 +83,4 @@ class LoginSymbolPresenter @Inject constructor(
             showSoftKeyboard()
         }
     }
-
-    fun onFaqClick() {
-        view?.openFaqPage()
-    }
-
-    fun onEmailClick() {
-        view?.openEmail()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 1afc1532..2e5143ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -26,10 +26,4 @@ interface LoginSymbolView : BaseView {
     fun showContent(show: Boolean)
 
     fun notifyParentAccountLogged(students: List<Student>)
-
-    fun showContact(show: Boolean)
-
-    fun openFaqPage()
-
-    fun openEmail()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 12bf1a13..00204a87 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -3,8 +3,6 @@ package io.github.wulkanowy.ui.modules.luckynumber
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
@@ -25,22 +23,17 @@ class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView
     override val titleStringId: Int
         get() = R.string.lucky_number_title
 
-    override val isViewEmpty get() = luckyNumberText.text.isBlank()
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_lucky_number, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        messageContainer = luckyNumberSwipe
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
-        luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateData(data: LuckyNumber) {
@@ -52,19 +45,11 @@ class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView
     }
 
     override fun showEmpty(show: Boolean) {
-        luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        luckyNumberError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        luckyNumberErrorMessage.text = message
+        luckyNumberEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showProgress(show: Boolean) {
-        luckyNumberProgress.visibility = if (show) VISIBLE else GONE
+        luckyNumberProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -72,7 +57,11 @@ class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView
     }
 
     override fun showContent(show: Boolean) {
-        luckyNumberContent.visibility = if (show) VISIBLE else GONE
+        luckyNumberContent.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun isViewEmpty(): Boolean {
+        return luckyNumberText.text.isBlank()
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index 63ced4b8..ee7260e6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -19,8 +19,6 @@ class LuckyNumberPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
-    private lateinit var lastError: Throwable
-
     override fun onAttachView(view: LuckyNumberView) {
         super.onAttachView(view)
         view.run {
@@ -29,7 +27,6 @@ class LuckyNumberPresenter @Inject constructor(
             enableSwipe(false)
         }
         Timber.i("Lucky number view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -55,49 +52,25 @@ class LuckyNumberPresenter @Inject constructor(
                         updateData(it)
                         showContent(true)
                         showEmpty(false)
-                        showErrorView(false)
                     }
                     analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
                 }, {
                     Timber.i("Loading lucky number result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty()) }
                     errorHandler.dispatch(it)
                 }, {
                     Timber.i("Loading lucky number result: No lucky number found")
                     view?.run {
                         showContent(false)
                         showEmpty(true)
-                        showEmpty(false)
                     }
                 })
             )
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the lucky number")
         loadData(true)
     }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
index a680c83e..9ead2b1f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
@@ -5,8 +5,6 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberView : BaseView {
 
-    val isViewEmpty: Boolean
-
     fun initView()
 
     fun updateData(data: LuckyNumber)
@@ -15,13 +13,11 @@ interface LuckyNumberView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
 
     fun showContent(show: Boolean)
+
+    fun isViewEmpty(): Boolean
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index e8ce3bcf..3dd0e5df 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -6,7 +6,6 @@ import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -26,8 +25,6 @@ class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigu
     @Inject
     override lateinit var presenter: LuckyNumberWidgetConfigurePresenter
 
-    private var dialog: AlertDialog? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
@@ -39,27 +36,11 @@ class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigu
     }
 
     override fun initView() {
-        with(widgetConfigureRecycler) {
+        widgetConfigureRecycler.apply {
             adapter = configureAdapter
             layoutManager = SmoothScrollLinearLayoutManager(context)
         }
-
-        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
-    }
-
-    override fun showThemeDialog() {
-        val items = arrayOf(
-            getString(R.string.widget_timetable_theme_light),
-            getString(R.string.widget_timetable_theme_dark)
-        )
-
-       dialog =  AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
-            .setTitle(R.string.widget_timetable_theme_title)
-           .setOnDismissListener { presenter.onDismissThemeView() }
-            .setSingleChoiceItems(items, -1) { _, which ->
-                presenter.onThemeSelect(which)
-            }
-            .show()
+        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
     }
 
     override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
@@ -89,9 +70,4 @@ class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigu
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this))
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        dialog?.dismiss()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 6e4716bf..6f4394ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
 import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
@@ -20,8 +19,6 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
 
     private var appWidgetId: Int? = null
 
-    private var selectedStudent: Student? = null
-
     fun onAttachView(view: LuckyNumberWidgetConfigureView, appWidgetId: Int?) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
@@ -31,22 +28,10 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
 
     fun onItemSelect(item: AbstractFlexibleItem<*>) {
         if (item is LuckyNumberWidgetConfigureItem) {
-            selectedStudent = item.student
-            view?.showThemeDialog()
+            registerStudent(item.student)
         }
     }
 
-    fun onThemeSelect(index: Int) {
-        appWidgetId?.let {
-            sharedPref.putLong(getThemeWidgetKey(it), index.toLong())
-        }
-        registerStudent(selectedStudent)
-    }
-
-    fun onDismissThemeView(){
-        view?.finishView()
-    }
-
     private fun loadData() {
         disposable.add(studentRepository.getSavedStudents(false)
             .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
@@ -58,23 +43,18 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
             .subscribe({
                 when {
                     it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 -> {
-                        selectedStudent = it.single().student
-                        view?.showThemeDialog()
-                    }
+                    it.size == 1 -> registerStudent(it.single().student)
                     else -> view?.updateData(it)
                 }
             }, { errorHandler.dispatch(it) }))
     }
 
-    private fun registerStudent(student: Student?) {
-        requireNotNull(student)
-
-        appWidgetId?.let { id ->
-            sharedPref.putLong(getStudentWidgetKey(id), student.id)
-            view?.run {
-                updateLuckyNumberWidget(id)
-                setSuccessResult(id)
+    private fun registerStudent(student: Student) {
+        appWidgetId?.also {
+            sharedPref.putLong(getStudentWidgetKey(it), student.id)
+            view?.apply {
+                updateLuckyNumberWidget(it)
+                setSuccessResult(it)
             }
         }
         view?.finishView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
index fa4c0cc6..49c3f1dc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
 
 interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun showThemeDialog()
-
     fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
 
     fun updateLuckyNumberWidget(widgetId: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index 12753b35..895fe571 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -55,10 +55,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
     lateinit var sharedPref: SharedPrefProvider
 
     companion object {
-
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
-
-        fun getThemeWidgetKey(appWidgetId: Int) = "lucky_number_widget_theme_$appWidgetId"
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@@ -73,26 +70,24 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
 
     private fun onUpdate(context: Context, intent: Intent) {
         intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
-            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
-
-            val luckyNumber = getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
-            val appIntent = PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
-                MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT)
-
-            val remoteView = RemoteViews(context.packageName, layoutId).apply {
-                setTextViewText(R.id.luckyNumberWidgetNumber, luckyNumber?.luckyNumber?.toString() ?: "#")
-                setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
+            RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+                setTextViewText(R.id.luckyNumberWidgetNumber,
+                    getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)?.luckyNumber?.toString() ?: "#"
+                )
+                setOnClickPendingIntent(R.id.luckyNumberWidgetContainer,
+                    PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
+                        MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+            }.also {
+                setStyles(it, intent)
+                appWidgetManager.updateAppWidget(appWidgetId, it)
             }
-
-            setStyles(remoteView, intent)
-            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
         }
     }
 
     private fun onDelete(intent: Intent) {
-        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
-        if (appWidgetId != 0) sharedPref.delete(getStudentWidgetKey(appWidgetId))
+        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+            if (it != 0) sharedPref.delete(getStudentWidgetKey(it))
+        }
     }
 
     private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
@@ -101,17 +96,19 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                 .filter { true }
                 .flatMap { studentRepository.getSavedStudents().toMaybe() }
                 .flatMap { students ->
-                    val student = students.singleOrNull { student -> student.id == studentId }
-                    when {
-                        student != null -> Maybe.just(student)
-                        studentId != 0L -> {
-                            studentRepository.isCurrentStudentSet()
-                                .filter { true }
-                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
-                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                    students.singleOrNull { student -> student.id == studentId }
+                        .let { student ->
+                            when {
+                                student != null -> Maybe.just(student)
+                                studentId != 0L -> {
+                                    studentRepository.isCurrentStudentSet()
+                                        .filter { true }
+                                        .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                        .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                                }
+                                else -> Maybe.empty()
+                            }
                         }
-                        else -> Maybe.empty()
-                    }
                 }
                 .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
                 .flatMap { luckyNumberRepository.getLuckyNumber(it) }
@@ -126,14 +123,11 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
     }
 
     private fun onOptionsChange(context: Context, intent: Intent) {
-        intent.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
-            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
-
-            val remoteView = RemoteViews(context.packageName, layoutId)
-
-            setStyles(remoteView, intent)
-            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
+        intent.extras?.let { extras ->
+            RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+                setStyles(this, intent)
+                appWidgetManager.updateAppWidget(extras.getInt(EXTRA_APPWIDGET_ID), this)
+            }
         }
     }
 
@@ -150,7 +144,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
             // 1x1
             maxWidth < 150 && maxHeight < 110 -> {
                 Timber.d("Lucky number widget size: 1x1")
-                with(views) {
+                views.run {
                     setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
@@ -160,7 +154,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
             // 1x2
             maxWidth < 150 && maxHeight > 110 -> {
                 Timber.d("Lucky number widget size: 1x2")
-                with(views) {
+                views.run {
                     setViewVisibility(R.id.luckyNumberWidgetImageTop, VISIBLE)
                     setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
@@ -170,7 +164,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
             // 2x1
             maxWidth >= 150 && maxHeight <= 110 -> {
                 Timber.d("Lucky number widget size: 2x1")
-                with(views) {
+                views.run {
                     setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetImageLeft, VISIBLE)
                     setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
@@ -180,7 +174,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
             // 2x2 and bigger
             else -> {
                 Timber.d("Lucky number widget size: 2x2 and bigger")
-                with(views) {
+                views.run {
                     setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
                     setViewVisibility(R.id.luckyNumberWidgetTitle, VISIBLE)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 991c1d10..4c7f7759 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -100,7 +100,7 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     override fun initView() {
         with(mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
+            setBackgroundColor(overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(4f)))
         }
 
         with(mainBottomNav) {
@@ -113,7 +113,7 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
             ))
             accentColor = getThemeAttrColor(R.attr.colorPrimary)
             inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
-            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
+            defaultBackgroundColor = overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
index bbaea51c..9444d58d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -26,25 +26,25 @@ import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
 import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersModule
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
 @Suppress("unused")
-@Module(includes = [MainModule.Static::class])
+@Module
 abstract class MainModule {
 
     @Module
-    object Static {
+    companion object {
 
+        @JvmStatic
         @Provides
         fun provideFragNavController(activity: MainActivity): FragNavController {
             return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
         }
 
         //In activities must be injected as Lazy
+        @JvmStatic
         @Provides
         fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
     }
@@ -120,8 +120,4 @@ abstract class MainModule {
     @PerFragment
     @ContributesAndroidInjector(modules = [LicenseModule::class])
     abstract fun bindLicenseFragment(): LicenseFragment
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [SchoolAndTeachersModule::class])
-    abstract fun bindSchoolAndTeachersFragment(): SchoolAndTeachersFragment
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 1c0fd39f..07e4c8d0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -7,7 +7,6 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.main.MainView.Section.GRADE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
-import io.github.wulkanowy.ui.modules.main.MainView.Section.SCHOOL
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
@@ -39,7 +38,7 @@ class MainPresenter @Inject constructor(
 
     fun onViewChange(section: MainView.Section?) {
         view?.apply {
-            showActionBarElevation(section != GRADE && section != MESSAGE && section != SCHOOL)
+            showActionBarElevation(section != GRADE && section != MESSAGE)
             currentViewTitle?.let { setViewTitle(it) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 033b6a1f..c53adc5b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -51,7 +51,6 @@ interface MainView : BaseView {
         NOTE(7),
         LUCKY_NUMBER(8),
         SETTINGS(9),
-        ABOUT(10),
-        SCHOOL(11)
+        ABOUT(10)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
index b2521902..c772466f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -9,12 +9,13 @@ import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
 @Suppress("unused")
-@Module(includes = [MessageModule.Static::class])
+@Module
 abstract class MessageModule {
 
     @Module
-    object Static {
+    companion object {
 
+        @JvmStatic
         @PerFragment
         @Provides
         fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 22231e42..93ef502f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -65,10 +65,6 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
     }
 
-    override fun initView() {
-        messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-    }
-
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.action_menu_message_preview, menu)
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
@@ -130,16 +126,8 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         menuDeleteButton?.setTitle(R.string.message_move_to_bin)
     }
 
-    override fun showErrorView(show: Boolean) {
-        messagePreviewError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        messagePreviewErrorMessage.text = message
-    }
-
-    override fun setErrorRetryCallback(callback: () -> Unit) {
-        messagePreviewErrorRetry.setOnClickListener { callback() }
+    override fun showMessageError() {
+        messagePreviewError.visibility = VISIBLE
     }
 
     override fun openMessageReply(message: Message?) {
@@ -155,7 +143,7 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
     }
 
     override fun notifyParentMessageDeleted(message: Message) {
-        parentFragmentManager.fragments.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
+        fragmentManager?.fragments?.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index c32bd611..a230c0b3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -23,29 +23,11 @@ class MessagePreviewPresenter @Inject constructor(
 
     private var message: Message? = null
 
-    private lateinit var lastError: Throwable
-
-    private var retryCallback: () -> Unit = {}
-
     fun onAttachView(view: MessagePreviewView, id: Long) {
         super.onAttachView(view)
-        view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(id)
     }
 
-    private fun onMessageLoadRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(messageId)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     private fun loadData(id: Long) {
         Timber.i("Loading message $id preview started")
         messageId = id
@@ -73,7 +55,7 @@ class MessagePreviewPresenter @Inject constructor(
                     analytics.logEvent("load_message_preview", "length" to message.content?.length)
                 }) {
                     Timber.i("Loading message $id preview result: An exception occurred ")
-                    retryCallback = { onMessageLoadRetry() }
+                    view?.showMessageError()
                     errorHandler.dispatch(it)
                 })
         }
@@ -103,7 +85,6 @@ class MessagePreviewPresenter @Inject constructor(
                         showContent(false)
                         showProgress(true)
                         showOptions(false)
-                        showErrorView(false)
                     }
                 }
                 .doFinally {
@@ -116,24 +97,15 @@ class MessagePreviewPresenter @Inject constructor(
                         popView()
                     }
                 }, { error ->
-                    retryCallback = { onMessageDelete() }
+                    view?.showMessageError()
                     errorHandler.dispatch(error)
                 }, {
-                    view?.showErrorView(true)
+                    view?.showMessageError()
                 })
             )
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            lastError = error
-            setErrorDetails(message)
-            showErrorView(true)
-            setErrorRetryCallback { retryCallback() }
-        }
-    }
-
     fun onMessageDelete(): Boolean {
         deleteMessage()
         return true
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index d5776627..373dee11 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -9,8 +9,6 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
-    fun initView()
-
     fun setSubject(subject: String)
 
     fun setRecipient(recipient: String)
@@ -25,23 +23,19 @@ interface MessagePreviewView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentMessageDeleted(message: Message)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun setErrorRetryCallback(callback: () -> Unit)
-
     fun showOptions(show: Boolean)
 
     fun setDeletedOptionsLabels()
 
     fun setNotDeletedOptionsLabels()
 
+    fun showMessageError()
+
     fun openMessageReply(message: Message?)
 
     fun openMessageForward(message: Message?)
 
     fun popView()
+
+    fun notifyParentMessageDeleted(message: Message)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index d6065983..326cd6a7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -72,8 +72,6 @@ class MessageTabFragment : BaseFragment(), MessageTabView {
             )
         }
         messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
-        messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateData(data: List<MessageItem>) {
@@ -104,14 +102,6 @@ class MessageTabFragment : BaseFragment(), MessageTabView {
         messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showErrorView(show: Boolean) {
-        messageTabError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        messageTabErrorMessage.text = message
-    }
-
     override fun showRefresh(show: Boolean) {
         messageTabSwipe.isRefreshing = show
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 1123e7e4..af576293 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -23,12 +23,9 @@ class MessageTabPresenter @Inject constructor(
 
     lateinit var folder: MessageFolder
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         this.folder = folder
     }
 
@@ -37,18 +34,6 @@ class MessageTabPresenter @Inject constructor(
         onParentViewLoadData(true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onDeleteMessage() {
         loadData(false)
     }
@@ -93,28 +78,17 @@ class MessageTabPresenter @Inject constructor(
                     view?.run {
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
-                        showErrorView(false)
                         updateData(it)
                     }
                     analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
                 }) {
                     Timber.i("Loading $folder message result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun updateMessage(message: Message) {
         Timber.i("Attempt to update message ${message.id}")
         disposable.add(messageRepository.updateMessage(message)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index e5705c73..967863de 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -26,10 +26,6 @@ interface MessageTabView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showRefresh(show: Boolean)
 
     fun openMessage(messageId: Long)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index d47574f6..1d9104a8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -61,8 +61,6 @@ class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledVi
             onDeviceUnregisterListener = presenter::onUnregisterDevice
         }
         mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
-        mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
     }
 
@@ -107,14 +105,6 @@ class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledVi
         mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showErrorView(show: Boolean) {
-        mobileDevicesError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        mobileDevicesErrorMessage.text = message
-    }
-
     override fun enableSwipe(enable: Boolean) {
         mobileDevicesSwipe.isEnabled = enable
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index e95d2ce0..71359a52 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -20,13 +20,10 @@ class MobileDevicePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository, schedulers) {
 
-    private lateinit var lastError: Throwable
-
     override fun onAttachView(view: MobileDeviceView) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Mobile device view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -34,18 +31,6 @@ class MobileDevicePresenter @Inject constructor(
         loadData(true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading mobile devices data started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -66,7 +51,6 @@ class MobileDevicePresenter @Inject constructor(
                     updateData(it)
                     showContent(it.isNotEmpty())
                     showEmpty(it.isEmpty())
-                    showErrorView(false)
                 }
                 analytics.logEvent("load_devices", "items" to it.size, "force_refresh" to forceRefresh)
             }) {
@@ -75,17 +59,6 @@ class MobileDevicePresenter @Inject constructor(
             })
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     fun onRegisterDevice() {
         view?.showTokenDialog()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
index 869b59bb..58804e24 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
@@ -25,10 +25,6 @@ interface MobileDeviceView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showUndo(position: Int, device: MobileDevice)
 
     fun showTokenDialog()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index 8b81156b..a4110128 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.util.Base64
@@ -11,14 +9,15 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.content.getSystemService
+import dagger.android.support.DaggerDialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRemote
+import io.github.wulkanowy.ui.base.BaseActivity
 import kotlinx.android.synthetic.main.dialog_mobile_device.*
 import javax.inject.Inject
 
-class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
+class MobileDeviceTokenDialog : DaggerDialogFragment(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
@@ -46,30 +45,15 @@ class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(mobileDeviceDialogToken) {
-            text = token.token
-            setOnClickListener { clickCopy(token.token) }
-        }
-        with(mobileDeviceDialogSymbol) {
-            text = token.symbol
-            setOnClickListener { clickCopy(token.symbol) }
-        }
-        with(mobileDeviceDialogPin) {
-            text = token.pin
-            setOnClickListener { clickCopy(token.pin) }
-        }
+        mobileDeviceDialogToken.text = token.token
+        mobileDeviceDialogSymbol.text = token.symbol
+        mobileDeviceDialogPin.text = token.pin
 
         mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
             BitmapFactory.decodeByteArray(it, 0, it.size)
         })
     }
 
-    private fun clickCopy(text: String) {
-        val clip = ClipData.newPlainText("wulkanowy", text)
-        activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
-        Toast.makeText(context, R.string.all_copied, Toast.LENGTH_LONG).show()
-    }
-
     override fun hideLoading() {
         mobileDeviceDialogProgress.visibility = GONE
     }
@@ -82,6 +66,22 @@ class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
         dismiss()
     }
 
+    override fun showError(text: String, error: Throwable) {
+        showMessage(text)
+    }
+
+    override fun showMessage(text: String) {
+        Toast.makeText(context, text, Toast.LENGTH_LONG).show()
+    }
+
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*>)?.openClearLoginView()
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index 7a9625c0..e21b4d16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -18,9 +18,7 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
 import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_more.*
@@ -56,9 +54,6 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     override val mobileDevicesRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
 
-    override val schoolAndTeachersRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.schoolandteachers_title) to getCompatDrawable((R.drawable.ic_more_schoolandteachers)) }
-
     override val settingsRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
 
@@ -111,10 +106,6 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
     }
 
-    override fun openSchoolAndTeachersView() {
-        (activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance())
-    }
-
     override fun openSettingsView() {
         (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 096f89e9..89367725 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -31,7 +31,6 @@ class MorePresenter @Inject constructor(
                 noteRes?.first -> openNoteView()
                 luckyNumberRes?.first -> openLuckyNumberView()
                 mobileDevicesRes?.first -> openMobileDevicesView()
-                schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
                 settingsRes?.first -> openSettingsView()
                 aboutRes?.first -> openAboutView()
             }
@@ -52,7 +51,6 @@ class MorePresenter @Inject constructor(
                 noteRes?.let { MoreItem(it.first, it.second) },
                 luckyNumberRes?.let { MoreItem(it.first, it.second) },
                 mobileDevicesRes?.let { MoreItem(it.first, it.second) },
-                schoolAndTeachersRes?.let { MoreItem(it.first, it.second) },
                 settingsRes?.let { MoreItem(it.first, it.second) },
                 aboutRes?.let { MoreItem(it.first, it.second) })
             )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index 41008176..e82c7554 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -15,8 +15,6 @@ interface MoreView : BaseView {
 
     val mobileDevicesRes: Pair<String, Drawable?>?
 
-    val schoolAndTeachersRes: Pair<String, Drawable?>?
-
     val settingsRes: Pair<String, Drawable?>?
 
     val aboutRes: Pair<String, Drawable?>?
@@ -40,6 +38,4 @@ interface MoreView : BaseView {
     fun openLuckyNumberView()
 
     fun openMobileDevicesView()
-
-    fun openSchoolAndTeachersView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index e5335e45..6117ae24 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -60,8 +60,6 @@ class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
             )
         }
         noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        noteErrorRetry.setOnClickListener { presenter.onRetry() }
-        noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun showNoteDialog(note: Note) {
@@ -84,14 +82,6 @@ class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
         noteEmpty.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showErrorView(show: Boolean) {
-        noteError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        noteErrorMessage.text = message
-    }
-
     override fun showProgress(show: Boolean) {
         noteProgress.visibility = if (show) VISIBLE else GONE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index 7acf37a4..df98ab88 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -21,13 +21,10 @@ class NotePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<NoteView>(errorHandler, studentRepository, schedulers) {
 
-    private lateinit var lastError: Throwable
-
     override fun onAttachView(view: NoteView) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Note view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -36,18 +33,6 @@ class NotePresenter @Inject constructor(
         loadData(true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading note data started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -68,28 +53,17 @@ class NotePresenter @Inject constructor(
                 view?.apply {
                     updateData(it)
                     showEmpty(it.isEmpty())
-                    showErrorView(false)
                     showContent(it.isNotEmpty())
                 }
                 analytics.logEvent("load_note", "items" to it.size, "force_refresh" to forceRefresh)
             }, {
                 Timber.i("Loading note result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
         )
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is NoteItem) {
             Timber.i("Select note item ${item.note.id}")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index a9c9f4f2..9a2c12eb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -18,10 +18,6 @@ interface NoteView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersChildView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersChildView.kt
deleted file mode 100644
index b5eedb6f..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersChildView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-interface SchoolAndTeachersChildView {
-
-    fun notifyParentDataLoaded()
-
-    fun onParentLoadData(forceRefresh: Boolean)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
deleted file mode 100644
index 5f9c0b9a..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_schoolandteachers.*
-import javax.inject.Inject
-
-class SchoolAndTeachersFragment : BaseFragment(), SchoolAndTeachersView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: SchoolAndTeachersPresenter
-
-    @Inject
-    lateinit var pagerAdapter: BaseFragmentPagerAdapter
-
-    companion object {
-        fun newInstance() = SchoolAndTeachersFragment()
-    }
-
-    override val titleStringId: Int get() = R.string.schoolandteachers_title
-
-    override val currentPageIndex get() = schoolandteachersViewPager.currentItem
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_schoolandteachers, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(pagerAdapter) {
-            containerId = schoolandteachersViewPager.id
-            addFragmentsWithTitle(mapOf(
-                SchoolFragment.newInstance() to getString(R.string.school_title),
-                TeacherFragment.newInstance() to getString(R.string.teachers_title)
-            ))
-        }
-
-        with(schoolandteachersViewPager) {
-            adapter = pagerAdapter
-            offscreenPageLimit = 2
-            setOnSelectPageListener(presenter::onPageSelected)
-        }
-
-        with(schoolandteachersTabLayout) {
-            setupWithViewPager(schoolandteachersViewPager)
-            setElevationCompat(context.dpToPx(4f))
-        }
-    }
-
-    override fun showContent(show: Boolean) {
-        schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-    }
-
-    override fun showProgress(show: Boolean) {
-        schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
-    }
-
-    fun onChildFragmentLoaded() {
-        presenter.onChildViewLoaded()
-    }
-
-    override fun notifyChildLoadData(index: Int, forceRefresh: Boolean) {
-        (pagerAdapter.getFragmentInstance(index) as? SchoolAndTeachersChildView)?.onParentLoadData(forceRefresh)
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
deleted file mode 100644
index 62803a28..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerChildFragment
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
-
-@Suppress("unused")
-@Module(includes = [SchoolAndTeachersModule.Static::class])
-abstract class SchoolAndTeachersModule {
-
-    @Module
-    object Static {
-
-        @PerFragment
-        @Provides
-        fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
-    }
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun provideSchoolFragment(): SchoolFragment
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun provideTeacherFragment(): TeacherFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
deleted file mode 100644
index 1856803c..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Completable
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class SchoolAndTeachersPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
-) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository, schedulers) {
-
-    override fun onAttachView(view: SchoolAndTeachersView) {
-        super.onAttachView(view)
-        disposable.add(Completable.timer(150, TimeUnit.MILLISECONDS, schedulers.mainThread)
-            .subscribe {
-                view.initView()
-                Timber.i("Message view was initialized")
-                loadData()
-            })
-    }
-
-    fun onPageSelected(index: Int) {
-        loadChild(index)
-    }
-
-    private fun loadData() {
-        view?.run { loadChild(currentPageIndex) }
-    }
-
-    private fun loadChild(index: Int, forceRefresh: Boolean = false) {
-        Timber.i("Load schoolandteachers child view index: $index")
-        view?.notifyChildLoadData(index, forceRefresh)
-    }
-
-    fun onChildViewLoaded() {
-        view?.apply {
-            showContent(true)
-            showProgress(false)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersView.kt
deleted file mode 100644
index 594441ec..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersView.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface SchoolAndTeachersView : BaseView {
-
-    val currentPageIndex: Int
-
-    fun initView()
-
-    fun showContent(show: Boolean)
-
-    fun showProgress(show: Boolean)
-
-    fun notifyChildLoadData(index: Int, forceRefresh: Boolean)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
deleted file mode 100644
index 5a7c4cad..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.school
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.utils.openDialer
-import io.github.wulkanowy.utils.openNavigation
-import kotlinx.android.synthetic.main.fragment_school.*
-import javax.inject.Inject
-
-class SchoolFragment : BaseFragment(), SchoolView, MainView.TitledView, SchoolAndTeachersChildView {
-
-    @Inject
-    lateinit var presenter: SchoolPresenter
-
-    override val titleStringId get() = R.string.school_title
-
-    override val isViewEmpty get() = schoolName.text.isBlank()
-
-    companion object {
-        fun newInstance() = SchoolFragment()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_school, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        schoolErrorRetry.setOnClickListener { presenter.onRetry() }
-        schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
-        schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
-        schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
-    }
-
-    override fun updateData(data: School) {
-        schoolName.text = data.name
-        schoolAddress.text = data.address.ifBlank { "-" }
-        schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
-        schoolTelephone.text = data.contact.ifBlank { "-" }
-        schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
-        schoolHeadmaster.text = data.headmaster
-        schoolPedagogue.text = data.pedagogue
-    }
-
-    override fun showEmpty(show: Boolean) {
-        schoolEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        schoolError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        schoolErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        schoolProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        schoolSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        schoolContent.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun hideRefresh() {
-        schoolSwipe.isRefreshing = false
-    }
-
-    override fun notifyParentDataLoaded() {
-        (parentFragment as? SchoolAndTeachersFragment)?.onChildFragmentLoaded()
-    }
-
-    override fun onParentLoadData(forceRefresh: Boolean) {
-        presenter.onParentViewLoadData(forceRefresh)
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-
-    override fun openMapsLocation(location: String) {
-        context?.openNavigation(location)
-    }
-
-    override fun dialPhone(phone: String) {
-        context?.openDialer(phone)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
deleted file mode 100644
index d3299d90..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.school
-
-import io.github.wulkanowy.data.repositories.school.SchoolRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import timber.log.Timber
-import javax.inject.Inject
-
-class SchoolPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val schoolRepository: SchoolRepository,
-    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SchoolView>(errorHandler, studentRepository, schedulers) {
-
-    private var address: String? = null
-
-    private var contact: String? = null
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: SchoolView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("School view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        loadData(true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    fun onParentViewLoadData(forceRefresh: Boolean) {
-        loadData(forceRefresh)
-    }
-
-    fun onAddressSelected() {
-        address?.let { view?.openMapsLocation(it) }
-    }
-
-    fun onTelephoneSelected() {
-        contact?.let { view?.dialPhone(it) }
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading school info started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMapMaybe { schoolRepository.getSchoolInfo(it, forceRefresh) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded()
-                }
-            }.subscribe({
-                Timber.i("Loading teachers result: Success")
-                view?.run {
-                    address = it.address.ifBlank { null }
-                    contact = it.contact.ifBlank { null }
-                    updateData(it)
-                    showContent(true)
-                    showEmpty(false)
-                    showErrorView(false)
-                }
-                analytics.logEvent("load_school", "force_refresh" to forceRefresh)
-            }, {
-                Timber.i("Loading school result: An exception occurred")
-                errorHandler.dispatch(it)
-            }, {
-                Timber.i("Loading school result: No school info found")
-                view?.run {
-                    showContent(!isViewEmpty)
-                    showEmpty(isViewEmpty)
-                    showErrorView(false)
-                }
-            }))
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-                showContent(false)
-            } else showError(message, error)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolView.kt
deleted file mode 100644
index c42c2f91..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.school
-
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
-
-interface SchoolView : BaseView, SchoolAndTeachersChildView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: School)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun hideRefresh()
-
-    fun openMapsLocation(location: String)
-
-    fun dialPhone(phone: String)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
deleted file mode 100644
index b6bb9c10..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import kotlinx.android.synthetic.main.fragment_teacher.*
-import javax.inject.Inject
-
-class TeacherFragment : BaseFragment(), TeacherView, MainView.TitledView,
-    SchoolAndTeachersChildView {
-
-    @Inject
-    lateinit var presenter: TeacherPresenter
-
-    @Inject
-    lateinit var teacherAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
-
-    companion object {
-        fun newInstance() = TeacherFragment()
-    }
-
-    override val titleStringId: Int
-        get() = R.string.teachers_title
-
-    override val noSubjectString get() = getString(R.string.teacher_no_subject)
-
-    override val isViewEmpty: Boolean
-        get() = teacherAdapter.isEmpty
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_teacher, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        teacherRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = teacherAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
-        }
-        teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        teacherErrorRetry.setOnClickListener { presenter.onRetry() }
-        teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-    }
-
-    override fun updateData(data: List<TeacherItem>) {
-        teacherAdapter.updateDataSet(data, true)
-    }
-
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        teacherAdapter.updateItem(item)
-    }
-
-    override fun clearData() {
-        teacherAdapter.clear()
-    }
-
-    override fun showEmpty(show: Boolean) {
-        teacherEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        teacherError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        teacherErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        teacherProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        teacherSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        teacherRecycler.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun hideRefresh() {
-        teacherSwipe.isRefreshing = false
-    }
-
-    override fun notifyParentDataLoaded() {
-        (parentFragment as? SchoolAndTeachersFragment)?.onChildFragmentLoaded()
-    }
-
-    override fun onParentLoadData(forceRefresh: Boolean) {
-        presenter.onParentViewLoadData(forceRefresh)
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
deleted file mode 100644
index 36831774..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import android.annotation.SuppressLint
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_teacher.*
-
-class TeacherItem(val teacher: Teacher, private val noSubjectText: String) : AbstractFlexibleItem<TeacherItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_teacher
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): TeacherItem.ViewHolder {
-        return TeacherItem.ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: TeacherItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            teacherItemName.text = teacher.name
-            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else noSubjectText
-            if (teacher.shortName.isNotBlank()) {
-                teacherItemShortName.visibility = VISIBLE
-                teacherItemShortName.text = "[${teacher.shortName}]"
-            } else {
-                teacherItemShortName.visibility = GONE
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TeacherItem
-
-        if (teacher != other.teacher) return false
-        if (teacher.id != other.teacher.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = teacher.hashCode()
-        result = 31 * result + teacher.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
deleted file mode 100644
index 6aa4871d..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import timber.log.Timber
-import javax.inject.Inject
-
-class TeacherPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val teacherRepository: TeacherRepository,
-    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TeacherView>(errorHandler, studentRepository, schedulers) {
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: TeacherView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Teacher view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        loadData(true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    fun onParentViewLoadData(forceRefresh: Boolean) {
-        loadData(forceRefresh)
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading teachers data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { teacherRepository.getTeachers(it, forceRefresh) }
-            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
-            .map { items -> items.map { TeacherItem(it, view?.noSubjectString.orEmpty()) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded()
-                }
-            }.subscribe({
-                Timber.i("Loading teachers result: Success")
-                view?.run {
-                    updateData(it)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                    showErrorView(false)
-                }
-                analytics.logEvent("load_teachers", "items" to it.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.i("Loading teachers result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
deleted file mode 100644
index b16be8ff..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
-
-interface TeacherView : BaseView, SchoolAndTeachersChildView {
-
-    val isViewEmpty: Boolean
-
-    val noSubjectString: String
-
-    fun initView()
-
-    fun updateData(data: List<TeacherItem>)
-
-    fun updateItem(item: AbstractFlexibleItem<*>)
-
-    fun hideRefresh()
-
-    fun clearData()
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 03a89d27..cb172b98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -5,17 +5,14 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.yariksoffice.lingver.Lingver
 import dagger.android.support.AndroidSupportInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-class SettingsFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener,
+class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener,
     MainView.TitledView, SettingsView {
 
     @Inject
@@ -24,9 +21,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
     @Inject
     lateinit var appInfo: AppInfo
 
-    @Inject
-    lateinit var lingver: Lingver
-
     companion object {
         fun newInstance() = SettingsFragment()
     }
@@ -56,10 +50,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
         activity?.recreate()
     }
 
-    override fun updateLanguage(langCode: String) {
-        lingver.setLocale(requireContext(), langCode)
-    }
-
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
         findPreference<Preference>(serviceEnablesKey)?.apply {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
@@ -83,10 +73,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 89ba0ee5..88d38e0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -6,7 +6,6 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.isHolidays
@@ -21,8 +20,7 @@ class SettingsPresenter @Inject constructor(
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper,
     private val syncManager: SyncManager,
-    private val chuckCollector: ChuckCollector,
-    private val appInfo: AppInfo
+    private val chuckCollector: ChuckCollector
 ) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SettingsView) {
@@ -40,10 +38,6 @@ class SettingsPresenter @Inject constructor(
                 servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
                 isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
                 appThemeKey -> view?.recreateView()
-                appLanguageKey -> view?.run {
-                    updateLanguage(if (appLanguage == "system") appInfo.systemLanguage else appLanguage)
-                    recreateView()
-                }
                 else -> Unit
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index e50eb47b..1c4bf3b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -6,7 +6,5 @@ interface SettingsView : BaseView {
 
     fun recreateView()
 
-    fun updateLanguage(langCode: String)
-
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 57ec5998..7e286c92 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -11,7 +11,6 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.synthetic.main.dialog_timetable.*
 import org.threeten.bp.LocalDateTime
@@ -73,22 +72,13 @@ class TimetableDialog : DialogFragment() {
 
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
         when {
-            info.isNotBlank() -> {
-                if (canceled) {
-                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                } else {
-                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                }
-
-                timetableDialogChanges.text = when {
-                    canceled && !changes -> "Lekcja odwołana: $info"
-                    changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
-                    changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
-                    else -> info.capitalize()
-                }
-            } else -> {
+            info.isNotBlank() -> timetableDialogChanges.text = when {
+                canceled && !changes -> "Lekcja odwołana: $info"
+                changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                else -> info.capitalize()
+            }
+            else -> {
                 timetableDialogChangesTitle.visibility = GONE
                 timetableDialogChanges.visibility = GONE
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index ef6057df..a580a417 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -6,10 +6,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
@@ -20,11 +17,9 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
-import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
@@ -44,6 +39,8 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
 
     override val titleStringId get() = R.string.timetable_title
 
+    override val roomString get() = getString(R.string.timetable_room)
+
     override val isViewEmpty get() = timetableAdapter.isEmpty
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
@@ -76,11 +73,7 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         }
 
         timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        timetableErrorRetry.setOnClickListener { presenter.onRetry() }
-        timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
         timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        timetableNavDate.setOnClickListener { presenter.onPickDate() }
         timetableNextButton.setOnClickListener { presenter.onNextDay() }
 
         timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
@@ -124,19 +117,11 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun showEmpty(show: Boolean) {
-        timetableEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        timetableError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        timetableErrorMessage.text = message
+        timetableEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showProgress(show: Boolean) {
-        timetableProgress.visibility = if (show) VISIBLE else GONE
+        timetableProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -144,36 +129,21 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun showContent(show: Boolean) {
-        timetableRecycler.visibility = if (show) VISIBLE else GONE
+        timetableRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetablePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetableNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
         (activity as? MainActivity)?.showDialogFragment(TimetableDialog.newInstance(lesson))
     }
 
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            show(this@TimetableFragment.parentFragmentManager, null)
-        }
-    }
-
     override fun openCompletedLessonsView() {
         (activity as? MainActivity)?.pushView(CompletedLessonsFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
index 0991981d..c721401f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -11,12 +11,11 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_timetable.*
 
-class TimetableItem(val lesson: Timetable) :
+class TimetableItem(val lesson: Timetable, private val roomText: String) :
     AbstractFlexibleItem<TimetableItem.ViewHolder>() {
 
     override fun getLayoutRes() = R.layout.item_timetable
@@ -27,97 +26,16 @@ class TimetableItem(val lesson: Timetable) :
 
     @SuppressLint("SetTextI18n")
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        updateFields(holder)
-
-        with(holder) {
+        holder.apply {
+            timetableItemNumber.text = lesson.number.toString()
+            timetableItemSubject.text = lesson.subject
+            timetableItemRoom.text = if (lesson.room.isNotBlank()) "$roomText ${lesson.room}" else ""
+            timetableItemTime.text = "${lesson.start.toFormattedString("HH:mm")} - ${lesson.end.toFormattedString("HH:mm")}"
+            timetableItemAlert.visibility = if (lesson.changes || lesson.canceled) VISIBLE else GONE
             timetableItemSubject.paintFlags =
                 if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
                 else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
         }
-
-        updateDescription(holder)
-        updateColors(holder)
-    }
-
-    private fun updateFields(holder: ViewHolder) {
-        with(holder) {
-            timetableItemNumber.text = lesson.number.toString()
-            timetableItemSubject.text = lesson.subject
-            timetableItemRoom.text = lesson.room
-            timetableItemTeacher.text = lesson.teacher
-            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
-        }
-    }
-
-    private fun updateDescription(holder: ViewHolder) {
-        with(holder) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                updateDescriptionNoChanges(this)
-            } else {
-                timetableItemDescription.visibility = GONE
-
-                timetableItemRoom.visibility = VISIBLE
-                timetableItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun updateDescriptionNoChanges(holder: ViewHolder) {
-        with(holder) {
-            timetableItemDescription.visibility = VISIBLE
-            timetableItemDescription.text = lesson.info
-
-            timetableItemRoom.visibility = GONE
-            timetableItemTeacher.visibility = GONE
-
-            timetableItemDescription.setTextColor(holder.view.context.getThemeAttrColor(
-                if (lesson.canceled) R.attr.colorPrimary
-                else R.attr.colorTimetableChange
-            ))
-        }
-    }
-
-    private fun updateColors(holder: ViewHolder) {
-        with(holder) {
-            if (lesson.canceled) {
-                timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
-                timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
-            } else {
-                updateNumberColor(this)
-                updateSubjectColor(this)
-                updateRoomColor(this)
-                updateTeacherColor(this)
-            }
-        }
-    }
-
-    private fun updateNumberColor(holder: ViewHolder) {
-        holder.timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateSubjectColor(holder: ViewHolder) {
-        holder.timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateRoomColor(holder: ViewHolder) {
-        holder.timetableItemRoom.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
-    }
-
-    private fun updateTeacherColor(holder: ViewHolder) {
-        holder.timetableItemTeacher.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 4c30ecb7..54439e0a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.timetable
 
-import android.annotation.SuppressLint
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -17,7 +16,6 @@ import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
@@ -37,13 +35,10 @@ class TimetablePresenter @Inject constructor(
     lateinit var currentDate: LocalDate
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: TimetableView, date: Long?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Timetable was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
@@ -59,32 +54,11 @@ class TimetablePresenter @Inject constructor(
         reloadView()
     }
 
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        loadData(of(year, month, day))
-        reloadView()
-    }
-
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the timetable")
         loadData(currentDate, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onViewReselected() {
         Timber.i("Timetable view is reselected")
         view?.also { view ->
@@ -134,7 +108,7 @@ class TimetablePresenter @Inject constructor(
                 .flatMap { semesterRepository.getCurrentSemester(it) }
                 .delay(200, MILLISECONDS)
                 .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
-                .map { items -> items.map { TimetableItem(it) } }
+                .map { items -> items.map { TimetableItem(it, view?.roomString.orEmpty()) } }
                 .map { items -> items.sortedBy { it.lesson.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -150,28 +124,17 @@ class TimetablePresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
-                        showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
                     analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading timetable result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun reloadView() {
         Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
@@ -179,18 +142,16 @@ class TimetablePresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
-            showErrorView(false)
             clearData()
             reloadNavigation()
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun reloadNavigation() {
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index f730a271..80a2f9b8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -2,10 +2,11 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
 
 interface TimetableView : BaseView {
 
+    val roomString: String
+
     val isViewEmpty: Boolean
 
     val currentStackSize: Int?
@@ -24,10 +25,6 @@ interface TimetableView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -40,8 +37,6 @@ interface TimetableView : BaseView {
 
     fun showTimetableDialog(lesson: Timetable)
 
-    fun showDatePickerDialog(currentDate: LocalDate)
-
     fun popView()
 
     fun openCompletedLessonsView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
index fd6dc8a6..716903f5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
@@ -9,7 +9,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.utils.getThemeAttrColor
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_completed_lesson.*
 
@@ -24,10 +23,6 @@ class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexib
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
         holder?.apply {
             completedLessonItemNumber.text = completedLesson.number.toString()
-            completedLessonItemNumber.setTextColor(holder.contentView.context.getThemeAttrColor(
-                if (completedLesson.substitution.isNotEmpty()) R.attr.colorTimetableChange
-                else android.R.attr.textColorPrimary
-            ))
             completedLessonItemSubject.text = completedLesson.subject
             completedLessonItemTopic.text = completedLesson.topic
             completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index 60c16b2d..c7b5c6ca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -3,11 +3,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -16,12 +12,10 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable_completed.*
-import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.TitledView {
@@ -61,11 +55,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
         }
 
         completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
-        completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
         completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
         completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
 
         completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
@@ -88,15 +78,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     override fun showEmpty(show: Boolean) {
-        completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        completedLessonError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        completedLessonErrorMessage.text = message
+        completedLessonsEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showFeatureDisabled() {
@@ -105,7 +87,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     override fun showProgress(show: Boolean) {
-        completedLessonsProgress.visibility = if (show) VISIBLE else GONE
+        completedLessonsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -113,36 +95,21 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     override fun showContent(show: Boolean) {
-        completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
+        completedLessonsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
         (activity as? MainActivity)?.showDialogFragment(CompletedLessonDialog.newInstance(completedLesson))
     }
 
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            show(this@CompletedLessonsFragment.parentFragmentManager, null)
-        }
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index e2b56950..b9e1fe2d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
-import android.annotation.SuppressLint
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -35,20 +34,17 @@ class CompletedLessonsPresenter @Inject constructor(
     lateinit var currentDate: LocalDate
         private set
 
-    private lateinit var lastError: Throwable
-
     fun onAttachView(view: CompletedLessonsView, date: Long?) {
         super.onAttachView(view)
         Timber.i("Completed lessons is attached")
         view.initView()
-        completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
             Timber.i("Completed lessons feature disabled by school")
         }
-        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
-        if (currentDate.isHolidays) setBaseDateOnHolidays()
-        reloadView()
     }
 
     fun onPreviousDay() {
@@ -61,32 +57,11 @@ class CompletedLessonsPresenter @Inject constructor(
         reloadView()
     }
 
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        loadData(LocalDate.of(year, month, day))
-        reloadView()
-    }
-
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the completed lessons")
         loadData(currentDate, true)
     }
 
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
     fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is CompletedLessonItem) {
             Timber.i("Select completed lessons item ${item.completedLesson.id}")
@@ -133,28 +108,17 @@ class CompletedLessonsPresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
-                        showErrorView(false)
                         showContent(it.isNotEmpty())
                     }
                     analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh)
                 }) {
                     Timber.i("Loading completed lessons result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                     completedLessonsErrorHandler.dispatch(it)
                 })
         }
     }
 
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
     private fun reloadView() {
         Timber.i("Reload completed lessons view with the date ${currentDate.toFormattedString()}")
         view?.apply {
@@ -162,18 +126,16 @@ class CompletedLessonsPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
-            showErrorView(false)
             clearData()
             reloadNavigation()
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun reloadNavigation() {
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
index a6a327e2..a8bef66f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
 
 interface CompletedLessonsView : BaseView {
 
@@ -20,10 +19,6 @@ interface CompletedLessonsView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
     fun showFeatureDisabled()
 
     fun showProgress(show: Boolean)
@@ -37,6 +32,4 @@ interface CompletedLessonsView : BaseView {
     fun showNextButton(show: Boolean)
 
     fun showCompletedLessonDialog(completedLesson: CompletedLesson)
-
-    fun showDatePickerDialog(currentDate: LocalDate)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 7636637f..79dd59bf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -28,8 +27,6 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
     @Inject
     override lateinit var presenter: TimetableWidgetConfigurePresenter
 
-    private var dialog: AlertDialog? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
@@ -41,27 +38,11 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
     }
 
     override fun initView() {
-        with(widgetConfigureRecycler) {
+        widgetConfigureRecycler.apply {
             adapter = configureAdapter
             layoutManager = SmoothScrollLinearLayoutManager(context)
         }
-
-        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
-    }
-
-    override fun showThemeDialog() {
-        val items = arrayOf(
-            getString(R.string.widget_timetable_theme_light),
-            getString(R.string.widget_timetable_theme_dark)
-        )
-
-        dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
-            .setTitle(R.string.widget_timetable_theme_title)
-            .setOnDismissListener { presenter.onDismissThemeView() }
-            .setSingleChoiceItems(items, -1) { _, which ->
-                presenter.onThemeSelect(which)
-            }
-            .show()
+        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
     }
 
     override fun updateData(data: List<TimetableWidgetConfigureItem>) {
@@ -91,9 +72,4 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this))
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        dialog?.dismiss()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index e1685108..9c0202db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
 import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
@@ -22,8 +21,6 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
 
     private var isFromProvider = false
 
-    private var selectedStudent: Student? = null
-
     fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
@@ -34,24 +31,10 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
 
     fun onItemSelect(item: AbstractFlexibleItem<*>) {
         if (item is TimetableWidgetConfigureItem) {
-            selectedStudent = item.student
-
-            if (isFromProvider) registerStudent(selectedStudent)
-            else view?.showThemeDialog()
+            registerStudent(item.student)
         }
     }
 
-    fun onThemeSelect(index: Int) {
-        appWidgetId?.let {
-            sharedPref.putLong(getThemeWidgetKey(it), index.toLong())
-        }
-        registerStudent(selectedStudent)
-    }
-
-    fun onDismissThemeView(){
-        view?.finishView()
-    }
-
     private fun loadData() {
         disposable.add(studentRepository.getSavedStudents(false)
             .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
@@ -63,23 +46,18 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
             .subscribe({
                 when {
                     it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 && !isFromProvider -> {
-                        selectedStudent = it.single().student
-                        view?.showThemeDialog()
-                    }
+                    it.size == 1 && !isFromProvider -> registerStudent(it.single().student)
                     else -> view?.updateData(it)
                 }
             }, { errorHandler.dispatch(it) }))
     }
 
-    private fun registerStudent(student: Student?) {
-        requireNotNull(student)
-
-        appWidgetId?.let { id ->
-            sharedPref.putLong(getStudentWidgetKey(id), student.id)
-            view?.run {
-                updateTimetableWidget(id)
-                setSuccessResult(id)
+    private fun registerStudent(student: Student) {
+        appWidgetId?.also {
+            sharedPref.putLong(getStudentWidgetKey(it), student.id)
+            view?.apply {
+                updateTimetableWidget(it)
+                setSuccessResult(it)
             }
         }
         view?.finishView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
index 7cac892d..98c800d4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -10,8 +10,6 @@ interface TimetableWidgetConfigureView : BaseView {
 
     fun updateTimetableWidget(widgetId: Int)
 
-    fun showThemeDialog()
-
     fun setSuccessResult(widgetId: Int)
 
     fun finishView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index fa989749..a0a519e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import android.annotation.SuppressLint
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.content.Context
 import android.content.Intent
@@ -19,9 +18,7 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toFormattedString
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -39,14 +36,6 @@ class TimetableWidgetFactory(
 
     private var lessons = emptyList<Timetable>()
 
-    private var layoutId: Int? = null
-
-    private var primaryColor: Int? = null
-
-    private var textColor: Int? = null
-
-    private var timetableChangeColor: Int? = null
-
     override fun getLoadingView() = null
 
     override fun hasStableIds() = true
@@ -66,141 +55,63 @@ class TimetableWidgetFactory(
             val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
-            updateTheme(appWidgetId)
-
-            updateLessons(date, studentId)
+            lessons = try {
+                studentRepository.isStudentSaved()
+                    .filter { true }
+                    .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                    .flatMap {
+                        it.singleOrNull { student -> student.id == studentId }
+                            .let { student ->
+                                if (student != null) Maybe.just(student)
+                                else Maybe.empty()
+                            }
+                    }
+                    .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
+                    .flatMap { timetableRepository.getTimetable(it, date, date).toMaybe() }
+                    .map { item -> item.sortedBy { it.number } }
+                    .subscribeOn(schedulers.backgroundThread)
+                    .blockingGet(emptyList())
+            } catch (e: Exception) {
+                Timber.e(e, "An error has occurred in timetable widget factory")
+                emptyList()
+            }
         }
     }
 
-    private fun updateTheme(appWidgetId: Int) {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        layoutId = if (savedTheme == 0L) R.layout.item_widget_timetable else R.layout.item_widget_timetable_dark
-
-        primaryColor = if (savedTheme == 0L) R.color.colorPrimary else R.color.colorPrimaryLight
-        textColor = if (savedTheme == 0L) android.R.color.black else android.R.color.white
-        timetableChangeColor = if (savedTheme == 0L) R.color.timetable_change_dark else R.color.timetable_change_light
-    }
-
-    private fun updateLessons(date: LocalDate, studentId: Long) {
-        lessons = try {
-            studentRepository.isStudentSaved()
-                .filter { true }
-                .flatMap { studentRepository.getSavedStudents().toMaybe() }
-                .flatMap {
-                    val student = it.singleOrNull { student -> student.id == studentId }
-
-                    if (student != null) Maybe.just(student)
-                    else Maybe.empty()
-                }
-                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
-                .flatMap { timetableRepository.getTimetable(it, date, date).toMaybe() }
-                .map { item -> item.sortedBy { it.number } }
-                .subscribeOn(schedulers.backgroundThread)
-                .blockingGet(emptyList())
-        } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in timetable widget factory")
-            emptyList()
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
     override fun getViewAt(position: Int): RemoteViews? {
         if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
 
-        return RemoteViews(context.packageName, layoutId!!).apply {
-            val lesson = lessons[position]
+        return RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
+            lessons[position].let {
+                setTextViewText(R.id.timetableWidgetItemSubject, it.subject)
+                setTextViewText(R.id.timetableWidgetItemNumber, it.number.toString())
+                setTextViewText(R.id.timetableWidgetItemTime, it.start.toFormattedString("HH:mm") +
+                    " - ${it.end.toFormattedString("HH:mm")}")
 
-            setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
-            setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
-            setTextViewText(R.id.timetableWidgetItemTimeStart, lesson.start.toFormattedString("HH:mm"))
-            setTextViewText(R.id.timetableWidgetItemTimeFinish, lesson.end.toFormattedString("HH:mm"))
+                if (it.room.isNotBlank()) {
+                    setTextViewText(R.id.timetableWidgetItemRoom, "${context.getString(R.string.timetable_room)} ${it.room}")
+                } else setTextViewText(R.id.timetableWidgetItemRoom, "")
 
-            updateDescription(this, lesson)
+                if (it.info.isNotBlank()) {
+                    setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
+                    setTextViewText(R.id.timetableWidgetItemDescription, it.run {
+                        when (true) {
+                            canceled && !changes -> "Lekcja odwołana: $info"
+                            changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                            changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                            else -> it.info.capitalize()
+                        }
+                    })
+                } else setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
 
-            if (lesson.canceled) {
-                updateStylesCanceled(this)
-            } else {
-                updateStylesNotCanceled(this, lesson)
+                if (it.canceled) {
+                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags",
+                        STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG)
+                } else {
+                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", ANTI_ALIAS_FLAG)
+                }
             }
-
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
         }
     }
-
-    private fun updateDescription(remoteViews: RemoteViews, lesson: Timetable) {
-        with(remoteViews) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                setTextViewText(R.id.timetableWidgetItemDescription, lesson.info)
-                setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
-                setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
-                setViewVisibility(R.id.timetableWidgetItemTeacher, GONE)
-            } else {
-                setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
-                setViewVisibility(R.id.timetableWidgetItemRoom, VISIBLE)
-                setViewVisibility(R.id.timetableWidgetItemTeacher, VISIBLE)
-            }
-        }
-    }
-
-    private fun updateStylesCanceled(remoteViews: RemoteViews) {
-        with(remoteViews) {
-            setInt(R.id.timetableWidgetItemSubject, "setPaintFlags",
-                STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG)
-            setTextColor(R.id.timetableWidgetItemNumber, context.getCompatColor(primaryColor!!))
-            setTextColor(R.id.timetableWidgetItemSubject, context.getCompatColor(primaryColor!!))
-            setTextColor(R.id.timetableWidgetItemDescription, context.getCompatColor(primaryColor!!))
-        }
-    }
-
-    private fun updateStylesNotCanceled(remoteViews: RemoteViews, lesson: Timetable) {
-        with(remoteViews) {
-            setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", ANTI_ALIAS_FLAG)
-            setTextColor(R.id.timetableWidgetItemSubject, context.getCompatColor(textColor!!))
-            setTextColor(R.id.timetableWidgetItemDescription, context.getCompatColor(timetableChangeColor!!))
-
-            updateNotCanceledLessonNumberColor(this, lesson)
-            updateNotCanceledSubjectColor(this, lesson)
-
-            val teacherChange = lesson.teacherOld.isNotBlank() && lesson.teacher != lesson.teacherOld
-            updateNotCanceledRoom(this, lesson, teacherChange)
-            updateNotCanceledTeacher(this, lesson, teacherChange)
-        }
-    }
-
-    private fun updateNotCanceledLessonNumberColor(remoteViews: RemoteViews, lesson: Timetable) {
-        remoteViews.setTextColor(R.id.timetableWidgetItemNumber, context.getCompatColor(
-            if (lesson.changes || (lesson.info.isNotBlank() && !lesson.canceled)) timetableChangeColor!!
-            else textColor!!
-        ))
-    }
-
-    private fun updateNotCanceledSubjectColor(remoteViews: RemoteViews, lesson: Timetable) {
-        remoteViews.setTextColor(R.id.timetableWidgetItemSubject, context.getCompatColor(
-            if (lesson.subjectOld.isNotBlank() && lesson.subject != lesson.subjectOld) timetableChangeColor!!
-            else textColor!!
-        ))
-    }
-
-    private fun updateNotCanceledRoom(remoteViews: RemoteViews, lesson: Timetable, teacherChange: Boolean) {
-        with(remoteViews) {
-            if (lesson.room.isNotBlank()) {
-                setTextViewText(R.id.timetableWidgetItemRoom,
-                    if (teacherChange) lesson.room
-                    else "${context.getString(R.string.timetable_room)} ${lesson.room}"
-                )
-
-                setTextColor(R.id.timetableWidgetItemRoom, context.getCompatColor(
-                    if (lesson.roomOld.isNotBlank() && lesson.room != lesson.roomOld) timetableChangeColor!!
-                    else textColor!!
-                ))
-            } else setTextViewText(R.id.timetableWidgetItemRoom, "")
-        }
-    }
-
-    private fun updateNotCanceledTeacher(remoteViews: RemoteViews, lesson: Timetable, teacherChange: Boolean) {
-        remoteViews.setTextViewText(R.id.timetableWidgetItemTeacher,
-            if (teacherChange) lesson.teacher
-            else ""
-        )
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 0030ee54..dadbe050 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -54,24 +54,21 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     lateinit var analytics: FirebaseAnalyticsHelper
 
     companion object {
-
-        private const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
-
-        private const val EXTRA_BUTTON_TYPE = "extraButtonType"
-
-        private const val BUTTON_NEXT = "buttonNext"
-
-        private const val BUTTON_PREV = "buttonPrev"
-
-        private const val BUTTON_RESET = "buttonReset"
-
         const val EXTRA_FROM_PROVIDER = "extraFromProvider"
 
+        const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
+
+        const val EXTRA_BUTTON_TYPE = "extraButtonType"
+
+        const val BUTTON_NEXT = "buttonNext"
+
+        const val BUTTON_PREV = "buttonPrev"
+
+        const val BUTTON_RESET = "buttonReset"
+
         fun getDateWidgetKey(appWidgetId: Int) = "timetable_widget_date_$appWidgetId"
 
         fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
-
-        fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -105,56 +102,45 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     }
 
     private fun onDelete(intent: Intent) {
-        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
-
-        if (appWidgetId != 0) {
-            with(sharedPref) {
-                delete(getStudentWidgetKey(appWidgetId))
-                delete(getDateWidgetKey(appWidgetId))
+        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+            if (it != 0) {
+                sharedPref.apply {
+                    delete(getStudentWidgetKey(it))
+                    delete(getDateWidgetKey(it))
+                }
             }
         }
     }
 
     @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val layoutId = if (savedTheme == 0L) R.layout.widget_timetable else R.layout.widget_timetable_dark
-
-        val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
-        val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
-        val resetNavIntent = createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET)
-        val adapterIntent = Intent(context, TimetableWidgetService::class.java)
-            .apply {
-                putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
-                //make Intent unique
-                action = appWidgetId.toString()
-            }
-        val accountIntent = PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
-            Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
-                addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
-                putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
-                putExtra(EXTRA_FROM_PROVIDER, true)
-            }, FLAG_UPDATE_CURRENT)
-        val appIntent = PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
-            MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT)
-
-        val remoteView = RemoteViews(context.packageName, layoutId).apply {
+        RemoteViews(context.packageName, R.layout.widget_timetable).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-            setTextViewText(R.id.timetableWidgetDate, date.toFormattedString("EEEE, dd.MM").capitalize())
+            setTextViewText(R.id.timetableWidgetDate, "${date.shortcutWeekDayName.capitalize()} ${date.toFormattedString()}")
             setTextViewText(R.id.timetableWidgetName, student?.studentName ?: context.getString(R.string.all_no_data))
-            setRemoteAdapter(R.id.timetableWidgetList, adapterIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetNext, nextNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetPrev, prevNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetDate, resetNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetName, resetNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetAccount, accountIntent)
-            setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
-        }
-
-        sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
-        with(appWidgetManager) {
-            notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-            updateAppWidget(appWidgetId, remoteView)
+            setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
+                .apply { putExtra(EXTRA_APPWIDGET_ID, appWidgetId) })
+            setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT))
+            setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV))
+            createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET).let {
+                setOnClickPendingIntent(R.id.timetableWidgetDate, it)
+                setOnClickPendingIntent(R.id.timetableWidgetName, it)
+            }
+            setOnClickPendingIntent(R.id.timetableWidgetAccount, PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
+                Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
+                    addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
+                    putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
+                    putExtra(EXTRA_FROM_PROVIDER, true)
+                }, FLAG_UPDATE_CURRENT))
+            setPendingIntentTemplate(R.id.timetableWidgetList,
+                PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+        }.also {
+            sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+            appWidgetManager.apply {
+                notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+                updateAppWidget(appWidgetId, it)
+            }
         }
     }
 
@@ -173,17 +159,19 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                 .filter { true }
                 .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
                 .flatMap { students ->
-                    val student = students.singleOrNull { student -> student.id == studentId }
-                    when {
-                        student != null -> Maybe.just(student)
-                        studentId != 0L -> {
-                            studentRepository.isCurrentStudentSet()
-                                .filter { true }
-                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
-                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                    students.singleOrNull { student -> student.id == studentId }
+                        .let { student ->
+                            when {
+                                student != null -> Maybe.just(student)
+                                studentId != 0L -> {
+                                    studentRepository.isCurrentStudentSet()
+                                        .filter { true }
+                                        .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                        .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                                }
+                                else -> Maybe.empty()
+                            }
                         }
-                        else -> Maybe.empty()
-                    }
                 }
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
index a04922e5..cad26f2e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
@@ -33,7 +33,7 @@ class MaterialLinearLayout : LinearLayout {
         if (SDK_INT >= LOLLIPOP) {
             setElevation(elevation)
         } else {
-            setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(elevation))
+            setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
index e19d0111..3bcaae7d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
@@ -19,7 +19,7 @@ open class MaterialTabLayout : TabLayout {
         if (SDK_INT >= LOLLIPOP) {
             setElevation(elevation)
         } else {
-            setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(elevation))
+            setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index a444da6f..3fa83a04 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.utils
 
-import android.content.res.Resources
 import android.os.Build.MANUFACTURER
 import android.os.Build.MODEL
 import android.os.Build.VERSION.SDK_INT
@@ -26,8 +25,4 @@ open class AppInfo {
     open val systemManufacturer: String get() = MANUFACTURER
 
     open val systemModel: String get() = MODEL
-
-    @Suppress("DEPRECATION")
-    open val systemLanguage: String
-        get() = Resources.getSystem().configuration.locale.language
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index a265378e..a941c6fa 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.utils
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.util.DisplayMetrics.DENSITY_DEFAULT
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
@@ -32,26 +31,4 @@ fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -
     }
 }
 
-fun Context.openEmailClient(chooserTitle: String, email: String, subject: String?, body: String?) {
-    val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", email, null))
-    emailIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
-    if (subject != null) emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
-    if (body != null) emailIntent.putExtra(Intent.EXTRA_TEXT, body)
-    startActivity(Intent.createChooser(emailIntent, chooserTitle))
-}
-
-fun Context.openNavigation(location: String) {
-    val intentUri = Uri.parse("geo:0,0?q=${Uri.encode(location)}")
-    val intent = Intent(Intent.ACTION_VIEW, intentUri)
-    if (intent.resolveActivity(packageManager) != null) {
-        startActivity(intent)
-    }
-}
-
-fun Context.openDialer(phone: String) {
-    val intentUri = Uri.parse("tel:$phone")
-    val intent = Intent(Intent.ACTION_DIAL, intentUri)
-    startActivity(intent)
-}
-
 fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
index 0b71c964..1fc3185c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
@@ -11,7 +11,6 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 
@@ -28,7 +27,6 @@ fun Fragment.toSection(): MainView.Section? {
         is LuckyNumberFragment -> MainView.Section.LUCKY_NUMBER
         is SettingsFragment -> MainView.Section.SETTINGS
         is AboutFragment -> MainView.Section.ABOUT
-        is SchoolAndTeachersFragment -> MainView.Section.SCHOOL
         else -> null
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
index 22dbc22f..c863b030 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -67,8 +67,8 @@ inline val Grade.colorStringId: Int
 
 fun Grade.changeModifier(plusModifier: Double, minusModifier: Double): Grade {
     return when {
-        modifier > 0 -> copy(modifier = plusModifier)
-        modifier < 0 -> copy(modifier = -minusModifier)
+        modifier != .0 && plusModifier != .0 && modifier > 0 -> copy(modifier = plusModifier)
+        modifier != .0 && minusModifier != .0 && modifier < 0 -> copy(modifier = -minusModifier)
         else -> this
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
deleted file mode 100644
index 922aafbd..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.wdullaer.materialdatetimepicker.date.DateRangeLimiter
-import org.threeten.bp.DayOfWeek
-import org.threeten.bp.LocalDate
-import java.util.Calendar
-
-@Suppress("UNUSED_PARAMETER")
-class SchooldaysRangeLimiter : DateRangeLimiter {
-
-    private val now = LocalDate.now()
-
-    override fun setToNearestDate(day: Calendar): Calendar = day
-
-    override fun isOutOfRange(year: Int, month: Int, day: Int): Boolean {
-        val date = LocalDate.of(year, month + 1, day)
-        val dayOfWeek = date.dayOfWeek
-        return dayOfWeek == DayOfWeek.SUNDAY || dayOfWeek == DayOfWeek.SATURDAY || date.isHolidays
-    }
-
-    override fun getStartDate(): Calendar {
-        val startYear = if (now.monthValue <= 6) now.year - 1 else now.year
-        val startOfSchoolYear = now.withYear(startYear).firstSchoolDay
-
-        val calendar = Calendar.getInstance()
-        calendar.set(startOfSchoolYear.year, startOfSchoolYear.monthValue - 1, startOfSchoolYear.dayOfMonth)
-        return calendar
-    }
-
-    override fun getEndDate(): Calendar {
-        val endYear = if (now.monthValue > 6) now.year + 1 else now.year
-        val endOfSchoolYear = now.withYear(endYear).lastSchoolDay
-
-        val calendar = Calendar.getInstance()
-        calendar.set(endOfSchoolYear.year, endOfSchoolYear.monthValue - 1, endOfSchoolYear.dayOfMonth)
-        return calendar
-    }
-
-    override fun writeToParcel(parcel: Parcel, flags: Int) {}
-
-    override fun describeContents() = 0
-
-    companion object CREATOR : Parcelable.Creator<SchooldaysRangeLimiter> {
-
-        override fun createFromParcel(parcel: Parcel): SchooldaysRangeLimiter = SchooldaysRangeLimiter()
-
-        override fun newArray(size: Int): Array<SchooldaysRangeLimiter?> = arrayOfNulls(size)
-    }
-}
diff --git a/app/src/main/play/listings/pl-PL/full-description.txt b/app/src/main/play/listings/pl-PL/full-description.txt
index 641b7706..d33cb56f 100644
--- a/app/src/main/play/listings/pl-PL/full-description.txt
+++ b/app/src/main/play/listings/pl-PL/full-description.txt
@@ -1,4 +1,4 @@
-Aplikacja jest przeznaczona dla użytkowników dziennika VULCAN UONET+.
+Aplikacja jest we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami.
 
 Wyróżnione cechy i funkcje:
 - obliczanie średniej ważonej,
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png
deleted file mode 100644
index 56768bf5..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png
deleted file mode 100644
index 83d9353a..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png
deleted file mode 100644
index f83a7af8..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png
deleted file mode 100644
index 90d5fef4..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png
deleted file mode 100644
index eadbf2db..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png
deleted file mode 100644
index 2a11a3db..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png
deleted file mode 100644
index d9b2f1c7..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png
new file mode 100644
index 00000000..8a52d8de
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png
new file mode 100644
index 00000000..c6508574
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png
new file mode 100644
index 00000000..376fc3c3
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png
new file mode 100644
index 00000000..6b4089b0
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png
new file mode 100644
index 00000000..c3dc523f
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png
new file mode 100644
index 00000000..511433d4
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png
new file mode 100644
index 00000000..1d502470
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png differ
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index fe3993f6..f60764da 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,7 @@
-Wersja 0.13.0
+Wersja 0.10.0
 
-- naprawiony plan lekcji po ostatniej aktualizacji VULCANa (19.11)
-- naprawiona opcja wyboru motywu dla widżetu ze szczęśliwym numerkiem
-- nowa opcja zmiany języka i język rosyjski
-- możliwość łatwego nawigowania między dniami w planie lekcji przez kalendarz
-- opcja ustawienia modyfikatora oceny na wartość 0,0
+- odświeżyliśmy wygląd aplikacji
+- poprawiliśmy wyświetlanie nauczycieli w planie lekcji
+- naprawiliśmy szczęsliwy numerek
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable/background_luckynumber_widget.xml b/app/src/main/res/drawable/backgorund_luckynumber_widget.xml
similarity index 78%
rename from app/src/main/res/drawable/background_luckynumber_widget.xml
rename to app/src/main/res/drawable/backgorund_luckynumber_widget.xml
index f29744d0..38cbde9b 100644
--- a/app/src/main/res/drawable/background_luckynumber_widget.xml
+++ b/app/src/main/res/drawable/backgorund_luckynumber_widget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/white" />
+    <solid android:color="#FFF" />
     <corners android:radius="5dp" />
 </shape>
diff --git a/app/src/main/res/drawable/background_luckynumber_widget_dark.xml b/app/src/main/res/drawable/background_luckynumber_widget_dark.xml
deleted file mode 100644
index fa15fd85..00000000
--- a/app/src/main/res/drawable/background_luckynumber_widget_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/colorWidgetBackground" />
-    <corners android:radius="5dp" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_about_faq.xml b/app/src/main/res/drawable/ic_about_faq.xml
deleted file mode 100644
index d6ab255b..00000000
--- a/app/src/main/res/drawable/ic_about_faq.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M11,18H13V16H11V18M12,2A10,10 0,0 0,2 12A10,10 0,0 0,12 22A10,10 0,0 0,22 12A10,10 0,0 0,12 2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0,0 0,8 10H10A2,2 0,0 1,12 8A2,2 0,0 1,14 10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0,0 0,12 6Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
deleted file mode 100644
index ee3ff4be..00000000
--- a/app/src/main/res/drawable/ic_chevron_left.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right.xml
deleted file mode 100644
index a6d73497..00000000
--- a/app/src/main/res/drawable/ic_chevron_right.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
deleted file mode 100644
index bb4cb302..00000000
--- a/app/src/main/res/drawable/ic_error.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFF"
-      android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_more_schoolandteachers.xml b/app/src/main/res/drawable/ic_more_schoolandteachers.xml
deleted file mode 100644
index 9cb9aee0..00000000
--- a/app/src/main/res/drawable/ic_more_schoolandteachers.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M18,15H16V17H18M18,11H16V13H18M20,19H12V17H14V15H12V13H14V11H12V9H20M10,7H8V5H10M10,11H8V9H10M10,15H8V13H10M10,19H8V17H10M6,7H4V5H6M6,11H4V9H6M6,15H4V13H6M6,19H4V17H6M12,7V3H2V21H22V7H12Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_school_directions.xml b/app/src/main/res/drawable/ic_school_directions.xml
deleted file mode 100644
index c48db1da..00000000
--- a/app/src/main/res/drawable/ic_school_directions.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFF"
-      android:pathData="M22.43,10.59l-9.01,-9.01c-0.75,-0.75 -2.07,-0.76 -2.83,0l-9,9c-0.78,0.78 -0.78,2.04 0,2.82l9,9c0.39,0.39 0.9,0.58 1.41,0.58 0.51,0 1.02,-0.19 1.41,-0.58l8.99,-8.99c0.79,-0.76 0.8,-2.02 0.03,-2.82zM12.01,20.99l-9,-9 9,-9 9,9 -9,9zM8,11v4h2v-3h4v2.5l3.5,-3.5L14,7.5L14,10L9,10c-0.55,0 -1,0.45 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_school_phone.xml b/app/src/main/res/drawable/ic_school_phone.xml
deleted file mode 100644
index 7e3d7991..00000000
--- a/app/src/main/res/drawable/ic_school_phone.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFF"
-      android:pathData="M6.54,5c0.06,0.89 0.21,1.76 0.45,2.59l-1.2,1.2c-0.41,-1.2 -0.67,-2.47 -0.76,-3.79h1.51m9.86,12.02c0.85,0.24 1.72,0.39 2.6,0.45v1.49c-1.32,-0.09 -2.59,-0.35 -3.8,-0.75l1.2,-1.19M7.5,3H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.49c0,-0.55 -0.45,-1 -1,-1 -1.24,0 -2.45,-0.2 -3.57,-0.57 -0.1,-0.04 -0.21,-0.05 -0.31,-0.05 -0.26,0 -0.51,0.1 -0.71,0.29l-2.2,2.2c-2.83,-1.45 -5.15,-3.76 -6.59,-6.59l2.2,-2.2c0.28,-0.28 0.36,-0.67 0.25,-1.02C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3841b25c..1a86fa92 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,17 +1,10 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/loginContainer"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/loginToolbar"
-        android:background="@android:color/transparent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    android:layout_height="match_parent">
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
         android:id="@+id/loginViewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d07dbbd8..84007c77 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <androidx.fragment.app.FragmentContainerView
+    <FrameLayout
         android:id="@+id/mainFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 31ca7dd3..47d6219a 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/timetable_changes"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -89,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index f3d4cf1c..d94912fa 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="300dp"
@@ -23,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/timetable_changes"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -32,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -58,11 +57,10 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
@@ -87,11 +85,10 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
@@ -133,11 +130,10 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index daf7e67f..033a6772 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.attendance.AttendanceFragment">
+    android:layout_height="match_parent">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -26,8 +25,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/attendanceRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/item_attendance" />
+                android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -55,106 +53,45 @@
                 android:text="@string/attendance_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/attendanceError"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:ignore="UseCompoundDrawables"
-            tools:visibility="invisible">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_error"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/attendanceErrorMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:padding="8dp"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/attendanceErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/all_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/attendanceErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/attendanceNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendancePreviousButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitStart"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_prev"
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/attendanceNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
-            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:text="@string/app_name" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceNextButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitEnd"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            android:drawablePadding="4dp"
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
+            android:text="@string/all_next"
+            android:textColor="?android:textColorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index da0ce7f2..31be9900 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
-                android:entries="@array/hosts_keys"
+                android:entries="@array/endpoints_keys"
                 android:paddingStart="10dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="10dp"
@@ -82,55 +82,4 @@
             android:text="@string/attendance_no_items"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/attendanceSummaryError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/attendanceSummaryErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/attendanceSummaryErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/attendanceSummaryErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 1e1b0c99..23086bfb 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.exam.ExamFragment">
+    android:layout_height="match_parent">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -26,8 +25,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/examRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/header_exam" />
+                android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -55,105 +53,44 @@
                 android:text="@string/exam_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/examError"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:ignore="UseCompoundDrawables"
-            tools:visibility="invisible">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_error"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/examErrorMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:padding="8dp"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/examErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/all_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/examErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/examNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/examPreviousButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitStart"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_prev"
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/examNavDate"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
-
-        <ImageButton
-            android:id="@+id/examNextButton"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/app_name" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/examNextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitEnd"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            android:gravity="end|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_next"
+            android:textColor="?android:textColorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 0bc864b2..d134ec17 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -13,17 +13,23 @@
         android:visibility="invisible"
         app:tabMode="scrollable"
         app:tabSelectedTextColor="?colorPrimary"
-        app:tabTextColor="@color/material_on_surface_emphasis_medium"
+        app:tabTextColor="@color/mtrl_on_surface_emphasis_medium"
         tools:ignore="UnusedAttribute"
         tools:visibility="visible" />
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/gradeViewPager"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/gradeSwipe"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="48dp"
-        android:visibility="invisible"
-        tools:visibility="visible" />
+        android:layout_marginTop="48dp">
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/gradeViewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible"
+            tools:visibility="visible" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeProgress"
@@ -35,7 +41,7 @@
         tools:visibility="invisible" />
 
     <LinearLayout
-        android:id="@+id/gradeError"
+        android:id="@+id/gradeEmpty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
@@ -47,41 +53,16 @@
         <ImageView
             android:layout_width="100dp"
             android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
+            app:srcCompat="@drawable/ic_main_grade"
             app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
-            android:id="@+id/gradeErrorMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
+            android:text="@string/grade_no_items"
             android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index a1faefe7..125d43a9 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -13,8 +13,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeDetailsRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_grade_details" />
+            android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
@@ -50,55 +49,4 @@
             android:text="@string/grade_no_items"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/gradeDetailsError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/gradeDetailsErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeDetailsErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeDetailsErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index 10c8bb19..49ae6682 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -47,45 +47,32 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <HorizontalScrollView
-                    android:layout_width="wrap_content"
+                <RadioGroup
+                    android:id="@+id/gradeStatisticsTypeSwitch"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center">
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="5dp"
+                    android:visibility="invisible"
+                    tools:visibility="visible">
 
-                    <RadioGroup
-                        android:id="@+id/gradeStatisticsTypeSwitch"
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/gradeStatisticsTypePartial"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:paddingStart="16dp"
-                        android:paddingTop="5dp"
-                        android:paddingEnd="16dp"
-                        android:visibility="invisible"
-                        tools:visibility="visible">
+                        android:checked="true"
+                        android:tag="partial"
+                        android:text="@string/grade_statistics_partial" />
 
-                        <com.google.android.material.radiobutton.MaterialRadioButton
-                            android:id="@+id/gradeStatisticsTypePartial"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:checked="true"
-                            android:tag="partial"
-                            android:text="@string/grade_statistics_partial" />
-
-                        <com.google.android.material.radiobutton.MaterialRadioButton
-                            android:id="@+id/gradeStatisticsTypeSemester"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:tag="annual"
-                            android:text="@string/grade_statistics_semester" />
-
-                        <com.google.android.material.radiobutton.MaterialRadioButton
-                            android:id="@+id/gradeStatisticsTypePoints"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:tag="points"
-                            android:text="@string/grade_statistics_points" />
-                    </RadioGroup>
-                </HorizontalScrollView>
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/gradeStatisticsTypeSemester"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:tag="annual"
+                        android:text="@string/grade_statistics_semester" />
+                </RadioGroup>
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -101,16 +88,6 @@
                         android:visibility="gone"
                         tools:visibility="visible" />
 
-                    <com.github.mikephil.charting.charts.BarChart
-                        android:id="@+id/gradeStatisticsChartPoints"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:background="?android:windowBackground"
-                        android:minHeight="400dp"
-                        android:visibility="gone"
-                        tools:visibility="visible" />
-
                     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                         android:id="@+id/gradeStatisticsProgress"
                         style="@style/Widget.MaterialProgressBar.ProgressBar"
@@ -144,58 +121,6 @@
                             android:text="@string/grade_no_items"
                             android:textSize="20sp" />
                     </LinearLayout>
-
-
-                    <LinearLayout
-                        android:id="@+id/gradeStatisticsError"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:visibility="invisible"
-                        tools:ignore="UseCompoundDrawables"
-                        tools:visibility="invisible">
-
-                        <ImageView
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            app:srcCompat="@drawable/ic_error"
-                            app:tint="?colorOnBackground"
-                            tools:ignore="contentDescription" />
-
-                        <TextView
-                            android:id="@+id/gradeStatisticsErrorMessage"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="20dp"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:text="@string/error_unknown"
-                            android:textSize="20sp" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
-                            android:gravity="center"
-                            android:orientation="horizontal">
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/gradeStatisticsErrorDetails"
-                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:layout_marginRight="8dp"
-                                android:text="@string/all_details" />
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/gradeStatisticsErrorRetry"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/all_retry" />
-                        </LinearLayout>
-                    </LinearLayout>
                 </FrameLayout>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 3f21e61c..2d9e7dc6 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -13,8 +13,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeSummaryRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_grade_summary" />
+            android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
@@ -50,55 +49,4 @@
             android:text="@string/grade_no_items"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/gradeSummaryError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/gradeSummaryErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeSummaryErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/gradeSummaryErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 0fcde9c0..b80727ec 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.homework.HomeworkFragment">
+    android:layout_height="match_parent">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -26,8 +25,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/homeworkRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/item_homework" />
+                android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -55,105 +53,44 @@
                 android:text="@string/homework_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/homeworkError"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:ignore="UseCompoundDrawables"
-            tools:visibility="invisible">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_error"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/homeworkErrorMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:padding="8dp"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/homeworkErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/all_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/homeworkErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/homeworkNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkPreviousButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitStart"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_prev"
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/homeworkNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:text="@string/app_name" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkNextButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitEnd"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
+            android:text="@string/all_next"
+            android:textColor="?android:textColorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 9f7f01e0..5f6d2b5c 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.login.form.LoginFormFragment">
+    android:layout_height="match_parent">
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginFormProgress"
@@ -26,78 +25,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:id="@+id/loginFormContact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible">
-
-                <TextView
-                    android:id="@+id/loginFormContactHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginLeft="32dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
-                    android:layout_marginRight="32dp"
-                    android:layout_marginBottom="16dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/login_contact_header"
-                    android:textSize="14sp"
-                    app:fontFamily="sans-serif-medium" />
-
-                <LinearLayout
-                    android:id="@+id/loginFormContactButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/loginFormContactEmail"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/login_contact_email"
-                        app:icon="@drawable/ic_more_messages" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/loginFormFaq"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/about_faq"
-                        app:icon="@drawable/ic_about_faq" />
-                </LinearLayout>
-
-                <View
-                    android:id="@+id/loginFormContactDivider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:background="?android:attr/listDivider" />
-            </LinearLayout>
-
             <TextView
                 android:id="@+id/loginFormHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="48dp"
+                android:layout_marginTop="32dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
                 android:gravity="center_horizontal"
@@ -107,7 +41,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_chainStyle="packed" />
 
 
@@ -193,8 +127,7 @@
                     android:id="@+id/loginFormHost"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:editable="false"
-                    tools:ignore="Deprecated,LabelFor" />
+                    tools:ignore="LabelFor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.button.MaterialButton
@@ -203,41 +136,45 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="48dp"
-                android:layout_marginBottom="32dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="@id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
 
             <TextView
                 android:id="@+id/loginFormVersion"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
                 android:maxLines="2"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
                 app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
-                app:layout_constraintStart_toStartOf="@id/loginFormHostLayout"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
                 tools:text="Version 1.0.0" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormPrivacyLink"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
-                android:gravity="start|center_vertical"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
                 android:text="@string/login_privacy_policy"
                 android:visibility="invisible"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
                 app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@id/loginFormHostLayout"
                 app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index 64e06cbd..5d74d066 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -19,85 +19,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/loginStudentSelectContact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <View
-                android:id="@+id/loginStudentSelectContactTopDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/loginStudentSelectContactHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:gravity="center_horizontal"
-                android:text="@string/login_contact_header"
-                android:textSize="14sp"
-                app:fontFamily="sans-serif-medium" />
-
-            <LinearLayout
-                android:id="@+id/loginStudentSelectContactButtons"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp">
-                <com.google.android.material.button.MaterialButton
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:id="@+id/loginStudentSelectContactEmail"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:text="@string/login_contact_email"
-                    app:icon="@drawable/ic_more_messages" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:id="@+id/loginStudentSelectContactDiscord"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginStart="8dp"
-                    android:text="@string/login_contact_discord"
-                    app:icon="@drawable/ic_about_discord" />
-            </LinearLayout>
-
-            <View
-                android:id="@+id/loginStudentSelectContactBottomDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-        </LinearLayout>
-
         <TextView
             android:id="@+id/loginStudentSelectHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginLeft="32dp"
+            android:layout_marginTop="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginRight="32dp"
-            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:gravity="center_horizontal"
             android:text="@string/login_select_student"
@@ -106,7 +36,7 @@
             app:layout_constraintBottom_toTopOf="@id/loginStudentSelectRecycler"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectContact"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 0f691649..6aab8b2e 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.login.symbol.LoginSymbolFragment">
+    android:layout_height="match_parent">
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginSymbolProgress"
@@ -25,82 +24,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:id="@+id/loginSymbolContact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible">
-
-                <View
-                    android:id="@+id/loginSymbolContactTopDivider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?android:attr/listDivider" />
-
-                <TextView
-                    android:id="@+id/loginSymbolContactHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginLeft="32dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
-                    android:layout_marginRight="32dp"
-                    android:layout_marginBottom="16dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/login_contact_header"
-                    android:textSize="14sp"
-                    app:fontFamily="sans-serif-medium" />
-
-                <LinearLayout
-                    android:id="@+id/loginSymbolContactButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/loginSymbolContactEmail"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/login_contact_email"
-                        app:icon="@drawable/ic_more_messages" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/loginSymbolFaq"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_weight="1"
-                        android:text="@string/about_faq"
-                        app:icon="@drawable/ic_about_faq" />
-                </LinearLayout>
-
-                <View
-                    android:id="@+id/loginSymbolContactBottomDivider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:background="?android:attr/listDivider" />
-            </LinearLayout>
-
             <TextView
                 android:id="@+id/loginSymbolHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
+                android:layout_marginLeft="32dp"
                 android:layout_marginTop="32dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
@@ -112,7 +41,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_chainStyle="packed" />
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index a6b9b822..5d3afda2 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -67,55 +67,4 @@
             android:text="@string/lucky_number_empty"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/luckyNumberError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/luckyNumberErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/luckyNumberErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/luckyNumberErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index b4cc0c2f..7a2cfcf4 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -16,7 +16,7 @@
         app:tabMaxWidth="0dp"
         app:tabMode="fixed"
         app:tabSelectedTextColor="?colorPrimary"
-        app:tabTextColor="@color/material_on_surface_emphasis_medium"
+        app:tabTextColor="@color/mtrl_on_surface_emphasis_medium"
         tools:ignore="UnusedAttribute"
         tools:visibility="visible" />
 
@@ -27,7 +27,7 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/openSendMessageButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,9 +35,8 @@
         android:layout_margin="16dp"
         android:clickable="true"
         android:focusable="true"
-        android:text="@string/send_message_title"
         android:tint="?colorOnSecondary"
-        app:icon="@drawable/ic_menu_message_write" />
+        app:srcCompat="@drawable/ic_menu_message_write" />
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageProgress"
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 4a6f7e9a..eedba669 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -54,56 +54,30 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
-
     <LinearLayout
         android:id="@+id/messagePreviewError"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
+        android:padding="10dp"
         android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
+        tools:ignore="UseCompoundDrawables">
 
         <ImageView
             android:layout_width="100dp"
             android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
+            app:srcCompat="@drawable/ic_more_messages"
             app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
-            android:id="@+id/messagePreviewErrorMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
+            android:text="@string/message_preview_error"
             android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/messagePreviewErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/messagePreviewErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
     </LinearLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index e83d913e..d7f3e706 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -12,8 +12,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/messageTabRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_message" />
+            android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
@@ -48,55 +47,4 @@
             android:text="@string/message_no_items"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/messageTabError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/messageTabErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/messageTabErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/messageTabErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index cf11c283..b78dc067 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -14,18 +14,6 @@
         android:indeterminate="true"
         tools:visibility="invisible" />
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/mobileDevicesSwipe"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mobileDevicesRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_mobile_device" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
     <LinearLayout
         android:id="@+id/mobileDevicesEmpty"
         android:layout_width="match_parent"
@@ -54,56 +42,17 @@
             tools:ignore="contentDescription" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/mobileDevicesError"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/mobileDevicesSwipe"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
+        android:layout_height="match_parent">
 
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/mobileDevicesErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/mobileDevicesRecycler"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/mobileDevicesErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/mobileDevicesErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_mobile_device" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/mobileDeviceAddButton"
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index e55f0007..41a9587d 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -48,55 +48,4 @@
             android:text="@string/note_no_items"
             android:textSize="20sp" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/noteError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/noteErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/noteErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/noteErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_school.xml b/app/src/main/res/layout/fragment_school.xml
deleted file mode 100644
index a7e9a213..00000000
--- a/app/src/main/res/layout/fragment_school.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.schoolandteachers.school.SchoolFragment">
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/schoolProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/schoolSwipe"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="8dp"
-        android:paddingLeft="8dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="12dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="8dp">
-
-        <LinearLayout
-            android:id="@+id/schoolContent"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="12dp"
-                android:paddingLeft="12dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="12dp"
-                android:paddingRight="12dp"
-                android:paddingBottom="8dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/school_name"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/schoolName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
-                    android:textSize="17sp"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingStart="12dp"
-                    android:paddingLeft="12dp"
-                    android:paddingTop="7dp"
-                    android:paddingEnd="12dp"
-                    android:paddingRight="12dp"
-                    android:paddingBottom="7dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/school_address"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/schoolAddress"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textIsSelectable="true"
-                        android:textSize="17sp"
-                        tools:text="@tools:sample/full_names" />
-                </LinearLayout>
-
-                <ImageButton
-                    android:id="@+id/schoolAddressButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_school_directions"
-                    android:contentDescription="@string/school_address_button"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:tint="?colorPrimary"
-                    android:padding="4dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_gravity="center_vertical" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingStart="12dp"
-                    android:paddingLeft="12dp"
-                    android:paddingTop="7dp"
-                    android:paddingEnd="12dp"
-                    android:paddingRight="12dp"
-                    android:paddingBottom="7dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/school_telephone"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/schoolTelephone"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textIsSelectable="true"
-                        android:textSize="17sp"
-                        tools:text="@tools:sample/full_names" />
-                </LinearLayout>
-
-                <ImageButton
-                    android:id="@+id/schoolTelephoneButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_school_phone"
-                    android:contentDescription="@string/school_telephone_button"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:tint="?colorPrimary"
-                    android:padding="4dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_gravity="center_vertical" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="12dp"
-                android:paddingLeft="12dp"
-                android:paddingTop="7dp"
-                android:paddingEnd="12dp"
-                android:paddingRight="12dp"
-                android:paddingBottom="7dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/school_headmaster"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/schoolHeadmaster"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
-                    android:textSize="17sp"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="12dp"
-                android:paddingLeft="12dp"
-                android:paddingTop="7dp"
-                android:paddingEnd="12dp"
-                android:paddingRight="12dp"
-                android:paddingBottom="7dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/school_pedagogue"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/schoolPedagogue"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
-                    android:textSize="17sp"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-        </LinearLayout>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/schoolEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_more_schoolandteachers"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/school_no_info"
-            android:textSize="20sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/schoolError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/schoolErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/schoolErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/schoolErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_schoolandteachers.xml b/app/src/main/res/layout/fragment_schoolandteachers.xml
deleted file mode 100644
index 6414abb9..00000000
--- a/app/src/main/res/layout/fragment_schoolandteachers.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <io.github.wulkanowy.ui.widgets.MaterialTabLayout
-        android:id="@+id/schoolandteachersTabLayout"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="?colorSurface"
-        android:visibility="invisible"
-        app:tabGravity="fill"
-        app:tabIndicatorColor="?colorPrimary"
-        app:tabMaxWidth="0dp"
-        app:tabMode="fixed"
-        app:tabSelectedTextColor="?colorPrimary"
-        app:tabTextColor="@color/material_on_surface_emphasis_medium"
-        tools:ignore="UnusedAttribute"
-        tools:visibility="visible" />
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/schoolandteachersViewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="48dp"
-        android:visibility="invisible" />
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/schoolandteachersProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
-
diff --git a/app/src/main/res/layout/fragment_teacher.xml b/app/src/main/res/layout/fragment_teacher.xml
deleted file mode 100644
index 484bf065..00000000
--- a/app/src/main/res/layout/fragment_teacher.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/teacherProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/teacherSwipe"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            tools:listitem="@layout/item_teacher"
-            android:id="@+id/teacherRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/teacherEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_more_schoolandteachers"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/teacher_no_items"
-            android:textSize="20sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/teacherError"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/teacherErrorMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/error_unknown"
-            android:textSize="20sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/teacherErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/teacherErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 98ccabbf..85324961 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.timetable.TimetableFragment">
+    android:layout_height="match_parent">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -26,8 +25,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/timetableRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/item_timetable" />
+                android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -55,106 +53,44 @@
                 android:text="@string/timetable_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/timetableError"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:ignore="UseCompoundDrawables"
-            tools:visibility="invisible">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_error"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/timetableErrorMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:padding="8dp"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/timetableErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/all_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/timetableErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/timetableNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetablePreviousButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitStart"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_prev"
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/timetableNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
-            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:text="@string/app_name" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableNextButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitEnd"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
+            android:text="@string/all_next"
+            android:textColor="?android:textColorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 11067044..dee31ae4 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -57,106 +57,44 @@
                 android:text="@string/completed_lessons_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/completedLessonError"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="invisible"
-            tools:ignore="UseCompoundDrawables"
-            tools:visibility="invisible">
-
-            <ImageView
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:srcCompat="@drawable/ic_error"
-                app:tint="?colorOnBackground"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/completedLessonErrorMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:padding="8dp"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/completedLessonErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/all_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/completedLessonErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/completedLessonsNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_gravity="bottom"
         android:orientation="horizontal"
-        android:gravity="center"
         tools:ignore="UnusedAttribute">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonsPreviousButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitStart"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left"
-            android:contentDescription="@string/all_prev"/>
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
+            android:text="@string/all_prev"
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:fontFamily="sans-serif"
-            android:background="?selectableItemBackgroundBorderless"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:text="@string/app_name" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonsNextButton"
-            android:layout_width="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_weight="1"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:scaleType="fitEnd"
-            android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right"
-            android:contentDescription="@string/all_next" />
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
+            android:text="@string/all_next"
+            android:textColor="?android:textColorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index 40f486cf..a83951dd 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -7,11 +7,9 @@
     android:background="?selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
-    android:paddingRight="12dp"
+    android:paddingRight="16dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.grade.details.GradeDetailsHeader"
-    android:paddingEnd="12dp"
-    android:paddingStart="16dp">
+    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
 
     <TextView
         android:id="@+id/gradeHeaderSubject"
@@ -50,7 +48,7 @@
         android:textSize="12sp"
         tools:text="12 grades" />
 
-    <ImageView
+    <TextView
         android:id="@+id/gradeHeaderNote"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index 8b49ba76..68c9ab95 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -5,12 +5,12 @@
     android:layout_height="wrap_content"
     android:background="@drawable/ic_all_divider"
     android:foreground="?selectableItemBackground"
-    android:paddingStart="8dp"
-    android:paddingLeft="8dp"
-    android:paddingTop="6dp"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="6dp"
+    android:paddingBottom="7dp"
     tools:context=".ui.modules.timetable.completed.CompletedLessonItem"
     tools:ignore="UnusedAttribute">
 
@@ -31,8 +31,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
         android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/completedLessonItemAlert"
@@ -67,8 +67,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:tint="?colorTimetableChange"
+        android:layout_marginTop="10dp"
+        android:tint="?colorPrimary"
         app:srcCompat="@drawable/ic_timetable_swap"
         tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 68169039..5d03ed58 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -32,7 +32,7 @@
         android:layout_toRightOf="@id/homeworkItemSubject"
         android:gravity="end"
         android:textSize="13sp"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/homeworkItemContent"
@@ -46,5 +46,5 @@
         android:layout_marginBottom="15dp"
         android:lineSpacingMultiplier="1.2"
         android:textSize="14sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
deleted file mode 100644
index 3bac0573..00000000
--- a/app/src/main/res/layout/item_teacher.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingLeft="12dp"
-    android:paddingTop="7dp"
-    android:paddingEnd="12dp"
-    android:paddingRight="12dp"
-    android:paddingBottom="7dp"
-    tools:context=".ui.modules.schoolandteachers.teacher.TeacherItem">
-
-    <TextView
-        android:id="@+id/teacherItemName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="17sp"
-        tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/teacherItemShortName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/teacherItemName"
-        android:layout_toRightOf="@+id/teacherItemName"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="17sp"
-        tools:text="[LI]" />
-
-    <TextView
-        android:id="@+id/teacherItemSubject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/teacherItemName"
-        android:layout_alignStart="@id/teacherItemName"
-        android:layout_alignLeft="@id/teacherItemName"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="11:11-12:00" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index fcdae2e0..0072524a 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,25 +1,26 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    android:paddingStart="8dp"
-    android:paddingLeft="8dp"
-    android:paddingTop="6dp"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="6dp"
+    android:paddingBottom="7dp"
     tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableItemNumber"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerVertical="true"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
         android:textSize="32sp"
-        android:textColor="?android:textColorPrimary"
         tools:text="5" />
 
     <TextView
@@ -31,41 +32,24 @@
         android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
         android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
+        android:layout_toEndOf="@+id/timetableItemNumber"
+        android:layout_toRightOf="@+id/timetableItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="15sp"
-        android:textColor="?android:textColorPrimary"
+        android:textSize="17sp"
         tools:text="@tools:sample/lorem" />
 
     <TextView
-        android:id="@+id/timetableItemTimeStart"
+        android:id="@+id/timetableItemTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/timetableItemNumber"
-        android:layout_toRightOf="@id/timetableItemNumber"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_alignTop="@id/timetableItemNumber"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="11:11" />
-
-    <TextView
-        android:id="@+id/timetableItemTimeFinish"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/timetableItemNumber"
-        android:layout_toRightOf="@id/timetableItemNumber"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
+        android:layout_alignStart="@id/timetableItemSubject"
+        android:layout_alignLeft="@id/timetableItemSubject"
         android:layout_alignBottom="@+id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="12:00" />
+        android:textSize="12sp"
+        tools:text="11:11-12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
@@ -74,47 +58,25 @@
         android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_toStartOf="@id/timetableItemAlert"
+        android:layout_toLeftOf="@id/timetableItemAlert"
+        android:layout_toEndOf="@+id/timetableItemTime"
+        android:layout_toRightOf="@+id/timetableItemTime"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="22"
-        tools:visibility="gone" />
+        android:textSize="12sp"
+        tools:text="Room 22" />
 
-    <TextView
-        android:id="@+id/timetableItemTeacher"
+    <ImageView
+        android:id="@+id/timetableItemAlert"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/timetableItemNumber"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@id/timetableItemRoom"
-        android:layout_toRightOf="@id/timetableItemRoom"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        tools:text="Agata Kowalska - Błaszczyk"
-        tools:visibility="gone" />
-
-    <TextView
-        android:id="@+id/timetableItemDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/timetableItemTimeFinish"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
-        android:textColor="?colorTimetableChange"
-        android:textSize="13sp"
-        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-        tools:visibility="visible" />
-
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        app:srcCompat="@drawable/ic_timetable_swap"
+        app:tint="?colorPrimary"
+        tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index c69bade8..bffc0bd5 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -1,134 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetableWidgetItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/ic_all_divider"
     android:minHeight="45dp"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/timetableWidgetItemNumber"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textColor="@android:color/black"
+        android:textSize="25sp"
+        tools:text="1" />
+
+    <TextView
+        android:id="@+id/timetableWidgetItemTime"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="6dp"
-        android:paddingStart="6dp"
-        android:paddingEnd="12dp"
-        android:paddingRight="12dp">
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
+        android:layout_toEndOf="@id/timetableWidgetItemNumber"
+        android:layout_toRightOf="@id/timetableWidgetItemNumber"
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="08:00 - 08:45" />
 
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLength="2"
-            android:textSize="28sp"
-            android:textColor="@android:color/black"
-            tools:text="5" />
+    <TextView
+        android:id="@+id/timetableWidgetItemSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginRight="25dp"
+        android:layout_toEndOf="@id/timetableWidgetItemTime"
+        android:layout_toRightOf="@id/timetableWidgetItemTime"
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="15sp"
-            android:textColor="@android:color/black"
-            tools:text="@tools:sample/lorem" />
+    <TextView
+        android:id="@+id/timetableWidgetItemDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/timetableWidgetItemSubject"
+        android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginRight="25dp"
+        android:layout_marginBottom="5dp"
+        android:layout_toEndOf="@id/timetableWidgetItemTime"
+        android:layout_toRightOf="@id/timetableWidgetItemTime"
+        android:textColor="@color/colorPrimaryDark"
+        android:textSize="12sp"
+        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu" />
 
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="22"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_toEndOf="@id/timetableWidgetItemRoom"
-            android:layout_toRightOf="@id/timetableWidgetItemRoom"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/timetable_change_dark"
-            android:textSize="13sp"
-            android:visibility="gone"
-            tools:text="Agata Kowalska - Błaszczyk"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="0dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:textColor="@color/timetable_change_dark"
-            android:textSize="13sp"
-            tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone"/>
-    </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDivider" />
-</LinearLayout>
+    <TextView
+        android:id="@+id/timetableWidgetItemRoom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/timetableWidgetItemTime"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="5dp"
+        android:layout_toEndOf="@id/timetableWidgetItemNumber"
+        android:layout_toRightOf="@id/timetableWidgetItemNumber"
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="12sp"
+        tools:text="Sala 25" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
deleted file mode 100644
index 3a143f74..00000000
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/timetableWidgetItemContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="45dp"
-    android:orientation="vertical"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorWidgetBackground"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="6dp"
-        android:paddingStart="6dp"
-        android:paddingEnd="12dp"
-        android:paddingRight="12dp">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLength="2"
-            android:textSize="28sp"
-            android:textColor="@android:color/white"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="15sp"
-            android:textColor="@android:color/white"
-            tools:text="@tools:sample/lorem" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="22"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_toEndOf="@id/timetableWidgetItemRoom"
-            android:layout_toRightOf="@id/timetableWidgetItemRoom"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/timetable_change_light"
-            android:textSize="13sp"
-            android:visibility="gone"
-            tools:text="Agata Kowalska - Błaszczyk"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="0dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:textColor="@color/timetable_change_light"
-            android:textSize="13sp"
-            tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone"/>
-    </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDividerInverse" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/widget_luckynumber.xml b/app/src/main/res/layout/widget_luckynumber.xml
index 360a1970..ec12e421 100644
--- a/app/src/main/res/layout/widget_luckynumber.xml
+++ b/app/src/main/res/layout/widget_luckynumber.xml
@@ -4,7 +4,7 @@
     android:id="@+id/luckyNumberWidgetContainer"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/background_luckynumber_widget"
+    android:background="@drawable/backgorund_luckynumber_widget"
     android:gravity="center"
     android:padding="10dp"
     tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
diff --git a/app/src/main/res/layout/widget_luckynumber_dark.xml b/app/src/main/res/layout/widget_luckynumber_dark.xml
deleted file mode 100644
index 77174730..00000000
--- a/app/src/main/res/layout/widget_luckynumber_dark.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/luckyNumberWidgetContainer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/background_luckynumber_widget_dark"
-    android:gravity="center"
-    android:padding="10dp"
-    tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
-
-    <ImageView
-        android:id="@+id/luckyNumberWidgetImageTop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/luckyNumberWidgetNumber"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:contentDescription="@string/lucky_number_title"
-        android:gravity="center"
-        android:src="@drawable/ic_widget_clover"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/luckyNumberWidgetTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
-        android:gravity="center"
-        android:labelFor="@id/luckyNumberWidgetImageTop"
-        android:text="@string/lucky_number_title"
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="22sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/luckyNumberWidgetImageLeft"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/luckyNumberWidgetNumber"
-        android:contentDescription="@string/lucky_number_title"
-        android:src="@drawable/ic_widget_clover"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/luckyNumberWidgetNumber"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/luckyNumberWidgetTitle"
-        android:layout_toEndOf="@id/luckyNumberWidgetImageLeft"
-        android:layout_toRightOf="@id/luckyNumberWidgetImageLeft"
-        android:gravity="center"
-        android:text="#"
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="34sp"
-        tools:ignore="HardcodedText"
-        tools:text="13" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
deleted file mode 100644
index 3a301eb9..00000000
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorWidgetBackground"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/colorWidgetTopBar">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/timetableWidgetAccount"
-            android:layout_toLeftOf="@id/timetableWidgetAccount"
-            android:layout_toEndOf="@id/timetableWidgetNext"
-            android:layout_toRightOf="@id/timetableWidgetNext"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/timetableWidgetDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="15sp"
-                tools:text="Pon. 30.03.2019" />
-
-            <TextView
-                android:id="@+id/timetableWidgetName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="13sp"
-                tools:text="Jan Kowalski" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/timetableWidgetAccount"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:background="?android:selectableItemBackground"
-            android:contentDescription="@string/account_title"
-            android:src="@drawable/ic_widget_account" />
-
-        <ImageButton
-            android:id="@+id/timetableWidgetPrev"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:backgroundTint="@color/colorWidgetNavButton"
-            android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
-
-        <ImageButton
-            android:id="@+id/timetableWidgetNext"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
-            android:backgroundTint="@color/colorWidgetNavButton"
-            android:contentDescription="@string/all_next"
-            android:rotation="180"
-            android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
-    </RelativeLayout>
-
-    <ListView
-        android:id="@+id/timetableWidgetList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
-        tools:listitem="@layout/item_widget_timetable_dark" />
-
-    <TextView
-        android:id="@+id/timetableWidgetEmpty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/widget_timetable_no_items"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        tools:visibility="invisible" />
-</FrameLayout>
diff --git a/app/src/main/res/menu/action_menu_attendance.xml b/app/src/main/res/menu/action_menu_attendance.xml
index bb20c8ec..86c2fed7 100644
--- a/app/src/main/res/menu/action_menu_attendance.xml
+++ b/app/src/main/res/menu/action_menu_attendance.xml
@@ -6,6 +6,6 @@
         android:icon="@drawable/ic_menu_attendance_summary"
         android:orderInCategory="1"
         android:title="@string/attendance_summary_button"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_grade.xml b/app/src/main/res/menu/action_menu_grade.xml
index 6357cbb5..4438309d 100644
--- a/app/src/main/res/menu/action_menu_grade.xml
+++ b/app/src/main/res/menu/action_menu_grade.xml
@@ -6,6 +6,6 @@
         android:icon="@drawable/ic_menu_grade_semester"
         android:orderInCategory="1"
         android:title="@string/grade_switch_semester"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_grade_details.xml b/app/src/main/res/menu/action_menu_grade_details.xml
index 62516cbd..6f8a1aea 100644
--- a/app/src/main/res/menu/action_menu_grade_details.xml
+++ b/app/src/main/res/menu/action_menu_grade_details.xml
@@ -3,9 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/gradeDetailsMenuRead"
-        android:enabled="false"
         android:orderInCategory="100"
         android:title="@string/grade_menu_read"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_main.xml b/app/src/main/res/menu/action_menu_main.xml
index 72bea25a..78b4ee4a 100644
--- a/app/src/main/res/menu/action_menu_main.xml
+++ b/app/src/main/res/menu/action_menu_main.xml
@@ -6,6 +6,6 @@
         android:icon="@drawable/ic_all_account"
         android:orderInCategory="2"
         android:title="@string/main_account_picker"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index dfc12e23..f7979780 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -6,20 +6,20 @@
         android:icon="@drawable/ic_menu_message_reply"
         android:orderInCategory="1"
         android:title="@string/message_reply"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuForward"
         android:icon="@drawable/ic_menu_message_forward"
         android:orderInCategory="1"
         android:title="@string/message_forward"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuDelete"
         android:icon="@drawable/ic_menu_message_delete"
         android:orderInCategory="1"
         android:title="@string/message_delete"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_send_message.xml b/app/src/main/res/menu/action_menu_send_message.xml
index 4b43764a..491f74f9 100644
--- a/app/src/main/res/menu/action_menu_send_message.xml
+++ b/app/src/main/res/menu/action_menu_send_message.xml
@@ -6,6 +6,6 @@
         android:icon="@drawable/ic_menu_message_send"
         android:orderInCategory="1"
         android:title="@string/send_message_title"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml
index c3d0222c..cfbdb626 100644
--- a/app/src/main/res/menu/action_menu_timetable.xml
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -6,6 +6,6 @@
         android:icon="@drawable/ic_menu_timetable_lessons_completed"
         android:orderInCategory="1"
         android:title="@string/completed_lessons_button"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 49264538..02309830 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,12 @@
     <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents">
         <item name="colorPrimary">@color/colorPrimaryLight</item>
         <item name="colorSecondary">@color/colorPrimaryLight</item>
-        <item name="colorTimetableChange">@color/timetable_change_light</item>
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-        <item name="mdtp_theme_dark">true</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
diff --git a/app/src/main/res/values-pl-v29/preferences_values.xml b/app/src/main/res/values-pl-v29/preferences_values.xml
deleted file mode 100644
index 57f20804..00000000
--- a/app/src/main/res/values-pl-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Motyw systemu</item>
-        <item>Jasny</item>
-        <item>Ciemny</item>
-        <item>Czarny (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2eeee5fc..a43493e7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -36,10 +36,6 @@
     <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_privacy_policy">Polityka prywatności</string>
-    <string name="login_contact_header">Problemy z logowaniem? Napisz do nas!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Wyślij email</string>
 
 
     <!--Main-->
@@ -70,9 +66,8 @@
     <string name="grade_menu_summary">Podsumowanie</string>
     <string name="grade_menu_statistics">Klasa</string>
     <string name="grade_menu_read">Oznacz jako przeczytane</string>
-    <string name="grade_statistics_partial">Cząstkowe</string>
-    <string name="grade_statistics_semester">Semestralne</string>
-    <string name="grade_statistics_points">Punkty</string>
+    <string name="grade_statistics_partial">Oceny cząstkowe</string>
+    <string name="grade_statistics_semester">Oceny semestralne</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d ocena</item>
         <item quantity="few">%d oceny</item>
@@ -83,7 +78,6 @@
         <item quantity="one">Nowa ocena</item>
         <item quantity="few">Nowe oceny</item>
         <item quantity="many">Nowe oceny</item>
-        <item quantity="other">Nowe oceny</item>
     </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Dostałeś %1$d ocenę</item>
@@ -117,7 +111,7 @@
     <string name="attendance_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="attendance_absence_unexcused">Nieobecność nieusprawiedliwiona</string>
     <string name="attendance_exemption">Zwolniony</string>
-    <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
+    <string name="attendance_excused_lateness">Spóźnienie usprawiedliowione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
     <string name="attendance_present">Obecny</string>
     <string name="attendance_number">Numer lekcji</string>
@@ -126,7 +120,6 @@
         <item quantity="one">%1$d nieobecność</item>
         <item quantity="few">%1$d nieobecności</item>
         <item quantity="many">%1$d nieobecności</item>
-        <item quantity="other">%1$d nieobecności</item>
     </plurals>
 
 
@@ -165,19 +158,16 @@
         <item quantity="one">%d wiadomość</item>
         <item quantity="few">%d wiadomości</item>
         <item quantity="many">%d wiadomości</item>
-        <item quantity="other">%d wiadomości</item>
     </plurals>
     <plurals name="message_new_items">
         <item quantity="one">Nowa wiadomość</item>
         <item quantity="few">Nowe wiadomości</item>
         <item quantity="many">Nowe wiadomości</item>
-        <item quantity="other">Nowe wiadomości</item>
     </plurals>
     <plurals name="message_notify_new_items">
         <item quantity="one">Dostałeś %1$d wiadomość</item>
         <item quantity="few">"Dostałeś %1$d wiadomości</item>
         <item quantity="many">Dostałeś %1$d wiadomości</item>
-        <item quantity="other">Dostałeś %1$d wiadomości</item>
     </plurals>
 
 
@@ -192,8 +182,8 @@
     <plurals name="note_new_items">
         <item quantity="one">Nowa uwaga</item>
         <item quantity="few">Nowe uwagi</item>
-        <item quantity="many">Nowe uwagi</item>
-        <item quantity="other">Nowe uwagi</item>
+        <item quantity="many">Nowych uwag</item>
+        <item quantity="other">Nowych uwag</item>
     </plurals>
     <plurals name="note_notify_new_items">
         <item quantity="one">Dostałeś %1$d uwagę</item>
@@ -226,28 +216,6 @@
     <string name="mobile_device_pin">PIN</string>
 
 
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">Szkoła i nauczyciele</string>
-
-
-    <!--School-->
-    <string name="school_title">Szkoła</string>
-    <string name="school_no_info">Brak informacji o szkole</string>
-    <string name="school_name">Nazwa szkoły</string>
-    <string name="school_address">Adres szkoły</string>
-    <string name="school_telephone">Telefon</string>
-    <string name="school_headmaster">Imię i nazwisko dyrektora</string>
-    <string name="school_pedagogue">Imię i nazwisko pedagoga</string>
-    <string name="school_address_button">Pokaż na mpaie</string>
-    <string name="school_telephone_button">Zadzwoń</string>
-
-
-    <!--Teacher-->
-    <string name="teachers_title">Nauczyciele</string>
-    <string name="teacher_no_items">Brak informacji o nauczycielach</string>
-    <string name="teacher_no_subject">Brak przedmiotu</string>
-
-
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
@@ -259,8 +227,6 @@
     <string name="about_version">Wersja aplikacji</string>
     <string name="about_feedback">Zgłoś błąd</string>
     <string name="about_feedback_summary">Wyślij zgłoszenie o błędzie poprzez e-maila</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Zobacz Najczęściej Zadawane Pytania</string>
     <string name="about_discord">Serwer discord</string>
     <string name="about_discord_summary">Dołącz do społeczności wulkanowego</string>
     <string name="about_privacy">Polityka prywatności</string>
@@ -277,7 +243,6 @@
 
     <!--Generic-->
     <string name="all_content">Treść</string>
-    <string name="all_retry">Ponów</string>
     <string name="all_description">Opis</string>
     <string name="all_no_description">Brak opisu</string>
     <string name="all_teacher">Nauczyciel</string>
@@ -295,9 +260,6 @@
 
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
-    <string name="widget_timetable_theme_title">Wybierz motyw</string>
-    <string name="widget_timetable_theme_light">Jasny</string>
-    <string name="widget_timetable_theme_dark">Ciemny</string>
 
 
     <!--Preferences-->
@@ -309,7 +271,6 @@
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
-    <string name="pref_view_app_language">Język aplikacji</string>
 
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/value_prefernces.xml
similarity index 73%
rename from app/src/main/res/values-pl/preferences_values.xml
rename to app/src/main/res/values-pl/value_prefernces.xml
index 33a66e0f..868ead4d 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/value_prefernces.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
         <item>30 minut</item>
@@ -10,21 +10,14 @@
         <item>24 godziny</item>
     </string-array>
 
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+    <string-array name="app_theme_entries">
         <item>Jasny</item>
         <item>Ciemny</item>
         <item>Czarny (AMOLED)</item>
     </string-array>
 
-    <string-array name="app_language_entries">
-        <item>Język systemu</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-    </string-array>
-
     <string-array name="grade_modifier_entries">
-        <item>0,0</item>
+        <item>Domyślna</item>
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
diff --git a/app/src/main/res/values-ru-v29/preferences_values.xml b/app/src/main/res/values-ru-v29/preferences_values.xml
deleted file mode 100644
index 2d8606a8..00000000
--- a/app/src/main/res/values-ru-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Тема системы</item>
-        <item>Светлая</item>
-        <item>Тёмная</item>
-        <item>Тёмная (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
deleted file mode 100644
index 641d754f..00000000
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="services_interval_entries">
-        <item>15 минут</item>
-        <item>30 минут</item>
-        <item>1 час</item>
-        <item>2 часа</item>
-        <item>6 часов</item>
-        <item>12 часов</item>
-        <item>24 часа</item>
-    </string-array>
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Светлая</item>
-        <item>Тёмная</item>
-        <item>Тёмная (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Язык системы</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,0</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Цвета оценок в дневнике</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Средняя оценка со 2 семестра</item>
-        <item>Средняя оценка с целого года</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 28f4831d..00000000
--- a/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="app_name">Wulkanowy</string>
-
-
-    <!--Activity/Fragment title-->
-    <string name="login_title">Авторизация</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Оценки</string>
-    <string name="attendance_title">Посещаемость</string>
-    <string name="exam_title">Тесты</string>
-    <string name="timetable_title">Расписание</string>
-    <string name="settings_title">Настройки</string>
-    <string name="more_title">Ещё</string>
-    <string name="about_title">О приложении</string>
-    <string name="license_title">Лицензии</string>
-    <string name="message_title">Сообщения</string>
-    <string name="send_message_title">Новое сообщение</string>
-    <string name="note_title">Предупреждения и свершения</string>
-    <string name="homework_title">Домашние задания</string>
-    <string name="account_title">Выберите аккаунт</string>
-
-
-    <!--Login-->
-    <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
-    <string name="login_header_symbol">Впишите \"symbol\"</string>
-    <string name="login_nickname_hint">Электронная почта или имя пользователя</string>
-    <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">Дневник</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Войти</string>
-    <string name="login_invalid_password">Слишком короткий пароль</string>
-    <string name="login_incorrect_password">Указаны неверные данные</string>
-    <string name="login_incorrect_symbol">Не удалось найти ученика. Пожалуйста, проверьте \"symbol\"</string>
-    <string name="login_field_required">Это поле обязательно</string>
-    <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">Вы можете найти \"symbol\" в Uczeń -&gt; Dostęp Mobilny -&gt; Zarejestruj urządzenie mobilne</string>
-    <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
-    <string name="login_privacy_policy">Политика приватности</string>
-    <string name="login_contact_header">Проблемы с авторизацией? Свяжитесь с нами!</string>
-    <string name="login_contact_email">Электронная почта</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Отправить письмо</string>
-
-
-    <!--Main-->
-    <string name="main_account_picker">Менеджер аккаунтов</string>
-    <string name="main_log_in">Войти</string>
-    <string name="main_session_expired">Сеанс истёк</string>
-    <string name="main_session_relogin">Сеанс истёк, пожалуйста, авторизируйтесь ещё раз</string>
-
-
-    <!--Grade-->
-    <string name="grade_header">Оценка</string>
-    <string name="grade_semester">Семестр %d</string>
-    <string name="grade_switch_semester">Сменить семестр</string>
-    <string name="grade_no_items">Оценки отсутствуют</string>
-    <string name="grade_weight">Вес</string>
-    <string name="grade_comment">Комментарий</string>
-    <string name="grade_no_new_items">Новые оценки отсутствуют</string>
-    <string name="grade_number_new_items">Количество новых оценок: %1$d</string>
-    <string name="grade_average">Средняя оценка: %1$.2f</string>
-    <string name="grade_no_average">Средняя оценка отсутствует</string>
-    <string name="grade_predicted">Ожидаемая оценка: %1$s</string>
-    <string name="grade_final">Итоговая оценка: %1$s</string>
-    <string name="grade_summary_points">Сумма очков</string>
-    <string name="grade_summary_final_grade">Итоговая оценка</string>
-    <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
-    <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
-    <string name="grade_summary_final_average">Итоговая средняя оценка</string>
-    <string name="grade_menu_summary">Итоги</string>
-    <string name="grade_menu_statistics">Класс</string>
-    <string name="grade_menu_read">Пометить как \"прочитанное*</string>
-    <string name="grade_statistics_partial">Частичные</string>
-    <string name="grade_statistics_semester">Семестровые</string>
-    <string name="grade_statistics_points">Очки</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d оценка</item>
-        <item quantity="few">%d оценки</item>
-        <item quantity="many">%d оценок</item>
-        <item quantity="other">%d оценок</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новая оценка</item>
-        <item quantity="few">Новые оценки</item>
-        <item quantity="many">Новые оценки</item>
-        <item quantity="other">Новые оценки</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">Вы получили %1$d оценку</item>
-        <item quantity="few">Вы получили %1$d оценки</item>
-        <item quantity="many">Вы получили %1$d оценок</item>
-        <item quantity="other">Вы получили %1$d оценок</item>
-    </plurals>
-
-
-    <!--Timetable-->
-    <string name="timetable_lesson">Урок</string>
-    <string name="timetable_room">Аудитория</string>
-    <string name="timetable_group">Группа</string>
-    <string name="timetable_time">Часы</string>
-    <string name="timetable_changes">Изменения</string>
-    <string name="timetable_no_items">Нету уроков в данный день</string>
-
-
-    <!--CompletedLesson-->
-    <string name="completed_lessons_title">Проведённые уроки</string>
-    <string name="completed_lessons_button">Просмотреть проведённые уроки</string>
-    <string name="completed_lessons_no_items">Нет информации о проведённых уроках</string>
-    <string name="completed_lessons_topic">Тема</string>
-    <string name="completed_lessons_absence">Отсутствие</string>
-    <string name="completed_lessons_resources">Ресурсы</string>
-
-
-    <!--Attendance-->
-    <string name="attendance_summary_button">Итоговая посещаемость</string>
-    <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
-    <string name="attendance_absence_excused">Оправданное отсутствие</string>
-    <string name="attendance_absence_unexcused">Неоправданное отсутствие</string>
-    <string name="attendance_exemption">Освобождение</string>
-    <string name="attendance_excused_lateness">Оправданное опоздание</string>
-    <string name="attendance_unexcused_lateness">Неоправданное опоздание</string>
-    <string name="attendance_present">Присутствие</string>
-    <string name="attendance_number">Урок №</string>
-    <string name="attendance_no_items">Данные не найдены</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d отсутствие</item>
-        <item quantity="few">%1$d отсутствия</item>
-        <item quantity="many">%1$d отсутствий</item>
-        <item quantity="other">%1$d отсутствий</item>
-    </plurals>
-
-
-    <!--Attendance summary-->
-    <string name="attendance_summary_final">Посещаемость</string>
-
-
-    <!--Exam-->
-    <string name="exam_no_items">Тесты на этой неделе не запланированы</string>
-    <string name="exam_type">Тип</string>
-    <string name="exam_entry_date">Дата записи</string>
-
-
-    <!--Message-->
-    <string name="message_inbox">Полученные</string>
-    <string name="message_sent">Отправленные</string>
-    <string name="message_trash">Корзина</string>
-    <string name="message_no_subject">(нету темы)</string>
-    <string name="message_no_items">Нет сообщений</string>
-    <string name="message_preview_error">Произошла ошибка во время получения текста сообщения</string>
-    <string name="message_from">От:</string>
-    <string name="message_to">Кому:</string>
-    <string name="message_date">Дата: %s</string>
-    <string name="message_reply">Ответ</string>
-    <string name="message_forward">Переслать</string>
-    <string name="message_delete">Удалить</string>
-    <string name="message_move_to_bin">Перенести в корзину</string>
-    <string name="message_delete_forever">Удалить навсегда</string>
-    <string name="message_delete_success">Сообщение успешно удалено</string>
-    <string name="message_subject">Тема</string>
-    <string name="message_content">Текст</string>
-    <string name="message_send_successful">Сообщение успешно отправлено</string>
-    <string name="message_required_recipients">Вы должны выбрать как минимум одного получателя</string>
-    <string name="message_content_min_length">Текст сообщения должен содержать как минимум 3 знака</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%d сообщение</item>
-        <item quantity="few">%d сообщения</item>
-        <item quantity="many">%d сообщений</item>
-        <item quantity="other">%d сообщений</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новое сообщение</item>
-        <item quantity="few">Новые сообщения</item>
-        <item quantity="many">Новые сообщения</item>
-        <item quantity="other">Новые сообщения</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">Вы получили %1$d новое сообщение</item>
-        <item quantity="few">Вы получили %1$d новых сообщения</item>
-        <item quantity="many">Вы получили %1$d новых сообщений</item>
-        <item quantity="other">Вы получили %1$d новых сообщений</item>
-    </plurals>
-
-
-    <!--Note-->
-    <string name="note_no_items">Нет данных о предупреждениях</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d предупреждение</item>
-        <item quantity="few">%d предупреждения</item>
-        <item quantity="many">%d предупреждений</item>
-        <item quantity="other">%d предупреждений</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новое предупреждение</item>
-        <item quantity="few">Новые предупреждения</item>
-        <item quantity="many">Новых предупреждений</item>
-        <item quantity="other">Новых предупреждений</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">Вы получили %1$d предупреждение</item>
-        <item quantity="few">Вы получили %1$d предупреждения</item>
-        <item quantity="many">Вы получили %1$d предупреждений</item>
-        <item quantity="other">Вы получили %1$d предупреждений</item>
-    </plurals>
-
-
-    <!--Homework-->
-    <string name="homework_no_items">Нет домашних заданий</string>
-
-
-    <!--Lucky number-->
-    <string name="lucky_number_title">Счастливый номер</string>
-    <string name="lucky_number_header">Сегодняшний счастливый номер</string>
-    <string name="lucky_number_empty">Нет данных о счастливом номере</string>
-    <string name="lucky_number_notify_new_item_title">Сегодняшний счастливый номер</string>
-    <string name="lucky_number_notify_new_item">Сегодняшний счастливый номер: %d</string>
-
-
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Мобильные устройства</string>
-    <string name="mobile_devices_no_items">Нет устройств</string>
-    <string name="mobile_devices_unregister">Удалить</string>
-    <string name="mobile_device_removed">Устройство удалено</string>
-    <string name="mobile_device_qr">QR-код</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-
-
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">Школа и учителя</string>
-
-
-    <!--School-->
-    <string name="school_title">Школа</string>
-    <string name="school_no_info">Нет информации о школе</string>
-    <string name="school_name">Название школы</string>
-    <string name="school_address">Адрес школы</string>
-    <string name="school_telephone">Телефон</string>
-    <string name="school_headmaster">Директор</string>
-    <string name="school_pedagogue">Педагог</string>
-    <string name="school_address_button">Показать на карте</string>
-    <string name="school_telephone_button">Позвонить</string>
-
-
-    <!--Teacher-->
-    <string name="teachers_title">Учителя</string>
-    <string name="teacher_no_items">Нет информации о учителях</string>
-    <string name="teacher_no_subject">Нет предмета</string>
-
-
-    <!--Account-->
-    <string name="account_add_new">Добавить аккаунт</string>
-    <string name="account_logout">Выйти</string>
-    <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
-    <string name="account_logout_student">Выйти</string>
-
-
-    <!--About-->
-    <string name="about_version">Версия приложения</string>
-    <string name="about_feedback">Сообщить о ошибке</string>
-    <string name="about_feedback_summary">Отправить сообщение о ошибке через электронную почту</string>
-    <string name="about_discord">Сервер Discord</string>
-    <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
-    <string name="about_privacy">Политика приватности</string>
-    <string name="about_privacy_summary">Правила сбора личных данных</string>
-    <string name="about_homepage">Домашняя страница</string>
-    <string name="about_homepage_summary">Посетить страницу и помочь в развитии приложения</string>
-    <string name="about_licenses">Лицензии</string>
-    <string name="about_licenses_summary">Лицензии использованных в приложении библиотек</string>
-
-
-    <!--Licenses-->
-    <string name="license_dialog_title">Лицензия</string>
-
-
-    <!--Generic-->
-    <string name="all_content">Содержание</string>
-    <string name="all_description">Описание</string>
-    <string name="all_no_description">Нет описания</string>
-    <string name="all_teacher">Учитель</string>
-    <string name="all_date">Дата</string>
-    <string name="all_entry_date">Дата записи</string>
-    <string name="all_color">Цвет</string>
-    <string name="all_details">Детали</string>
-    <string name="all_category">Категория</string>
-    <string name="all_close">Закрыть</string>
-    <string name="all_no_data">Нет данных</string>
-    <string name="all_subject">Предмет</string>
-    <string name="all_prev">Предыдущий</string>
-    <string name="all_next">Следующий</string>
-
-
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Нет уроков</string>
-    <string name="widget_timetable_theme_title">Выбрать тему</string>
-    <string name="widget_timetable_theme_light">Светлая</string>
-    <string name="widget_timetable_theme_dark">Тёмная</string>
-
-
-    <!--Preferences-->
-    <string name="pref_view_header">Внешний вид</string>
-    <string name="pref_view_list">При входе открывать</string>
-    <string name="pref_view_grade_average_mode">Рассчитывание средней годовой оценки</string>
-    <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
-    <string name="pref_view_present">Показывать присутствия в посещаемости</string>
-    <string name="pref_view_app_theme">Тема приложения</string>
-    <string name="pref_view_expand_grade">Больше оценок</string>
-    <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
-    <string name="pref_view_app_language">Язык приложения</string>
-    <string name="pref_notify_header">Уведомления</string>
-    <string name="pref_notify_switch">Показывать уведомления</string>
-    <string name="pref_notify_debug_switch">Показывать дебаг-уведомления</string>
-    <string name="pref_services_header">Синхронизация</string>
-    <string name="pref_services_switch">Автоматическая синхронизация</string>
-    <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
-    <string name="pref_services_interval">Интервал синхронизации</string>
-    <string name="pref_services_wifi">Только через Wi-Fi</string>
-    <string name="pref_other_header">Другие</string>
-    <string name="pref_other_grade_modifier_plus">Вес плюса</string>
-    <string name="pref_other_grade_modifier_minus">Вес минуса</string>
-    <string name="pref_other_fill_message_content">Ответить с историей сообщений</string>
-
-
-    <!--Notification Channels-->
-    <string name="channel_new_entries">Новые данные в дневнике</string>
-    <string name="channel_debug">Дебаг</string>
-
-
-    <!--Colors-->
-    <string name="all_black">Чёрный</string>
-    <string name="all_red">Красный</string>
-    <string name="all_blue">Голубой</string>
-    <string name="all_green">Зелёный</string>
-    <string name="all_purple">Фиолетовый</string>
-    <string name="all_empty_color">Нет цвета</string>
-
-
-    <!--Others-->
-    <string name="all_copied">Скопировано</string>
-    <string name="all_undo">Отменить</string>
-
-
-    <!--Errors-->
-    <string name="error_no_internet">Нет интернет-подключения</string>
-    <string name="error_timeout">Слишком долгое ожидание соединения с дневником</string>
-    <string name="error_login_failed">Авторизация не удалась. Пожалуйста, попробуйте ещё раз или перезапустите дневник</string>
-    <string name="error_service_unavailable">Дневник недоступен. Попробуйте позже</string>
-    <string name="error_unknown">Произошла неожиданная ошибка</string>
-    <string name="error_feature_disabled">Функция была выключена школой</string>
-
-</resources>
diff --git a/app/src/main/res/values-v29/preferences_defaults.xml b/app/src/main/res/values-v29/preferences_defaults.xml
deleted file mode 100644
index bb573d66..00000000
--- a/app/src/main/res/values-v29/preferences_defaults.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="pref_default_app_theme">system</string>
-</resources>
diff --git a/app/src/main/res/values-v29/preferences_values.xml b/app/src/main/res/values-v29/preferences_values.xml
deleted file mode 100644
index f27c1c69..00000000
--- a/app/src/main/res/values-v29/preferences_values.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>System theme</item>
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</item>
-    </string-array>
-    <string-array name="app_theme_values" translatable="false" tools:ignore="InconsistentArrays">
-        <item>system</item>
-        <item>light</item>
-        <item>dark</item>
-        <item>black</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_endpoints.xml
similarity index 79%
rename from app/src/main/res/values/api_hosts.xml
rename to app/src/main/res/values/api_endpoints.xml
index df42f592..e07f2b4b 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_endpoints.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string-array name="hosts_keys">
+    <string-array name="endpoints_keys">
         <item>Vulcan</item>
         <item>Opolska eSzkoła</item>
         <item>Gdańska Platforma Edukacyjna</item>
-        <item>Lubelski Portal Oświatowy</item>
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
         <item>Fakelog</item>
     </string-array>
-    <string-array name="hosts_values">
+    <string-array name="endpoints_values">
         <item>https://vulcan.net.pl</item>
         <item>https://eszkola.opolskie.pl</item>
         <item>https://edu.gdansk.pl</item>
-        <item>https://edu.lublin.eu</item>
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
         <item>http://fakelog.cf</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 49cdd5b7..accd3f80 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="colorDivider" format="color" />
-    <attr name="colorTimetableChange" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6221ef99..f7accebf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,9 +6,6 @@
     <color name="colorError">#ff5722</color>
     <color name="colorErrorLight">#e84853</color>
 
-    <color name="timetable_change_light">#ffd54f</color>
-    <color name="timetable_change_dark">#ff8f00</color>
-
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
 
@@ -34,10 +31,9 @@
     <color name="grade_vulcan_one">#d65757</color>
     <color name="grade_vulcan_default">#3d5f9c</color>
 
-
-    <!--Dark color resource for app widgets-->
-
-    <color name="colorWidgetBackground">#121212</color>
-    <color name="colorWidgetTopBar">#272727</color>
-    <color name="colorWidgetNavButton">#383838</color>
+    <color name="chip_backgroundColor_inverse">#595959</color>
+    <color name="chip_labelColor_inverse">#fefefe</color>
+    <color name="chip_detailed_backgroundColor">#fefefe</color>
+    <color name="filterable_list_backgroundColor_inverse">#393939</color>
+    <color name="filterable_list_textColor_inverse">#fefefe</color>
 </resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
deleted file mode 100644
index 91b357d9..00000000
--- a/app/src/main/res/values/preferences_defaults.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="pref_default_startup">0</string>
-    <bool name="pref_default_attendance_present">true</bool>
-    <string name="pref_default_grade_average_mode">only_one_semester</string>
-    <bool name="pref_default_grade_average_force_calc">false</bool>
-    <bool name="pref_default_expand_grade">false</bool>
-    <string name="pref_default_app_theme">light</string>
-    <string name="pref_default_grade_color_scheme">vulcan</string>
-    <string name="pref_default_app_language">system</string>
-    <bool name="pref_default_services_enable">true</bool>
-    <string name="pref_default_services_interval">60</string>
-    <bool name="pref_default_services_wifi_only">false</bool>
-    <bool name="pref_default_notifications_enable">true</bool>
-    <bool name="pref_default_notification_debug">false</bool>
-    <string name="pref_default_grade_modifier_plus">0.33</string>
-    <string name="pref_default_grade_modifier_minus">0.33</string>
-    <bool name="pref_default_fill_message_content">true</bool>
-</resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index a2172db9..730fea59 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -7,7 +7,6 @@
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
     <string name="pref_key_grade_average_force_calc">grade_average_always_calc</string>
-    <string name="pref_key_app_language">app_language</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13bdfc79..8ebb4b84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,12 +36,6 @@
     <string name="login_symbol_helper">The symbol can be found on the register page in Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_privacy_policy">Privacy policy</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Send email</string>
-    <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
-    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nOpis problemu:</string>
 
 
     <!--Main-->
@@ -72,9 +66,8 @@
     <string name="grade_menu_summary">Summary</string>
     <string name="grade_menu_statistics">Class</string>
     <string name="grade_menu_read">Mark as read</string>
-    <string name="grade_statistics_partial">Partial</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_partial">Partial grades</string>
+    <string name="grade_statistics_semester">Semester grades</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d grade</item>
         <item quantity="other">%d grades</item>
@@ -207,28 +200,6 @@
     <string name="mobile_device_pin">PIN</string>
 
 
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">School and teachers</string>
-
-
-    <!--School-->
-    <string name="school_title">School</string>
-    <string name="school_no_info">No info about school</string>
-    <string name="school_name">School name</string>
-    <string name="school_address">School address</string>
-    <string name="school_telephone">Telephone</string>
-    <string name="school_headmaster">Name of headmaster</string>
-    <string name="school_pedagogue">Name of pedagogue</string>
-    <string name="school_address_button">Show on map</string>
-    <string name="school_telephone_button">Call</string>
-
-
-    <!--Teacher-->
-    <string name="teachers_title">Teachers</string>
-    <string name="teacher_no_items">No info about teachers</string>
-    <string name="teacher_no_subject">No subject</string>
-
-
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
@@ -240,8 +211,6 @@
     <string name="about_version">App version</string>
     <string name="about_feedback">Report a bug</string>
     <string name="about_feedback_summary">Send a bug report via e-mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Read Frequently Asked Questions</string>
     <string name="about_discord">Discord server</string>
     <string name="about_discord_summary">Join the wulkanowy community</string>
     <string name="about_privacy">Privacy policy</string>
@@ -258,7 +227,6 @@
 
     <!--Generic-->
     <string name="all_content">Content</string>
-    <string name="all_retry">Retry</string>
     <string name="all_description">Description</string>
     <string name="all_no_description">No description</string>
     <string name="all_teacher">Teacher</string>
@@ -276,9 +244,6 @@
 
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
-    <string name="widget_timetable_theme_title">Choose theme</string>
-    <string name="widget_timetable_theme_light">Light</string>
-    <string name="widget_timetable_theme_dark">Dark</string>
 
 
     <!--Preferences-->
@@ -290,7 +255,6 @@
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_app_language">App language</string>
 
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_switch">Show notifications</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 68c0800b..c8b41a1a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="colorOnSecondary">@android:color/white</item>
-        <item name="colorTimetableChange">@color/timetable_change_dark</item>
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="android:textColor">?android:textColorPrimary</item>
@@ -24,11 +23,8 @@
 
     <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSecondary">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
-
-    <style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog"/>
 </resources>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/value_prefernces.xml
similarity index 78%
rename from app/src/main/res/values/preferences_values.xml
rename to app/src/main/res/values/value_prefernces.xml
index 05210fd2..97396baa 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/value_prefernces.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string-array name="startup_tab_entries" translatable="false">
         <item>@string/grade_title</item>
         <item>@string/attendance_title</item>
@@ -13,30 +13,17 @@
         <item>3</item>
     </string-array>
 
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+    <string-array name="app_theme_entries">
         <item>Light</item>
         <item>Dark</item>
         <item>Black (AMOLED)</item>
     </string-array>
-    <string-array name="app_theme_values" translatable="false" tools:ignore="InconsistentArrays">
+    <string-array name="app_theme_values" translatable="false">
         <item>light</item>
         <item>dark</item>
         <item>black</item>
     </string-array>
 
-    <string-array name="app_language_entries">
-        <item>System language</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-    </string-array>
-    <string-array name="app_language_values" translatable="false">
-        <item>system</item>
-        <item>pl</item>
-        <item>en</item>
-        <item>ru</item>
-    </string-array>
-
     <string-array name="services_interval_entries">
         <item>15 minutes</item>
         <item>30 minutes</item>
@@ -57,7 +44,7 @@
     </string-array>
 
     <string-array name="grade_modifier_entries">
-        <item>0,00</item>
+        <item>Default</item>
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index d9e6c533..d762066a 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -4,7 +4,7 @@
         app:iconSpaceReserved="false"
         app:title="@string/pref_view_header">
         <ListPreference
-            app:defaultValue="@string/pref_default_startup"
+            app:defaultValue="0"
             app:entries="@array/startup_tab_entries"
             app:entryValues="@array/startup_tab_value"
             app:iconSpaceReserved="false"
@@ -12,7 +12,7 @@
             app:title="@string/pref_view_list"
             app:useSimpleSummaryProvider="true" />
         <ListPreference
-            app:defaultValue="@string/pref_default_app_theme"
+            app:defaultValue="light"
             app:entries="@array/app_theme_entries"
             app:entryValues="@array/app_theme_values"
             app:iconSpaceReserved="false"
@@ -20,42 +20,34 @@
             app:title="@string/pref_view_app_theme"
             app:useSimpleSummaryProvider="true" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_attendance_present"
+            app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_attendance_present"
             app:title="@string/pref_view_present" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_expand_grade"
+            app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_expand_grade"
             app:title="@string/pref_view_expand_grade" />
         <ListPreference
-            app:defaultValue="@string/pref_default_grade_color_scheme"
+            app:defaultValue="vulcan"
             app:entries="@array/grade_color_scheme_entries"
             app:entryValues="@array/grade_color_scheme_values"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_grade_color_scheme"
             app:title="@string/pref_view_grade_color_scheme"
             app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_app_language"
-            app:entries="@array/app_language_entries"
-            app:entryValues="@array/app_language_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_app_language"
-            app:title="@string/pref_view_app_language"
-            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_services_header">
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_services_enable"
+            app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_services_enable"
             app:title="@string/pref_services_switch" />
         <ListPreference
-            app:defaultValue="@string/pref_default_services_interval"
+            app:defaultValue="60"
             app:dependency="services_enable"
             app:entries="@array/services_interval_entries"
             app:entryValues="@array/services_interval_value"
@@ -64,7 +56,7 @@
             app:title="@string/pref_services_interval"
             app:useSimpleSummaryProvider="true" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_services_wifi_only"
+            app:defaultValue="false"
             app:dependency="services_enable"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_services_wifi_only"
@@ -74,13 +66,13 @@
         app:iconSpaceReserved="false"
         app:title="@string/pref_notify_header">
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notifications_enable"
+            app:defaultValue="true"
             app:dependency="services_enable"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notifications_enable"
             app:title="@string/pref_notify_switch" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notification_debug"
+            app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notification_debug"
             app:title="@string/pref_notify_debug_switch" />
@@ -89,7 +81,7 @@
         app:iconSpaceReserved="false"
         app:title="@string/pref_other_header">
         <ListPreference
-            app:defaultValue="@string/pref_default_grade_modifier_plus"
+            app:defaultValue="0.0"
             app:entries="@array/grade_modifier_entries"
             app:entryValues="@array/grade_modifier_value"
             app:iconSpaceReserved="false"
@@ -97,7 +89,7 @@
             app:title="@string/pref_other_grade_modifier_plus"
             app:useSimpleSummaryProvider="true" />
         <ListPreference
-            app:defaultValue="@string/pref_default_grade_modifier_minus"
+            app:defaultValue="0.0"
             app:entries="@array/grade_modifier_entries"
             app:entryValues="@array/grade_modifier_value"
             app:iconSpaceReserved="false"
@@ -105,7 +97,7 @@
             app:title="@string/pref_other_grade_modifier_minus"
             app:useSimpleSummaryProvider="true" />
         <ListPreference
-            app:defaultValue="@string/pref_default_grade_average_mode"
+            app:defaultValue="only_one_semester"
             app:entries="@array/grade_average_mode_entries"
             app:entryValues="@array/grade_average_mode_values"
             app:iconSpaceReserved="false"
@@ -113,12 +105,12 @@
             app:title="@string/pref_view_grade_average_mode"
             app:useSimpleSummaryProvider="true" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_grade_average_force_calc"
-            app:iconSpaceReserved="false"
+            app:defaultValue="false"
             app:key="@string/pref_key_grade_average_force_calc"
-            app:title="@string/pref_view_grade_average_force_calc" />
+            app:title="@string/pref_view_grade_average_force_calc"
+            app:iconSpaceReserved="false" />
         <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_fill_message_content"
+            app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_fill_message_content"
             app:title="@string/pref_other_fill_message_content" />
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
index 2fb566e7..37d3f2ad 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.grades.GradePointsSummary
 import io.github.wulkanowy.api.grades.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.mockk.MockKAnnotations
@@ -9,7 +8,7 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
-import org.junit.Assert.assertEquals
+import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 
@@ -28,7 +27,7 @@ class GradeStatisticsRemoteTest {
 
     @Test
     fun getGradeStatisticsTest() {
-        every { mockApi.getGradesPartialStatistics(1) } returns Single.just(listOf(
+        every { mockApi.getGradesStatistics(1, any()) } returns Single.just(listOf(
             getGradeStatistics("Fizyka"),
             getGradeStatistics("Matematyka")
         ))
@@ -40,24 +39,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.diaryId } returns 1
 
         val stats = GradeStatisticsRemote(mockApi).getGradeStatistics(semesterMock, false).blockingGet()
-        assertEquals(2, stats.size)
-    }
-
-    @Test
-    fun getGradePointsStatisticsTest() {
-        every { mockApi.getGradesPointsStatistics(1) } returns Single.just(listOf(
-            getGradePointsStatistics("Fizyka"),
-            getGradePointsStatistics("Matematyka")
-        ))
-
-        every { mockApi.diaryId } returns 1
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.semesterId } returns 1
-        every { semesterMock.semesterName } returns 2
-        every { semesterMock.diaryId } returns 1
-
-        val stats = GradeStatisticsRemote(mockApi).getGradePointsStatistics(semesterMock).blockingGet()
-        assertEquals(2, stats.size)
+        Assert.assertEquals(2, stats.size)
     }
 
     private fun getGradeStatistics(subjectName: String): GradeStatistics {
@@ -67,12 +49,4 @@ class GradeStatisticsRemoteTest {
             amount = 10
         }
     }
-
-    private fun getGradePointsStatistics(subjectName: String): GradePointsSummary {
-        return GradePointsSummary(
-            subject = subjectName,
-            student = 0.80,
-            others = 0.40
-        )
-    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 4ef5904f..75b7327a 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -35,7 +35,7 @@ class LoginPresenterTest {
 
     @Test
     fun initViewTest() {
-        verify(loginView).initView()
+        verify(loginView).initAdapter()
         verify(loginView).showActionBar(false)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index 2bba619f..31618fd4 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -41,9 +41,9 @@ class GradeExtensionTest {
     }
 
     @Test
-    fun changeModifier_zero() {
-        assertEquals(.0, createGrade(5, .0, .5).changeModifier(.0, .0).modifier, .0)
-        assertEquals(.0, createGrade(5, .0, -.5).changeModifier(.0, .0).modifier, .0)
+    fun changeModifier_default() {
+        assertEquals(.33, createGrade(5, .0, .33).changeModifier(.0, .0).modifier, .0)
+        assertEquals(-.33, createGrade(5, .0, -.33).changeModifier(.0, .0).modifier, .0)
     }
 
     @Test
diff --git a/build.gradle b/build.gradle
index 0843a31a..e8f29a52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.50'
     repositories {
         mavenCentral()
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath "io.fabric.tools:gradle:1.31.2"
-        classpath "com.github.triplet.gradle:play-publisher:2.4.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
-        classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.1'
+        classpath "io.fabric.tools:gradle:1.31.0"
+        classpath "com.github.Triple-T:gradle-play-publisher:cdaeb61a87fedd1874e15e94eab7c6b80fda6727"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
+        classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0"
     }
 }
 
@@ -35,6 +36,8 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
+        maven { url "https://kotlin.bintray.com/kotlinx/" }
+        maven { url "https://dl.bintray.com/mockito/maven" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 113bb106..44e7e13b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,9 @@
 # Project-wide Gradle settings.
+
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
+
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 
@@ -16,4 +18,4 @@ kapt.incremental.apt=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ebb3108..dbe85eef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists