diff --git a/.bettercodehub.yml b/.bettercodehub.yml
index 349f7675..d7be5169 100644
--- a/.bettercodehub.yml
+++ b/.bettercodehub.yml
@@ -1,3 +1,3 @@
-component_depth: 8
+component_depth: 10
 languages:
 - kotlin
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cad32112..ce2922ba 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-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;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 createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createFdroidDebugCoverageReport 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 63783326..d3fb6e4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,91 @@
-/captures
-.externalNativeBuild
-
-## https://gist.github.com/iainconnor/8605514
+# Created by https://www.gitignore.io
 
 # Built application files
-/build
-/*/build/
+*.apk
+*.ap_
+*.aab
 
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Gradle generated files
-.gradle/
+# Proguard folder generated by Eclipse
+proguard/
 
-# Signing files
-.signing/
+# Log Files
+*.log
 
-# User-specific configurations
-.idea/copyright/profiles_settings.xml
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ configurations
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+.idea/modules.xml
+.idea/navEditor.xml
+.idea/caches/
 .idea/libraries/
-.idea/inspectionProfiles/
+.idea/shelf/
 .idea/.name
 .idea/compiler.xml
+.idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
-.idea/modules.xml
 .idea/scopes/scope_settings.xml
-.idea/tasks.xml
 .idea/vcs.xml
-.idea/workspace.xml
-.idea/caches/
-*.iml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/runConfigurations.xml
+.idea/discord.xml
+
+# Keystore files
+*.jks
+*.keystore
+*.p12
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
 
 # OS-specific files
 .DS_Store
@@ -43,9 +95,21 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/caches/
-app/key.p12
-app/upload-key.jks
-*.log
-.idea/assetWizardSettings.xml
-.idea/uiDesigner.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+.idea/jarRepositories.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 43e9b544..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="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
@@ -21,13 +18,10 @@
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -38,6 +32,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -48,6 +43,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -59,6 +55,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -69,6 +66,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -79,6 +77,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -89,6 +88,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -99,6 +99,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -110,6 +111,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -121,6 +123,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -138,7 +141,6 @@
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7ac24c77..00000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 0bcf9bdb..ee3e6f3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.9.2
+    - 0.18.0
 
 android:
  licenses:
@@ -34,12 +34,12 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-19
-    - sys-img-armeabi-v7a-android-19
+    - android-22
+    - sys-img-armeabi-v7a-android-22
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
     - adb shell input keyevent 82 &
@@ -48,20 +48,15 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createPlayDebugCoverageReport --stacktrace --daemon
-  - ./gradlew jacocoTestReport --stacktrace --daemon
-  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
-      git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
-    fi
+  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
+  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
     fi
 
 after_success:
diff --git a/LICENSE b/LICENSE
index f48b2114..5dd9cacf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 wulkanowy
+   Copyright 2019 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.en.md b/README.en.md
new file mode 100644
index 00000000..7444ccca
--- /dev/null
+++ b/README.en.md
@@ -0,0 +1,61 @@
+[Polska wersja README](README.md)
+
+# Wulkanowy
+[![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)
+
+Unofficial android VULCAN UONET+ register client for both students and their parents
+
+## Features
+
+* logging in using the email and password OR using token and pin
+* functions from the register website:
+    * grades
+    * grade statistics
+    * attendance
+    * percentage of attendance
+    * exams
+    * timetable
+    * completed lessons
+    * messages
+    * homework
+    * notes
+    * lucky number
+* calculation of the average independently of school's preferences
+* notifications, e.g. about a new grade
+* dark and black (AMOLED) theme
+* offline mode
+* no ads
+
+## Download
+
+You can download the current beta version from the Google Play or the F-Droid store
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+    
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
+
+## Built With
+
+
+* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Contributing
+
+Please contribute to the project either by creating a PR or submitting an issue on GitHub.
+
+## License
+
+This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
diff --git a/README.md b/README.md
index 07f06d7f..61b13444 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,62 @@
+[English version of README](README.en.md)
+
 # Wulkanowy
-
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
-[![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
-[![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
 [![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)](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)
+[![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)
 
-[Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)
+Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
-[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
+## Funkcje
 
-Androidowy klient dziennika VULCAN UONET+.
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
+* funkcje ze strony internetowej dziennika:
+    * oceny
+    * statystyki ocen
+    * frekwencja
+    * procent frekwencji
+    * sprawdziany
+    * plan lekcji
+    * lekcje zrealizowane
+    * wiadomości
+    * zadania domowe
+    * uwagi
+    * szczęśliwy numerek
+* obliczanie średniej niezależnie od preferencji szkoły
+* powiadomienia np. o nowej ocenie
+* ciemny i czarny (AMOLED) motyw
+* tryb offilne
+* brak reklam
+
+## Pobierz
+
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub F-Droid
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Pobierz z Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Pobierz z F-Droid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
 
 
-## License
+Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
 
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
+
+## Zbudowana za pomocą
+
+* [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Współpraca
+
+Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
+
+## Licencja
+
+Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/build.gradle b/app/build.gradle
index 2a59303c..c1e8b581 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,34 +1,36 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 41
-        versionName "0.9.3"
+        minSdkVersion 17
+        targetSdkVersion 29
+        versionCode 59
+        versionName "0.18.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
-                crashlytics_enabled: project.hasProperty("enableCrashlytics")
+                firebase_enabled: project.hasProperty("enableFirebase")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+                arguments = [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true"
+                ]
             }
         }
     }
@@ -48,34 +50,35 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = true
-            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
-            multiDexKeepProguard file('proguard-multidex-rules.pro')
+            testCoverageEnabled = project.hasProperty('coverage')
+            ext.enableCrashlytics = project.hasProperty("enableFirebase")
         }
     }
 
     flavorDimensions "platform"
+
     productFlavors {
         play {
             dimension "platform"
         }
 
         fdroid {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
+    viewBinding {
+        enabled = true
+    }
+
     lintOptions {
         disable 'HardwareIds'
     }
@@ -84,10 +87,19 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-}
 
-androidExtensions {
-    experimental = true
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    packagingOptions {
+        exclude 'META-INF/library_release.kotlin_module'
+        exclude 'META-INF/library-core_release.kotlin_module'
+    }
+
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 play {
@@ -97,82 +109,100 @@ play {
     track = 'alpha'
 }
 
+ext {
+    work_manager = "2.3.4"
+    room = "2.2.5"
+    dagger = "2.27"
+    chucker = "3.2.0"
+    mockk = "1.9.2"
+}
+
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+}
+
 dependencies {
-    implementation "io.github.wulkanowy:api:0.9.3"
+    implementation "io.github.wulkanowy:sdk:0.18.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core:1.0.2"
-    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.fragment:fragment:1.0.0"
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.0.0"
-    implementation "com.google.android.material:material:1.1.0-alpha07"
-    implementation "com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation "com.google.android.material:material:1.1.0"
+    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"
 
-    implementation "androidx.work:work-runtime:2.0.1"
-    implementation "androidx.work:work-rxjava2:2.0.1"
+    implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.room:room-runtime:2.1.0"
-    implementation "androidx.room:room-rxjava2:2.1.0"
-    kapt "androidx.room:room-compiler:2.1.0"
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
 
-    implementation "com.google.dagger:dagger-android-support:2.23.1"
-    kapt "com.google.dagger:dagger-compiler:2.23.1"
-    kapt "com.google.dagger:dagger-android-processor:2.23.1"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"
+    implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.room:room-rxjava2:$room"
+    implementation "androidx.room:room-ktx:$room"
+    kapt "androidx.room:room-compiler:$room"
+
+    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 "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.2.0"
+    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.2"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
 
-    implementation "com.google.code.gson:gson:2.8.5"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
     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.3"
+    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "io.coil-kt:coil:0.11.0"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
 
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
-    implementation "com.takisoft.preferencex:preferencex:1.0.0"
+    playImplementation 'com.google.firebase:firebase-analytics:17.4.1'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.6'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.6"
+    playImplementation 'com.google.firebase:firebase-messaging:20.1.7'
+    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    playImplementation "com.google.firebase:firebase-core:16.0.9"
-    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
-    releaseImplementation "fr.o80.chucker:library-no-op:2.0.4"
-
-    debugImplementation "fr.o80.chucker:library:2.0.4"
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
-    testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
-    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:2.28.2"
-    testImplementation("org.mockito:mockito-inline:2.28.2") {
-        exclude group: "org.mockito", module: "mockito-core"
-    }
+    testImplementation "junit:junit:4.13"
+    testImplementation "io.mockk:mockk:$mockk"
+    testImplementation "org.threeten:threetenbp:1.4.4"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.1"
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
-    androidTestImplementation "androidx.room:room-testing:2.1.0"
+    androidTestImplementation "io.mockk:mockk-android:$mockk"
+    androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-core:2.28.2"
-    androidTestImplementation("org.mockito:mockito-android:2.28.2") {
-        exclude group: 'org.mockito', module: 'mockito-core'
-    }
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 44cd3f62..e9abfb61 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.3"
+    toolVersion "0.8.5"
     reportsDir = file("$buildDir/reports")
 }
 
diff --git a/app/key-encrypted.p12 b/app/key-encrypted.p12
deleted file mode 100644
index d9811213..00000000
Binary files a/app/key-encrypted.p12 and /dev/null differ
diff --git a/app/proguard-multidex-rules.pro b/app/proguard-multidex-rules.pro
deleted file mode 100644
index 9ee1737f..00000000
--- a/app/proguard-multidex-rules.pro
+++ /dev/null
@@ -1,3 +0,0 @@
--keep class android.support.test.internal** { *; }
--keep class org.junit.** { *; }
--keep public class io.github.wulkanowy** { *; }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7d42536d..1a8b8c32 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -11,6 +11,10 @@
 -verbose
 
 
+#Keep all wulkanowy files
+-keep class io.github.wulkanowy.** {*;}
+
+
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
@@ -32,11 +36,17 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
+
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
-#Config for API
--keep class io.github.wulkanowy.api.** {*;}
 
 #Config for Material Components
--keep class com.google.android.material.tabs.** {*;}
+-keep class com.google.android.material.tabs.** { *; }
+
+
+#Config for About Libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
new file mode 100644
index 00000000..34df45eb
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
@@ -0,0 +1,1480 @@
+{
+  "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
new file mode 100644
index 00000000..8b777b7b
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
@@ -0,0 +1,1530 @@
+{
+  "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
new file mode 100644
index 00000000..4f7497fe
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
@@ -0,0 +1,1592 @@
+{
+  "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/schemas/io.github.wulkanowy.data.db.AppDatabase/19.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/19.json
new file mode 100644
index 00000000..1e4593bb
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/19.json
@@ -0,0 +1,1628 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "294f40cebf8314f9776208827240e65f",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_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` REAL 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": "REAL",
+            "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, `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, `content` 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": "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": "content",
+            "columnName": "content",
+            "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, '294f40cebf8314f9776208827240e65f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
new file mode 100644
index 00000000..925d787a
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
@@ -0,0 +1,1634 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "37a216a7afcea922b66001ca5ed6cf74",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_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, `student_plan` INTEGER 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": "studentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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` REAL 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": "REAL",
+            "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, `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, `content` 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": "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": "content",
+            "columnName": "content",
+            "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, '37a216a7afcea922b66001ca5ed6cf74')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
new file mode 100644
index 00000000..dfad69f5
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
@@ -0,0 +1,1652 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "f905d8a3ff4718d30ae7413a5a717b1f",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_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, `student_plan` INTEGER 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": "studentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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, `time_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, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "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": "timeId",
+            "columnName": "time_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
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "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` REAL 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": "REAL",
+            "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, `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, `content` 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": "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": "content",
+            "columnName": "content",
+            "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, 'f905d8a3ff4718d30ae7413a5a717b1f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
new file mode 100644
index 00000000..1eb8bc19
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
@@ -0,0 +1,1658 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "798956844fdb3f64073921184e3acbfd",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` 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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "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, `is_current` INTEGER 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, `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": "current",
+            "columnName": "is_current",
+            "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": "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, `student_plan` INTEGER 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": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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, `time_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, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "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": "timeId",
+            "columnName": "time_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
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "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` REAL 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": "REAL",
+            "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, `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, `content` 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": "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": "content",
+            "columnName": "content",
+            "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, '798956844fdb3f64073921184e3acbfd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
new file mode 100644
index 00000000..f75a72ac
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
@@ -0,0 +1,1682 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "f2505bf0c76c3ae4567856536d790909",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` 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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "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, `is_current` INTEGER 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, `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": "current",
+            "columnName": "is_current",
+            "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": "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, `student_plan` INTEGER 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": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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, `time_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, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "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": "timeId",
+            "columnName": "time_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
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "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` REAL 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": "REAL",
+            "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, `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, `content` 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": "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": "content",
+            "columnName": "content",
+            "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, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER 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": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "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, 'f2505bf0c76c3ae4567856536d790909')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
new file mode 100644
index 00000000..17ae7d79
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
@@ -0,0 +1,1732 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 24,
+    "identityHash": "9bbf60310b56a855839164e2aae031f9",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` 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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "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, `is_current` INTEGER 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, `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": "current",
+            "columnName": "is_current",
+            "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": "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, `student_plan` INTEGER 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": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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, `time_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, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "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": "timeId",
+            "columnName": "time_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
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "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` REAL 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": "REAL",
+            "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, `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, `content` 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, `has_attachments` 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": "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": "content",
+            "columnName": "content",
+            "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
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "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, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER 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": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "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, '9bbf60310b56a855839164e2aae031f9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
new file mode 100644
index 00000000..e99a11d4
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
@@ -0,0 +1,1744 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 25,
+    "identityHash": "d101f5a26a024f62e6fee161e421b882",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` 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": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "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": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "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, `is_current` INTEGER 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, `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": "current",
+            "columnName": "is_current",
+            "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": "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, `student_plan` INTEGER 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": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "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, `time_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, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "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": "timeId",
+            "columnName": "time_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
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "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` REAL 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": "REAL",
+            "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, `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, `content` 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, `has_attachments` 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": "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": "content",
+            "columnName": "content",
+            "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
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "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, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER 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": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "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, `is_done` INTEGER 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, `attachments` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "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
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "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, 'd101f5a26a024f62e6fee161e421b882')"
+    ]
+  }
+}
\ 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 f720663b..611161e5 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
@@ -1,11 +1,13 @@
 package io.github.wulkanowy.data.db.migrations
 
+import androidx.preference.PreferenceManager
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import org.junit.Rule
 
 abstract class AbstractMigrationTest {
@@ -22,11 +24,8 @@ abstract class AbstractMigrationTest {
     fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
             AppDatabase::class.java, dbName)
-            .addMigrations(
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15()
+            .addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
+                .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())))
             )
             .build()
         // close the database and release any stream resources when the test finishes
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 eb9d02a5..6f9406f6 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,10 +3,13 @@ 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.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.threeten.bp.LocalDate.of
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class Migration13Test : AbstractMigrationTest() {
@@ -97,48 +100,69 @@ class Migration13Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
-        val db = getMigratedRoomDatabase()
-
-        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
-        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
+        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
+        assertTrue { semesters1.single { it.second }.second }
         semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
+            assertFalse(second)
+            assertEquals(1, first.semesterId)
+            assertEquals(1, first.diaryId)
         }
         semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
+            assertFalse(second)
+            assertEquals(3, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
         semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
+            assertTrue(second)
+            assertEquals(4, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
 
-        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)
-            assertEquals(of(1970, 1, 1), it[0].start)
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertEquals(1970, it[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].first.end)
+            assertEquals(of(1970, 1, 1), it[0].first.start)
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
     }
 
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
+        val semesters = mutableListOf<Pair<Semester, Boolean>>()
+
+        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),
+                    classId = cursor.getInt(7),
+                    unitId = cursor.getInt(8),
+                    schoolYear = cursor.getInt(9),
+                    start = Converters().timestampToDate(cursor.getLong(10))!!,
+                    end = Converters().timestampToDate(cursor.getLong(11))!!
+                ) to (cursor.getInt(6) == 1))
+            } 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/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
new file mode 100644
index 00000000..bbbfd83d
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.entities.Student
+import org.threeten.bp.LocalDateTime
+
+fun getStudent(): Student {
+    return Student(
+        email = "test",
+        password = "test123",
+        schoolSymbol = "23",
+        scrapperBaseUrl = "fakelog.cf",
+        loginType = "AUTO",
+        isCurrent = true,
+        studentName = "",
+        schoolShortName = "",
+        schoolName = "",
+        studentId = 0,
+        classId = 1,
+        symbol = "",
+        registrationDate = LocalDateTime.now(),
+        className = "",
+        loginMode = "API",
+        certificateKey = "",
+        privateKey = "",
+        mobileBaseUrl = "",
+        userLoginId = 0,
+        isParent = false
+    )
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index 69502e74..c7ede6ae 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -10,8 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +35,19 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
+            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(attendance[0].date, of(2018, 9, 10))
+        assertEquals(attendance[1].date, of(2018, 9, 14))
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
index 356073e8..50badc46 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -11,6 +11,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,20 +37,20 @@ class CompletedLessonsLocalTest {
     @Test
     fun saveAndReadTest() {
         completedLessonsLocal.saveCompletedLessons(listOf(
-            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
-            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
-            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
+            getCompletedLesson(of(2018, 9, 10), 1),
+            getCompletedLesson(of(2018, 9, 14), 2),
+            getCompletedLesson(of(2018, 9, 17), 3)
         ))
 
         val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
             )
             .blockingGet()
         assertEquals(2, completed.size)
-        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(completed[0].date, of(2018, 9, 10))
+        assertEquals(completed[1].date, of(2018, 9, 14))
     }
 
     private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index fb76306d..98dfc88e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -10,7 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,19 +35,19 @@ class ExamLocalTest {
     @Test
     fun saveAndReadTest() {
         examLocal.saveExams(listOf(
-                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
+            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(exams[0].date, of(2018, 9, 10))
+        assertEquals(exams[1].date, of(2018, 9, 14))
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
index 954d0eea..eb1a5548 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -24,7 +24,7 @@ class GradeLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
     }
 
     @After
@@ -40,10 +40,10 @@ class GradeLocalTest {
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
         ))
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
+        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
 
         val grades = gradeLocal
-            .getGrades(semester)
+            .getGradesDetails(semester)
             .blockingGet()
 
         assertEquals(2, grades.size)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index a0acb5a7..cdd51477 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -6,15 +6,15 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Grade
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -25,14 +25,13 @@ import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-import io.github.wulkanowy.api.grades.Grade as GradeApi
 
 @SdkSuppress(minSdkVersion = P)
 @RunWith(AndroidJUnit4::class)
 class GradeRepositoryTest {
 
-    @SpyK
-    private var mockApi = Api()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     private val settings = InternetObservingSettings.builder()
         .strategy(TestInternetObservingStrategy())
@@ -54,14 +53,15 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
-        gradeRemote = GradeRemote(mockApi)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeRemote = GradeRemote(mockSdk)
 
-        every { mockApi.diaryId } returns 1
         every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
         every { semesterMock.studentId } returns 1
-        every { semesterMock.semesterId } returns 1
         every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -71,15 +71,15 @@ class GradeRepositoryTest {
 
     @Test
     fun markOlderThanRegisterDateAsRead() {
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
             createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
             createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
             createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -95,15 +95,15 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
             createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
             createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
             createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -119,15 +119,15 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(2, grades.size)
+        assertEquals(2, grades.first.size)
     }
 
     @Test
@@ -137,32 +137,32 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
     fun emptyLocal() {
         gradeLocal.saveGrades(listOf())
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf(
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
@@ -172,11 +172,11 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockApi.getGrades(1) } returns Single.just(listOf())
+        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(0, grades.size)
+        assertEquals(0, grades.first.size)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
index e0fd05a8..9146934b 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -1,8 +1,7 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import io.github.wulkanowy.api.toDate
 import org.threeten.bp.LocalDate
-import io.github.wulkanowy.api.grades.Grade as GradeRemote
+import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
 import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
 
 fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
@@ -18,17 +17,25 @@ fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String,
         description = desc,
         entry = "",
         gradeSymbol = "",
-        value = value,
+        value = value.toDouble(),
         weight = "",
         weightValue = weight
     )
 }
 
 fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
-    return GradeRemote().apply {
-        this.value = value
-        this.weightValue = weight
-        this.date = date.toDate()
-        this.description = desc
-    }
+    return GradeRemote(
+        subject = "",
+        color = "",
+        comment = "",
+        date = date,
+        description = desc,
+        entry = "",
+        modifier = .0,
+        symbol = "",
+        teacher = "",
+        value = value.toDouble(),
+        weight = weight.toString(),
+        weightValue = weight
+    )
 }
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 0057a26e..bd3635fe 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,13 +4,14 @@ 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
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -24,7 +25,7 @@ class GradeStatisticsLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
     }
 
     @After
@@ -39,10 +40,7 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Matematyka"
-        ).blockingGet()
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
@@ -55,15 +53,54 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(1, stats.size)
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
         assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
+    }
+
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        with(stats[0]) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        assertEquals(null, stats)
+    }
+
+    private fun getSemester(): Semester {
+        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
     }
 
     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/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
index 77ddafb9..65ef1fcb 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -6,11 +6,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,7 +38,7 @@ class LuckyNumberLocalTest {
     fun saveAndReadTest() {
         luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
             LocalDate.of(2019, 1, 20)
         ).blockingGet()
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
index 6edaccdb..22578e41 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -42,7 +42,7 @@ class RecipientLocalTest {
         ))
 
         val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", "", 1, true, LocalDateTime.now()),
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
             2,
             ReportingUnit(1, 4, "", 0, "", emptyList())
         ).blockingGet()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index cecd8099..530bfb3f 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -5,13 +5,11 @@ 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.SharedPrefHelper
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.getStudent
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -21,14 +19,13 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedHelper: SharedPrefHelper
+    private val student = getStudent()
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -39,8 +36,7 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
-            .blockingGet()
+        studentLocal.saveStudents(listOf(student)).blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index eea5463d..aa35fe79 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -1,13 +1,11 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import io.github.wulkanowy.api.toDate
-import io.github.wulkanowy.utils.toDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.LocalDateTime.now
-import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
+fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
         studentId = 1,
         diaryId = 2,
@@ -23,23 +21,28 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
-        changes = false,
+        isStudentPlan = true,
+        changes = changes,
         canceled = false
     )
 }
 
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
+fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
     return TimetableRemote(
         number = number,
-        start = start.toDate(),
-        end = start.plusMinutes(45).toDate(),
-        date = start.toLocalDate().toDate(),
+        start = start,
+        end = start.plusMinutes(45),
+        date = start.toLocalDate(),
         subject = subject,
         group = "",
         room = room,
         teacher = teacher,
         info = "",
-        changes = false,
-        canceled = false
+        changes = changes,
+        canceled = false,
+        roomOld = "",
+        subjectOld = "",
+        teacherOld = "",
+        studentPlan = true
     )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index fe25e4e9..a66e5843 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -35,13 +35,13 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-            createTimetableLocal(1, of(2018, 9, 10, 0, 0, 0)),
-            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
-            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
+            createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
         ))
 
         val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2018, 9, 10),
             LocalDate.of(2018, 9, 14)
         ).blockingGet()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 79216d55..75f2f0b8 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -6,14 +6,17 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.data.repositories.getStudent
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.mockk
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -27,16 +30,24 @@ import kotlin.test.assertEquals
 @RunWith(AndroidJUnit4::class)
 class TimetableRepositoryTest {
 
-    @SpyK
-    private var mockApi = Api()
+    @MockK
+    private lateinit var mockSdk: Sdk
 
     private val settings = InternetObservingSettings.builder()
         .strategy(TestInternetObservingStrategy())
         .build()
 
+    @MockK
+    private lateinit var studentMock: Student
+
+    private val student = getStudent()
+
     @MockK
     private lateinit var semesterMock: Semester
 
+    @MockK
+    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
@@ -48,10 +59,20 @@ class TimetableRepositoryTest {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         timetableLocal = TimetableLocal(testDb.timetableDao)
-        timetableRemote = TimetableRemote(mockApi)
+        timetableRemote = TimetableRemote(mockSdk)
+
+        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
+        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
+
+        every { studentMock.studentId } returns 1
+        every { studentMock.studentName } returns "Jan Kowalski"
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 2
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -60,30 +81,86 @@ class TimetableRepositoryTest {
     }
 
     @Test
-    fun copyDetailsToCompletedFromPrevious() {
+    fun copyRoomToCompletedFromPrevious() {
         timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
-            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
         ))
 
-        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
-            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
-            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
-            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
             .blockingGet()
 
         assertEquals(4, lessons.size)
         assertEquals("123", lessons[0].room)
         assertEquals("321", lessons[1].room)
         assertEquals("213", lessons[2].room)
+    }
 
-        assertEquals("", lessons[3].teacher)
+    @Test
+    fun copyTeacherToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
+            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
+            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
+
+            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
+            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
+        ))
+
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+
+            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .blockingGet()
+
+        assertEquals(12, lessons.size)
+
+        assertEquals("Paweł Poniedziałkowski", lessons[0].teacher)
+        assertEquals("Jakub Wtorkowski", lessons[1].teacher)
+        assertEquals("Joanna Poniedziałkowska", lessons[2].teacher)
+        assertEquals("Joanna Wtorkowska", lessons[3].teacher)
+
+        assertEquals("Joanna Wtorkowska", lessons[4].teacher)
+        assertEquals("", lessons[5].teacher)
+        assertEquals("", lessons[6].teacher)
+        assertEquals("", lessons[7].teacher)
+
+        assertEquals("Paweł Środowski", lessons[8].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[9].teacher)
+        assertEquals("Paweł Środowski", lessons[10].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[11].teacher)
     }
 }
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml
new file mode 100644
index 00000000..832eba83
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="30.434782"
+    android:viewportHeight="30.434782">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 8.131 2.131 C 7.601 2.131 7.092 2.342 6.717 2.717 C 6.342 3.092 6.131 3.601 6.131 4.131 L 6.131 18.131 C 6.131 18.661 6.342 19.17 6.717 19.545 C 7.092 19.92 7.601 20.131 8.131 20.131 L 16.918 20.131 C 17.252 19.39 17.712 18.714 18.277 18.131 L 8.131 18.131 L 8.131 4.131 L 22.131 4.131 L 22.131 16.1 C 22.516 16.034 22.906 16.001 23.297 16 C 23.576 16.002 23.854 16.02 24.131 16.055 L 24.131 4.131 C 24.131 3.601 23.92 3.092 23.545 2.717 C 23.17 2.342 22.661 2.131 22.131 2.131 L 8.131 2.131 Z M 2.131 6.131 L 2.131 22.131 C 2.131 22.661 2.342 23.17 2.717 23.545 C 3.092 23.92 3.601 24.131 4.131 24.131 L 16.391 24.131 C 16.329 23.757 16.297 23.379 16.297 23 C 16.299 22.709 16.319 22.419 16.357 22.131 L 4.131 22.131 L 4.131 6.131 L 2.131 6.131 Z M 14.131 6.131 C 13.601 6.131 13.092 6.342 12.717 6.717 C 12.342 7.092 12.131 7.601 12.131 8.131 L 12.131 14.131 C 12.131 15.231 13.031 16.131 14.131 16.131 L 16.131 16.131 C 16.661 16.131 17.17 15.92 17.545 15.545 C 17.92 15.17 18.131 14.661 18.131 14.131 L 18.131 12.131 C 18.131 11.601 17.92 11.092 17.545 10.717 C 17.17 10.342 16.661 10.131 16.131 10.131 L 14.131 10.131 L 14.131 8.131 L 18.131 8.131 L 18.131 6.131 L 14.131 6.131 Z M 14.131 12.131 L 16.131 12.131 L 16.131 14.131 L 14.131 14.131 L 14.131 12.131 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 20.174 28 L 20.174 18.521 L 23.091 18.521 Q 24.341 18.521 25.324 19.087 Q 26.314 19.647 26.867 20.689 Q 27.421 21.724 27.421 23.046 L 27.421 23.482 Q 27.421 24.803 26.874 25.832 Q 26.333 26.861 25.344 27.427 Q 24.354 27.993 23.111 28 Z M 22.128 20.103 L 22.128 26.431 L 23.072 26.431 Q 24.217 26.431 24.823 25.682 Q 25.428 24.934 25.441 23.54 L 25.441 23.039 Q 25.441 21.594 24.842 20.852 Q 24.243 20.103 23.091 20.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
new file mode 100644
index 00000000..4f3eb98e
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 10.734 3.043 C 9.234 3.043 8.043 4.293 8.043 5.793 C 8.043 7.683 9.743 9.223 13.043 12.223 C 16.343 9.223 18.043 7.684 18.043 5.734 C 18.043 4.234 16.793 3.043 15.293 3.043 C 14.433 3.043 13.613 3.403 13.043 4.043 C 12.473 3.403 11.654 3.043 10.734 3.043 Z M 5.734 8.043 C 4.234 8.043 3.043 9.293 3.043 10.793 C 3.043 11.653 3.403 12.473 4.043 13.043 C 3.403 13.613 3.043 14.434 3.043 15.354 C 3.043 16.854 4.293 18.043 5.793 18.043 C 7.683 18.043 9.223 16.343 12.223 13.043 C 9.223 9.743 7.684 8.043 5.734 8.043 Z M 20.293 8.043 C 18.403 8.043 16.863 9.743 13.873 13.043 C 15.043 14.334 15.987 15.373 16.824 16.168 C 17.476 15.484 18.26 14.94 19.129 14.567 C 19.997 14.195 20.932 14.002 21.877 14 C 22.181 14.002 22.484 14.025 22.785 14.066 C 22.615 13.68 22.365 13.329 22.043 13.043 C 22.683 12.473 23.043 11.654 23.043 10.734 C 23.043 9.234 21.793 8.043 20.293 8.043 Z M 13.043 13.863 C 9.743 16.863 8.043 18.404 8.043 20.354 C 8.043 21.854 9.293 23.043 10.793 23.043 C 11.653 23.043 12.473 22.683 13.043 22.043 C 13.576 22.642 14.333 22.982 15.182 23.025 C 14.981 22.369 14.879 21.686 14.877 21 C 14.88 19.52 15.351 18.078 16.225 16.883 C 15.422 16.032 14.368 15.067 13.043 13.863 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml
new file mode 100644
index 00000000..8fe12de4
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 5.043 3.043 C 3.943 3.043 3.053 3.943 3.053 5.043 L 3.043 23.043 L 7.043 19.043 L 15.16 19.043 C 15.646 17.378 16.733 15.952 18.209 15.043 L 7.043 15.043 L 7.043 13.043 L 19.043 13.043 L 19.043 14.609 C 19.935 14.211 20.9 14.003 21.877 14 C 22.268 14.003 22.658 14.038 23.043 14.105 L 23.043 5.043 C 23.043 3.943 22.143 3.043 21.043 3.043 L 5.043 3.043 Z M 7.043 7.043 L 19.043 7.043 L 19.043 9.043 L 7.043 9.043 L 7.043 7.043 Z M 7.043 10.043 L 19.043 10.043 L 19.043 12.043 L 7.043 12.043 L 7.043 10.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml
new file mode 100644
index 00000000..d30f2233
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 3.043 3.043 L 3.043 12.043 C 3.043 13.043 4.043 14.043 5.043 14.043 L 7.244 14.043 C 7.644 16.043 8.943 17.743 12.043 18.043 L 12.043 20.143 C 9.843 20.343 9.043 21.444 9.043 22.744 L 9.043 23.043 L 15.188 23.043 C 14.983 22.381 14.879 21.693 14.877 21 C 14.877 20.763 14.888 20.527 14.912 20.291 C 14.649 20.226 14.364 20.172 14.043 20.143 L 14.043 18.043 C 14.68 17.981 15.224 17.848 15.717 17.678 C 16.382 16.446 17.401 15.442 18.643 14.795 C 18.725 14.551 18.792 14.299 18.844 14.043 L 21.043 14.043 C 22.043 14.043 23.043 13.043 23.043 12.043 L 23.043 3.043 L 19.043 3.043 C 18.143 3.043 17.043 4.043 17.043 5.043 L 9.043 5.043 C 9.043 4.043 7.943 3.043 7.043 3.043 L 3.043 3.043 Z M 5.043 5.043 L 7.043 5.043 L 7.043 12.043 L 5.043 12.043 L 5.043 5.043 Z M 19.043 5.043 L 21.043 5.043 L 21.043 12.043 L 19.043 12.043 L 19.043 5.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_grade.png b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png
new file mode 100644
index 00000000..013b7ac4
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png
new file mode 100644
index 00000000..74a4d0c5
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_message.png b/app/src/debug/res/drawable-hdpi/ic_stat_message.png
new file mode 100644
index 00000000..be41e343
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_note.png b/app/src/debug/res/drawable-hdpi/ic_stat_note.png
new file mode 100644
index 00000000..1992edf2
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_grade.png b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png
new file mode 100644
index 00000000..a5df2a35
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png
new file mode 100644
index 00000000..278ed2c6
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_message.png b/app/src/debug/res/drawable-mdpi/ic_stat_message.png
new file mode 100644
index 00000000..7327a02f
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_note.png b/app/src/debug/res/drawable-mdpi/ic_stat_note.png
new file mode 100644
index 00000000..2fb02098
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png
new file mode 100644
index 00000000..c63f810f
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png
new file mode 100644
index 00000000..4035ceba
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png
new file mode 100644
index 00000000..c4140be8
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xhdpi/ic_stat_note.png
new file mode 100644
index 00000000..6b533c8e
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png
new file mode 100644
index 00000000..13c26b77
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png
new file mode 100644
index 00000000..da435745
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png
new file mode 100644
index 00000000..9d0fa781
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png
new file mode 100644
index 00000000..64da443f
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable/ic_launcher_foreground.xml b/app/src/debug/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 6be79909..00000000
--- a/app/src/debug/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="1926.9231"
-        android:viewportHeight="1926.9231">
-    <group android:translateX="462.46155"
-            android:translateY="462.46155">
-      <path
-          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
-          android:fillColor="#AD2A2A"/>
-      <path
-          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
-          android:strokeAlpha="0.49803922"
-          android:strokeLineJoin="round"
-          android:strokeWidth="4"
-          android:fillColor="#3f3f3f"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"
-          android:fillAlpha="1"
-          android:strokeLineCap="square"/>
-      <path
-          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
-          android:strokeAlpha="1"
-          android:strokeLineJoin="miter"
-          android:strokeWidth="1.94642854"
-          android:fillColor="#000000"
-          android:strokeColor="#00000000"
-          android:fillAlpha="0.18431373"
-          android:strokeLineCap="butt"/>
-      <path
-          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-    </group>
-</vector>
diff --git a/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml b/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
new file mode 100644
index 00000000..799ea037
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#ad2a2a"
+        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
+    <path
+        android:fillColor="#3f3f3f"
+        android:pathData="M886.7,1119.5h1580.5c0.6,0 0,292 0,292H886.7a19.4,19.4 0,0 1,-19.5 -19.5v-253c0,-10.8 8.7,-19.5 19.5,-19.5z"
+        android:strokeWidth="4"
+        android:strokeAlpha=".5"
+        android:strokeColor="#000"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha=".2"
+        android:fillColor="#000"
+        android:pathData="M1191.2,1173.4v19.9h-88.7v59.3h77v19.9h-77v65.4h89.8v19.9L1079,1357.8v-104.2l-52.3,-52.3 -0.8, -0.2a75.1,75.1 0,0 1,12.7 23,104 104,0 0,1 5.7,34.7v13.5c0,12.7 -2,24.3 -5.7,34.8a72.8,72.8 0,0 1,-41.6 44.4,85.5 85.5,0 0,1 -34.3,6.3L920,1357.8v-6.6l-0.4,6.8 53.8,53.5h622L1416,1232l-58.4,-58.4h-0.3l-58,184.1h -20.4l-44.7,-141.3zM1245.8,1173.5l43,146.5 23.7,-79.7zM972.1,1173.8zM943.8,1192.5v146.1h18.9a62,62 0,0 0,25.8 -5.2,50.3 50.3,0 0,0 18,-14c4.9,-6 8.4,-13 10.7,-21 2.3,-8 3.6,-16.7 3.7,-26v-13.9c-0.1,-9.4 -1.4,-18 -3.7,-26 -2.4,-8 -6,-15 -10.7,-20.7a49.3,49.3 0,0 0,-18 -14,63.4 63.4,0 0,0 -25.8,-5.3zM1022.6,1197.3l2,2.1 -2,-2z"
+        android:strokeWidth="1.9"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M920,1357.7v-184.5h42.7q19.3,0.3 34.3,6.6 15.2,6.2 25.6,17.5 10.6,11.2 16,26.9 5.6,15.6 5.7, 34.6v13.5q-0.1,19 -5.7,34.7 -5.4,15.6 -16,26.9 -10.4,11.2 -25.6,17.5 -15,6.2 -34.3,6.3zM943.8,1192.5v146.1h18.9q15, -0.1 25.8,-5.2 11,-5.2 18,-14 7.3,-9 10.7,-21 3.5,-12 3.6,-26v-13.9q0,-14 -3.6,-26t-10.7,-20.7q-7,-9 -18,-14 -10.9,-5 -25.8,-5.3zM1179.5,1272.5h-77v65.4h89.8v19.9L1079,1357.8v-184.6h112.2v20h-88.7v59.4h77zM1288.9, 1320l43.6,-146.8h25l-58.2,184.6h-20.4l-58.3,-184.6h25z"
+        android:strokeWidth="1"
+        android:strokeColor="#000" />
+</vector>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1..7dbec2cb 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1..7dbec2cb 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/values-pl/strings.xml b/app/src/debug/res/values-pl/strings.xml
deleted file mode 100644
index c90641dd..00000000
--- a/app/src/debug/res/values-pl/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Wulkanowy DEV</string>
-</resources>
diff --git a/app/src/debug/res/values/ic_launcher_background.xml b/app/src/debug/res/values/ic_launcher_background.xml
deleted file mode 100644
index 9646c0b4..00000000
--- a/app/src/debug/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#D32F2F</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/debug/res/values/preferences_defaults.xml b/app/src/debug/res/values/preferences_defaults.xml
new file mode 100644
index 00000000..f5a12464
--- /dev/null
+++ b/app/src/debug/res/values/preferences_defaults.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+    <bool name="pref_default_notification_debug">true</bool>
+</resources>
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index be4c0ebe..60dc6b56 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -5,13 +5,12 @@ package io.github.wulkanowy.utils
 import android.content.Context
 import timber.log.Timber
 
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    // do nothing
+fun initCrashlytics(context: Context, appInfo: AppInfo) {}
+
+open class TimberTreeNoOp : Timber.Tree() {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
 }
 
-class CrashlyticsTree : Timber.Tree() {
+class CrashlyticsTree : TimberTreeNoOp()
 
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        // do nothing
-    }
-}
+class CrashlyticsExceptionTree : TimberTreeNoOp()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65a140f2..802cf1ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,8 +4,6 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -20,11 +18,13 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:supportsRtl,android:allowBackup">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen">
+            android:theme="@style/WulkanowyTheme.SplashScreen"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -40,12 +40,14 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
@@ -91,17 +93,58 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
+        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
+
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
             android:exported="false"
             tools:node="remove" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
+        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            android:enabled="${firebase_enabled}"
+            android:exported="false" />
+
         <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="${fabric_api_key}" />
+            android:name="firebase_analytics_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="${firebase_enabled}" />
+
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${crashlytics_enabled}" />
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_messaging_auto_init_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_push" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="push_channel" />
     </application>
 </manifest>
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
new file mode 100644
index 00000000..40aff4c4
--- /dev/null
+++ b/app/src/main/assets/contributors.json
@@ -0,0 +1,38 @@
+[
+  {
+    "displayName": "Mikołaj Pich",
+    "githubUsername": "mklkj"
+  },
+  {
+    "displayName": "Rafał Borcz",
+    "githubUsername": "Faierbel"
+  },
+  {
+    "displayName": "Dominik Korsa",
+    "githubUsername": "dominik-korsa"
+  },
+  {
+    "displayName": "Kacper Ziubryniewicz",
+    "githubUsername": "kapi2289"
+  },
+  {
+    "displayName": "doteq",
+    "githubUsername": "doteq"
+  },
+  {
+    "displayName": "Paweł Krzyś",
+    "githubUsername": "pavuloff"
+  },
+  {
+    "displayName": "Piotr Romanowski",
+    "githubUsername": "v0idzz"
+  },
+  {
+    "displayName": "Dinolek",
+    "githubUsername": "Dinolek"
+  },
+  {
+    "displayName": "Mateusz Idziejczak",
+    "githubUsername": "PanTajemnic"
+  }
+]
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 85070edc..0e094f69 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,34 +1,38 @@
 package io.github.wulkanowy
 
 import android.content.Context
+import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
-import androidx.work.WorkManager
 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 fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
-import io.github.wulkanowy.utils.initCrashlytics
 import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
 import java.io.IOException
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication() {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
     lateinit var workerFactory: SyncWorkerFactory
 
+    @Inject
+    lateinit var themeManager: ThemeManager
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -41,25 +45,24 @@ class WulkanowyApp : DaggerApplication() {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
+        themeManager.applyDefaultTheme()
 
-        initWorkManager()
         initLogging()
-        initCrashlytics(this, appInfo)
-    }
-
-    private fun initWorkManager() {
-        WorkManager.initialize(this,
-            Configuration.Builder()
-                .setWorkerFactory(workerFactory)
-                .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-                .build())
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+            Timber.plant(FileLoggerTree.Builder()
+                .withFileName("wulkanowy.%g.log")
+                .withDirName(applicationContext.filesDir.absolutePath)
+                .withFileLimit(10)
+                .withMinPriority(DEBUG)
+                .build()
+            )
         } else {
+            Timber.plant(CrashlyticsExceptionTree())
             Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
@@ -76,4 +79,9 @@ class WulkanowyApp : DaggerApplication() {
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
         return DaggerAppComponent.factory().create(this)
     }
+
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+        .setWorkerFactory(workerFactory)
+        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+        .build()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
deleted file mode 100644
index b6eee316..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Student
-import java.net.URL
-import javax.inject.Inject
-
-class ApiHelper @Inject constructor(private val api: Api) {
-
-    fun initApi(student: Student) {
-        api.apply {
-            email = student.email
-            password = student.password
-            symbol = student.symbol
-            schoolSymbol = student.schoolSymbol
-            studentId = student.studentId
-            classId = student.classId
-            host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = student.endpoint.startsWith("https")
-            loginType = Api.LoginType.valueOf(student.loginType)
-            useNewStudent = true
-        }
-    }
-
-    fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        api.apply {
-            this.email = email
-            this.password = password
-            this.symbol = symbol
-            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = endpoint.startsWith("https")
-            useNewStudent = true
-        }
-    }
-}
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 97da6bb8..9540372f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -1,22 +1,23 @@
 package io.github.wulkanowy.data
 
+import android.app.AlarmManager
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.AssetManager
 import android.content.res.Resources
+import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
-import com.readystatesoftware.chuck.api.ChuckCollector
-import com.readystatesoftware.chuck.api.ChuckInterceptor
-import com.readystatesoftware.chuck.api.RetentionManager
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
 import dagger.Module
 import dagger.Provides
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import okhttp3.logging.HttpLoggingInterceptor
-import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
-import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
+import io.github.wulkanowy.sdk.Sdk
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -33,34 +34,39 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideApi(chuckCollector: ChuckCollector, context: Context): Api {
-        return Api().apply {
-            logLevel = NONE
+    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
+        return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
-            setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC))
+            setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            setInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true, 0)
+            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
-        return ChuckCollector(context)
-            .showNotification(prefRepository.isDebugNotificationEnable)
-            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+        return ChuckerCollector(
+            context = context,
+            showNotification = prefRepository.isDebugNotificationEnable,
+            retentionPeriod = RetentionManager.Period.ONE_HOUR
+        )
     }
 
     @Singleton
     @Provides
-    fun provideDatabase(context: Context) = AppDatabase.newInstance(context)
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
     fun provideResources(context: Context): Resources = context.resources
 
+    @Singleton
+    @Provides
+    fun provideAssets(context: Context): AssetManager = context.assets
+
     @Singleton
     @Provides
     fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -85,10 +91,18 @@ 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
 
+    @Singleton
+    @Provides
+    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
+
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao
@@ -136,4 +150,12 @@ 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 a97a3042..762c52f8 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,41 +6,50 @@ 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
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 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
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 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
@@ -48,7 +57,17 @@ 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.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration20
+import io.github.wulkanowy.data.db.migrations.Migration21
+import io.github.wulkanowy.data.db.migrations.Migration22
+import io.github.wulkanowy.data.db.migrations.Migration23
+import io.github.wulkanowy.data.db.migrations.Migration24
+import io.github.wulkanowy.data.db.migrations.Migration25
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -70,7 +89,9 @@ import javax.inject.Singleton
         Grade::class,
         GradeSummary::class,
         GradeStatistics::class,
+        GradePointsStatistics::class,
         Message::class,
+        MessageAttachment::class,
         Note::class,
         Homework::class,
         Subject::class,
@@ -78,7 +99,9 @@ import javax.inject.Singleton
         CompletedLesson::class,
         ReportingUnit::class,
         Recipient::class,
-        MobileDevice::class
+        MobileDevice::class,
+        Teacher::class,
+        School::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -87,29 +110,43 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 15
+        const val VERSION_SCHEMA = 25
 
-        fun newInstance(context: Context): AppDatabase {
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18(),
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25()
+            )
+        }
+
+        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
                 .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                 .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(
-                    Migration2(),
-                    Migration3(),
-                    Migration4(),
-                    Migration5(),
-                    Migration6(),
-                    Migration7(),
-                    Migration8(),
-                    Migration9(),
-                    Migration10(),
-                    Migration11(),
-                    Migration12(),
-                    Migration13(),
-                    Migration14(),
-                    Migration15()
-                )
+                .addMigrations(*getMigrations(sharedPrefProvider))
                 .build()
         }
     }
@@ -132,8 +169,12 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeStatistics: GradeStatisticsDao
 
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
+    abstract val messageAttachmentDao: MessageAttachmentDao
+
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao
@@ -149,4 +190,8 @@ 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/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index 73a04d23..294f73d3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -48,4 +48,14 @@ class Converters {
     fun gsonToIntList(value: String): List<Int> {
         return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
     }
+
+    @TypeConverter
+    fun stringPairListToGson(list: List<Pair<String, String>>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
+        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
deleted file mode 100644
index 74f9fa65..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db
-
-import android.annotation.SuppressLint
-import android.content.SharedPreferences
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-@SuppressLint("ApplySharedPref")
-class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
-
-    fun putLong(key: String, value: Long, sync: Boolean = false) {
-        sharedPref.edit().putLong(key, value).apply {
-            if (sync) commit() else apply()
-        }
-    }
-
-    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
-
-    fun delete(key: String) {
-        sharedPref.edit().remove(key).apply()
-    }
-}
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
new file mode 100644
index 00000000..4a4aaf74
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import javax.inject.Inject
+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) }
+    }
+
+    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
+
+    fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
+
+    fun putString(key: String, value: String, sync: Boolean = false) {
+        sharedPref.edit(sync) { putString(key, value) }
+    }
+
+    fun delete(key: String) {
+        sharedPref.edit().remove(key).apply()
+    }
+}
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 d3c4f146..3eb57473 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,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface AttendanceDao {
-
-    @Insert
-    fun insertAll(exams: List<Attendance>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Attendance>)
+interface AttendanceDao : BaseDao<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 a7413de5..fd58533f 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,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(exams: List<AttendanceSummary>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<AttendanceSummary>)
+interface AttendanceSummaryDao : BaseDao<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
new file mode 100644
index 00000000..32dbadb8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
@@ -0,0 +1,17 @@
+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 6816ceaa..e13e569b 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,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface CompletedLessonsDao {
-
-    @Insert
-    fun insertAll(exams: List<CompletedLesson>)
-
-    @Delete
-    fun deleteAll(exams: List<CompletedLesson>)
+interface CompletedLessonsDao : BaseDao<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 06cd5613..ca6b32df 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,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ExamDao {
-
-    @Insert
-    fun insertAll(exams: List<Exam>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Exam>)
+interface ExamDao : BaseDao<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 0bd210b0..c74d1937 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,26 +1,14 @@
 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 {
-
-    @Insert
-    fun insertAll(grades: List<Grade>)
-
-    @Update
-    fun updateAll(grade: List<Grade>)
-
-    @Delete
-    fun deleteAll(grades: List<Grade>)
+interface GradeDao : BaseDao<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
new file mode 100644
index 00000000..da182866
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
@@ -0,0 +1,18 @@
+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<List<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 338c369f..6faa35d0 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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeStatisticsDao {
-
-    @Insert
-    fun insertAll(gradesStatistics: List<GradeStatistics>)
-
-    @Delete
-    fun deleteAll(gradesStatistics: List<GradeStatistics>)
+interface GradeStatisticsDao : BaseDao<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 3f2e87bd..1165ef07 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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeSummaryDao {
-
-    @Insert
-    fun insertAll(gradesSummary: List<GradeSummary>)
-
-    @Delete
-    fun deleteAll(gradesSummary: List<GradeSummary>)
+interface GradeSummaryDao : BaseDao<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 253bdb11..1947a0df 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,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface HomeworkDao {
-
-    @Insert
-    fun insertAll(homework: List<Homework>)
-
-    @Delete
-    fun deleteAll(homework: List<Homework>)
+interface HomeworkDao : BaseDao<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 afd7905c..f16c28d9 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,10 +1,7 @@
 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
@@ -12,18 +9,8 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface LuckyNumberDao {
-
-    @Insert
-    fun insert(luckyNumber: LuckyNumber)
-
-    @Update
-    fun update(luckyNumber: LuckyNumber)
-
-    @Delete
-    fun delete(luckyNumber: LuckyNumber)
+interface LuckyNumberDao : BaseDao<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/MessageAttachmentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
new file mode 100644
index 00000000..3c511a27
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+
+@Dao
+interface MessageAttachmentDao : BaseDao<MessageAttachment> {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAttachments(items: List<MessageAttachment>): List<Long>
+}
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 4f72c6c9..7a69e270 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,31 +1,23 @@
 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 androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.reactivex.Maybe
+import io.reactivex.Single
 
 @Dao
-interface MessagesDao {
+interface MessagesDao : BaseDao<Message> {
 
-    @Insert
-    fun insertAll(messages: List<Message>)
-
-    @Delete
-    fun deleteAll(messages: List<Message>)
-
-    @Update
-    fun updateAll(messages: List<Message>)
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
 
     @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>>
 
-    @Query("SELECT * FROM Messages WHERE id = :id")
-    fun load(id: Long): Maybe<Message>
-
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: 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 d6b97f6a..b05b2d9c 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,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(devices: List<MobileDevice>)
-
-    @Delete
-    fun deleteAll(devices: List<MobileDevice>)
+interface MobileDeviceDao : BaseDao<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 867e06a2..ea2fc6eb 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,28 +1,15 @@
 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 {
-
-    @Insert
-    fun insertAll(notes: List<Note>)
-
-    @Update
-    fun updateAll(notes: List<Note>)
-
-    @Delete
-    fun deleteAll(notes: List<Note>)
+interface NoteDao : BaseDao<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 7c5fd6ca..afb941b1 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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface RecipientDao {
-
-    @Insert
-    fun insertAll(messages: List<Recipient>)
-
-    @Delete
-    fun deleteAll(messages: List<Recipient>)
+interface RecipientDao : BaseDao<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 1898390a..6ddfd494 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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ReportingUnitDao {
-
-    @Insert
-    fun insertAll(reportingUnits: List<ReportingUnit>)
-
-    @Delete
-    fun deleteAll(reportingUnits: List<ReportingUnit>)
+interface ReportingUnitDao : BaseDao<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
new file mode 100644
index 00000000..e9bd6755
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
@@ -0,0 +1,15 @@
+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 01841fb6..654b80f3 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,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface SemesterDao {
-
-    @Insert
-    fun insertAll(semester: List<Semester>)
-
-    @Delete
-    fun deleteAll(semester: List<Semester>)
+interface SemesterDao : BaseDao<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/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 57bf25fb..901ddc73 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -22,6 +22,9 @@ interface StudentDao {
     @Query("SELECT * FROM Students WHERE is_current = 1")
     fun loadCurrent(): Maybe<Student>
 
+    @Query("SELECT * FROM Students WHERE id = :id")
+    fun loadById(id: Int): Maybe<Student>
+
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
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 725a371a..525a7129 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,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(subjects: List<Subject>): List<Long>
-
-    @Delete
-    fun deleteAll(subjects: List<Subject>)
+interface SubjectDao : BaseDao<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
new file mode 100644
index 00000000..5ea237a8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
@@ -0,0 +1,15 @@
+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 abe21361..6b62cc82 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,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface TimetableDao {
-
-    @Insert
-    fun insertAll(exams: List<Timetable>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Timetable>)
+interface TimetableDao : BaseDao<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/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index 3c58971a..aa8da8db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -15,6 +15,9 @@ data class Attendance(
     @ColumnInfo(name = "diary_id")
     val diaryId: Int,
 
+    @ColumnInfo(name = "time_id")
+    val timeId: Int,
+
     val date: LocalDate,
 
     val number: Int,
@@ -33,7 +36,13 @@ data class Attendance(
 
     val excused: Boolean,
 
-    val deleted: Boolean
+    val deleted: Boolean,
+
+    val excusable: Boolean,
+
+    @ColumnInfo(name = "excuse_status")
+    val excuseStatus: String?
+
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index 1221a7aa..3f69c61b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -19,7 +19,7 @@ data class Grade(
 
     val entry: String,
 
-    val value: Int,
+    val value: Double,
 
     val modifier: Double,
 
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
new file mode 100644
index 00000000..407f18bd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
@@ -0,0 +1,24 @@
+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/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index a22df096..cd7d153e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -27,10 +27,14 @@ data class Homework(
     val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+    val teacherSymbol: String,
 
+    val attachments: List<Pair<String, String>>
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_done")
+    var isDone: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 48b4fd02..05829841 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -29,6 +29,8 @@ data class Message(
 
     val subject: String,
 
+    var content: String,
+
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -42,7 +44,10 @@ data class Message(
     @ColumnInfo(name = "read_by")
     val readBy: Int,
 
-    val removed: Boolean
+    val removed: Boolean,
+
+    @ColumnInfo(name = "has_attachments")
+    val hasAttachments: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
@@ -50,6 +55,4 @@ data class Message(
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
-
-    var content: String? = null
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
new file mode 100644
index 00000000..d1886e91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
@@ -0,0 +1,26 @@
+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 = "MessageAttachments")
+data class MessageAttachment(
+
+    @PrimaryKey
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "message_id")
+    val messageId: Int,
+
+    @ColumnInfo(name = "one_drive_id")
+    val oneDriveId: String,
+
+    @ColumnInfo(name = "url")
+    val url: String,
+
+    @ColumnInfo(name = "filename")
+    val filename: String
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
new file mode 100644
index 00000000..2e7af0f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class MessageWithAttachment(
+    @Embedded
+    val message: Message,
+
+    @Relation(parentColumn = "message_id", entityColumn = "message_id")
+    val attachments: List<MessageAttachment>
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index 5f3a92ab..6f707a66 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -16,8 +16,19 @@ data class Note(
 
     val teacher: String,
 
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String,
+
     val category: String,
 
+    @ColumnInfo(name = "category_type")
+    val categoryType: Int,
+
+    @ColumnInfo(name = "is_points_show")
+    val isPointsShow: Boolean,
+
+    val points: Int,
+
     val content: String
 ) : Serializable {
 
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
new file mode 100644
index 00000000..20fae450
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
@@ -0,0 +1,30 @@
+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/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 6c06be11..0641e0b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -27,9 +27,6 @@ data class Semester(
     @ColumnInfo(name = "semester_name")
     val semesterName: Int,
 
-    @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
-
     val start: LocalDate,
 
     val end: LocalDate,
@@ -43,4 +40,8 @@ data class Semester(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+
+    @ColumnInfo(name = "is_current")
+    var current: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index 13c5ee08..905979f9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -10,10 +10,27 @@ import java.io.Serializable
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
 
-    val endpoint: String,
+    @ColumnInfo(name = "scrapper_base_url")
+    val scrapperBaseUrl: String,
 
+    @ColumnInfo(name = "mobile_base_url")
+    val mobileBaseUrl: String,
+
+    @ColumnInfo(name = "login_type")
     val loginType: String,
 
+    @ColumnInfo(name = "login_mode")
+    val loginMode: String,
+
+    @ColumnInfo(name = "certificate_key")
+    val certificateKey: String,
+
+    @ColumnInfo(name = "private_key")
+    val privateKey: String,
+
+    @ColumnInfo(name = "is_parent")
+    val isParent: Boolean,
+
     val email: String,
 
     var password: String,
@@ -23,12 +40,18 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
+    @ColumnInfo(name = "user_login_id")
+    val userLoginId: Int,
+
     @ColumnInfo(name = "student_name")
     val studentName: String,
 
     @ColumnInfo(name = "school_id")
     val schoolSymbol: String,
 
+    @ColumnInfo(name ="school_short")
+    val schoolShortName: String,
+
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 
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
new file mode 100644
index 00000000..52c96f8a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
@@ -0,0 +1,27 @@
+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/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index 9bc3d214..cad3b7c6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -40,6 +40,9 @@ data class Timetable(
 
     val info: String,
 
+    @ColumnInfo(name = "student_plan")
+    val isStudentPlan: Boolean,
+
     val changes: Boolean,
 
     val canceled: Boolean
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
new file mode 100644
index 00000000..7f40c0f8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 00000000..e2a2574d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000..6c5e56c6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
@@ -0,0 +1,22 @@
+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/db/migrations/Migration19.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration19.kt
new file mode 100644
index 00000000..d38f1245
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration19.kt
@@ -0,0 +1,119 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
+
+class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migration(18, 19) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateMessages(database)
+        migrateGrades(database)
+        migrateStudents(database)
+        migrateSharedPreferences()
+    }
+
+    private fun migrateMessages(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                is_notified INTEGER NOT NULL,
+                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,
+                content 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
+            )
+        """)
+    }
+
+    private fun migrateGrades(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Grades")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Grades (
+                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 REAL 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
+            )
+        """)
+    }
+
+    private fun migrateStudents(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Students_tmp (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                scrapper_base_url TEXT NOT NULL,
+                mobile_base_url TEXT NOT NULL,
+                is_parent INTEGER NOT NULL,
+                login_type TEXT NOT NULL,
+                login_mode TEXT NOT NULL,
+                certificate_key TEXT NOT NULL,
+                private_key TEXT NOT NULL,
+                email TEXT NOT NULL,
+                password TEXT NOT NULL,
+                symbol TEXT NOT NULL,
+                student_id INTEGER NOT NULL,
+                user_login_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
+            )
+        """)
+
+        database.execSQL("ALTER TABLE Students ADD COLUMN scrapperBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN apiBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN is_parent INT NOT NULL DEFAULT 0;")
+        database.execSQL("ALTER TABLE Students ADD COLUMN loginMode TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN certificateKey TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN privateKey TEXT NOT NULL DEFAULT \"\";")
+        database.execSQL("ALTER TABLE Students ADD COLUMN user_login_id INTEGER NOT NULL DEFAULT 0;")
+
+        database.execSQL("""
+            INSERT INTO Students_tmp(
+            id, scrapper_base_url, mobile_base_url, is_parent, login_type, login_mode, certificate_key, private_key, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date)
+            SELECT
+            id, endpoint, apiBaseUrl, is_parent, loginType, "SCRAPPER", certificateKey, privateKey, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date
+            FROM Students
+        """)
+        database.execSQL("DROP TABLE Students")
+        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
+        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students (email, symbol, student_id, school_id, class_id)")
+    }
+
+    private fun migrateSharedPreferences() {
+        if (sharedPrefProvider.getString("grade_modifier_plus", "0.0") == "0.0") {
+            sharedPrefProvider.putString("grade_modifier_plus", "0.33")
+        }
+        if (sharedPrefProvider.getString("grade_modifier_minus", "0.0") == "0.0") {
+            sharedPrefProvider.putString("grade_modifier_minus", "0.33")
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt
new file mode 100644
index 00000000..2fcfc183
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20 : Migration(19, 20) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateTimetable(database)
+        truncateSubjects(database)
+    }
+
+    private fun migrateTimetable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Timetable")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS `Timetable` (
+                `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,
+                `student_plan` INTEGER NOT NULL,
+                `changes` INTEGER NOT NULL,
+                `canceled` INTEGER NOT NULL
+            )
+        """)
+    }
+
+    private fun truncateSubjects(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Subjects")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt
new file mode 100644
index 00000000..bc0ff900
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21 : Migration(20, 21) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excusable INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN time_id INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excuse_status TEXT DEFAULT NULL")
+
+        database.execSQL("DELETE FROM Semesters")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
new file mode 100644
index 00000000..cf50a6c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration22 : Migration(21, 22) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
new file mode 100644
index 00000000..22de94c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration23 : Migration(22, 23) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
new file mode 100644
index 00000000..604ed487
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration24 : Migration(23, 24) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS MessageAttachments (
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                one_drive_id TEXT NOT NULL,
+                url TEXT NOT NULL,
+                filename TEXT NOT NULL,
+                PRIMARY KEY(real_id)
+            )
+        """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
new file mode 100644
index 00000000..4749bac7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration25 : Migration(24, 25) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
new file mode 100644
index 00000000..e792bde4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.pojos
+
+class Contributor(val displayName: String, val githubUsername: String)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
new file mode 100644
index 00000000..34b62abd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
+
+data class GradeStatisticsItem(
+
+    val type: ViewType,
+
+    val partial: List<GradeStatistics>,
+
+    val points: GradePointsStatistics?
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
new file mode 100644
index 00000000..6a0b2d32
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.repositories.appcreator
+
+import android.content.res.AssetManager
+import com.google.gson.Gson
+import io.github.wulkanowy.data.pojos.Contributor
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
+    fun getAppCreators(): Single<List<Contributor>> {
+        return Single.fromCallable<List<Contributor>> {
+            Gson().fromJson(
+                assets.open("contributors.json").bufferedReader().use { it.readText() },
+                Array<Contributor>::class.java
+            ).toList()
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index b3544c3f..f64d920d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -1,25 +1,31 @@
 package io.github.wulkanowy.data.repositories.attendance
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AttendanceRemote @Inject constructor(private val api: Api) {
+class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getAttendance(startDate, endDate) }.map { attendance ->
+    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendance(startDate, endDate, semester.semesterId)
+            .map { attendance ->
                 attendance.map {
                     Attendance(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
+                        timeId = it.timeId,
                         number = it.number,
                         subject = it.subject,
                         name = it.name,
@@ -28,9 +34,20 @@ class AttendanceRemote @Inject constructor(private val api: Api) {
                         exemption = it.exemption,
                         lateness = it.lateness,
                         excused = it.excused,
-                        deleted = it.deleted
+                        deleted = it.deleted,
+                        excusable = it.excusable,
+                        excuseStatus = it.excuseStatus?.name
                     )
                 }
             }
     }
+
+    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
+            Absent(
+                date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
+                timeId = attendance.timeId
+            )
+        }, reason)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index 85102b3c..22fe7fa5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -4,6 +4,7 @@ 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.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,25 +21,25 @@ class AttendanceRepository @Inject constructor(
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean)
-        : Single<List<Attendance>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getAttendance(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                        if (it) remote.getAttendance(semester, dates.first, dates.second)
-                        else Single.error(UnknownHostException())
-                    }.flatMap { newAttendance ->
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                            .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
-                            }
-                    }.flatMap {
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                    }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
+        return local.getAttendance(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getAttendance(student, semester, start.monday, end.friday)
+                else Single.error(UnknownHostException())
+            }.flatMap { newAttendance ->
+                local.getAttendance(semester, start.monday, end.friday)
+                    .toSingle(emptyList())
+                    .doOnSuccess { oldAttendance ->
+                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                    }
+            }.flatMap {
+                local.getAttendance(semester, start.monday, end.friday)
+                    .toSingle(emptyList())
+            }).map { list -> list.filter { it.date in start..end } }
+    }
+
+    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(student, semester, attendanceList, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
new file mode 100644
index 00000000..50d6b8ed
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.data.repositories.attendance
+
+enum class SentExcuseStatus(val id: Int = 0) {
+    WAITING,
+    ACCEPTED,
+    DENIED
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index d38dd3a4..8fef5c39 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -1,18 +1,21 @@
 package io.github.wulkanowy.data.repositories.attendancesummary
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AttendanceSummaryRemote @Inject constructor(private val api: Api) {
+class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getAttendanceSummary(subjectId) }.map { attendance ->
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendanceSummary(subjectId)
+            .map { attendance ->
                 attendance.map {
                     AttendanceSummary(
                         studentId = semester.studentId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index c6587050..5f0b2b34 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -4,6 +4,7 @@ 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.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -17,11 +18,11 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getAttendanceSummary(semester, subjectId)
+                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
index 58dd5a9d..bb115111 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -1,27 +1,28 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.toLocalDate
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class CompletedLessonsRemote @Inject constructor(private val api: Api) {
+class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getCompletedLessons(startDate, endDate) }
+    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getCompletedLessons(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     it.absence
                     CompletedLesson(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         number = it.number,
                         subject = it.subject,
                         topic = it.topic,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index c22fabc3..f31e3055 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -4,6 +4,7 @@ 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.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,25 +21,22 @@ class CompletedLessonsRepository @Inject constructor(
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
-                                    local.saveCompletedLessons(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return local.getCompletedLessons(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getCompletedLessons(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteCompleteLessons(old.uniqueSubtract(new))
+                            local.saveCompletedLessons(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getCompletedLessons(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index f6d653a6..fb105cee 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -1,26 +1,28 @@
 package io.github.wulkanowy.data.repositories.exam
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ExamRemote @Inject constructor(private val api: Api) {
+class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getExams(startDate, endDate) }.map { exams ->
+    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getExams(startDate, endDate, semester.semesterId)
+            .map { exams ->
                 exams.map {
                     Exam(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
-                        date = it.date.toLocalDate(),
-                        entryDate = it.entryDate.toLocalDate(),
+                        date = it.date,
+                        entryDate = it.entryDate,
                         subject = it.subject,
                         group = it.group,
                         type = it.type,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index be60eaec..452a1551 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -4,6 +4,7 @@ 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.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -20,25 +21,22 @@ class ExamRepository @Inject constructor(
     private val remote: ExamRemote
 ) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getExams(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getExams(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteExams(old.uniqueSubtract(new))
-                                    local.saveExams(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return local.getExams(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getExams(student, semester, start.monday, end.friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getExams(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteExams(old.uniqueSubtract(new))
+                            local.saveExams(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getExams(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index 4983a474..944ed34a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,14 +1,19 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
+class GradeLocal @Inject constructor(
+    private val gradeDb: GradeDao,
+    private val gradeSummaryDb: GradeSummaryDao
+) {
 
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
@@ -22,7 +27,19 @@ class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
         gradeDb.updateAll(grades)
     }
 
-    fun getGrades(semester: Semester): Maybe<List<Grade>> {
+    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
         return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
+
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index 570ab7a7..abb2f98c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,37 +1,52 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeRemote @Inject constructor(private val api: Api) {
+class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(semester: Semester): Single<List<Grade>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGrades(semester.semesterId) }
-            .map { grades ->
-                grades.map {
+    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGrades(semester.semesterId)
+            .map { (details, summary) ->
+                details.map {
                     Grade(
-                        semesterId = semester.semesterId,
                         studentId = semester.studentId,
+                        semesterId = semester.semesterId,
                         subject = it.subject,
                         entry = it.entry,
                         value = it.value,
                         modifier = it.modifier,
                         comment = it.comment,
                         color = it.color,
-                        gradeSymbol = it.symbol.orEmpty(),
-                        description = it.description.orEmpty(),
+                        gradeSymbol = it.symbol,
+                        description = it.description,
                         weight = it.weight,
                         weightValue = it.weightValue,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         teacher = it.teacher
                     )
+                } to summary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
                 }
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 7f8e92a2..e28350a5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.grade
 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.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -19,34 +20,47 @@ class GradeRepository @Inject constructor(
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
-        return local.getGrades(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGrades(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                            local.deleteGrades(old.uniqueSubtract(new))
-                            local.saveGrades(new.uniqueSubtract(old)
-                                .onEach {
-                                    if (it.date >= notifyBreakDate) it.apply {
-                                        isRead = false
-                                        if (notify) isNotified = false
-                                    }
-                                })
-                        }
-                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return local.getGradesDetails(semester).flatMap { details ->
+            local.getGradesSummary(semester).map { summary -> details to summary }
+        }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getGrades(student, semester)
+                else Single.error(UnknownHostException())
+            }.flatMap { (newDetails, newSummary) ->
+                local.getGradesDetails(semester).toSingle(emptyList())
+                    .doOnSuccess { old ->
+                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                        local.deleteGrades(old.uniqueSubtract(newDetails))
+                        local.saveGrades(newDetails.uniqueSubtract(old)
+                            .onEach {
+                                if (it.date >= notifyBreakDate) it.apply {
+                                    isRead = false
+                                    if (notify) isNotified = false
+                                }
+                            })
+                    }.flatMap {
+                        local.getGradesSummary(semester).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
+                                local.saveGradesSummary(newSummary.uniqueSubtract(old))
+                            }
+                    }
+            }.flatMap {
+                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
+                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
+                        details to summary
+                    }
+                }
+            })
     }
 
     fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
     fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
     fun updateGrade(grade: Grade): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
deleted file mode 100644
index e74641d3..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
-
-    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
deleted file mode 100644
index 3335cfb0..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryRemote @Inject constructor(private val api: Api) {
-
-    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesSummary(semester.semesterId) }
-            .map { gradesSummary ->
-                gradesSummary.map {
-                    GradeSummary(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        position = it.order,
-                        subject = it.name,
-                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
-                    )
-                }
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
deleted file mode 100644
index 660a032c..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-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.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: GradeSummaryLocal,
-    private val remote: GradeSummaryRemote
-) {
-
-    fun getGradesSummary(semester: Semester, forceRefresh: Boolean = false): Single<List<GradeSummary>> {
-        return local.getGradesSummary(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGradeSummary(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesSummary(old.uniqueSubtract(new))
-                            local.saveGradesSummary(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
-    }
-}
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 581ac2f8..7994bd75 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,6 +1,8 @@
 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
@@ -8,27 +10,51 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+class GradeStatisticsLocal @Inject constructor(
+    private val gradeStatisticsDb: GradeStatisticsDao,
+    private val gradePointsStatisticsDb: GradePointsStatisticsDao
+) {
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
-            .filter { !it.isEmpty() }
+        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() }
     }
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        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)
+        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)
+                } + list
             }
-        }
-        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
+        }.filter { it.isNotEmpty() }
     }
 
     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 fa3b951f..99e0cb98 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,27 +1,47 @@
 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.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsRemote @Inject constructor(private val api: Api) {
+class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
-            .map { gradeStatistics ->
-                gradeStatistics.map {
-                    GradeStatistics(
+    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
+            if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
+            else it.getGradesPartialStatistics(semester.semesterId)
+        }.map { gradeStatistics ->
+            gradeStatistics.map {
+                GradeStatistics(
+                    semesterId = semester.semesterId,
+                    studentId = semester.studentId,
+                    subject = it.subject,
+                    grade = it.gradeValue,
+                    amount = it.amount,
+                    semester = isSemester
+                )
+            }
+        }
+    }
+
+    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesPointsStatistics(semester.semesterId)
+            .map { gradePointsStatistics ->
+                gradePointsStatistics.map {
+                    GradePointsStatistics(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
                         subject = it.subject,
-                        grade = it.gradeValue,
-                        amount = it.amount ?: 0,
-                        semester = isSemester
+                        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 9617cdd6..8d96d2f5 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,8 +2,12 @@ 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.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -17,11 +21,11 @@ class GradeStatisticsRepository @Inject constructor(
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatistics>> {
-        return local.getGradesStatistics(semester, isSemester, subjectName).filter { !forceRefresh }
+    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getGradeStatistics(semester, isSemester)
+                    if (it) remote.getGradeStatistics(student, semester, isSemester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
@@ -29,6 +33,43 @@ class GradeStatisticsRepository @Inject constructor(
                             local.deleteGradesStatistics(old.uniqueSubtract(new))
                             local.saveGradesStatistics(new.uniqueSubtract(old))
                         }
-                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
+    }
+
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
+        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradePointsStatistics(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
+    }
+
+    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
+        return groupBy { it.subject }.map {
+            GradeStatisticsItem(
+                type = ViewType.PARTIAL,
+                partial = it.value
+                    .sortedByDescending { item -> item.grade }
+                    .filter { item -> item.amount != 0 },
+                points = null
+            )
+        }
+    }
+
+    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
+        return map {
+            GradeStatisticsItem(
+                type = ViewType.POINTS,
+                partial = emptyList(),
+                points = it
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index 671ecafd..fdae4518 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -19,6 +19,10 @@ class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
         homeworkDb.deleteAll(homework)
     }
 
+    fun updateHomework(homework: List<Homework>) {
+        homeworkDb.updateAll(homework)
+    }
+
     fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
             .filter { it.isNotEmpty() }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 681b6646..20ffee99 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -1,31 +1,33 @@
 package io.github.wulkanowy.data.repositories.homework
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class HomeworkRemote @Inject constructor(private val api: Api) {
+class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getHomework(startDate, endDate) }
+    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getHomework(startDate, endDate)
             .map { homework ->
                 homework.map {
                     Homework(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
-                        date = it.date.toLocalDate(),
-                        entryDate = it.entryDate.toLocalDate(),
+                        date = it.date,
+                        entryDate = it.entryDate,
                         subject = it.subject,
                         content = it.content,
                         teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol
+                        teacherSymbol = it.teacherSymbol,
+                        attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
                     )
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 3f924944..4454fd88 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -4,9 +4,11 @@ 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.Homework
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Completable
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -20,12 +22,12 @@ class HomeworkRepository @Inject constructor(
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
         return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
             local.getHomework(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                     .flatMap {
-                        if (it) remote.getHomework(semester, monday, friday)
+                        if (it) remote.getHomework(student, semester, monday, friday)
                         else Single.error(UnknownHostException())
                     }.flatMap { new ->
                         local.getHomework(semester, monday, friday).toSingle(emptyList())
@@ -36,4 +38,12 @@ class HomeworkRepository @Inject constructor(
                     }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }
     }
+
+    fun toggleDone(homework: Homework): Completable {
+        return Completable.fromCallable {
+            local.updateHomework(listOf(homework.apply {
+                isDone = !isDone
+            }))
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
new file mode 100644
index 00000000..be6ad2f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.data.repositories.logger
+
+import android.content.Context
+import io.reactivex.Single
+import java.io.File
+import java.io.FileNotFoundException
+import javax.inject.Inject
+
+class LoggerRepository @Inject constructor(private val context: Context) {
+
+    fun getLastLogLines(): Single<List<String>> {
+        return getLastModified()
+            .map { it.readText() }
+            .map { it.split("\n") }
+    }
+
+    fun getLogFiles(): Single<List<File>> {
+        return Single.fromCallable {
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
+                it.name.endsWith(".log")
+            }
+        }
+    }
+
+    private fun getLastModified(): Single<File> {
+        return Single.fromCallable {
+            var lastModifiedTime = Long.MIN_VALUE
+            var chosenFile: File? = null
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
+                if (file.lastModified() > lastModifiedTime) {
+                    lastModifiedTime = file.lastModified()
+                    chosenFile = file
+                }
+            }
+            if (chosenFile == null) throw FileNotFoundException("Log file not found")
+            chosenFile
+        }
+    }
+}
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 115c8965..0f4f79c8 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
@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -12,18 +12,18 @@ import javax.inject.Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
     fun saveLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.insert(luckyNumber)
+        luckyNumberDb.insertAll(listOf(luckyNumber))
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.update(luckyNumber)
+        luckyNumberDb.updateAll(listOf(luckyNumber))
     }
 
     fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.delete(luckyNumber)
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
-    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
-        return luckyNumberDb.load(semester.studentId, date)
+    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<LuckyNumber> {
+        return luckyNumberDb.load(student.studentId, date)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
index 1b0f12b3..0c71897a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -1,26 +1,24 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Maybe
-import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class LuckyNumberRemote @Inject constructor(private val api: Api) {
+class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMapMaybe { it.getLuckyNumber() }
-            .map {
-                LuckyNumber(
-                    studentId = semester.studentId,
-                    date = LocalDate.now(),
-                    luckyNumber = it
-                )
-            }
+    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
+            LuckyNumber(
+                studentId = student.studentId,
+                date = LocalDate.now(),
+                luckyNumber = it
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
index 4036521f..374b9a29 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.repositories.luckynumber
 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.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Completable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -18,14 +18,14 @@ class LuckyNumberRepository @Inject constructor(
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(semester, LocalDate.now()).filter { !forceRefresh }
+    fun getLuckyNumber(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMapMaybe {
-                    if (it) remote.getLuckyNumber(semester)
+                    if (it) remote.getLuckyNumber(student)
                     else Maybe.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getLuckyNumber(semester, LocalDate.now())
+                    local.getLuckyNumber(student, LocalDate.now())
                         .doOnSuccess { old ->
                             if (new != old) {
                                 local.deleteLuckyNumber(old)
@@ -39,13 +39,13 @@ class LuckyNumberRepository @Inject constructor(
                                 if (notify) isNotified = false
                             })
                         }
-                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
-                    { local.getLuckyNumber(semester, LocalDate.now()) })
+                }.flatMap({ local.getLuckyNumber(student, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(student, LocalDate.now()) })
             )
     }
 
-    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
+    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index ce08d13e..53cf0a98 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -1,15 +1,22 @@
 package io.github.wulkanowy.data.repositories.message
 
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
 import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
+class MessageLocal @Inject constructor(
+    private val messagesDb: MessagesDao,
+    private val messageAttachmentDao: MessageAttachmentDao
+) {
 
     fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
@@ -23,8 +30,12 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessage(id: Long): Maybe<Message> {
-        return messagesDb.load(id)
+    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
+        return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
+    }
+
+    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
+        messageAttachmentDao.insertAttachments(attachments)
     }
 
     fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
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 b2bff1e7..1808c048 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
@@ -1,24 +1,25 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.messages.Folder
-import io.github.wulkanowy.api.messages.SentMessage
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Folder
+import io.github.wulkanowy.sdk.pojo.SentMessage
+import io.github.wulkanowy.utils.init
 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
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 @Singleton
-class MessageRemote @Inject constructor(private val api: Api) {
+class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getMessages(student: Student, folder: MessageFolder): Single<List<Message>> {
-        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
+        return sdk.init(student).getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
             messages.map {
                 Message(
                     studentId = student.id.toInt(),
@@ -28,39 +29,52 @@ class MessageRemote @Inject constructor(private val api: Api) {
                     senderId = it.senderId ?: 0,
                     recipient = it.recipient.orEmpty(),
                     subject = it.subject.trim(),
-                    date = it.date?.toLocalDateTime() ?: now(),
+                    date = it.date ?: now(),
+                    content = it.content.orEmpty(),
                     folderId = it.folderId,
                     unread = it.unread ?: false,
                     unreadBy = it.unreadBy ?: 0,
                     readBy = it.readBy ?: 0,
-                    removed = it.removed
+                    removed = it.removed,
+                    hasAttachments = it.hasAttachments
                 )
             }
         }
     }
 
-    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
-        return api.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
+    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
+        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
+            details.content to details.attachments.map {
+                MessageAttachment(
+                    realId = it.id,
+                    messageId = it.messageId,
+                    oneDriveId = it.oneDriveId,
+                    url = it.url,
+                    filename = it.filename
+                )
+            }
+        }
     }
 
-    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return api.sendMessage(
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return sdk.init(student).sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.map {
-                ApiRecipient(
+                SdkRecipient(
                     id = it.realId,
                     name = it.realName,
                     loginId = it.loginId,
                     reportingUnitId = it.unitId,
                     role = it.role,
-                    hash = it.hash
+                    hash = it.hash,
+                    shortName = it.name
                 )
             }
         )
     }
 
-    fun deleteMessage(message: Message): Single<Boolean> {
-        return api.deleteMessages(listOf(Pair(message.realId, message.folderId)))
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return sdk.init(student).deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index c10cd518..2d2c0430 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -2,16 +2,17 @@ package io.github.wulkanowy.data.repositories.message
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.messages.SentMessage
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
-import io.reactivex.Maybe
 import io.reactivex.Single
+import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -20,54 +21,53 @@ import javax.inject.Singleton
 class MessageRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: MessageLocal,
-    private val remote: MessageRemote,
-    private val apiHelper: ApiHelper
+    private val remote: MessageRemote
 ) {
 
-    fun getMessages(student: Student, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return Single.just(apiHelper.initApi(student))
-            .flatMap { _ ->
-                local.getMessages(student, folder).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getMessages(student, folder)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getMessages(student, folder).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteMessages(old.uniqueSubtract(new))
-                                    local.saveMessages(new.uniqueSubtract(old)
-                                        .onEach {
-                                            it.isNotified = !notify
-                                        })
-                                }
-                        }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
-                    )
-            }
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return local.getMessages(student, folder).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getMessages(student, semester, folder)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getMessages(student, folder).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteMessages(old.uniqueSubtract(new))
+                            local.saveMessages(new.uniqueSubtract(old)
+                                .onEach {
+                                    it.isNotified = !notify
+                                })
+                        }
+                }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+            )
     }
 
-    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
-        return Single.just(apiHelper.initApi(student))
-            .flatMap { _ ->
-                local.getMessage(messageDbId)
-                    .filter { !it.content.isNullOrEmpty() }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) local.getMessage(messageDbId).toSingle()
-                            else Single.error(UnknownHostException())
-                        }
-                        .flatMap { dbMessage ->
-                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
-                                local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
-                                    id = dbMessage.id
-                                    content = it
-                                }))
-                            }
-                        }.flatMap {
-                            local.getMessage(messageDbId).toSingle()
-                        }
-                    )
+    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
+        return local.getMessageWithAttachment(student, message)
+            .filter {
+                it.message.content.isNotEmpty().also { status ->
+                    Timber.d("Message content in db empty: ${!status}")
+                } && !it.message.unread
             }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) local.getMessageWithAttachment(student, message)
+                    else Single.error(UnknownHostException())
+                }
+                .flatMap { dbMessage ->
+                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
+                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
+                            id = dbMessage.message.id
+                            content = content.ifBlank { downloadedMessage }
+                        }))
+                        local.saveMessageAttachments(attachments)
+                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
+                    }
+                }.flatMap {
+                    local.getMessageWithAttachment(student, message)
+                }
+            )
     }
 
     fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
@@ -76,29 +76,24 @@ class MessageRepository @Inject constructor(
             .toSingle(emptyList())
     }
 
-    fun updateMessage(message: Message): Completable {
-        return Completable.fromCallable { local.updateMessages(listOf(message)) }
-    }
-
     fun updateMessages(messages: List<Message>): Completable {
         return Completable.fromCallable { local.updateMessages(messages) }
     }
 
-    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.sendMessage(subject, content, recipients)
+                if (it) remote.sendMessage(student, subject, content, recipients)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun deleteMessage(message: Message): Maybe<Boolean> {
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.deleteMessage(message)
+                if (it) remote.deleteMessage(student, message)
                 else Single.error(UnknownHostException())
             }
-            .filter { it }
             .doOnSuccess {
                 if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
                     id = message.id
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 8f0efa5b..473ffa7f 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,7 +3,6 @@ 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/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
index 86fdce97..800f9597 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -1,25 +1,26 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
-import io.github.wulkanowy.api.Api
 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.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MobileDeviceRemote @Inject constructor(private val api: Api) {
+class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getRegisteredDevices() }
+    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getRegisteredDevices()
             .map { devices ->
                 devices.map {
                     MobileDevice(
                         studentId = semester.studentId,
-                        date = it.date.toLocalDateTime(),
+                        date = it.createDate,
                         deviceId = it.id,
                         name = it.name
                     )
@@ -27,14 +28,14 @@ class MobileDeviceRemote @Inject constructor(private val api: Api) {
             }
     }
 
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.unregisterDevice(device.deviceId) }
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .unregisterDevice(device.deviceId)
     }
 
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getToken() }
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getToken()
             .map {
                 MobileDeviceToken(
                     token = it.token,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
index ac450ff4..545846e8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -4,6 +4,7 @@ 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.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -18,11 +19,11 @@ class MobileDeviceRepository @Inject constructor(
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
         return local.getDevices(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getDevices(semester)
+                    if (it) remote.getDevices(student, semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getDevices(semester).toSingle(emptyList())
@@ -34,18 +35,18 @@ class MobileDeviceRepository @Inject constructor(
             ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
     }
 
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.unregisterDevice(semester, device)
+                if (it) remote.unregisterDevice(student, semester, device)
                 else Single.error(UnknownHostException())
             }
     }
 
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.getToken(semester)
+                if (it) remote.getToken(student, semester)
                 else Single.error(UnknownHostException())
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index aebc6230..2c62b608 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -1,26 +1,31 @@
 package io.github.wulkanowy.data.repositories.note
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class NoteRemote @Inject constructor(private val api: Api) {
+class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getNotes(semester: Semester): Single<List<Note>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getNotes() }
+    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getNotes(semester.semesterId)
             .map { notes ->
                 notes.map {
                     Note(
                         studentId = semester.studentId,
-                        date = it.date.toLocalDate(),
+                        date = it.date,
                         teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
                         category = it.category,
+                        categoryType = it.categoryType.id,
+                        isPointsShow = it.showPoints,
+                        points = it.points,
                         content = it.content
                     )
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index 52cb2d0f..e155e2ba 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -23,7 +23,7 @@ class NoteRepository @Inject constructor(
         return local.getNotes(student).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getNotes(semester)
+                    if (it) remote.getNotes(student, semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getNotes(student).toSingle(emptyList())
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 bb9a39b1..6b13563a 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,52 +12,77 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
+        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
 
     val isShowPresent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
+        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
     val gradeAverageMode: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
 
     val gradeAverageForceCalc: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
 
     val isGradeExpandable: Boolean
-        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
+        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
+    val showAllSubjectsOnStatisticsList: Boolean
+        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
+
+    val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
-        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
+        get() = getString(appThemeKey, R.string.pref_default_app_theme)
 
     val gradeColorTheme: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
+        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
 
-    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
+    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 isServiceEnabled: Boolean
-        get() = sharedPref.getBoolean(serviceEnableKey, true)
+        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
 
-    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
     val servicesInterval: Long
-        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
+        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
 
-    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
-        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)
+        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
 
     val isNotificationsEnable: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
+        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
+    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
+    val isUpcomingLessonsNotificationsEnable: Boolean
+        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
+
+    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
-        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
+        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
 
     val gradePlusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
 
     val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
 
     val fillMessageContent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
+        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
+
+    val showWholeClassPlan: String
+        get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
+
+    val showTimetableTimers: Boolean
+        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
+
+    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))
 }
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 6b8328ec..9b1d4ac2 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>) {
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
index b726edda..e5b16a15 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -1,34 +1,36 @@
 package io.github.wulkanowy.data.repositories.recipient
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
-import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 @Singleton
-class RecipientRemote @Inject constructor(private val api: Api) {
+class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
-        return api.getRecipients(unit.realId, role)
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return sdk.init(student).getRecipients(unit.realId, role)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
-    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
-        return api.getMessageRecipients(message.messageId, message.senderId)
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
             .map { recipients ->
                 recipients.map { it.toRecipient() }
             }
     }
 
-    private fun ApiRecipient.toRecipient(): Recipient {
+    private fun SdkRecipient.toRecipient(): Recipient {
         return Recipient(
-            studentId = api.studentId,
+            studentId = sdk.studentId,
             realId = id,
             realName = name,
             name = shortName,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index cde75ea8..6f8a72af 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories.recipient
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
@@ -17,36 +16,31 @@ import javax.inject.Singleton
 class RecipientRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
-    private val remote: RecipientRemote,
-    private val apiHelper: ApiHelper
+    private val remote: RecipientRemote
 ) {
 
     fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return Single.just(apiHelper.initApi(student))
-            .flatMap { _ ->
-                local.getRecipients(student, role, unit).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getRecipients(role, unit)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteRecipients(old.uniqueSubtract(new))
-                                    local.saveRecipients(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
+        return local.getRecipients(student, role, unit).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getRecipients(student, role, unit)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteRecipients(old.uniqueSubtract(new))
+                            local.saveRecipients(new.uniqueSubtract(old))
                         }
-                    )
-            }
+                }.flatMap {
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                }
+            )
     }
 
     fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return Single.just(apiHelper.initApi(student))
-            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
+        return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
-                if (it) remote.getMessageRecipients(message)
+                if (it) remote.getMessageRecipients(student, message)
                 else Single.error(UnknownHostException())
             }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
new file mode 100644
index 00000000..f2789125
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return sdk.getPasswordResetCaptchaCode(host, symbol)
+    }
+
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
+        return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
new file mode 100644
index 00000000..86d4ba1b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
+
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getReCaptchaSiteKey(host, symbol)
+            else Single.error(UnknownHostException())
+        }
+    }
+
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+            else Single.error(UnknownHostException())
+        }
+    }
+}
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 b4281cbf..6f9eec3f 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>) {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
index feb4b013..1fd8b08e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -1,19 +1,21 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ReportingUnitRemote @Inject constructor(private val api: Api) {
+class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getReportingUnits(): Single<List<ReportingUnit>> {
-        return api.getReportingUnits().map {
+    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
+        return sdk.init(student).getReportingUnits().map {
             it.map { unit ->
                 ReportingUnit(
-                    studentId = api.studentId,
+                    studentId = sdk.studentId,
                     realId = unit.id,
                     roles = unit.roles,
                     senderId = unit.senderId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index 6758898e..ee544098 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories.reportingunit
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -16,41 +15,34 @@ import javax.inject.Singleton
 class ReportingUnitRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
-    private val remote: ReportingUnitRemote,
-    private val apiHelper: ApiHelper
+    private val remote: ReportingUnitRemote
 ) {
 
     fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
-        return Single.just(apiHelper.initApi(student))
-            .flatMap { _ ->
-                local.getReportingUnits(student).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getReportingUnits()
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getReportingUnits(student).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteReportingUnits(old.uniqueSubtract(new))
-                                    local.saveReportingUnits(new.uniqueSubtract(old))
-                                }
-                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
-                    )
-            }
+        return local.getReportingUnits(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getReportingUnits(student)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getReportingUnits(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteReportingUnits(old.uniqueSubtract(new))
+                            local.saveReportingUnits(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+            )
     }
 
     fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
-        return Maybe.just(apiHelper.initApi(student))
-            .flatMap { _ ->
-                local.getReportingUnit(student, unitId)
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) getReportingUnits(student, true)
-                            else Single.error(UnknownHostException())
-                        }.flatMapMaybe {
-                            local.getReportingUnit(student, unitId)
-                        }
-                    )
-            }
+        return local.getReportingUnit(student, unitId)
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) getReportingUnits(student, true)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe {
+                    local.getReportingUnit(student, unitId)
+                }
+            )
     }
 }
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
new file mode 100644
index 00000000..d8727287
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 00000000..6a95a446
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.school
+
+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.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+
+class SchoolRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .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
new file mode 100644
index 00000000..1715a28d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -0,0 +1,42 @@
+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.github.wulkanowy.data.db.entities.Student
+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(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+        return local.getSchool(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSchoolInfo(student, 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/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index b9750e7d..3d98785c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -19,6 +19,6 @@ class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
     }
 
     fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
+        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index c199c16c..90f0e1d7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -1,35 +1,32 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SemesterRemote @Inject constructor(private val api: Api) {
+class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
     fun getSemesters(student: Student): Single<List<Semester>> {
-        return api.getSemesters().map { semesters ->
-            semesters.map { semester ->
+        return sdk.init(student).getSemesters().map { semesters ->
+            semesters.map {
                 Semester(
                     studentId = student.studentId,
-                    diaryId = semester.diaryId,
-                    diaryName = semester.diaryName,
-                    schoolYear = semester.schoolYear,
-                    semesterId = semester.semesterId,
-                    semesterName = semester.semesterNumber,
-                    isCurrent = semester.current,
-                    start = semester.start,
-                    end = semester.end,
-                    classId = semester.classId,
-                    unitId = semester.unitId
+                    diaryId = it.diaryId,
+                    diaryName = it.diaryName,
+                    schoolYear = it.schoolYear,
+                    semesterId = it.semesterId,
+                    semesterName = it.semesterNumber,
+                    start = it.start,
+                    end = it.end,
+                    classId = it.classId,
+                    unitId = it.unitId
                 )
             }
-
         }
     }
 }
-
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 59301403..68946bee 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -2,13 +2,13 @@ package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
 import io.reactivex.Single
-import timber.log.Timber
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,32 +17,31 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val settings: InternetObservingSettings,
-    private val apiHelper: ApiHelper
+    private val settings: InternetObservingSettings
 ) {
 
-    fun getSemesters(student: Student, forceRefresh: Boolean = false): Single<List<Semester>> {
-        return Maybe.just(apiHelper.initApi(student))
-            .flatMap { local.getSemesters(student).filter { !forceRefresh } }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSemesters(student) else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    val currentSemesters = new.filter { it.isCurrent }
-                    if (currentSemesters.size == 1) {
-                        local.getSemesters(student).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteSemesters(old.uniqueSubtract(new))
-                                local.saveSemesters(new.uniqueSubtract(old))
-                            }
-                    } else {
-                        Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")
-                        throw IllegalArgumentException("Current semester can be only one.")
-                    }
-                }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
+        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
+            when {
+                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
+                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
+                else -> true
+            }
+        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getSemesters(student)
+                else Single.error(UnknownHostException())
+            }.flatMap { new ->
+                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
+
+                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
+                    local.deleteSemesters(old.uniqueSubtract(new))
+                    local.saveSemesters(new.uniqueSubtract(old))
+                }
+            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
     fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
-        return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
+        return getSemesters(student, forceRefresh).map { it.getCurrentOrLast() }
     }
 }
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 e6d74421..06b9bb4a 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.student
 import android.content.Context
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
 import io.reactivex.Completable
@@ -18,17 +19,34 @@ class StudentLocal @Inject constructor(
 ) {
 
     fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
+        return Single.fromCallable {
+            studentDb.insertAll(students.map {
+                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
+                else it
+            })
+        }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
-            .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
-            .filter { !it.isEmpty() }
+            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .filter { it.isNotEmpty() }
+    }
+
+    fun getStudentById(id: Int): Maybe<Student> {
+        return studentDb.loadById(id).map {
+            it.apply {
+                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
+        }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
-        return studentDb.loadCurrent().map { it.apply { if (decryptPass) password = decrypt(password) } }
+        return studentDb.loadCurrent().map {
+            it.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
+        }
     }
 
     fun setCurrentStudent(student: Student): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index 251d3834..9b77c9ad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -1,34 +1,52 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 @Singleton
-class StudentRemote @Inject constructor(private val api: Api) {
+class StudentRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
-        return api.getStudents().map { students ->
-            students.map { student ->
-                Student(
-                    email = email,
-                    password = password,
-                    symbol = student.symbol,
-                    studentId = student.studentId,
-                    studentName = student.studentName,
-                    schoolSymbol = student.schoolSymbol,
-                    schoolName = student.schoolName,
-                    className = student.className,
-                    classId = student.classId,
-                    endpoint = endpoint,
-                    loginType = student.loginType.name,
-                    isCurrent = false,
-                    registrationDate = now()
-                )
-            }
+    private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
+        return students.map { student ->
+            Student(
+                email = email,
+                password = password,
+                isParent = student.isParent,
+                symbol = student.symbol,
+                studentId = student.studentId,
+                userLoginId = student.userLoginId,
+                studentName = student.studentName,
+                schoolSymbol = student.schoolSymbol,
+                schoolShortName = student.schoolShortName,
+                schoolName = student.schoolName,
+                className = student.className,
+                classId = student.classId,
+                scrapperBaseUrl = student.scrapperBaseUrl,
+                loginType = student.loginType.name,
+                isCurrent = false,
+                registrationDate = now(),
+                mobileBaseUrl = student.mobileBaseUrl,
+                privateKey = student.privateKey,
+                certificateKey = student.certificateKey,
+                loginMode = student.loginMode.name
+            )
         }
     }
+
+    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
+    }
+
+    fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index 5c4a6055..bebd1eb9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories.student
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.reactivex.Completable
@@ -16,27 +15,44 @@ import javax.inject.Singleton
 class StudentRepository @Inject constructor(
     private val local: StudentLocal,
     private val remote: StudentRemote,
-    private val settings: InternetObservingSettings,
-    private val apiHelper: ApiHelper
+    private val settings: InternetObservingSettings
 ) {
 
     fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
     fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
 
-    fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                apiHelper.initApi(email, password, symbol, endpoint)
-                if (it) remote.getStudents(email, password, endpoint)
-                else Single.error(UnknownHostException("No internet connection"))
-            }
+    fun getStudentsApi(pin: String, symbol: String, token: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsMobileApi(token, pin, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
+    }
+
+    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsHybrid(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
     fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
         return local.getStudents(decryptPass).toSingle(emptyList())
     }
 
+    fun getStudentById(id: Int): Single<Student> {
+        return local.getStudentById(id)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
+    }
+
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
         return local.getCurrentStudent(decryptPass)
             .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index 63e33401..f8c13e6c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -12,7 +12,7 @@ class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
     fun getSubjects(semester: Semester): Maybe<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
-            .filter { !it.isEmpty() }
+            .filter { it.isNotEmpty() }
     }
 
     fun saveSubjects(subjects: List<Subject>) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index 88fbb196..d30232f8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -1,25 +1,27 @@
 package io.github.wulkanowy.data.repositories.subject
 
-import io.github.wulkanowy.api.Api
 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.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SubjectRemote @Inject constructor(private val api: Api) {
+class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSubjects(semester: Semester): Single<List<Subject>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { api.getSubjects() }
+    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSubjects()
             .map { subjects ->
                 subjects.map {
                     Subject(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
                         name = it.name,
-                        realId = it.value
+                        realId = it.id
                     )
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 0c5f386b..649904da 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.subject
 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.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -17,11 +18,11 @@ class SubjectRepository @Inject constructor(
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
         return local.getSubjects(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getSubjects(semester)
+                    if (it) remote.getSubjects(student, semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getSubjects(semester)
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
new file mode 100644
index 00000000..dd2be5e5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 00000000..01552f74
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getTeachers(semester.semesterId)
+            .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
new file mode 100644
index 00000000..3c10be73
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -0,0 +1,35 @@
+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.Student
+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(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(student, 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/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index 77742e7b..22cb947d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -1,30 +1,30 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.toLocalDate
-import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class TimetableRemote @Inject constructor(private val api: Api) {
+class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getTimetable(startDate, endDate) }
+    fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getTimetable(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     Timetable(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
                         number = it.number,
-                        start = it.start.toLocalDateTime(),
-                        end = it.end.toLocalDateTime(),
-                        date = it.date.toLocalDate(),
+                        start = it.start,
+                        end = it.end,
+                        date = it.date,
                         subject = it.subject,
                         subjectOld = it.subjectOld,
                         group = it.group,
@@ -33,6 +33,7 @@ class TimetableRemote @Inject constructor(private val api: Api) {
                         teacher = it.teacher,
                         teacherOld = it.teacherOld,
                         info = it.info,
+                        isStudentPlan = it.studentPlan,
                         changes = it.changes,
                         canceled = it.canceled
                     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index 0e6331f9..082b03cf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -3,7 +3,9 @@ package io.github.wulkanowy.data.repositories.timetable
 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.Student
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
@@ -17,25 +19,27 @@ import javax.inject.Singleton
 class TimetableRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: TimetableLocal,
-    private val remote: TimetableRemote
+    private val remote: TimetableRemote,
+    private val schedulerHelper: TimetableNotificationSchedulerHelper
 ) {
 
-    fun getTimetable(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
         return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
             local.getTimetable(semester, monday, friday).filter { !forceRefresh }
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                    if (it) remote.getTimetable(semester, monday, friday)
+                    if (it) remote.getTimetable(student, semester, monday, friday)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getTimetable(semester, monday, friday)
                         .toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteTimetable(old.uniqueSubtract(new))
-                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
-                                item.apply {
-                                    old.singleOrNull { this.start == it.start }?.let {
-                                        return@map copy(
-                                            room = if (room.isEmpty()) it.room else room
+                            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
+                            local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
+                                item.also { new ->
+                                    old.singleOrNull { new.start == it.start }?.let { old ->
+                                        return@map new.copy(
+                                            room = if (new.room.isEmpty()) old.room else new.room,
+                                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
                                         )
                                     }
                                 }
@@ -43,7 +47,7 @@ class TimetableRepository @Inject constructor(
                         }
                 }.flatMap {
                     local.getTimetable(semester, monday, friday).toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
+                }).map { list -> list.filter { it.date in start..end }.also { schedulerHelper.scheduleNotifications(it, student) } }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
index 3ac3a525..c0329f7d 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
     AppModule::class,
     RepositoryModule::class,
     ServicesModule::class,
-    BuilderModule::class])
+    BindingModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
     @Component.Factory
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 42e50fa4..db5ff59b 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -2,10 +2,9 @@ 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
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.WulkanowyApp
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.SchedulersProvider
@@ -22,9 +21,6 @@ internal class AppModule {
     @Provides
     fun provideSchedulersProvider() = SchedulersProvider()
 
-    @Provides
-    fun provideFlexibleAdapter() = FlexibleAdapter<AbstractFlexibleItem<*>>(null, null, true)
-
     @Singleton
     @Provides
     fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
@@ -32,4 +28,8 @@ internal class AppModule {
     @Singleton
     @Provides
     fun provideAppInfo() = AppInfo()
+
+    @Singleton
+    @Provides
+    fun provideLingver() = Lingver.getInstance()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
rename to app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
index a963e9a9..1b462964 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -3,19 +3,25 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 
+@Suppress("unused")
 @Module
-internal abstract class BuilderModule {
+internal abstract class BindingModule {
+
+    @ContributesAndroidInjector
+    abstract fun bindErrorDialog(): ErrorDialog
 
     @PerActivity
     @ContributesAndroidInjector
@@ -43,4 +49,7 @@ internal abstract class BuilderModule {
 
     @ContributesAndroidInjector
     abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableNotificationReceiver(): TimetableNotificationReceiver
 }
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 84409a84..b87f0e68 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.services
 
-import android.app.NotificationManager
+import android.app.AlarmManager
 import android.content.Context
-import android.content.Context.NOTIFICATION_SERVICE
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.getSystemService
 import androidx.work.WorkManager
 import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
@@ -11,43 +11,48 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
+import io.github.wulkanowy.services.sync.channels.Channel
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
+import io.github.wulkanowy.services.sync.channels.NewGradesChannel
+import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
+import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel
+import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
 import io.github.wulkanowy.services.sync.works.ExamWork
 import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
-import io.github.wulkanowy.services.sync.works.GradeSummaryWork
 import io.github.wulkanowy.services.sync.works.GradeWork
 import io.github.wulkanowy.services.sync.works.HomeworkWork
 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
 import javax.inject.Singleton
 
+@Suppress("unused")
 @AssistedModule
 @Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
 
-    @Module
     companion object {
 
-        @JvmStatic
         @Provides
-        fun provideWorkManager() = WorkManager.getInstance()
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
-        @JvmStatic
         @Singleton
         @Provides
-        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
 
-        @JvmStatic
         @Singleton
         @Provides
-        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        fun provideAlarmManager(context: Context): AlarmManager = context.getSystemService()!!
     }
 
     @ContributesAndroidInjector
@@ -65,10 +70,6 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideAttendanceWork(work: AttendanceWork): Work
 
-    @Binds
-    @IntoSet
-    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
-
     @Binds
     @IntoSet
     abstract fun provideExamWork(work: ExamWork): Work
@@ -81,6 +82,10 @@ 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
@@ -104,4 +109,32 @@ abstract class ServicesModule {
     @Binds
     @IntoSet
     abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideDebugChannel(channel: DebugChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideLuckyNumberChannel(channel: LuckyNumberChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewGradesChannel(channel: NewGradesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewMessageChannel(channel: NewMessagesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewNotesChannel(channel: NewNotesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun providePushChannel(channel: PushChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideUpcomingLessonsChannel(channel: UpcomingLessonsChannel): Channel
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
new file mode 100644
index 00000000..0130f467
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -0,0 +1,117 @@
+package io.github.wulkanowy.services.alarm
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Build.VERSION_CODES.N
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.utils.toLocalDateTime
+import timber.log.Timber
+import javax.inject.Inject
+
+class TimetableNotificationReceiver : BroadcastReceiver() {
+
+    @Inject
+    lateinit var studentRepository: StudentRepository
+
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    companion object {
+        const val NOTIFICATION_TYPE_CURRENT = 1
+        const val NOTIFICATION_TYPE_UPCOMING = 2
+        const val NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION = 3
+
+        const val NOTIFICATION_ID = "id"
+
+        const val STUDENT_NAME = "student_name"
+        const val STUDENT_ID = "student_id"
+        const val LESSON_TYPE = "type"
+        const val LESSON_TITLE = "title"
+        const val LESSON_ROOM = "room"
+        const val LESSON_NEXT_TITLE = "next_title"
+        const val LESSON_NEXT_ROOM = "next_room"
+        const val LESSON_START = "start_timestamp"
+        const val LESSON_END = "end_timestamp"
+    }
+
+    @SuppressLint("CheckResult")
+    override fun onReceive(context: Context, intent: Intent) {
+        Timber.d("Receiving intent... ${intent.toUri(0)}")
+        AndroidInjection.inject(this, context)
+
+        studentRepository.getCurrentStudent(false)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val studentId = intent.getIntExtra(STUDENT_ID, 0)
+                if (it.studentId == studentId) prepareNotification(context, intent)
+                else Timber.d("Notification studentId($studentId) differs from current(${it.studentId})")
+            }, { Timber.e(it) })
+    }
+
+    private fun prepareNotification(context: Context, intent: Intent) {
+        val type = intent.getIntExtra(LESSON_TYPE, 0)
+        val notificationId = intent.getIntExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
+
+        if (type == NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION) {
+            return NotificationManagerCompat.from(context).cancel(notificationId)
+        }
+
+        val studentId = intent.getIntExtra(STUDENT_ID, 0)
+        val studentName = intent.getStringExtra(STUDENT_NAME)
+
+        val subject = intent.getStringExtra(LESSON_TITLE)
+        val room = intent.getStringExtra(LESSON_ROOM)
+
+        val start = intent.getLongExtra(LESSON_START, 0)
+        val end = intent.getLongExtra(LESSON_END, 0)
+
+        val nextSubject = intent.getStringExtra(LESSON_NEXT_TITLE)
+        val nextRoom = intent.getStringExtra(LESSON_NEXT_ROOM)
+
+        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: ${start.toLocalDateTime()}, student: $studentId")
+
+        showNotification(context, notificationId, studentName,
+            if (type == NOTIFICATION_TYPE_CURRENT) end else start, end - start,
+            context.getString(if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next, "($room) $subject".removePrefix("()")),
+            nextSubject?.let { context.getString(R.string.timetable_later, "($nextRoom) $nextSubject".removePrefix("()")) }
+        )
+    }
+
+    private fun showNotification(context: Context, notificationId: Int, studentName: String?, countDown: Long, timeout: Long, title: String, next: String?) {
+        NotificationManagerCompat.from(context).notify(notificationId, NotificationCompat.Builder(context, CHANNEL_ID)
+            .setContentTitle(title)
+            .setContentText(next)
+            .setAutoCancel(false)
+            .setOngoing(true)
+            .setWhen(countDown)
+            .apply {
+                if (Build.VERSION.SDK_INT >= N) setUsesChronometer(true)
+            }
+            .setTimeoutAfter(timeout)
+            .setSmallIcon(R.drawable.ic_stat_timetable)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setStyle(NotificationCompat.InboxStyle().also {
+                it.setSummaryText(studentName)
+                it.addLine(next)
+            })
+            .setContentIntent(PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+                MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+            .build()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
new file mode 100644
index 00000000..5374c476
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -0,0 +1,109 @@
+package io.github.wulkanowy.services.alarm
+
+import android.app.AlarmManager
+import android.app.AlarmManager.RTC_WAKEUP
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_CANCEL_CURRENT
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.AlarmManagerCompat
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_END
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_ROOM
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_TITLE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_ROOM
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_START
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TITLE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TYPE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_ID
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_CURRENT
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_UPCOMING
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_ID
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.toTimestamp
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+import timber.log.Timber
+import javax.inject.Inject
+
+class TimetableNotificationSchedulerHelper @Inject constructor(
+    private val context: Context,
+    private val alarmManager: AlarmManager,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
+
+    private fun getUpcomingLessonTime(index: Int, day: List<Timetable>, lesson: Timetable): LocalDateTime {
+        return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
+    }
+
+    fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
+        lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
+            val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
+            cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
+            cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
+
+            Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
+        }
+    }
+
+    private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
+        if (now() in range) cancelNotification()
+        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_CANCEL_CURRENT))
+    }
+
+    fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
+
+    fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
+        if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
+
+        lessons.groupBy { it.date }
+            .map { it.value.sortedBy { lesson -> lesson.start } }
+            .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
+            .map { day ->
+                day.forEachIndexed { index, lesson ->
+                    val intent = createIntent(student, lesson, day.getOrNull(index + 1))
+
+                    if (lesson.start > now()) {
+                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, day, lesson))
+                    }
+
+                    if (lesson.end > now()) {
+                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
+                        if (day.lastIndex == index) {
+                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
+                        }
+                    }
+                }
+            }
+    }
+
+    private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
+        return Intent(context, TimetableNotificationReceiver::class.java).apply {
+            putExtra(STUDENT_ID, student.studentId)
+            putExtra(STUDENT_NAME, student.studentName)
+            putExtra(LESSON_ROOM, lesson.room)
+            putExtra(LESSON_START, lesson.start.toTimestamp())
+            putExtra(LESSON_END, lesson.end.toTimestamp())
+            putExtra(LESSON_TITLE, lesson.subject)
+            putExtra(LESSON_NEXT_TITLE, nextLesson?.subject)
+            putExtra(LESSON_NEXT_ROOM, nextLesson?.room)
+        }
+    }
+
+    private fun scheduleBroadcast(intent: Intent, studentId: Int, notificationType: Int, time: LocalDateTime) {
+        AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, RTC_WAKEUP, time.toTimestamp(),
+            PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
+                it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
+                it.putExtra(LESSON_TYPE, notificationType)
+            }, FLAG_CANCEL_CURRENT)
+        )
+        Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
+    }
+}
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 d85c75c3..965ed0ad 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
@@ -2,20 +2,27 @@ package io.github.wulkanowy.services.sync
 
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
+import androidx.core.app.NotificationManagerCompat
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
+import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
+import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.PeriodicWorkRequest
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
+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
+import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
+import io.reactivex.Observable
 import org.threeten.bp.LocalDate.now
 import timber.log.Timber
 import java.util.concurrent.TimeUnit.MINUTES
@@ -26,37 +33,32 @@ import javax.inject.Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
-    sharedPrefHelper: SharedPrefHelper,
-    newEntriesChannel: NewEntriesChannel,
-    debugChannel: DebugChannel,
+    channels: Set<@JvmSuppressWildcards Channel>,
+    notificationManager: NotificationManagerCompat,
+    sharedPrefProvider: SharedPrefProvider,
     appInfo: AppInfo
 ) {
 
-    companion object {
-
-        private const val APP_VERSION_CODE_KEY = "app_version_code"
-    }
-
     init {
         if (now().isHolidays) stopSyncWorker()
 
-        if (SDK_INT > O) {
-            newEntriesChannel.create()
-            if (appInfo.isDebug) debugChannel.create()
+        if (SDK_INT >= O) {
+            channels.forEach { it.create() }
+            notificationManager.deleteNotificationChannel("new_entries_channel")
         }
 
-        if (sharedPrefHelper.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
-            startSyncWorker(true)
-            sharedPrefHelper.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
+        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
+            startPeriodicSyncWorker(true)
+            sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
-
         Timber.i("SyncManager was initialized")
     }
 
-    fun startSyncWorker(restart: Boolean = false) {
+    fun startPeriodicSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
-                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
+                PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
+                    .setInitialDelay(10, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                     .setConstraints(Constraints.Builder()
                         .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) UNMETERED else CONNECTED)
@@ -65,6 +67,19 @@ class SyncManager @Inject constructor(
         }
     }
 
+    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
+        val work = OneTimeWorkRequestBuilder<SyncWorker>()
+            .setInputData(
+                Data.Builder()
+                    .putBoolean("one_time", true)
+                    .build()
+            )
+            .build()
+
+        workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
+        return workManager.getWorkInfoByIdObservable(work.id)
+    }
+
     fun stopSyncWorker() {
         workManager.cancelUniqueWork(SyncWorker::class.java.simpleName)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 6a4c4ca6..126d856a 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -5,16 +5,18 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
+import androidx.work.Data
 import androidx.work.ListenableWorker
 import androidx.work.RxWorker
 import androidx.work.WorkerParameters
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
-import io.github.wulkanowy.api.interceptor.FeatureDisabledException
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
@@ -43,6 +45,10 @@ class SyncWorker @AssistedInject constructor(
                     .flatMapCompletable { semester ->
                         Completable.mergeDelayError(works.map { work ->
                             work.create(student, semester)
+                                .onErrorResumeNext {
+                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
+                                    else Completable.error(it)
+                                }
                                 .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
                                 .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
                                 .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
@@ -52,8 +58,15 @@ class SyncWorker @AssistedInject constructor(
             .toSingleDefault(Result.success())
             .onErrorReturn {
                 Timber.e(it, "There was an error during synchronization")
-                if (it is FeatureDisabledException) Result.success()
-                else Result.retry()
+                when {
+                    inputData.getBoolean("one_time", false) -> {
+                        Result.failure(Data.Builder()
+                            .putString("error", it.toString())
+                            .build()
+                        )
+                    }
+                    else -> Result.retry()
+                }
             }
             .doOnSuccess {
                 if (preferencesRepository.isDebugNotificationEnable) notify(it)
@@ -64,7 +77,7 @@ class SyncWorker @AssistedInject constructor(
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_more_settings_24dp)
+            .setSmallIcon(R.drawable.ic_stat_push)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
@@ -78,4 +91,3 @@ class SyncWorker @AssistedInject constructor(
         fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
new file mode 100644
index 00000000..f47c2220
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
@@ -0,0 +1,6 @@
+package io.github.wulkanowy.services.sync.channels
+
+interface Channel {
+
+    fun create()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 02fff569..9b6f213b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -3,26 +3,30 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
-    private val context: Context
-) {
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context,
+    private val appInfo: AppInfo
+) : Channel {
 
     companion object {
         const val CHANNEL_ID = "debug_channel"
     }
 
-    fun create() {
+    override fun create() {
+        if (appInfo.isDebug) return
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
-                lockscreenVisibility = VISIBILITY_PUBLIC
-            })
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
+                .apply {
+                    lockscreenVisibility = VISIBILITY_PUBLIC
+                })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
new file mode 100644
index 00000000..ae228edd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class LuckyNumberChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "lucky_number_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_lucky_number), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
new file mode 100644
index 00000000..7d6f275d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewGradesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_grade_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_grades), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
new file mode 100644
index 00000000..49f39c6b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewMessagesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_message_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_message), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
new file mode 100644
index 00000000..d80d43dc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewNotesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_notes_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_notes), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
new file mode 100644
index 00000000..a0e24ab4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class PushChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "push_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_push), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                }
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
similarity index 52%
rename from app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
rename to app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
index 8e24a2a6..a292c8b5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
@@ -3,28 +3,29 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.NotificationManager.IMPORTANCE_HIGH
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
-class NewEntriesChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+class UpcomingLessonsChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
-) {
+) : Channel {
 
     companion object {
-        const val CHANNEL_ID = "new_entries_channel"
+        const val CHANNEL_ID = "lesson_channel"
     }
 
-    fun create() {
+    override fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
-                enableLights(true)
-                enableVibration(true)
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_upcoming_lessons), IMPORTANCE_DEFAULT).apply {
                 lockscreenVisibility = VISIBILITY_PUBLIC
-            })
+                setShowBadge(false)
+                enableVibration(false)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 01978c5b..5f7d7efa 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -11,7 +11,7 @@ class AttendanceSummaryWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceSummaryRepository.getAttendanceSummary(semester, -1, true).ignoreElement()
+        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
     }
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index e4b55b0e..e8579ddb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -12,7 +12,7 @@ import javax.inject.Inject
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return attendanceRepository.getAttendance(semester, now().monday, now().friday, true)
+        return attendanceRepository.getAttendance(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 29642ad6..0da597e0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -14,7 +14,7 @@ class CompletedLessonWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return completedLessonsRepository.getCompletedLessons(semester, now().monday, now().friday, true)
+        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index 8744fcc7..c6110bbb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -12,6 +12,6 @@ import javax.inject.Inject
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return examRepository.getExams(semester, now().monday, now().friday, true).ignoreElement()
+        return examRepository.getExams(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 1de39a95..327c7174 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return gradeStatisticsRepository.getGradesStatistics(semester, "Wszystkie", false, true)
+        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 0c70b476..6e90826a 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -13,9 +13,9 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -38,17 +38,17 @@ class GradeWork @Inject constructor(
     }
 
     private fun notify(grades: List<Grade>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
             .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_grade)
+            .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
             .setDefaults(DEFAULT_ALL)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.GRADE.id,
-                    MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.GRADE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                 grades.forEach { addLine("${it.subject}: ${it.entry}") }
@@ -58,4 +58,3 @@ class GradeWork @Inject constructor(
         )
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index 32b356c6..cf348439 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -12,6 +12,6 @@ import javax.inject.Inject
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return homeworkRepository.getHomework(semester, now().monday, now().friday, true).ignoreElement()
+        return homeworkRepository.getHomework(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index ebd536b7..f19af4df 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -13,9 +13,9 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -29,8 +29,8 @@ class LuckyNumberWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return luckyNumberRepository.getLuckyNumber(semester, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(semester) }
+        return luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(student) }
             .flatMapCompletable {
                 notify(it)
                 luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
@@ -38,17 +38,17 @@ class LuckyNumberWork @Inject constructor(
     }
 
     private fun notify(luckyNumber: LuckyNumber) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, LuckyNumberChannel.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
             .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
-            .setSmallIcon(R.drawable.ic_stat_notify_lucky_number)
+            .setSmallIcon(R.drawable.ic_stat_luckynumber)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
             .build())
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index d5016aee..b8773dbc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -14,9 +14,9 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -30,7 +30,7 @@ class MessageWork @Inject constructor(
 ) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return messageRepository.getMessages(student, RECEIVED, true, preferencesRepository.isNotificationsEnable)
+        return messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable)
             .flatMap { messageRepository.getNotNotifiedMessages(student) }
             .flatMapCompletable {
                 if (it.isNotEmpty()) notify(it)
@@ -39,17 +39,17 @@ class MessageWork @Inject constructor(
     }
 
     private fun notify(messages: List<Message>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewMessagesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
             .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_message)
+            .setSmallIcon(R.drawable.ic_stat_message)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.MESSAGE, true), FLAG_UPDATE_CURRENT)
             )
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 86e540c4..4fc92ffc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -13,9 +13,9 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.NewNotesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -38,17 +38,17 @@ class NoteWork @Inject constructor(
     }
 
     private fun notify(notes: List<Note>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewNotesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
             .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_note)
+            .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.NOTE.id,
-                    MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.NOTE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.NOTE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
                 notes.forEach { addLine("${it.teacher}: ${it.category}") }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
similarity index 51%
rename from app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
rename to app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index 6de0bc5b..5a7a41d8 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -2,13 +2,13 @@ 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.gradessummary.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
 import io.reactivex.Completable
 import javax.inject.Inject
 
-class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
+class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return gradeSummaryRepository.getGradesSummary(semester, true).ignoreElement()
+        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index 743ae0e8..0990ed67 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -12,7 +12,7 @@ import javax.inject.Inject
 class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
 
     override fun create(student: Student, semester: Semester): Completable {
-        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
+        return timetableRepository.getTimetable(student, semester, now().monday, now().friday, true)
             .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index f3429457..e5ccf963 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -3,7 +3,8 @@ package io.github.wulkanowy.services.widgets
 import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
@@ -23,13 +24,16 @@ class TimetableWidgetService : RemoteViewsService() {
     lateinit var semesterRepo: SemesterRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var prefRepository: PreferencesRepository
+
+    @Inject
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider
 
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         AndroidInjection.inject(this)
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, schedulers, applicationContext, intent)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, schedulers, applicationContext, intent)
     }
 }
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 0879aa3c..f20fb22f 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
@@ -1,29 +1,36 @@
 package io.github.wulkanowy.ui.base
 
+import android.app.ActivityManager
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.AndroidInjection
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
+import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
-    HasSupportFragmentInjector {
+abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
+    AppCompatActivity(), BaseView, HasAndroidInjector {
+
+    protected var binding: VB by lifecycleAwareVariable()
 
     @Inject
-    lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
@@ -37,22 +44,29 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
-        themeManager.applyTheme(this)
+        themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        if (SDK_INT >= LOLLIPOP) {
+            @Suppress("DEPRECATION")
+            setTaskDescription(ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)))
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) {
-                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-                }
+                .setAction(R.string.all_details) { showErrorDetailsDialog(error) }
                 .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()
@@ -78,5 +92,5 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
         presenter.onDetachView()
     }
 
-    override fun supportFragmentInjector() = supportFragmentInjector
+    override fun androidInjector() = androidInjector
 }
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
new file mode 100644
index 00000000..0279dccf
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.base
+
+import android.widget.Toast
+import androidx.viewbinding.ViewBinding
+import dagger.android.support.DaggerAppCompatDialogFragment
+import io.github.wulkanowy.utils.lifecycleAwareVariable
+
+abstract class BaseDialogFragment<VB : ViewBinding> : DaggerAppCompatDialogFragment(), BaseView {
+
+    protected var binding: VB by lifecycleAwareVariable()
+
+    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/BaseExpandableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
new file mode 100644
index 00000000..eee4625c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.base
+
+import android.util.DisplayMetrics
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSmoothScroller
+import androidx.recyclerview.widget.RecyclerView
+import kotlin.math.max
+import kotlin.math.min
+
+abstract class BaseExpandableAdapter<T : RecyclerView.ViewHolder> : RecyclerView.Adapter<T>() {
+
+    companion object {
+        private const val MILLISECONDS_PER_INCH = 100f
+        private const val AUTO_SCROLL_DELAY = 150L
+    }
+
+    private var recyclerView: RecyclerView? = null
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        this.recyclerView = recyclerView
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        this.recyclerView = null
+    }
+
+    // original: https://github.com/davideas/FlexibleAdapter/blob/5.1.0/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java#L4984-L5011
+    protected fun scrollToHeaderWithSubItems(position: Int, subItemsCount: Int) {
+        val layoutManager = recyclerView!!.layoutManager as LinearLayoutManager
+        val firstVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
+        val lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition()
+        val itemsToShow = position + subItemsCount - lastVisibleItem
+        if (itemsToShow > 0) {
+            val scrollMax: Int = position - firstVisibleItem
+            val scrollMin = max(0, position + subItemsCount - lastVisibleItem)
+            val scrollBy = min(scrollMax, scrollMin)
+            val scrollTo = firstVisibleItem + scrollBy
+            scrollToPosition(scrollTo)
+        } else if (position < firstVisibleItem) {
+            scrollToPosition(position)
+        }
+    }
+
+    private fun scrollToPosition(position: Int) {
+        recyclerView?.run {
+            postDelayed({
+                layoutManager?.startSmoothScroll(object : LinearSmoothScroller(context) {
+                    override fun getVerticalSnapPreference() = SNAP_TO_START
+                    override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics) = MILLISECONDS_PER_INCH / displayMetrics.densityDpi
+                }.apply {
+                    targetPosition = position
+                })
+            }, AUTO_SCROLL_DELAY)
+        }
+    }
+}
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 4b2ad053..83f78765 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
@@ -1,40 +1,48 @@
 package io.github.wulkanowy.ui.base
 
 import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseFragment : DaggerFragment(), BaseView {
+abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : DaggerFragment(layoutId),
+    BaseView {
+
+    protected var binding: VB by lifecycleAwareVariable()
 
     protected var messageContainer: View? = null
 
     override fun showError(text: String, error: Throwable) {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) {
-                    if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-                }
+                .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
                 .show()
         } else {
-            (activity as? BaseActivity<*>)?.showError(text, error)
+            (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()
         } else {
-            (activity as? BaseActivity<*>)?.showMessage(text)
+            (activity as? BaseActivity<*, *>)?.showMessage(text)
         }
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
index fcf7e980..5f8bf417 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
@@ -4,14 +4,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 
-class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) :
+    FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     private val pages = mutableMapOf<Fragment, String?>()
 
     var containerId = 0
 
     fun getFragmentInstance(position: Int): Fragment? {
-        if (containerId == 0) throw IllegalArgumentException("Container id is 0")
+        require(containerId != 0) { "Container id is 0" }
         return fragmentManager.findFragmentByTag("android:switcher:$containerId:$position")
     }
 
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 7681263b..0f4df92c 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,4 +9,6 @@ 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 db3918b9..5fd6a86a 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
@@ -2,23 +2,37 @@ package io.github.wulkanowy.ui.base
 
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.Context.CLIPBOARD_SERVICE
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.HorizontalScrollView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.fragment.app.DialogFragment
+import androidx.core.content.getSystemService
 import io.github.wulkanowy.R
-import kotlinx.android.synthetic.main.dialog_error.*
+import io.github.wulkanowy.databinding.DialogErrorBinding
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getString
+import io.github.wulkanowy.utils.openEmailClient
+import io.github.wulkanowy.utils.openInternetBrowser
+import java.io.InterruptedIOException
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.inject.Inject
 
-class ErrorDialog : DialogFragment() {
+class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
 
     private lateinit var error: Throwable
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
@@ -38,23 +52,53 @@ class ErrorDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_error, container, false)
+        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        StringWriter().let { writer ->
-            error.printStackTrace(PrintWriter(writer))
 
-            errorDialogContent.text = writer.toString()
+        val stringWriter = StringWriter().apply {
+            error.printStackTrace(PrintWriter(this))
+        }
+
+        with(binding) {
+            errorDialogContent.text = stringWriter.toString()
+            with(errorDialogHorizontalScroll) {
+                post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
+            }
             errorDialogCopy.setOnClickListener {
-                ClipData.newPlainText("wulkanowyError", writer.toString()).let { clip ->
-                    (activity?.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip = clip
-                }
+                val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
+                activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
+
                 Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
             }
+            errorDialogCancel.setOnClickListener { dismiss() }
+            errorDialogReport.setOnClickListener { openEmailClient(stringWriter.toString()) }
+            errorDialogMessage.text = resources.getString(error)
+            errorDialogReport.isEnabled = when (error) {
+                is UnknownHostException,
+                is InterruptedIOException,
+                is SocketTimeoutException,
+                is ServiceUnavailableException,
+                is FeatureDisabledException,
+                is FeatureNotAvailableException -> false
+                else -> true
+            }
         }
-        errorDialogCancel.setOnClickListener { dismiss() }
+    }
+
+    private fun openEmailClient(content: String) {
+        requireContext().openEmailClient(
+            chooserTitle = getString(R.string.about_feedback),
+            email = "wulkanowyinc@gmail.com",
+            subject = "Zgłoszenie błędu",
+            body = requireContext().getString(R.string.about_feedback_template,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+            ) + "\n" + content,
+            onActivityNotFound = {
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+            }
+        )
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index 16e9a048..f746b36f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -1,20 +1,15 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.R
-import io.github.wulkanowy.api.interceptor.FeatureDisabledException
-import io.github.wulkanowy.api.interceptor.ServiceUnavailableException
-import io.github.wulkanowy.api.login.BadCredentialsException
-import io.github.wulkanowy.api.login.NotLoggedInException
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
+import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckCollector: ChuckCollector) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
@@ -23,23 +18,16 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     var onNoCurrentStudent: () -> Unit = {}
 
     fun dispatch(error: Throwable) {
-        chuckCollector.onError(error.javaClass.simpleName, error)
+        chuckerCollector.onError(error.javaClass.simpleName, error)
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
 
     protected open fun proceed(error: Throwable) {
-        resources.run {
-            when (error) {
-                is UnknownHostException -> showErrorMessage(getString(R.string.error_no_internet), error)
-                is SocketTimeoutException -> showErrorMessage(getString(R.string.error_timeout), error)
-                is NotLoggedInException -> showErrorMessage(getString(R.string.error_login_failed), error)
-                is ServiceUnavailableException -> showErrorMessage(getString(R.string.error_service_unavailable), error)
-                is FeatureDisabledException -> showErrorMessage(getString(R.string.error_feature_disabled), error)
-                is ScramblerException, is BadCredentialsException -> onSessionExpired()
-                is NoCurrentStudentException -> onNoCurrentStudent()
-                else -> showErrorMessage(getString(R.string.error_unknown), error)
-            }
+        when (error) {
+            is ScramblerException, is BadCredentialsException -> onSessionExpired()
+            is NoCurrentStudentException -> onNoCurrentStudent()
+            else -> showErrorMessage(resources.getString(error), error)
         }
     }
 
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 449f451b..50134861 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
@@ -2,29 +2,36 @@ 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
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
 
-    fun applyTheme(activity: AppCompatActivity) {
+    fun applyActivityTheme(activity: AppCompatActivity) {
         if (isThemeApplicable(activity)) {
-            activity.delegate.apply {
-                when (preferencesRepository.appTheme) {
-                    "light" -> setLocalNightMode(MODE_NIGHT_NO)
-                    "dark" -> setLocalNightMode(MODE_NIGHT_YES)
-                    "black" -> {
-                        setLocalNightMode(MODE_NIGHT_YES)
-                        activity.setTheme(R.style.WulkanowyTheme_Black)
-                    }
-                }
-            }
+            applyDefaultTheme()
+            if (preferencesRepository.appTheme == "black") activity.setTheme(R.style.WulkanowyTheme_Black)
         }
     }
 
+    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")
+            }
+        )
+    }
+
     private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
         return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
             .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
new file mode 100644
index 00000000..cefe6ed7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.ui.base
+
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ItemAccountBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Pair<Student, Boolean>>()
+
+    var onClickListener: (Student) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (student, isCurrent) = items[position]
+
+        with(holder.binding) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+
+            with(accountItemImage) {
+                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+            }
+
+            root.setOnClickListener { onClickListener(student) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
new file mode 100644
index 00000000..35dec3b4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
@@ -0,0 +1,72 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemAboutBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
+import javax.inject.Inject
+
+class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        ITEM_HEADER(1),
+        ITEM_ELEMENT(2)
+    }
+
+    var items = emptyList<Triple<String, String, Drawable?>>()
+
+    var onClickListener: (name: String) -> Unit = {}
+
+    override fun getItemCount() = items.size + 1
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.ITEM_HEADER.id
+        else -> ViewType.ITEM_ELEMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ITEM_HEADER.id -> HeaderViewHolder(ScrollableHeaderAboutBinding.inflate(inflater, parent, false))
+            ViewType.ITEM_ELEMENT.id -> ItemViewHolder(ItemAboutBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 1)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
+        with(binding.aboutScrollableHeaderIcon) {
+            setImageDrawable(ResourcesCompat.getDrawableForDensity(
+                context.resources, context.applicationInfo.icon, 640, null)
+            )
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemAboutBinding, position: Int) {
+        val (title, summary, image) = items[position]
+
+        with(binding) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+
+            root.setOnClickListener { onClickListener(title) }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: ScrollableHeaderAboutBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemAboutBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 79373be9..3828a2bc 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
@@ -1,96 +1,146 @@
 package io.github.wulkanowy.ui.modules.about
 
-import android.content.Intent
-import android.net.Uri
+import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.withOnExtraListener
 import javax.inject.Inject
 
-class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
+class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var fragmentCompat: LibsFragmentCompat
+    lateinit var aboutAdapter: AboutAdapter
 
     @Inject
     lateinit var appInfo: AppInfo
 
+    override val versionRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
+        }
+
+    override val creatorsRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_contributor), getString(R.string.about_contributor_summary), getCompatDrawable(R.drawable.ic_about_creator))
+        }
+
+    override val feedbackRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            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))
+        }
+
+    override val homepageRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_homepage), getString(R.string.about_homepage_summary), getCompatDrawable(R.drawable.ic_about_homepage))
+        }
+
+    override val licensesRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_licenses), getString(R.string.about_licenses_summary), getCompatDrawable(R.drawable.ic_about_licenses))
+        }
+
+    override val privacyRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_privacy), getString(R.string.about_privacy_summary), getCompatDrawable(R.drawable.ic_about_privacy))
+        }
+
+    override val titleStringId get() = R.string.about_title
+
     companion object {
         fun newInstance() = AboutFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.about_title
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAboutBinding.bind(view)
         presenter.onAttachView(this)
-        return Bundle().apply {
-            putSerializable("data", LibsBuilder()
-                .withAboutAppName(getString(R.string.app_name))
-                .withAboutVersionShown(true)
-                .withAboutIconShown(true)
-                .withLicenseShown(true)
-                .withAboutSpecial1(getString(R.string.about_discord_invite))
-                .withAboutSpecial2(getString(R.string.about_homepage))
-                .withAboutSpecial3(getString(R.string.about_feedback))
-                .withFields(R.string::class.java.fields)
-                .withCheckCachedDetection(false)
-                .withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
-                    "Butterknife", "CircleImageView")
-                .withOnExtraListener { presenter.onExtraSelect(it) })
-        }.let {
-            fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
+    }
+
+    override fun initView() {
+        aboutAdapter.onClickListener = presenter::onItemSelected
+
+        with(binding.aboutRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = aboutAdapter
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fragmentCompat.onViewCreated(view, savedInstanceState)
+    override fun updateData(data: List<Triple<String, String, Drawable?>>) {
+        with(aboutAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
-    override fun openDiscordInviteView() {
+    override fun openLogViewer() {
+        if (appInfo.isDebug) (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
+    }
+
+    override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openHomepageWebView() {
+    override fun openHomepage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
     }
 
-    override fun openEmailClientView() {
-        val intent = Intent(Intent.ACTION_SENDTO).apply {
-            data = Uri.parse("mailto:")
-            putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
-            putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
-            putExtra(Intent.EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
-                Build: ${appInfo.versionCode}
-                SDK: ${appInfo.systemVersion}
-                Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
-            """.trimIndent())
-        }
-
-        context?.let {
-            if (intent.resolveActivity(it.packageManager) != null) {
-                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
-            } else {
-                it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+    override fun openEmailClient() {
+        requireContext().openEmailClient(
+            chooserTitle = getString(R.string.about_feedback),
+            email = "wulkanowyinc@gmail.com",
+            subject = "Zgłoszenie błędu",
+            body = requireContext().getString(R.string.about_feedback_template,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+            ),
+            onActivityNotFound = {
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
             }
-        }
+        )
+    }
+
+    override fun openFaqPage() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania", ::showMessage)
+    }
+
+    override fun openLicenses() {
+        (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
+    }
+
+    override fun openCreators() {
+        (activity as? MainActivity)?.pushView(ContributorFragment.newInstance())
+    }
+
+    override fun openPrivacyPolicy() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
     }
 
     override fun onDestroyView() {
-        fragmentCompat.onDestroyView()
         presenter.onDetachView()
         super.onDestroyView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
deleted file mode 100644
index cc5ba7cf..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
-import dagger.Module
-import dagger.Provides
-import io.github.wulkanowy.di.scopes.PerFragment
-
-@Module
-class AboutModule {
-
-    @PerFragment
-    @Provides
-    fun provideLibsFragmentCompat() = LibsFragmentCompat()
-}
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 736bf0ce..27237ea6 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
@@ -1,9 +1,5 @@
 package io.github.wulkanowy.ui.modules.about
 
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL2
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL3
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -21,28 +17,70 @@ class AboutPresenter @Inject constructor(
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("About view was initialized")
+        loadData()
     }
 
-    fun onExtraSelect(type: Libs.SpecialButton?) {
+    fun onItemSelected(name: String) {
         view?.run {
-            when (type) {
-                SPECIAL1 -> {
-                    Timber.i("Opening discord invide page")
-                    analytics.logEvent("open_page", "name" to "discord")
-                    openDiscordInviteView()
+            when (name) {
+                versionRes?.first -> {
+                    Timber.i("Opening log viewer")
+                    openLogViewer()
+                    analytics.logEvent("about_open", "name" to "log_viewer")
                 }
-                SPECIAL2 -> {
-                    Timber.i("Opening home page")
-                    analytics.logEvent("open_page", "name" to "home")
-                    openHomepageWebView()
-                }
-                SPECIAL3 -> {
+                feedbackRes?.first -> {
                     Timber.i("Opening email client")
-                    analytics.logEvent("open_page", "name" to "email")
-                    openEmailClientView()
+                    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()
+                    analytics.logEvent("about_open", "name" to "discord")
+                }
+                homepageRes?.first -> {
+                    Timber.i("Opening homepage")
+                    openHomepage()
+                    analytics.logEvent("about_open", "name" to "homepage")
+                }
+                licensesRes?.first -> {
+                    Timber.i("Opening licenses view")
+                    openLicenses()
+                    analytics.logEvent("about_open", "name" to "licenses")
+                }
+                creatorsRes?.first -> {
+                    Timber.i("Opening creators view")
+                    openCreators()
+                    analytics.logEvent("about_open", "name" to "creators")
+                }
+                privacyRes?.first -> {
+                    Timber.i("Opening privacy page ")
+                    openPrivacyPolicy()
+                    analytics.logEvent("about_open", "name" to "privacy")
                 }
             }
         }
     }
+
+    private fun loadData() {
+        view?.run {
+            updateData(listOfNotNull(
+                versionRes,
+                creatorsRes,
+                feedbackRes,
+                faqRes,
+                discordRes,
+                homepageRes,
+                licensesRes,
+                privacyRes
+            ))
+        }
+    }
 }
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 5b206ad8..79b700ea 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
@@ -1,12 +1,43 @@
 package io.github.wulkanowy.ui.modules.about
 
+import android.graphics.drawable.Drawable
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AboutView : BaseView {
 
-    fun openDiscordInviteView()
+    val versionRes: Triple<String, String, Drawable?>?
 
-    fun openEmailClientView()
+    val creatorsRes: Triple<String, String, Drawable?>?
 
-    fun openHomepageWebView()
+    val feedbackRes: Triple<String, String, Drawable?>?
+
+    val faqRes: Triple<String, String, Drawable?>?
+
+    val discordRes: Triple<String, String, Drawable?>?
+
+    val homepageRes: Triple<String, String, Drawable?>?
+
+    val licensesRes: Triple<String, String, Drawable?>?
+
+    val privacyRes: Triple<String, String, Drawable?>?
+
+    fun initView()
+
+    fun updateData(data: List<Triple<String, String, Drawable?>>)
+
+    fun openLogViewer()
+
+    fun openDiscordInvite()
+
+    fun openEmailClient()
+
+    fun openFaqPage()
+
+    fun openHomepage()
+
+    fun openLicenses()
+
+    fun openCreators()
+
+    fun openPrivacyPolicy()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
new file mode 100644
index 00000000..215cd27d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import coil.api.load
+import coil.transform.RoundedCornersTransformation
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.databinding.ItemContributorBinding
+import javax.inject.Inject
+
+class ContributorAdapter @Inject constructor() :
+    RecyclerView.Adapter<ContributorAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Contributor>()
+
+    var onClickListener: (Contributor) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemContributorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            creatorItemName.text = item.displayName
+            creatorItemAvatar.load("https://github.com/${item.githubUsername}.png") {
+                transformations(RoundedCornersTransformation(8f))
+                crossfade(true)
+            }
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemContributorBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
new file mode 100644
index 00000000..42eebd34
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
@@ -0,0 +1,71 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.databinding.FragmentContributorBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.openInternetBrowser
+import javax.inject.Inject
+
+class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fragment_contributor),
+    ContributorView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: ContributorPresenter
+
+    @Inject
+    lateinit var creatorsAdapter: ContributorAdapter
+
+    override val titleStringId get() = R.string.contributors_title
+
+    companion object {
+        fun newInstance() = ContributorFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentContributorBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding.creatorRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = creatorsAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        creatorsAdapter.onClickListener = presenter::onItemSelected
+        binding.creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
+    }
+
+    override fun updateData(data: List<Contributor>) {
+        with(creatorsAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun openUserGithubPage(username: String) {
+        context?.openInternetBrowser("https://github.com/${username}", ::showMessage)
+    }
+
+    override fun openGithubContributorsPage() {
+        context?.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/graphs/contributors", ::showMessage)
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.creatorProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
new file mode 100644
index 00000000..416a59ce
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
+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 javax.inject.Inject
+
+class ContributorPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val appCreatorRepository: AppCreatorRepository
+) : BasePresenter<ContributorView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: ContributorView) {
+        super.onAttachView(view)
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelected(contributor: Contributor) {
+        view?.openUserGithubPage(contributor.githubUsername)
+    }
+
+    fun onSeeMoreClick() {
+        view?.openGithubContributorsPage()
+    }
+
+    private fun loadData() {
+        disposable.add(appCreatorRepository.getAppCreators()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
new file mode 100644
index 00000000..8007e4e3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.ui.base.BaseView
+
+interface ContributorView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<Contributor>)
+
+    fun openUserGithubPage(username: String)
+
+    fun openGithubContributorsPage()
+
+    fun showProgress(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
new file mode 100644
index 00000000..07025c09
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.databinding.ItemLicenseBinding
+import javax.inject.Inject
+
+class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Library>()
+
+    var onClickListener: (Library) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemLicenseBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            licenseItemName.text = item.libraryName
+            licenseItemSummary.text = item.license?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemLicenseBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
new file mode 100644
index 00000000..f6c3b569
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -0,0 +1,83 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
+import androidx.core.text.parseAsHtml
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.mikepenz.aboutlibraries.Libs
+import com.mikepenz.aboutlibraries.entity.Library
+import dagger.Lazy
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLicenseBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
+    LicenseView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LicensePresenter
+
+    @Inject
+    lateinit var licenseAdapter: LicenseAdapter
+
+    @Inject
+    lateinit var libs: Lazy<Libs>
+
+    override val titleStringId get() = R.string.license_title
+
+    override val appLibraries: ArrayList<Library>?
+        get() = context?.let {
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+        }
+
+    companion object {
+        fun newInstance() = LicenseFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLicenseBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        licenseAdapter.onClickListener = presenter::onItemSelected
+
+        with(binding.licenseRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = licenseAdapter
+        }
+    }
+
+    override fun updateData(data: List<Library>) {
+        with(licenseAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun openLicense(licenseHtml: String) {
+        context?.let {
+            AlertDialog.Builder(it).apply {
+                setTitle(R.string.license_dialog_title)
+                setMessage(licenseHtml.parseAsHtml())
+                setPositiveButton(android.R.string.ok) { _, _ -> }
+                show()
+            }
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.licenseProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
new file mode 100644
index 00000000..0ffc3d90
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.content.Context
+import com.mikepenz.aboutlibraries.Libs
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.di.scopes.PerFragment
+
+@Module
+class LicenseModule {
+
+    @PerFragment
+    @Provides
+    fun provideLibs(context: Context) = Libs(context)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
new file mode 100644
index 00000000..d0f6d69e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import com.mikepenz.aboutlibraries.entity.Library
+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.Single
+import javax.inject.Inject
+
+class LicensePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: LicenseView) {
+        super.onAttachView(view)
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelected(library: Library) {
+        view?.run { library.license?.licenseDescription?.let { openLicense(it) } }
+    }
+
+    private fun loadData() {
+        disposable.add(Single.fromCallable { view?.appLibraries.orEmpty() }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
new file mode 100644
index 00000000..0680dbb7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LicenseView : BaseView {
+
+    val appLibraries: ArrayList<Library>?
+
+    fun initView()
+
+    fun updateData(data: List<Library>)
+
+    fun openLicense(licenseHtml: String)
+
+    fun showProgress(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
new file mode 100644
index 00000000..45c304aa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
@@ -0,0 +1,22 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class LogViewerAdapter : RecyclerView.Adapter<LogViewerAdapter.ViewHolder>() {
+
+    var lines = emptyList<String>()
+
+    class ViewHolder(val textView: TextView) : RecyclerView.ViewHolder(textView)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(TextView(parent.context))
+    }
+
+    override fun getItemCount() = lines.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.textView.text = lines[position]
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
new file mode 100644
index 00000000..08f91aff
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import android.content.Intent
+import android.content.Intent.EXTRA_EMAIL
+import android.content.Intent.EXTRA_STREAM
+import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
+import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.content.FileProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.BuildConfig.APPLICATION_ID
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLogviewerBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import java.io.File
+import javax.inject.Inject
+
+class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragment_logviewer),
+    LogViewerView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LogViewerPresenter
+
+    private val logAdapter = LogViewerAdapter()
+
+    override val titleStringId: Int
+        get() = R.string.logviewer_title
+
+    companion object {
+        fun newInstance() = LogViewerFragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLogviewerBinding.bind(view)
+        messageContainer = binding.logViewerRecycler
+        presenter.onAttachView(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_logviewer, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.logViewerMenuShare) presenter.onShareLogsSelected()
+        else false
+    }
+
+    override fun initView() {
+        with(binding.logViewerRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = logAdapter
+        }
+
+        binding.logViewRefreshButton.setOnClickListener { presenter.onRefreshClick() }
+    }
+
+    override fun setLines(lines: List<String>) {
+        logAdapter.lines = lines
+        logAdapter.notifyDataSetChanged()
+        binding.logViewerRecycler.scrollToPosition(lines.size - 1)
+    }
+
+    override fun shareLogs(files: List<File>) {
+        val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+            type = "text/plain"
+            putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
+            addFlags(FLAG_GRANT_READ_URI_PERMISSION)
+            putParcelableArrayListExtra(EXTRA_STREAM, ArrayList(files.map {
+                if (SDK_INT < LOLLIPOP) Uri.fromFile(it)
+                else FileProvider.getUriForFile(requireContext(), "$APPLICATION_ID.fileprovider", it)
+            }))
+        }
+
+        startActivity(Intent.createChooser(intent, getString(R.string.logviewer_share)))
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
new file mode 100644
index 00000000..4485cb3e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import io.github.wulkanowy.data.repositories.logger.LoggerRepository
+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 timber.log.Timber
+import javax.inject.Inject
+
+class LogViewerPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val loggerRepository: LoggerRepository
+) : BasePresenter<LogViewerView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: LogViewerView) {
+        super.onAttachView(view)
+        view.initView()
+        loadLogFile()
+    }
+
+    fun onShareLogsSelected(): Boolean {
+        disposable.add(loggerRepository.getLogFiles()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading logs files result: ${it.joinToString { it.name }}")
+                view?.shareLogs(it)
+            }, {
+                Timber.i("Loading logs files result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
+        return true
+    }
+
+    fun onRefreshClick() {
+        loadLogFile()
+    }
+
+    private fun loadLogFile() {
+        disposable.add(loggerRepository.getLastLogLines()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading last log file result: load ${it.size} lines")
+                view?.setLines(it)
+            }, {
+                Timber.i("Loading last log file result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
new file mode 100644
index 00000000..bd98c24f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import io.github.wulkanowy.ui.base.BaseView
+import java.io.File
+
+interface LogViewerView : BaseView {
+
+    fun initView()
+
+    fun setLines(lines: List<String>)
+
+    fun shareLogs(files: List<File>)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
new file mode 100644
index 00000000..7df0ca37
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.ui.modules.account
+
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ItemAccountBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Student>()
+
+    var onClickListener: (Student) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val student = items[position]
+
+        with(holder.binding) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+
+            with(accountItemImage) {
+                val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+            }
+
+            root.setOnClickListener { onClickListener(student) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
+}
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 f23a1eb5..ce811e0b 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,24 +7,21 @@ 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 androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.DialogAccountBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 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 : DaggerAppCompatDialogFragment(), AccountView {
+class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
 
     @Inject
-    lateinit var accountAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var accountAdapter: AccountAdapter
 
     companion object {
         fun newInstance() = AccountDialog()
@@ -36,7 +33,7 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_account, container, false)
+        return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -45,18 +42,23 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
     }
 
     override fun initView() {
-        accountAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
+        accountAdapter.onClickListener = presenter::onItemSelected
 
-        accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
-        accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
-        accountDialogRecycler.apply {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = accountAdapter
+        with(binding) {
+            accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
+            accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
+            accountDialogRecycler.apply {
+                layoutManager = LinearLayoutManager(context)
+                adapter = accountAdapter
+            }
         }
     }
 
-    override fun updateData(data: List<AccountItem>) {
-        accountAdapter.updateDataSet(data)
+    override fun updateData(data: List<Student>) {
+        with(accountAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
@@ -77,14 +79,6 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
         }
     }
 
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
-    }
-
     override fun showConfirmDialog() {
         context?.let {
             AlertDialog.Builder(it)
@@ -105,4 +99,3 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
         super.onDestroy()
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
deleted file mode 100644
index 972d10a2..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-import android.annotation.SuppressLint
-import android.view.View
-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.Student
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
-
-class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (student.isCurrent) R.drawable.ic_account_circular_border else 0)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AccountItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(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/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index e9b4b81e..3416a043 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.account
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -63,32 +63,29 @@ class AccountPresenter @Inject constructor(
             }))
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item is AccountItem) {
-            Timber.i("Select student item ${item.student.id}")
-            if (item.student.isCurrent) {
-                view?.dismissView()
-            } else {
-                Timber.i("Attempt to change a student")
-                disposable.add(studentRepository.switchStudent(item.student)
-                    .subscribeOn(schedulers.backgroundThread)
-                    .observeOn(schedulers.mainThread)
-                    .doFinally { view?.dismissView() }
-                    .subscribe({
-                        Timber.i("Change a student result: Success")
-                        view?.recreateMainView()
-                    }, {
-                        Timber.i("Change a student result: An exception occurred")
-                        errorHandler.dispatch(it)
-                    }))
-            }
+    fun onItemSelected(student: Student) {
+        Timber.i("Select student item ${student.id}")
+        if (student.isCurrent) {
+            view?.dismissView()
+        } else {
+            Timber.i("Attempt to change a student")
+            disposable.add(studentRepository.switchStudent(student)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally { view?.dismissView() }
+                .subscribe({
+                    Timber.i("Change a student result: Success")
+                    view?.recreateMainView()
+                }, {
+                    Timber.i("Change a student result: An exception occurred")
+                    errorHandler.dispatch(it)
+                }))
         }
     }
 
     private fun loadData() {
         Timber.i("Loading account data started")
         disposable.add(studentRepository.getSavedStudents(false)
-            .map { it.map { item -> AccountItem(item) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
@@ -100,4 +97,3 @@ class AccountPresenter @Inject constructor(
             }))
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index ede5023b..abb9e1d2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.account
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<AccountItem>)
+    fun updateData(data: List<Student>)
 
     fun dismissView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
new file mode 100644
index 00000000..a63d5045
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -0,0 +1,80 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
+import io.github.wulkanowy.databinding.ItemAttendanceBinding
+import javax.inject.Inject
+
+class AttendanceAdapter @Inject constructor() :
+    RecyclerView.Adapter<AttendanceAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Attendance>()
+
+    var excuseActionMode: Boolean = false
+
+    var onClickListener: (Attendance) -> Unit = {}
+
+    var onExcuseCheckboxSelect: (attendanceItem: Attendance, checked: Boolean) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAttendanceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            attendanceItemNumber.text = item.number.toString()
+            attendanceItemSubject.text = item.subject
+            attendanceItemDescription.text = item.name
+            attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
+            attendanceItemNumber.visibility = View.GONE
+            attendanceItemExcuseInfo.visibility = View.GONE
+            attendanceItemExcuseCheckbox.visibility = View.GONE
+            attendanceItemExcuseCheckbox.isChecked = false
+            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
+                onExcuseCheckboxSelect(item, checked)
+            }
+
+            when (if (item.excuseStatus != null) SentExcuseStatus.valueOf(item.excuseStatus) else null) {
+                SentExcuseStatus.WAITING -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
+                    attendanceItemExcuseInfo.visibility = View.VISIBLE
+                    attendanceItemAlert.visibility = View.INVISIBLE
+                }
+                SentExcuseStatus.DENIED -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
+                    attendanceItemExcuseInfo.visibility = View.VISIBLE
+                }
+                else -> {
+                    if (item.excusable && excuseActionMode) {
+                        attendanceItemNumber.visibility = View.GONE
+                        attendanceItemExcuseCheckbox.visibility = View.VISIBLE
+                    } else {
+                        attendanceItemNumber.visibility = View.VISIBLE
+                        attendanceItemExcuseCheckbox.visibility = View.GONE
+                    }
+                }
+            }
+            root.setOnClickListener {
+                onClickListener(item)
+
+                with(attendanceItemExcuseCheckbox) {
+                    if (excuseActionMode && isVisible) {
+                        isChecked = !isChecked
+                    }
+                }
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemAttendanceBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 611dd999..97b76e81 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -5,13 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.databinding.DialogAttendanceBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_attendance.*
 
 class AttendanceDialog : DialogFragment() {
 
+    private var binding: DialogAttendanceBinding by lifecycleAwareVariable()
+
     private lateinit var attendance: Attendance
 
     companion object {
@@ -33,16 +35,18 @@ class AttendanceDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_attendance, container, false)
+        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        attendanceDialogSubject.text = attendance.subject
-        attendanceDialogDescription.text = attendance.name
-        attendanceDialogDate.text = attendance.date.toFormattedString()
-        attendanceDialogNumber.text = attendance.number.toString()
-        attendanceDialogClose.setOnClickListener { dismiss() }
+        with(binding) {
+            attendanceDialogSubject.text = attendance.subject
+            attendanceDialogDescription.text = attendance.name
+            attendanceDialogDate.text = attendance.date.toFormattedString()
+            attendanceDialogNumber.text = attendance.number.toString()
+            attendanceDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
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 f3131098..6599243d 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
@@ -1,33 +1,47 @@
 package io.github.wulkanowy.ui.modules.attendance
 
+import android.content.DialogInterface.BUTTON_POSITIVE
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-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 android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.view.ActionMode
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.databinding.DialogExcuseBinding
+import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 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.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_attendance.*
+import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.dpToPx
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {
+class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
 
     @Inject
-    lateinit var attendanceAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var attendanceAdapter: AttendanceAdapter
+
+    override val excuseSuccessString: String
+        get() = getString(R.string.attendance_excuse_success)
+
+    override val excuseNoSelectionString: String
+        get() = getString(R.string.attendance_excuse_no_selection)
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -35,46 +49,77 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         fun newInstance() = AttendanceFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.attendance_title
+    override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty: Boolean
-        get() = attendanceAdapter.isEmpty
+    override val isViewEmpty get() = attendanceAdapter.items.isEmpty()
 
-    override val currentStackSize: Int?
-        get() = (activity as? MainActivity)?.currentStackSize
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
+
+    override val excuseActionMode: Boolean get() = attendanceAdapter.excuseActionMode
+
+    private var actionMode: ActionMode? = null
+    private val actionModeCallback = object : ActionMode.Callback {
+        override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+            val inflater = mode.menuInflater
+            inflater.inflate(R.menu.context_menu_excuse, menu)
+            return true
+        }
+
+        override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+            mode.title = getString(R.string.attendance_excuse_title)
+            return presenter.onPrepareActionMode()
+        }
+
+        override fun onDestroyActionMode(mode: ActionMode) {
+            presenter.onDestroyActionMode()
+            actionMode = null
+        }
+
+        override fun onActionItemClicked(mode: ActionMode, menu: MenuItem): Boolean {
+            return when (menu.itemId) {
+                R.id.excuseMenuSubmit -> presenter.onExcuseSubmitButtonClick()
+                else -> false
+            }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_attendance, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = attendanceRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAttendanceBinding.bind(view)
+        messageContainer = binding.attendanceRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        attendanceAdapter.apply {
-            setOnItemClickListener { presenter.onAttendanceItemSelected(it) }
+        with(attendanceAdapter) {
+            onClickListener = presenter::onAttendanceItemSelected
+            onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
         }
 
-        attendanceRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.attendanceRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = attendanceAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+
+        with(binding) {
+            attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
+            attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+            attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            attendanceNavDate.setOnClickListener { presenter.onPickDate() }
+            attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+
+            attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
+
+            attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
         }
-        attendanceSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        attendanceNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -86,66 +131,132 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         else false
     }
 
-    override fun updateData(data: List<AttendanceItem>) {
-        attendanceAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Attendance>) {
+        with(attendanceAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        attendanceNavDate.text = date
+        binding.attendanceNavDate.text = date
     }
 
     override fun clearData() {
-        attendanceAdapter.clear()
+        with(attendanceAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        attendanceRecycler.smoothScrollToPosition(0)
+        binding.attendanceRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
+    override fun onFragmentChanged() {
+        if (::presenter.isInitialized) presenter.onMainViewChanged()
+    }
+
     override fun popView() {
         (activity as? MainActivity)?.popView()
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        binding.attendanceEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.attendanceError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.attendanceErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.attendanceProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        attendanceSwipe.isEnabled = enable
+        binding.attendanceSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        attendanceSwipe.isRefreshing = false
+        binding.attendanceSwipe.isRefreshing = false
     }
 
     override fun showPreButton(show: Boolean) {
-        attendancePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        attendanceNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showExcuseButton(show: Boolean) {
+        binding.attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
     }
 
     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 showExcuseDialog() {
+        val dialogBinding = DialogExcuseBinding.inflate(LayoutInflater.from(context))
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.attendance_excuse_title)
+            .setView(dialogBinding.root)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .create()
+            .apply {
+                setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ ->
+                    presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty())
+                }
+            }.show()
+    }
+
     override fun openSummaryView() {
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
 
+    override fun startActionMode() {
+        actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
+    }
+
+    override fun showExcuseCheckboxes(show: Boolean) {
+        attendanceAdapter.apply {
+            excuseActionMode = show
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun finishActionMode() {
+        actionMode?.finish()
+    }
+
     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/attendance/AttendanceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
deleted file mode 100644
index 16a140cb..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance
-
-import android.view.View
-import android.view.View.INVISIBLE
-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.Attendance
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_attendance.*
-
-class AttendanceItem(val attendance: Attendance) : AbstractFlexibleItem<AttendanceItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_attendance
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            attendanceItemNumber.text = attendance.number.toString()
-            attendanceItemSubject.text = attendance.subject
-            attendanceItemDescription.text = attendance.name
-            attendanceItemAlert.visibility = attendance.run { if (absence && !excused) VISIBLE else INVISIBLE }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceItem
-
-        if (attendance != other.attendance) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = attendance.hashCode()
-        result = 31 * result + attendance.id.toInt()
-        return result
-    }
-
-    class ViewHolder(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/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 5e7333e1..3a1fb0ce 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,7 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.annotation.SuppressLint
+import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,7 +9,13 @@ 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.*
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousOrSameSchoolDay
+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.ofEpochDay
@@ -26,37 +33,70 @@ class AttendancePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().previousOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
+    private lateinit var lastError: Throwable
+
+    private val attendanceToExcuseList = mutableListOf<Attendance>()
+
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Attendance view was initialized")
-        loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
     fun onPreviousDay() {
+        view?.finishActionMode()
+        attendanceToExcuseList.clear()
         loadData(currentDate.previousSchoolDay)
         reloadView()
     }
 
     fun onNextDay() {
+        view?.finishActionMode()
+        attendanceToExcuseList.clear()
         loadData(currentDate.nextSchoolDay)
         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 ->
             if (view.currentStackSize == 1) {
-                now().previousOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -66,10 +106,59 @@ class AttendancePresenter @Inject constructor(
         }
     }
 
-    fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is AttendanceItem) {
-            Timber.i("Select attendance item ${item.attendance.id}")
-            view?.showAttendanceDialog(item.attendance)
+    fun onMainViewChanged() {
+        view?.finishActionMode()
+    }
+
+    fun onAttendanceItemSelected(attendance: Attendance) {
+        view?.apply {
+            if (!excuseActionMode) {
+                Timber.i("Select attendance item ${attendance.id}")
+                showAttendanceDialog(attendance)
+            }
+        }
+    }
+
+    fun onExcuseButtonClick() {
+        view?.startActionMode()
+    }
+
+    fun onExcuseCheckboxSelect(attendanceItem: Attendance, checked: Boolean) {
+        if (checked) attendanceToExcuseList.add(attendanceItem)
+        else attendanceToExcuseList.remove(attendanceItem)
+    }
+
+    fun onExcuseSubmitButtonClick(): Boolean {
+        view?.apply {
+            return if (attendanceToExcuseList.isNotEmpty()) {
+                showExcuseDialog()
+                true
+            } else {
+                showMessage(excuseNoSelectionString)
+                false
+            }
+        }
+        return false
+    }
+
+    fun onExcuseDialogSubmit(reason: String) {
+        view?.finishActionMode()
+        excuseAbsence(if (reason != "") reason else null, attendanceToExcuseList.toList())
+    }
+
+    fun onPrepareActionMode(): Boolean {
+        view?.apply {
+            showExcuseCheckboxes(true)
+            showExcuseButton(false)
+        }
+        attendanceToExcuseList.clear()
+        return true
+    }
+
+    fun onDestroyActionMode() {
+        view?.apply {
+            showExcuseCheckboxes(false)
+            showExcuseButton(true)
         }
     }
 
@@ -78,21 +167,36 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { attendanceRepository.getAttendance(it, date, date, forceRefresh) }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+                    }
+                }
                 .map { list ->
                     if (prefRepository.isShowPresent) list
                     else list.filter { !it.presence }
                 }
-                .map { items -> items.map { AttendanceItem(it) } }
-                .map { items -> items.sortedBy { it.attendance.number } }
+                .map { items -> items.sortedBy { it.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -107,18 +211,65 @@ class AttendancePresenter @Inject constructor(
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
+                        showErrorView(false)
                         showContent(it.isNotEmpty())
+                        showExcuseButton(it.any { item -> item.excusable })
                     }
                     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 excuseAbsence(reason: String?, toExcuseList: List<Attendance>) {
+        Timber.i("Excusing absence started")
+        disposable.apply {
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+                    }
+                }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        showProgress(true)
+                        showContent(false)
+                        showExcuseButton(false)
+                    }
+                }
+                .subscribe({
+                    Timber.i("Excusing for absence result: Success")
+                    analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
+                    attendanceToExcuseList.clear()
+                    view?.apply {
+                        showExcuseButton(false)
+                        showMessage(excuseSuccessString)
+                    }
+                    loadData(currentDate, true)
+                }) {
+                    Timber.i("Excusing for absence result: An exception occurred")
+                    view?.showProgress(false)
+                    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 {
@@ -126,10 +277,18 @@ class AttendancePresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            showNextButton(!currentDate.plusDays(1).isHolidays)
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").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 04fe94a4..484070a2 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,6 +2,7 @@ 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 {
 
@@ -9,9 +10,15 @@ interface AttendanceView : BaseView {
 
     val currentStackSize: Int?
 
+    val excuseSuccessString: String
+
+    val excuseNoSelectionString: String
+
+    val excuseActionMode: Boolean
+
     fun initView()
 
-    fun updateData(data: List<AttendanceItem>)
+    fun updateData(data: List<Attendance>)
 
     fun updateNavigationDay(date: String)
 
@@ -23,6 +30,10 @@ interface AttendanceView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -33,9 +44,21 @@ interface AttendanceView : BaseView {
 
     fun showNextButton(show: Boolean)
 
+    fun showExcuseButton(show: Boolean)
+
     fun showAttendanceDialog(lesson: Attendance)
 
+    fun showDatePickerDialog(currentDate: LocalDate)
+
+    fun showExcuseDialog()
+
     fun openSummaryView()
 
+    fun startActionMode()
+
+    fun showExcuseCheckboxes(show: Boolean)
+
+    fun finishActionMode()
+
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
new file mode 100644
index 00000000..236c3da1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
@@ -0,0 +1,101 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
+import io.github.wulkanowy.utils.calculatePercentage
+import io.github.wulkanowy.utils.getFormattedName
+import org.threeten.bp.Month
+import java.util.Locale
+import javax.inject.Inject
+
+class AttendanceSummaryAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
+    }
+
+    var items = emptyList<AttendanceSummary>()
+
+    override fun getItemCount() = if (items.isNotEmpty()) items.size + 2 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.HEADER.id
+        else -> ViewType.ITEM.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderAttendanceSummaryBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemAttendanceSummaryBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 2)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
+        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
+    }
+
+    private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
+        val item = if (position == -1) getTotalItem() else items[position]
+
+        with(binding) {
+            attendanceSummaryMonth.text = when (position) {
+                -1 -> root.context.getString(R.string.attendance_summary_total)
+                else -> item.month.getFormattedName()
+            }
+            attendanceSummaryPercentage.text = when (position) {
+                -1 -> formatPercentage(items.calculatePercentage())
+                else -> formatPercentage(item.calculatePercentage())
+            }
+
+            attendanceSummaryPresent.text = item.presence.toString()
+            attendanceSummaryAbsenceUnexcused.text = item.absence.toString()
+            attendanceSummaryAbsenceExcused.text = item.absenceExcused.toString()
+            attendanceSummaryAbsenceSchool.text = item.absenceForSchoolReasons.toString()
+            attendanceSummaryExemption.text = item.exemption.toString()
+            attendanceSummaryLatenessUnexcused.text = item.lateness.toString()
+            attendanceSummaryLatenessExcused.text = item.latenessExcused.toString()
+        }
+    }
+
+    private fun getTotalItem() = AttendanceSummary(
+        month = Month.APRIL,
+        presence = items.sumBy { it.presence },
+        absence = items.sumBy { it.absence },
+        absenceExcused = items.sumBy { it.absenceExcused },
+        absenceForSchoolReasons = items.sumBy { it.absenceForSchoolReasons },
+        exemption = items.sumBy { it.exemption },
+        lateness = items.sumBy { it.lateness },
+        latenessExcused = items.sumBy { it.latenessExcused },
+        diaryId = -1,
+        studentId = -1,
+        subjectId = -1
+    )
+
+    private fun formatPercentage(percentage: Double): String {
+        return if (percentage == 0.0) "0%"
+        else "${String.format(Locale.FRANCE, "%.2f", percentage)}%"
+    }
+
+    class HeaderViewHolder(val binding: ScrollableHeaderAttendanceSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class ItemViewHolder(val binding: ItemAttendanceSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 1845bdda..1b9fe08e 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
@@ -1,31 +1,31 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
 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 android.widget.ArrayAdapter
 import android.widget.TextView
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
-import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
 
-class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainView.TitledView {
+class AttendanceSummaryFragment :
+    BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
+    AttendanceSummaryView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendanceSummaryPresenter
 
     @Inject
-    lateinit var attendanceSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var attendanceSummaryAdapter: AttendanceSummaryAdapter
 
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
@@ -35,82 +35,92 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         fun newInstance() = AttendanceSummaryFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.attendance_title
+    override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty
-        get() = attendanceSummaryAdapter.isEmpty
+    override val isViewEmpty get() = attendanceSummaryAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = attendanceSummaryRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAttendanceSummaryBinding.bind(view)
+        messageContainer = binding.attendanceSummaryRecycler
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SUBJECT_KEY))
     }
 
     override fun initView() {
-        attendanceSummaryRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.attendanceSummaryRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
-        attendanceSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
 
-        context?.let {
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
-            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+        with(binding) {
+            attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+            attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
 
-        attendanceSummarySubjects.run {
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+
+        with(binding.attendanceSummarySubjects) {
             adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
+
+        binding.attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
         }
     }
 
-    override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
-        attendanceSummaryAdapter.apply {
-            updateDataSet(data, true)
-            removeAllScrollableHeaders()
-            addScrollableHeader(header)
+    override fun updateDataSet(data: List<AttendanceSummary>) {
+        with(attendanceSummaryAdapter) {
+            items = data
+            notifyDataSetChanged()
         }
     }
 
     override fun clearView() {
-        attendanceSummaryAdapter.clear()
+        with(attendanceSummaryAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.attendanceSummaryError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.attendanceSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        attendanceSummarySwipe.isEnabled = enable
+        binding.attendanceSummarySwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showSubjects(show: Boolean) {
-        attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
+        binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun hideRefresh() {
-        attendanceSummarySwipe.isRefreshing = false
+        binding.attendanceSummarySwipe.isRefreshing = false
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -119,7 +129,7 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
deleted file mode 100644
index 265d6ce4..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-import android.view.View
-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 kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_attendance_summary.*
-
-class AttendanceSummaryItem(
-    private val month: String,
-    private val percentage: String,
-    private val present: String,
-    private val absence: String,
-    private val excusedAbsence: String,
-    private val schoolAbsence: String,
-    private val exemption: String,
-    private val lateness: String,
-    private val excusedLateness: String
-) : AbstractFlexibleItem<AttendanceSummaryItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_attendance_summary
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            attendanceSummaryMonth.text = month
-            attendanceSummaryPercentage.text = percentage
-            attendanceSummaryPresent.text = present
-            attendanceSummaryAbsenceUnexcused.text = absence
-            attendanceSummaryAbsenceExcused.text = excusedAbsence
-            attendanceSummaryAbsenceSchool.text = schoolAbsence
-            attendanceSummaryExemption.text = exemption
-            attendanceSummaryLatenessUnexcused.text = lateness
-            attendanceSummaryLatenessExcused.text = excusedLateness
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceSummaryItem
-
-        if (month != other.month) return false
-        if (percentage != other.percentage) return false
-        if (present != other.present) return false
-        if (absence != other.absence) return false
-        if (excusedAbsence != other.excusedAbsence) return false
-        if (schoolAbsence != other.schoolAbsence) return false
-        if (exemption != other.exemption) return false
-        if (lateness != other.lateness) return false
-        if (excusedLateness != other.excusedLateness) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = month.hashCode()
-        result = 31 * result + percentage.hashCode()
-        result = 31 * result + present.hashCode()
-        result = 31 * result + absence.hashCode()
-        result = 31 * result + excusedAbsence.hashCode()
-        result = 31 * result + schoolAbsence.hashCode()
-        result = 31 * result + exemption.hashCode()
-        result = 31 * result + lateness.hashCode()
-        result = 31 * result + excusedLateness.hashCode()
-        return result
-    }
-
-    class ViewHolder(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/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index dc6fe5b3..72dfc327 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -10,12 +9,8 @@ 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 io.github.wulkanowy.utils.calculatePercentage
-import io.github.wulkanowy.utils.getFormattedName
+import org.threeten.bp.Month
 import timber.log.Timber
-import java.lang.String.format
-import java.util.Locale.FRANCE
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class AttendanceSummaryPresenter @Inject constructor(
@@ -33,10 +28,13 @@ 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()
     }
@@ -46,12 +44,26 @@ class AttendanceSummaryPresenter @Inject constructor(
         loadData(currentSubjectId, true)
     }
 
-    fun onSubjectSelected(name: String) {
+    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 {
@@ -65,10 +77,12 @@ class AttendanceSummaryPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { attendanceSummaryRepository.getAttendanceSummary(it, subjectId, forceRefresh) }
-                .map { createAttendanceSummaryItems(it) to AttendanceSummaryScrollableHeader(formatPercentage(it.calculatePercentage())) }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap {
+                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
+                    }
+                }
+                .map { items -> items.sortedByDescending { if (it.month.value <= Month.JUNE.value) it.month.value + 12 else it.month.value } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -81,25 +95,38 @@ class AttendanceSummaryPresenter @Inject constructor(
                 .subscribe({
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.first.isEmpty())
-                        showContent(it.first.isNotEmpty())
-                        updateDataSet(it.first, it.second)
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        updateDataSet(it)
                     }
-                    analytics.logEvent("load_attendance_summary", "items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId)
+                    analytics.logEvent("load_attendance_summary", "items" to it.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()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { subjectRepository.getSubjects(it) }
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
+                }
+            }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)
@@ -116,25 +143,4 @@ class AttendanceSummaryPresenter @Inject constructor(
             })
         )
     }
-
-    private fun createAttendanceSummaryItems(attendanceSummary: List<AttendanceSummary>): List<AttendanceSummaryItem> {
-        return attendanceSummary.sortedByDescending { it.id }.map {
-            AttendanceSummaryItem(
-                month = it.month.getFormattedName(),
-                percentage = formatPercentage(it.calculatePercentage()),
-                present = it.presence.toString(),
-                absence = it.absence.toString(),
-                excusedAbsence = it.absenceExcused.toString(),
-                schoolAbsence = it.absenceForSchoolReasons.toString(),
-                exemption = it.exemption.toString(),
-                lateness = it.lateness.toString(),
-                excusedLateness = it.latenessExcused.toString()
-            )
-        }
-    }
-
-    private fun formatPercentage(percentage: Double): String {
-        return if (percentage == 0.0) "0%"
-        else "${format(FRANCE, "%.2f", percentage)}%"
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
deleted file mode 100644
index c258f71d..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-import android.view.View
-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 kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.scrollable_header_attendance_summary.*
-
-class AttendanceSummaryScrollableHeader(private val percentage: String) :
-    AbstractFlexibleItem<AttendanceSummaryScrollableHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.scrollable_header_attendance_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
-        holder?.apply { attendanceSummaryScrollableHeaderPercentage.text = percentage }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceSummaryScrollableHeader
-
-        if (percentage != other.percentage) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return percentage.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
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 50f03e20..dd4053c7 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AttendanceSummaryView : BaseView {
@@ -18,7 +19,11 @@ interface AttendanceSummaryView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun updateDataSet(data: List<AttendanceSummary>)
 
     fun updateSubjects(data: ArrayList<String>)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
new file mode 100644
index 00000000..85061997
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.ui.modules.exam
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.HeaderExamBinding
+import io.github.wulkanowy.databinding.ItemExamBinding
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+
+class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<ExamItem<*>>()
+
+    var onClickListener: (Exam) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ExamItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderExamBinding.inflate(inflater, parent, false))
+            ExamItem.ViewType.ITEM.id -> ItemViewHolder(ItemExamBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Exam)
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun bindHeaderViewHolder(binding: HeaderExamBinding, date: LocalDate) {
+        with(binding) {
+            examHeaderDay.text = date.weekDayName.capitalize()
+            examHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemExamBinding, exam: Exam) {
+        with(binding) {
+            examItemSubject.text = exam.subject
+            examItemTeacher.text = exam.teacher
+            examItemType.text = exam.type
+
+            root.setOnClickListener { onClickListener(exam) }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: HeaderExamBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemExamBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index ed5092c9..c1a6f1f0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -5,13 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.DialogExamBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_exam.*
 
 class ExamDialog : DialogFragment() {
 
+    private var binding: DialogExamBinding by lifecycleAwareVariable()
+
     private lateinit var exam: Exam
 
     companion object {
@@ -33,18 +35,20 @@ class ExamDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_exam, container, false)
+        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        examDialogSubjectValue.text = exam.subject
-        examDialogTypeValue.text = exam.type
-        examDialogTeacherValue.text = exam.teacher
-        examDialogDateValue.text = exam.entryDate.toFormattedString()
-        examDialogDescriptionValue.text = exam.description
+        with(binding) {
+            examDialogSubjectValue.text = exam.subject
+            examDialogTypeValue.text = exam.type
+            examDialogTeacherValue.text = exam.teacher
+            examDialogDateValue.text = exam.entryDate.toFormattedString()
+            examDialogDescriptionValue.text = exam.description
 
-        examDialogClose.setOnClickListener { dismiss() }
+            examDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
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 47f6d587..eeab30c1 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
@@ -1,32 +1,29 @@
 package io.github.wulkanowy.ui.modules.exam
 
 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 eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.FragmentExamBinding
 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.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_exam.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.dpToPx
 import javax.inject.Inject
 
-class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
+class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
+    MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: ExamPresenter
 
     @Inject
-    lateinit var examAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var examAdapter: ExamAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -34,57 +31,62 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
         fun newInstance() = ExamFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.exam_title
+    override val titleStringId get() = R.string.exam_title
 
-    override val isViewEmpty: Boolean
-        get() = examAdapter.isEmpty
+    override val isViewEmpty get() = examAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_exam, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = examRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentExamBinding.bind(view)
+        messageContainer = binding.examRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        examAdapter.run {
-            setOnItemClickListener { presenter.onExamItemSelected(it) }
-        }
-        examRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        examAdapter.onClickListener = presenter::onExamItemSelected
+
+        with(binding.examRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = examAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider(R.layout.item_exam)
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+
+        with(binding) {
+            examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            examErrorRetry.setOnClickListener { presenter.onRetry() }
+            examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+            examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
+            examNextButton.setOnClickListener { presenter.onNextWeek() }
+
+            examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
         }
-        examSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-        examNextButton.setOnClickListener { presenter.onNextWeek() }
     }
 
     override fun hideRefresh() {
-        examSwipe.isRefreshing = false
+        binding.examSwipe.isRefreshing = false
     }
 
-    override fun updateData(data: List<ExamItem>) {
-        examAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<ExamItem<*>>) {
+        with(examAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationWeek(date: String) {
-        examNavDate.text = date
+        binding.examNavDate.text = date
     }
 
     override fun clearData() {
-        examAdapter.clear()
+        with(examAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        examRecycler.scrollToPosition(0)
+        binding.examRecycler.scrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -92,27 +94,35 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
     }
 
     override fun showEmpty(show: Boolean) {
-        examEmpty.visibility = if (show) VISIBLE else GONE
+        binding.examEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.examError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.examErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        examProgress.visibility = if (show) VISIBLE else GONE
+        binding.examProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        examSwipe.isEnabled = enable
+        binding.examSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        examRecycler.visibility = if (show) VISIBLE else GONE
+        binding.examRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        examNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.examNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExamDialog(exam: Exam) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
deleted file mode 100644
index 0a5b862c..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.exam
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_exam.*
-import org.threeten.bp.LocalDate
-
-class ExamHeader(private val date: LocalDate) : AbstractHeaderItem<ExamHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_exam
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            examHeaderDay.text = date.weekDayName.capitalize()
-            examHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as ExamHeader
-
-        if (date != other.date) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return date.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
-            LayoutContainer {
-
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
index 8971b4df..579e3720 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
@@ -1,50 +1,9 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Exam
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_exam.*
+data class ExamItem<out T>(val value: T, val viewType: ViewType) {
 
-class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<ExamItem.ViewHolder, ExamHeader>(header) {
-
-    override fun getLayoutRes() = R.layout.item_exam
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            examItemSubject.text = exam.subject
-            examItemTeacher.text = exam.teacher
-            examItemType.text = exam.type
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as ExamItem
-
-        if (exam != other.exam) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = exam.hashCode()
-        result = 31 * result + exam.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
     }
 }
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 4045a956..495602fc 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -10,6 +9,7 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -18,7 +18,6 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
@@ -30,14 +29,20 @@ class ExamPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     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")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -56,16 +61,26 @@ class ExamPresenter @Inject constructor(
         loadData(currentDate, true)
     }
 
-    fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is ExamItem) {
-            Timber.i("Select exam item ${item.exam.id}")
-            view?.showExamDialog(item.exam)
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
         }
+        loadData(currentDate, true)
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    fun onExamItemSelected(exam: Exam) {
+        Timber.i("Select exam item ${exam.id}")
+        view?.showExamDialog(exam)
     }
 
     fun onViewReselected() {
         Timber.i("Exam view is reselected")
-        now().nextOrSameSchoolDay.also {
+        baseDate.also {
             if (currentDate != it) {
                 loadData(it)
                 reloadView()
@@ -73,17 +88,31 @@ class ExamPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading exam data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap {
-                    examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh)
-                }.map { it.groupBy { exam -> exam.date }.toSortedMap() }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        examRepository.getExams(student, semester, currentDate.monday, currentDate.friday, forceRefresh)
+                    }
+                }
                 .map { createExamItems(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -99,25 +128,36 @@ 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 createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
-        return items.flatMap {
-            ExamHeader(it.key).let { header ->
-                it.value.reversed().map { item -> ExamItem(header, item) }
-            }
+    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: List<Exam>): List<ExamItem<*>> {
+        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
+            listOf(ExamItem(date, ExamItem.ViewType.HEADER)) + exams.reversed().map { exam ->
+                ExamItem(exam, ExamItem.ViewType.ITEM)
+            }
+        }.flatten()
+    }
+
     private fun reloadView() {
         Timber.i("Reload exam view with the date ${currentDate.toFormattedString()}")
         view?.apply {
@@ -125,7 +165,14 @@ class ExamPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
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 888cb05e..00429bae 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
@@ -9,7 +9,7 @@ interface ExamView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<ExamItem>)
+    fun updateData(data: List<ExamItem<*>>)
 
     fun updateNavigationWeek(date: String)
 
@@ -21,6 +21,10 @@ 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/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 3f794ff1..954b5756 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -3,70 +3,76 @@ package io.github.wulkanowy.ui.modules.grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import io.reactivex.Maybe
 import io.reactivex.Single
 import javax.inject.Inject
 
 class GradeAverageProvider @Inject constructor(
-    private val preferencesRepository: PreferencesRepository,
+    private val semesterRepository: SemesterRepository,
     private val gradeRepository: GradeRepository,
-    private val gradeSummaryRepository: GradeSummaryRepository
+    private val preferencesRepository: PreferencesRepository
 ) {
 
-    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
-        return when (preferencesRepository.gradeAverageMode) {
-            "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
-            "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
-            else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+    private val plusModifier = preferencesRepository.gradePlusModifier
+
+    private val minusModifier = preferencesRepository.gradeMinusModifier
+
+    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean = false): Single<List<GradeDetailsWithAverage>> {
+        return semesterRepository.getSemesters(student).flatMap { semesters ->
+            when (preferencesRepository.gradeAverageMode) {
+                "only_one_semester" -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
+                "all_year" -> calculateWholeYearAverage(student, semesters, semesterId, forceRefresh)
+                else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+            }
         }
     }
 
-    private fun getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+    private fun calculateWholeYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
-        val plusModifier = preferencesRepository.gradePlusModifier
-        val minusModifier = preferencesRepository.gradeMinusModifier
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
-            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
-                .flatMap { firstGrades ->
-                    if (selectedSemester == firstSemester) Single.just(firstGrades)
-                    else {
-                        gradeRepository.getGrades(student, firstSemester)
-                            .map { secondGrades -> secondGrades + firstGrades }
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMap { selectedDetails ->
+            val isAnyAverage = selectedDetails.any { it.average != .0 }
+
+            if (selectedSemester != firstSemester) {
+                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
+                    selectedDetails.map { selected ->
+                        val second = secondDetails.singleOrNull { it.subject == selected.subject }
+                        selected.copy(
+                            average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                                (selected.grades + second?.grades.orEmpty()).calcAverage()
+                            } else (selected.average + (second?.average ?: selected.average)) / 2
+                        )
                     }
-                }.map { grades ->
-                    grades.map { it.changeModifier(plusModifier, minusModifier) }
-                        .groupBy { it.subject }
-                        .mapValues { it.value.calcAverage() }
-                })
+                }
+            } else Single.just(selectedDetails)
+        }
     }
 
-    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
-        val selectedSemester = semesters.single { it.semesterId == semesterId }
-        val plusModifier = preferencesRepository.gradePlusModifier
-        val minusModifier = preferencesRepository.gradeMinusModifier
+    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
+        return gradeRepository.getGrades(student, semester, forceRefresh).map { (details, summaries) ->
+            val isAnyAverage = summaries.any { it.average != .0 }
+            val allGrades = details.groupBy { it.subject }
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
-            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
-                .map { grades ->
-                    grades.map { it.changeModifier(plusModifier, minusModifier) }
-                        .groupBy { it.subject }
-                        .mapValues { it.value.calcAverage() }
-                })
-    }
-
-    private fun getAverageFromGradeSummary(selectedSemester: Semester, forceRefresh: Boolean): Maybe<Map<String, Double>> {
-        return gradeSummaryRepository.getGradesSummary(selectedSemester, forceRefresh)
-            .toMaybe()
-            .flatMap {
-                if (it.any { summary -> summary.average != .0 }) {
-                    Maybe.just(it.map { summary -> summary.subject to summary.average }.toMap())
-                } else Maybe.empty()
-            }.filter { !preferencesRepository.gradeAverageForceCalc }
+            summaries.map { summary ->
+                val grades = allGrades[summary.subject].orEmpty()
+                GradeDetailsWithAverage(
+                    subject = summary.subject,
+                    average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                        grades.map {
+                            if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier)
+                            else it
+                        }.calcAverage()
+                    } else summary.average,
+                    points = summary.pointsSum,
+                    summary = summary,
+                    grades = grades
+                )
+            }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
new file mode 100644
index 00000000..3f5d706b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
+
+data class GradeDetailsWithAverage(
+    val subject: String,
+    val average: Double,
+    val points: String,
+    val summary: GradeSummary,
+    val grades: List<Grade>
+)
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 eb5e3669..59b83c4b 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
@@ -1,27 +1,26 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 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
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
 
-class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
@@ -37,23 +36,20 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
         fun newInstance() = GradeFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.grade_title
+    override val titleStringId get() = R.string.grade_title
 
-    override val currentPageIndex: Int
-        get() = gradeViewPager.currentItem
+    override var subtitleString = ""
+
+    override val currentPageIndex get() = binding.gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
@@ -64,8 +60,8 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun initView() {
-        pagerAdapter.apply {
-            containerId = gradeViewPager.id
+        with(pagerAdapter) {
+            containerId = binding.gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
                 GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
@@ -73,13 +69,21 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             ))
         }
 
-        gradeViewPager.run {
+        with(binding.gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
+        }
+
+        with(binding.gradeTabLayout) {
+            setupWithViewPager(binding.gradeViewPager)
+            setElevationCompat(context.dpToPx(4f))
+        }
+
+        with(binding) {
+            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        gradeTabLayout.setupWithViewPager(gradeViewPager)
-        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -92,44 +96,47 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun showContent(show: Boolean) {
-        gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        with(binding) {
+            gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showEmpty(show: Boolean) {
-        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    override fun showErrorView(show: Boolean) {
+        binding.gradeError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showRefresh(show: Boolean) {
-        gradeSwipe.isRefreshing = show
+    override fun setErrorDetails(message: String) {
+        binding.gradeErrorMessage.text = message
     }
 
     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),
+            getString(R.string.grade_semester, 2)
+        )
+
+        AlertDialog.Builder(requireContext())
+            .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
+                presenter.onSemesterSelected(which)
+                dialog.dismiss()
+            }
+            .setTitle(R.string.grade_switch_semester)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
     }
 
-    override fun showSemesterDialog(selectedIndex: Int) {
-        arrayOf(getString(R.string.grade_semester, 1),
-            getString(R.string.grade_semester, 2)).also { array ->
-            context?.let {
-                AlertDialog.Builder(it)
-                    .setSingleChoiceItems(array, selectedIndex) { dialog, which ->
-                        presenter.onSemesterSelected(which)
-                        dialog.dismiss()
-                    }
-                    .setTitle(R.string.grade_switch_semester)
-                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    .show()
-            }
-        }
+    override fun setCurrentSemesterName(semester: Int, schoolYear: Int) {
+        subtitleString = getString(R.string.grade_subtitle, semester, schoolYear, schoolYear + 1)
+        (activity as MainView).setViewSubTitle(subtitleString)
     }
 
     fun onChildRefresh() {
@@ -158,7 +165,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
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 46a923d9..342f356c 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
@@ -10,13 +10,12 @@ 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
 
+@Suppress("unused")
 @Module
 abstract class GradeModule {
 
-    @Module
     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 2ee69480..78885ebd 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
@@ -7,7 +7,9 @@ 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 io.github.wulkanowy.utils.getCurrentOrLast
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
@@ -21,18 +23,20 @@ class GradePresenter @Inject constructor(
     var selectedIndex = 0
         private set
 
+    private var schoolYear = 0
+
     private var semesters = emptyList<Semester>()
 
     private val loadedSemesterId = mutableMapOf<Int, Int>()
 
+    private lateinit var lastError: Throwable
+
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
         selectedIndex = savedIndex ?: 0
-        view.run {
-            initView()
-            enableSwipe(false)
-        }
+        view.initView()
         Timber.i("Grade view was initialized with $selectedIndex index")
+        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -56,6 +60,7 @@ class GradePresenter @Inject constructor(
             selectedIndex = index + 1
             loadedSemesterId.clear()
             view?.let {
+                it.setCurrentSemesterName(index + 1, schoolYear)
                 notifyChildrenSemesterChange()
                 loadChild(it.currentPageIndex)
             }
@@ -71,7 +76,7 @@ class GradePresenter @Inject constructor(
         view?.apply {
             showContent(true)
             showProgress(false)
-            showEmpty(false)
+            showErrorView(false)
             loadedSemesterId[currentPageIndex] = semesterId
         }
     }
@@ -80,41 +85,53 @@ class GradePresenter @Inject constructor(
         if (semesters.isNotEmpty()) loadChild(index)
     }
 
-    fun onSwipeRefresh() {
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
         loadData()
     }
 
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
     private fun loadData() {
         Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .doOnSuccess {
-                it.first { item -> item.isCurrent }.also { current ->
-                    selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
-                    semesters = it.filter { semester -> semester.diaryId == current.diaryId }
-                }
-            }
+            .flatMap { semesterRepository.getSemesters(it, refreshOnNoCurrent = true) }
+            .delay(200, MILLISECONDS)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .doFinally { view?.showRefresh(false) }
             .subscribe({
+                val current = it.getCurrentOrLast()
+                selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
+                schoolYear = current.schoolYear
+                semesters = it.filter { semester -> semester.diaryId == current.diaryId }
+                view?.setCurrentSemesterName(current.semesterName, schoolYear)
+
                 view?.run {
                     Timber.i("Loading grade result: Attempt load index $currentPageIndex")
                     loadChild(currentPageIndex)
-                    enableSwipe(false)
+                    showErrorView(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 {
+            showProgress(false)
+            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 a37e6d67..7b52daa8 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,15 +12,15 @@ interface GradeView : BaseView {
 
     fun showProgress(show: Boolean)
 
-    fun showEmpty(show: Boolean)
+    fun showErrorView(show: Boolean)
 
-    fun showRefresh(show: Boolean)
+    fun setErrorDetails(message: String)
 
     fun showSemesterSwitch(show: Boolean)
 
     fun showSemesterDialog(selectedIndex: Int)
 
-    fun enableSwipe(enable: Boolean)
+    fun setCurrentSemesterName(semester: Int, schoolYear: Int)
 
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
new file mode 100644
index 00000000..7adab547
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
@@ -0,0 +1,176 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.annotation.SuppressLint
+import android.content.res.Resources
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
+import io.github.wulkanowy.databinding.ItemGradeDetailsBinding
+import io.github.wulkanowy.ui.base.BaseExpandableAdapter
+import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<RecyclerView.ViewHolder>() {
+
+    private var headers = mutableListOf<GradeDetailsItem>()
+
+    private var items = mutableListOf<GradeDetailsItem>()
+
+    private var expandedPosition = RecyclerView.NO_POSITION
+
+    private var isExpandable = false
+
+    var onClickListener: (Grade, position: Int) -> Unit = { _, _ -> }
+
+    var colorTheme = ""
+
+    fun setDataItems(data: List<GradeDetailsItem>, isExpanded: Boolean = isExpandable) {
+        headers = data.filter { it.viewType == ViewType.HEADER }.toMutableList()
+        items = if (isExpanded) headers else data.toMutableList()
+        isExpandable = isExpanded
+        expandedPosition = RecyclerView.NO_POSITION
+    }
+
+    fun updateDetailsItem(position: Int, grade: Grade) {
+        items[position] = GradeDetailsItem(grade, ViewType.ITEM)
+        notifyItemChanged(position)
+    }
+
+    fun getHeaderItem(subject: String): GradeDetailsItem {
+        return headers.single { (it.value as GradeDetailsHeader).subject == subject }
+    }
+
+    fun updateHeaderItem(item: GradeDetailsItem) {
+        headers[headers.indexOf(item)] = item
+        items[items.indexOf(item)] = item
+        notifyItemChanged(items.indexOf(item))
+    }
+
+    fun collapseAll() {
+        if (expandedPosition != -1) {
+            refreshList(headers)
+            expandedPosition = RecyclerView.NO_POSITION
+        }
+    }
+
+    @Synchronized
+    private fun refreshList(newItems: List<GradeDetailsItem>) {
+        val diffCallback = GradeDetailsDiffUtil(items, newItems)
+        val diffResult = DiffUtil.calculateDiff(diffCallback)
+        items = newItems.toMutableList()
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(HeaderGradeDetailsBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemGradeDetailsBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(
+                binding = holder.binding,
+                header = items[position].value as GradeDetailsHeader,
+                headerPosition = headers.indexOf(items[position]),
+                adapterPosition = position
+            )
+            is ItemViewHolder -> bindItemViewHolder(
+                binding = holder.binding,
+                grade = items[position].value as Grade,
+                position = position
+            )
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: HeaderGradeDetailsBinding, header: GradeDetailsHeader, headerPosition: Int, adapterPosition: Int) {
+        with(binding) {
+            gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
+            gradeHeaderSubject.apply {
+                text = header.subject
+                maxLines = if (headerPosition == expandedPosition) 2 else 1
+            }
+            gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
+            gradeHeaderPointsSum.text = root.context.getString(R.string.grade_points_sum, header.pointsSum)
+            gradeHeaderPointsSum.visibility = if (!header.pointsSum.isNullOrEmpty()) View.VISIBLE else View.GONE
+            gradeHeaderNumber.text = root.context.resources.getQuantityString(R.plurals.grade_number_item, header.grades.size, header.grades.size)
+            gradeHeaderNote.visibility = if (header.newGrades > 0) View.VISIBLE else View.GONE
+            if (header.newGrades > 0) gradeHeaderNote.text = header.newGrades.toString(10)
+
+            gradeHeaderContainer.isEnabled = isExpandable
+            gradeHeaderContainer.setOnClickListener {
+                expandedPosition = if (expandedPosition == adapterPosition) -1 else adapterPosition
+
+                if (expandedPosition != RecyclerView.NO_POSITION) {
+                    refreshList(headers.toMutableList().apply {
+                        addAll(headerPosition + 1, header.grades)
+                    })
+                    scrollToHeaderWithSubItems(headerPosition, header.grades.size)
+                } else {
+                    refreshList(headers)
+                }
+            }
+        }
+    }
+
+    private fun formatAverage(average: Double?, resources: Resources): String {
+        return if (average == null || average == .0) resources.getString(R.string.grade_no_average)
+        else resources.getString(R.string.grade_average, average)
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindItemViewHolder(binding: ItemGradeDetailsBinding, grade: Grade, position: Int) {
+        with(binding) {
+            gradeItemValue.run {
+                text = grade.entry
+                setBackgroundResource(grade.getBackgroundColor(colorTheme))
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> root.context.getString(R.string.all_no_description)
+            }
+            gradeItemDate.text = grade.date.toFormattedString()
+            gradeItemWeight.text = "${root.context.getString(R.string.grade_weight)}: ${grade.weight}"
+            gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(grade, position) }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemGradeDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class GradeDetailsDiffUtil(private val old: List<GradeDetailsItem>, private val new: List<GradeDetailsItem>) :
+        DiffUtil.Callback() {
+
+        override fun getOldListSize() = old.size
+
+        override fun getNewListSize() = new.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 0abeaeea..698aff3e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -8,13 +8,17 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.DialogGradeBinding
 import io.github.wulkanowy.utils.colorStringId
 import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.getGradeColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_grade.*
 
 class GradeDetailsDialog : DialogFragment() {
 
+    private var binding: DialogGradeBinding by lifecycleAwareVariable()
+
     private lateinit var grade: Grade
 
     private lateinit var colorScheme: String
@@ -43,42 +47,49 @@ class GradeDetailsDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_grade, container, false)
+        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        gradeDialogSubject.text = grade.subject
-        gradeDialogWeightValue.text = grade.weight
-        gradeDialogDateValue.text = grade.date.toFormattedString()
-        gradeDialogColorValue.text = getString(grade.colorStringId)
+        with(binding) {
+            gradeDialogSubject.text = grade.subject
 
-        gradeDialogCommentValue.apply {
-            if (grade.comment.isBlank()) {
-                visibility = GONE
-                gradeDialogComment.visibility = GONE
-            } else text = grade.comment
-        }
-
-        gradeDialogValue.run {
-            text = grade.entry
-            setBackgroundResource(grade.getBackgroundColor(colorScheme))
-        }
-
-        gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
-            getString(R.string.all_no_data)
-        } else grade.teacher
-
-        gradeDialogDescriptionValue.text = grade.run {
-            when {
-                description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
-                description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
-                gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
-                else -> description
+            gradeDialogColorAndWeightValue.run {
+                text = context.getString(R.string.grade_weight_value, grade.weight)
+                setBackgroundResource(grade.getGradeColor())
             }
-        }
 
-        gradeDialogClose.setOnClickListener { dismiss() }
+            gradeDialogDateValue.text = grade.date.toFormattedString()
+            gradeDialogColorValue.text = getString(grade.colorStringId)
+
+            gradeDialogCommentValue.apply {
+                if (grade.comment.isBlank()) {
+                    visibility = GONE
+                    gradeDialogComment.visibility = GONE
+                } else text = grade.comment
+            }
+
+            gradeDialogValue.run {
+                text = grade.entry
+                setBackgroundResource(grade.getBackgroundColor(colorScheme))
+            }
+
+            gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
+                getString(R.string.all_no_data)
+            } else grade.teacher
+
+            gradeDialogDescriptionValue.text = grade.run {
+                when {
+                    description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
+                    description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
+                    gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
+                    else -> description
+                }
+            }
+
+            gradeDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
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 d50fd057..ac50b9f5 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
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -9,83 +8,65 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IExpandable
-import eu.davidea.flexibleadapter.items.IFlexible
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
 
-class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeChildView {
+class GradeDetailsFragment :
+    BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
+    GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeDetailsPresenter
 
     @Inject
-    lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var gradeDetailsAdapter: GradeDetailsAdapter
+
+    private var gradeDetailsMenu: Menu? = null
 
     companion object {
         fun newInstance() = GradeDetailsFragment()
     }
 
-    override val emptyAverageString: String
-        get() = getString(R.string.grade_no_average)
-
-    override val averageString: String
-        get() = getString(R.string.grade_average)
-
-    override val weightString: String
-        get() = getString(R.string.grade_weight)
-
-    override val noDescriptionString: String
-        get() = getString(R.string.all_no_description)
-
     override val isViewEmpty
-        get() = gradeDetailsAdapter.isEmpty
+        get() = gradeDetailsAdapter.itemCount == 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_details, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeDetailsRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeDetailsBinding.bind(view)
+        messageContainer = binding.gradeDetailsRecycler
         presenter.onAttachView(this)
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.action_menu_grade_details, menu)
+        gradeDetailsMenu = menu
+        presenter.updateMarkAsDoneButton()
     }
 
     override fun initView() {
-        gradeDetailsAdapter.run {
-            isAutoCollapseOnExpand = true
-            isAutoScrollOnExpand = true
-            setOnItemClickListener { presenter.onGradeItemSelected(it) }
-        }
+        gradeDetailsAdapter.onClickListener = presenter::onGradeItemSelected
 
-        gradeDetailsRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = gradeDetailsAdapter
-            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
-                .withDefaultDivider(R.layout.header_grade_details)
-            )
+        with(binding) {
+            with(gradeDetailsRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = gradeDetailsAdapter
+            }
+            gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -93,16 +74,23 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
         else false
     }
 
-    override fun updateData(data: List<GradeDetailsHeader>) {
-        gradeDetailsAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String) {
+        with(gradeDetailsAdapter) {
+            colorTheme = gradeColorTheme
+            setDataItems(data, isGradeExpandable)
+            notifyDataSetChanged()
+        }
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        gradeDetailsAdapter.updateItem(item)
+    override fun updateItem(item: Grade, position: Int) {
+        gradeDetailsAdapter.updateDetailsItem(position, item)
     }
 
     override fun clearView() {
-        gradeDetailsAdapter.clear()
+        with(gradeDetailsAdapter) {
+            setDataItems(mutableListOf())
+            notifyDataSetChanged()
+        }
     }
 
     override fun collapseAllItems() {
@@ -110,35 +98,43 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     }
 
     override fun scrollToStart() {
-        gradeDetailsRecycler.scrollToPosition(0)
+        binding.gradeDetailsRecycler.smoothScrollToPosition(0)
     }
 
-    override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {
-        return gradeDetailsAdapter.getExpandableOf(item)
+    override fun getHeaderOfItem(subject: String): GradeDetailsItem {
+        return gradeDetailsAdapter.getHeaderItem(subject)
     }
 
-    override fun getGradeNumberString(number: Int): String {
-        return resources.getQuantityString(R.plurals.grade_number_item, number, number)
+    override fun updateHeaderItem(item: GradeDetailsItem) {
+        gradeDetailsAdapter.updateHeaderItem(item)
     }
 
     override fun showProgress(show: Boolean) {
-        gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
+        binding.gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeDetailsSwipe.isEnabled = enable
+        binding.gradeDetailsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.gradeDetailsError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.gradeDetailsErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeDetailsSwipe.isRefreshing = show
+        binding.gradeDetailsSwipe.isRefreshing = show
     }
 
     override fun showGradeDialog(grade: Grade, colorScheme: String) {
@@ -165,8 +161,12 @@ 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()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
deleted file mode 100644
index e5f6e824..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractExpandableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_grade_details.*
-
-class GradeDetailsHeader(
-    private val subject: String,
-    private val number: String,
-    private val average: String,
-    var newGrades: Int,
-    private val isExpandable: Boolean
-) : AbstractExpandableItem<GradeDetailsHeader.ViewHolder, GradeDetailsItem>() {
-
-    init {
-        isExpanded = !isExpandable
-    }
-
-    override fun getLayoutRes() = R.layout.header_grade_details
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeHeaderSubject.apply {
-                text = subject
-                maxLines = if (isExpanded) 2 else 1
-            }
-            gradeHeaderAverage.text = average
-            gradeHeaderNumber.text = number
-            gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
-            gradeHeaderContainer.isEnabled = isExpandable
-
-            isViewExpandable = isExpandable
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeDetailsHeader
-
-        if (subject != other.subject) return false
-        if (number != other.number) return false
-        if (average != other.average) return false
-        if (isExpandable != other.isExpandable) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = subject.hashCode()
-        result = 31 * result + number.hashCode()
-        result = 31 * result + average.hashCode()
-        result = 31 * result + isExpandable.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
-        ExpandableViewHolder(view, adapter), LayoutContainer {
-
-        var isViewExpandable = true
-
-        init {
-            contentView.setOnClickListener(this)
-        }
-
-        override val containerView: View
-            get() = contentView
-
-        override fun isViewCollapsibleOnClick() = isViewExpandable
-
-        override fun isViewExpandableOnClick() = isViewExpandable
-
-        override fun onClick(view: View?) {
-            super.onClick(view)
-            mAdapter.getItem(adapterPosition)?.let { mAdapter.updateItem(it) }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
deleted file mode 100644
index 39a911e6..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.content.Context
-import android.graphics.Canvas
-import androidx.recyclerview.widget.RecyclerView
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-
-class GradeDetailsHeaderItemDecoration(context: Context) : FlexibleItemDecoration(context) {
-
-    override fun drawVertical(canvas: Canvas, parent: RecyclerView) {
-        canvas.save()
-        val left: Int
-        val right: Int
-        if (parent.clipToPadding) {
-            left = parent.paddingLeft
-            right = parent.width - parent.paddingRight
-            canvas.clipRect(left, parent.paddingTop, right,
-                parent.height - parent.paddingBottom)
-        } else {
-            left = 0
-            right = parent.width
-        }
-
-        val itemCount = parent.childCount
-        for (i in 1 until itemCount) {
-            val child = parent.getChildAt(i)
-            val viewHolder = parent.getChildViewHolder(child)
-            if (shouldDrawDivider(viewHolder)) {
-                parent.getDecoratedBoundsWithMargins(child, mBounds)
-                val bottom = mBounds.top + Math.round(child.translationY)
-                val top = bottom - mDivider.intrinsicHeight
-                mDivider.setBounds(left, top, right, bottom)
-                mDivider.draw(canvas)
-            }
-        }
-        canvas.restore()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 1e47eca5..28197496 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -1,74 +1,19 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-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.Grade
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_grade_details.*
-
-class GradeDetailsItem(
-    val grade: Grade,
-    private val valueBgColor: Int,
-    private val weightString: String,
-    private val noDescriptionString: String
-) : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_grade_details
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeItemValue.run {
-                text = grade.entry
-                setBackgroundResource(valueBgColor)
-            }
-            gradeItemDescription.text = when {
-                grade.description.isNotBlank() -> grade.description
-                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
-                else -> noDescriptionString
-            }
-            gradeItemDate.text = grade.date.toFormattedString()
-            gradeItemWeight.text = "$weightString: ${grade.weight}"
-            gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeDetailsItem
-
-        if (grade != other.grade) return false
-        if (grade.id != other.grade.id) return false
-        if (weightString != other.weightString) return false
-        if (valueBgColor != other.valueBgColor) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = grade.hashCode()
-        result = 31 * result + grade.id.toInt()
-        result = 31 * result + weightString.hashCode()
-        result = 31 * result + valueBgColor
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
+enum class ViewType(val id: Int) {
+    HEADER(1),
+    ITEM(2)
 }
+
+data class GradeDetailsItem(
+    val value: Any,
+    val viewType: ViewType
+)
+
+data class GradeDetailsHeader(
+    val subject: String,
+    val average: Double?,
+    val pointsSum: String?,
+    var newGrades: Int,
+    val grades: List<GradeDetailsItem>
+)
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 29911a54..26c22264 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -9,9 +8,9 @@ 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.grade.GradeAverageProvider
+import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -26,11 +25,16 @@ 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) {
@@ -38,22 +42,20 @@ class GradeDetailsPresenter @Inject constructor(
         loadData(semesterId, forceRefresh)
     }
 
-    fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is GradeDetailsItem) {
-            Timber.i("Select grade item ${item.grade.id}")
-            view?.apply {
-                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
-                if (!item.grade.isRead) {
-                    item.grade.isRead = true
-                    updateItem(item)
-                    getHeaderOfItem(item)?.let { header ->
-                        if (header is GradeDetailsHeader) {
-                            header.newGrades--
-                            updateItem(header)
-                        }
-                    }
-                    updateGrade(item.grade)
+    fun onGradeItemSelected(grade: Grade, position: Int) {
+        Timber.i("Select grade item ${grade.id}")
+        view?.apply {
+            showGradeDialog(grade, preferencesRepository.gradeColorTheme)
+            if (!grade.isRead) {
+                grade.isRead = true
+                updateItem(grade, position)
+                getHeaderOfItem(grade.subject).let { header ->
+                    (header.value as GradeDetailsHeader).newGrades--
+                    updateHeaderItem(header)
                 }
+                newGradesAmount--
+                updateMarkAsDoneButton()
+                updateGrade(grade)
             }
         }
     }
@@ -85,6 +87,18 @@ 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) {
@@ -106,19 +120,14 @@ 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()
-            .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
-            .flatMap { (student, semesters) ->
-                averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
-                    .flatMap { averages ->
-                        gradeRepository.getGrades(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
-                            .map { it.sortedByDescending { grade -> grade.date } }
-                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
-                            .map { createGradeItems(it, averages) }
-                    }
-            }
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -129,53 +138,52 @@ class GradeDetailsPresenter @Inject constructor(
                     notifyParentDataLoaded(semesterId)
                 }
             }
-            .subscribe({
+            .subscribe({ grades ->
                 Timber.i("Loading grade details result: Success")
+                newGradesAmount = grades.sumBy { it.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                updateMarkAsDoneButton()
                 view?.run {
-                    showEmpty(it.isEmpty())
-                    showContent(it.isNotEmpty())
-                    updateData(it)
+                    showEmpty(grades.isEmpty())
+                    showErrorView(false)
+                    showContent(grades.isNotEmpty())
+                    updateData(
+                        data = createGradeItems(grades),
+                        isGradeExpandable = preferencesRepository.isGradeExpandable,
+                        gradeColorTheme = preferencesRepository.gradeColorTheme
+                    )
                 }
-                analytics.logEvent("load_grade_details", "items" to it.size, "force_refresh" to forceRefresh)
+                analytics.logEvent("load_grade_details", "items" to grades.size, "force_refresh" to forceRefresh)
             }) {
                 Timber.i("Loading grade details result: An exception occurred")
-                view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
-    private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
-        val isGradeExpandable = preferencesRepository.isGradeExpandable
-        val gradeColorTheme = preferencesRepository.gradeColorTheme
-
-        val noDescriptionString = view?.noDescriptionString.orEmpty()
-        val weightString = view?.weightString.orEmpty()
-
-        return items.map {
-            GradeDetailsHeader(
-                subject = it.key,
-                average = formatAverage(averages[it.key]),
-                number = view?.getGradeNumberString(it.value.size).orEmpty(),
-                newGrades = it.value.filter { grade -> !grade.isRead }.size,
-                isExpandable = isGradeExpandable
-            ).apply {
-                subItems = it.value.map { item ->
-                    GradeDetailsItem(
-                        grade = item,
-                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
-                        weightString = weightString,
-                        noDescriptionString = noDescriptionString
-                    )
-                }
-            }
+    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 formatAverage(average: Double?): String {
-        return view?.run {
-            if (average == null || average == .0) emptyAverageString
-            else averageString.format(average)
-        }.orEmpty()
+    private fun createGradeItems(items: List<GradeDetailsWithAverage>): List<GradeDetailsItem> {
+        return items.filter { it.grades.isNotEmpty() }.map { (subject, average, points, _, grades) ->
+            val subItems = grades.map {
+                GradeDetailsItem(it, ViewType.ITEM)
+            }
+
+            listOf(GradeDetailsItem(GradeDetailsHeader(
+                subject = subject,
+                average = average,
+                pointsSum = points,
+                newGrades = grades.filter { grade -> !grade.isRead }.size,
+                grades = subItems
+            ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
+        }.flatten()
     }
 
     private fun updateGrade(grade: Grade) {
@@ -183,8 +191,9 @@ class GradeDetailsPresenter @Inject constructor(
         disposable.add(gradeRepository.updateGrade(grade)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ Timber.i("Update grade result: Success") })
-            { error ->
+            .subscribe({
+                Timber.i("Update grade result: Success")
+            }) { error ->
                 Timber.i("Update grade result: An exception occurred")
                 errorHandler.dispatch(error)
             })
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 88b83bda..e71fcc3c 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
@@ -1,8 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IExpandable
-import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -10,19 +7,13 @@ interface GradeDetailsView : BaseView {
 
     val isViewEmpty: Boolean
 
-    val emptyAverageString: String
-
-    val averageString: String
-
-    val weightString: String
-
-    val noDescriptionString: String
-
     fun initView()
 
-    fun updateData(data: List<GradeDetailsHeader>)
+    fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String)
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateItem(item: Grade, position: Int)
+
+    fun updateHeaderItem(item: GradeDetailsItem)
 
     fun clearView()
 
@@ -38,6 +29,10 @@ interface GradeDetailsView : BaseView {
 
     fun showProgress(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun enableSwipe(enable: Boolean)
 
     fun showRefresh(show: Boolean)
@@ -46,7 +41,7 @@ interface GradeDetailsView : BaseView {
 
     fun notifyParentRefresh()
 
-    fun getGradeNumberString(number: Int): String
+    fun enableMarkAsDoneButton(enable: Boolean)
 
-    fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
+    fun getHeaderOfItem(subject: String): GradeDetailsItem
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
new file mode 100644
index 00000000..dbb60910
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
@@ -0,0 +1,208 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+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.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.databinding.ItemGradeStatisticsBarBinding
+import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class GradeStatisticsAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<GradeStatisticsItem>()
+
+    var theme: String = "vulcan"
+
+    var showAllSubjectsOnList: Boolean = false
+
+    private val vulcanGradeColors = listOf(
+        6 to R.color.grade_vulcan_six,
+        5 to R.color.grade_vulcan_five,
+        4 to R.color.grade_vulcan_four,
+        3 to R.color.grade_vulcan_three,
+        2 to R.color.grade_vulcan_two,
+        1 to R.color.grade_vulcan_one
+    )
+
+    private val materialGradeColors = listOf(
+        6 to R.color.grade_material_six,
+        5 to R.color.grade_material_five,
+        4 to R.color.grade_material_four,
+        3 to R.color.grade_material_three,
+        2 to R.color.grade_material_two,
+        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+"
+    )
+
+    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
+
+    override fun getItemViewType(position: Int) = items[position].type.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            ViewType.PARTIAL.id, ViewType.SEMESTER.id -> PieViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
+            ViewType.POINTS.id -> BarViewHolder(ItemGradeStatisticsBarBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is PieViewHolder -> bindPieChart(holder, items[position].partial)
+            is BarViewHolder -> bindBarChart(holder, items[position].points!!)
+        }
+    }
+
+    private fun bindPieChart(holder: PieViewHolder, partials: List<GradeStatistics>) {
+        with(holder.binding.gradeStatisticsPieTitle) {
+            text = partials.firstOrNull()?.subject
+            visibility = if (items.size == 1 || !showAllSubjectsOnList) GONE else VISIBLE
+        }
+
+        val gradeColors = when (theme) {
+            "vulcan" -> vulcanGradeColors
+            else -> materialGradeColors
+        }
+
+        val dataset = PieDataSet(partials.map {
+            PieEntry(it.amount.toFloat(), it.grade.toString())
+        }, "Legenda")
+
+        with(dataset) {
+            valueTextSize = 12f
+            sliceSpace = 1f
+            valueTextColor = Color.WHITE
+            setColors(partials.map {
+                gradeColors.single { color -> color.first == it.grade }.second
+            }.toIntArray(), holder.binding.root.context)
+        }
+
+        with(holder.binding.gradeStatisticsPie) {
+            setTouchEnabled(false)
+            if (partials.size == 1) animateXY(1000, 1000)
+            data = PieData(dataset).apply {
+                setValueFormatter(object : ValueFormatter() {
+                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
+                    }
+                })
+            }
+            with(legend) {
+                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                setCustom(gradeLabels.mapIndexed { i, it ->
+                    LegendEntry().apply {
+                        label = it
+                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
+                        form = Legend.LegendForm.SQUARE
+                    }
+                })
+            }
+
+            minAngleForSlices = 25f
+            description.isEnabled = false
+            centerText = partials.fold(0) { acc, it -> acc + it.amount }
+                .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
+
+            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
+            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
+            invalidate()
+        }
+    }
+
+    private fun bindBarChart(holder: BarViewHolder, points: GradePointsStatistics) {
+        with(holder.binding.gradeStatisticsBarTitle) {
+            text = points.subject
+            visibility = if (items.size == 1) GONE else VISIBLE
+        }
+
+        val dataset = BarDataSet(listOf(
+            BarEntry(1f, points.others.toFloat()),
+            BarEntry(2f, points.student.toFloat())
+        ), "Legenda")
+
+        with(dataset) {
+            valueTextSize = 12f
+            valueTextColor = holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            valueFormatter = object : ValueFormatter() {
+                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
+            }
+            colors = gradePointsColors
+        }
+
+        with(holder.binding.gradeStatisticsBar) {
+            setTouchEnabled(false)
+            if (items.size == 1) animateXY(1000, 1000)
+            data = BarData(dataset).apply {
+                barWidth = 0.5f
+                setFitBars(true)
+            }
+            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
+                }
+            ))
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+
+            description.isEnabled = false
+
+            holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
+                axisLeft.textColor = it
+                axisRight.textColor = it
+            }
+            xAxis.setDrawLabels(false)
+            xAxis.setDrawGridLines(false)
+            with(axisLeft) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
+            with(axisRight) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
+            invalidate()
+        }
+    }
+
+    private class PieViewHolder(val binding: ItemGradeStatisticsPieBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class BarViewHolder(val binding: ItemGradeStatisticsBarBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 a1cea6df..3a8f4007 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,34 +1,30 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import android.graphics.Color.WHITE
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ArrayAdapter
 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.PieData
-import com.github.mikephil.charting.data.PieDataSet
-import com.github.mikephil.charting.data.PieEntry
-import com.github.mikephil.charting.formatter.ValueFormatter
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
-import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
-import kotlinx.android.synthetic.main.fragment_grade_statistics.*
 import javax.inject.Inject
 
-class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.GradeChildView {
+class GradeStatisticsFragment :
+    BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
+    GradeStatisticsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeStatisticsPresenter
 
+    @Inject
+    lateinit var statisticsAdapter: GradeStatisticsAdapter
+
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
     companion object {
@@ -37,142 +33,100 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isViewEmpty
-        get() = gradeStatisticsChart.isEmpty
+    override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
 
-    private lateinit var gradeColors: List<Pair<Int, Int>>
+    override val currentType
+        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+            R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
+            R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
+            else -> ViewType.POINTS
+        }
 
-    private val vulcanGradeColors = listOf(
-        6 to R.color.grade_vulcan_six,
-        5 to R.color.grade_vulcan_five,
-        4 to R.color.grade_vulcan_four,
-        3 to R.color.grade_vulcan_three,
-        2 to R.color.grade_vulcan_two,
-        1 to R.color.grade_vulcan_one
-    )
-
-    private val materialGradeColors = listOf(
-        6 to R.color.grade_material_six,
-        5 to R.color.grade_material_five,
-        4 to R.color.grade_material_four,
-        3 to R.color.grade_material_three,
-        2 to R.color.grade_material_two,
-        1 to R.color.grade_material_one
-    )
-
-    private val gradeLabels = listOf(
-        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
-    )
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_statistics, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeStatisticsChart
-        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeStatisticsBinding.bind(view)
+        messageContainer = binding.gradeStatisticsSwipe
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        gradeStatisticsChart.run {
-            description.isEnabled = false
-            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
-            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
-            animateXY(1000, 1000)
-            minAngleForSlices = 25f
-            legend.apply {
-                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-            }
+        with(binding.gradeStatisticsRecycler) {
+            layoutManager = LinearLayoutManager(requireContext())
+            adapter = statisticsAdapter
         }
 
-        context?.let {
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
-            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
-        }
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        gradeStatisticsSubjects.run {
+        with(binding.gradeStatisticsSubjects) {
             adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        with(binding) {
+            gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+
+            gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
         }
     }
 
-    override fun updateData(items: List<GradeStatistics>, theme: String) {
-        gradeColors = when (theme) {
-            "vulcan" -> vulcanGradeColors
-            else -> materialGradeColors
-        }
-
-        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 {
-                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
-                    }
-                })
-                centerText = items.fold(0) { acc, it -> acc + it.amount }
-                    .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
-            }
-            legend.apply {
-                setCustom(gradeLabels.mapIndexed { i, it ->
-                    LegendEntry().apply {
-                        label = it
-                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
-                        form = Legend.LegendForm.SQUARE
-                    }
-                })
-            }
-            invalidate()
+    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
+        with(statisticsAdapter) {
+            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
+            this.theme = theme
+            this.items = items
+            notifyDataSetChanged()
         }
     }
 
     override fun showSubjects(show: Boolean) {
-        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
-        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun clearView() {
-        gradeStatisticsChart.clear()
+        statisticsAdapter.items = emptyList()
+    }
+
+    override fun resetView() {
+        binding.gradeStatisticsScroll.scrollTo(0, 0)
     }
 
     override fun showContent(show: Boolean) {
-        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
+        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.gradeStatisticsErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeStatisticsSwipe.isEnabled = enable
+        binding.gradeStatisticsSwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeStatisticsSwipe.isRefreshing = show
+        binding.gradeStatisticsSwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -180,7 +134,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     }
 
     override fun onParentReselected() {
-        //
+        presenter.onParentViewReselected()
     }
 
     override fun onParentChangeSemester() {
@@ -197,18 +151,16 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onResume() {
         super.onResume()
-        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
-        }
+        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putBoolean(GradeStatisticsFragment.SAVED_CHART_TYPE, presenter.currentIsSemester)
+        outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.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 55ea611f..5cc733cd 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,19 +30,28 @@ class GradeStatisticsPresenter @Inject constructor(
 
     private var currentSubjectName: String = "Wszystkie"
 
-    var currentIsSemester = false
+    private lateinit var lastError: Throwable
+
+    var currentType: ViewType = ViewType.PARTIAL
         private set
 
-    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
+    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
         super.onAttachView(view)
-        currentIsSemester = isSemester ?: false
+        currentType = type ?: ViewType.PARTIAL
         view.initView()
+        errorHandler.showErrorMessage = ::showErrorViewOnError
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
+        loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
+    }
+
+    fun onParentViewReselected() {
+        view?.run {
+            if (!isViewEmpty) resetView()
+        }
     }
 
     fun onParentViewChangeSemester() {
@@ -51,6 +60,7 @@ class GradeStatisticsPresenter @Inject constructor(
             enableSwipe(false)
             showRefresh(false)
             showContent(false)
+            showErrorView(false)
             showEmpty(false)
             clearView()
         }
@@ -62,64 +72,89 @@ class GradeStatisticsPresenter @Inject constructor(
         view?.notifyParentRefresh()
     }
 
-    fun onSubjectSelected(name: String) {
+    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 {
             showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
+            showErrorView(false)
             clearView()
         }
-        (subjects.singleOrNull { it.name == name }?.name).let {
-            if (it != currentSubjectName) loadData(currentSemesterId, name, currentIsSemester)
+        (subjects.singleOrNull { it.name == name }?.name)?.let {
+            if (it != currentSubjectName) loadDataByType(currentSemesterId, it, currentType)
         }
     }
 
-    fun onTypeChange(isSemester: Boolean) {
-        Timber.i("Select grade stats semester: $isSemester")
+    fun onTypeChange() {
+        val type = view?.currentType ?: ViewType.POINTS
+        Timber.i("Select grade stats semester: $type")
         disposable.clear()
         view?.run {
             showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
+            showErrorView(false)
             clearView()
         }
-        loadData(currentSemesterId, currentSubjectName, isSemester)
+        loadDataByType(currentSemesterId, currentSubjectName, type)
     }
 
     private fun loadSubjects() {
         Timber.i("Loading grade stats subjects started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { subjectRepository.getSubjects(it) }
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
+                }
+            }
             .doOnSuccess { subjects = it }
             .map { ArrayList(it.map { subject -> subject.name }) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
                 Timber.i("Loading grade stats subjects result: Success")
-                view?.run {
-                    updateSubjects(it)
-                    showSubjects(true)
-                }
+                view?.updateSubjects(it)
             }, {
-                Timber.e("Loading grade stats subjects result: An exception occurred")
+                Timber.i("Loading grade stats subjects result: An exception occurred")
                 errorHandler.dispatch(it)
             })
         )
     }
 
-    private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
+    private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
+        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
+        currentType = type
+
         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) }
-            .map { list -> list.sortedByDescending { it.grade } }
-            .map { list -> list.filter { it.amount != 0 } }
+            .flatMap { student ->
+                semesterRepository.getSemesters(student).flatMap { semesters ->
+                    val semester = semesters.first { item -> item.semesterId == semesterId }
+
+                    with(gradeStatisticsRepository) {
+                        when (type) {
+                            ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
+                            ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
+                            ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
+                        }
+                    }
+                }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -135,13 +170,25 @@ class GradeStatisticsPresenter @Inject constructor(
                 view?.run {
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
-                    updateData(it, preferencesRepository.gradeColorTheme)
+                    showErrorView(false)
+                    updateData(it, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
+                    showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
                 }
                 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) }
+                Timber.i("Loading grade stats 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/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
index edb2552e..26b4a119 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,17 +1,19 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeStatisticsView : BaseView {
 
     val isViewEmpty: Boolean
 
+    val currentType: ViewType
+
     fun initView()
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(items: List<GradeStatistics>, theme: String)
+    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
 
     fun showSubjects(show: Boolean)
 
@@ -21,10 +23,16 @@ interface GradeStatisticsView : BaseView {
 
     fun clearView()
 
+    fun resetView()
+
     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
new file mode 100644
index 00000000..02e95b0e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+enum class ViewType(val id: Int) {
+    SEMESTER(1),
+    PARTIAL(2),
+    POINTS(3)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
new file mode 100644
index 00000000..30c4ccc2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
@@ -0,0 +1,85 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
+import io.github.wulkanowy.utils.calcAverage
+import java.util.Locale
+import javax.inject.Inject
+
+class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
+    }
+
+    var items = emptyList<GradeSummary>()
+
+    override fun getItemCount() = items.size + 1
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.HEADER.id
+        else -> ViewType.ITEM.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemGradeSummaryBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position - 1])
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
+        if (items.isEmpty()) return
+
+        with(binding) {
+            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage())
+            gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
+                .filter { value -> value.average != 0.0 }
+                .map { values -> values.average }
+                .reversed() // fix average precision
+                .average()
+            )
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummary) {
+        with(binding) {
+            gradeSummaryItemTitle.text = item.subject
+            gradeSummaryItemPoints.text = item.pointsSum
+            gradeSummaryItemAverage.text = formatAverage(item.average, "")
+            gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim()
+            gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim()
+
+            gradeSummaryItemPointsContainer.visibility = if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
+        }
+    }
+
+    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
+        return if (average == 0.0) defaultValue
+        else String.format(Locale.FRANCE, "%.2f", average)
+    }
+
+    private class HeaderViewHolder(val binding: ScrollableHeaderGradeSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemGradeSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 7699a641..d169f7c6 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
@@ -1,36 +1,35 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 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 eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
-import kotlinx.android.synthetic.main.fragment_grade_summary.*
 import javax.inject.Inject
 
-class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeChildView {
+class GradeSummaryFragment :
+    BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
+    GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeSummaryPresenter
 
     @Inject
-    lateinit var gradeSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var gradeSummaryAdapter: GradeSummaryAdapter
 
     companion object {
         fun newInstance() = GradeSummaryFragment()
     }
 
     override val isViewEmpty
-        get() = gradeSummaryAdapter.isEmpty
+        get() = gradeSummaryAdapter.items.isEmpty()
 
     override val predictedString
         get() = getString(R.string.grade_summary_predicted_grade)
@@ -38,60 +37,69 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
     override val finalString
         get() = getString(R.string.grade_summary_final_grade)
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_summary, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeSummaryRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeSummaryBinding.bind(view)
+        messageContainer = binding.gradeSummaryRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        gradeSummaryAdapter.setDisplayHeadersAtStartUp(true)
-
-        gradeSummaryRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.gradeSummaryRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = gradeSummaryAdapter
         }
-        gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        with(binding) {
+            gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
-    override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
-        gradeSummaryAdapter.apply {
-            updateDataSet(data, true)
-            removeAllScrollableHeaders()
-            addScrollableHeader(header)
+    override fun updateData(data: List<GradeSummary>) {
+        with(gradeSummaryAdapter) {
+            items = data
+            notifyDataSetChanged()
         }
     }
 
     override fun clearView() {
-        gradeSummaryAdapter.clear()
+        with(gradeSummaryAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        gradeSummaryRecycler.scrollToPosition(0)
+        binding.gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.gradeSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
+        binding.gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeSummarySwipe.isEnabled = enable
+        binding.gradeSummarySwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeSummarySwipe.isRefreshing = show
+        binding.gradeSummarySwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -115,7 +123,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
deleted file mode 100644
index 95c32d17..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-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.GradeSummary
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_grade_summary.*
-
-class GradeSummaryItem(
-    val summary: GradeSummary,
-    private val average: String
-) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_grade_summary
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeSummaryItemTitle.text = summary.subject
-            gradeSummaryItemPoints.text = summary.pointsSum
-            gradeSummaryItemAverage.text = average
-            gradeSummaryItemPredicted.text = "${summary.predictedGrade} ${summary.proposedPoints}".trim()
-            gradeSummaryItemFinal.text = "${summary.finalGrade} ${summary.finalPoints}".trim()
-
-            gradeSummaryItemPointsContainer.visibility = if (summary.pointsSum.isBlank()) GONE else VISIBLE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryItem
-
-        if (average != other.average) return false
-        if (summary != other.summary) return false
-        if (summary.id != other.summary.id) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = summary.hashCode()
-        result = 31 * result + summary.id.hashCode()
-        result = 31 * result + average.hashCode()
-        return result
-    }
-
-    class ViewHolder(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/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 3f8fd0ed..9b837213 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
@@ -1,47 +1,37 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-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.ui.modules.grade.GradeAverageProvider
+import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calcAverage
 import timber.log.Timber
-import java.lang.String.format
-import java.util.Locale.FRANCE
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val gradeSummaryRepository: GradeSummaryRepository,
-    private val semesterRepository: SemesterRepository,
     private val averageProvider: GradeAverageProvider,
     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) {
         Timber.i("Loading grade summary data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
-            .flatMap { (student, semesters) ->
-                gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
-                    .map { it.sortedBy { subject -> subject.subject } }
-                    .flatMap { gradesSummary ->
-                        averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
-                            .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
-                    }
-            }
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .map { createGradeSummaryItems(it) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -51,26 +41,49 @@ class GradeSummaryPresenter @Inject constructor(
                     enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
-            }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
+            }.subscribe({
                 Timber.i("Loading grade summary result: Success")
                 view?.run {
-                    showEmpty(gradeSummaryItems.isEmpty())
-                    showContent(gradeSummaryItems.isNotEmpty())
-                    updateData(gradeSummaryItems, gradeSummaryHeader)
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it)
                 }
-                analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
+                analytics.logEvent("load_grade_summary", "items" to it.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()
@@ -89,32 +102,15 @@ class GradeSummaryPresenter @Inject constructor(
         disposable.clear()
     }
 
-    private fun createGradeSummaryItemsAndHeader(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
-        : Pair<List<GradeSummaryItem>, GradeSummaryScrollableHeader> {
-        return averages.filterValues { value -> value != 0.0 }
-            .let { filteredAverages ->
-                gradesSummary.filter { !checkEmpty(it, filteredAverages) }
-                    .map {
-                        GradeSummaryItem(
-                            summary = it,
-                            average = formatAverage(filteredAverages.getOrElse(it.subject) { 0.0 }, "")
-                        )
-                    }.let {
-                        it to GradeSummaryScrollableHeader(
-                            formatAverage(gradesSummary.calcAverage()),
-                            formatAverage(filteredAverages.values.average()))
-                    }
-            }
-    }
-
-    private fun checkEmpty(gradeSummary: GradeSummary, averages: Map<String, Double>): Boolean {
-        return gradeSummary.run {
-            finalGrade.isBlank() && predictedGrade.isBlank() && averages[subject] == null
+    private fun createGradeSummaryItems(items: List<GradeDetailsWithAverage>): List<GradeSummary> {
+        return items.map {
+            it.summary.copy(average = it.average)
         }
     }
 
-    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
-        return if (average == 0.0) defaultValue
-        else format(FRANCE, "%.2f", average)
+    private fun checkEmpty(gradeSummary: GradeSummary, averages: List<Triple<String, Double, String>>): Boolean {
+        return gradeSummary.run {
+            finalGrade.isBlank() && predictedGrade.isBlank() && averages.singleOrNull { it.first == subject } == null
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
deleted file mode 100644
index f1c535c7..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.view.View
-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 kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.scrollable_header_grade_summary.*
-
-class GradeSummaryScrollableHeader(private val finalAverage: String, private val calculatedAverage: String)
-    : AbstractFlexibleItem<GradeSummaryScrollableHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.scrollable_header_grade_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder?.apply {
-            gradeSummaryScrollableHeaderFinal.text = finalAverage
-            gradeSummaryScrollableHeaderCalculated.text = calculatedAverage
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryScrollableHeader
-
-        if (calculatedAverage != other.calculatedAverage) return false
-        if (finalAverage != other.finalAverage) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = calculatedAverage.hashCode()
-        result = 31 * result + finalAverage.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
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 9e9c6e58..974d9141 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeSummaryView : BaseView {
@@ -12,7 +13,7 @@ interface GradeSummaryView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader)
+    fun updateData(data: List<GradeSummary>)
 
     fun resetView()
 
@@ -26,6 +27,10 @@ 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/HomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
new file mode 100644
index 00000000..a87ad18e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
@@ -0,0 +1,67 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.HeaderHomeworkBinding
+import io.github.wulkanowy.databinding.ItemHomeworkBinding
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+
+class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<HomeworkItem<*>>()
+
+    var onClickListener: (Homework) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            HomeworkItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderHomeworkBinding.inflate(inflater, parent, false))
+            HomeworkItem.ViewType.ITEM.id -> ItemViewHolder(ItemHomeworkBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Homework)
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun bindHeaderViewHolder(binding: HeaderHomeworkBinding, date: LocalDate) {
+        with(binding) {
+            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemHomeworkBinding, homework: Homework) {
+        with(binding) {
+            homeworkItemSubject.text = homework.subject
+            homeworkItemTeacher.text = homework.teacher
+            homeworkItemContent.text = homework.content
+            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
+            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(homework) }
+        }
+    }
+
+    class HeaderViewHolder(val binding: HeaderHomeworkBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class ItemViewHolder(val binding: ItemHomeworkBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
deleted file mode 100644
index 42784188..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_homework.*
-
-class HomeworkDialog : DialogFragment() {
-
-    private lateinit var homework: Homework
-
-    companion object {
-        private const val ARGUMENT_KEY = "Item"
-
-        fun newInstance(homework: Homework): HomeworkDialog {
-            return HomeworkDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            homework = getSerializable(HomeworkDialog.ARGUMENT_KEY) as Homework
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_homework, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        homeworkDialogDate.text = homework.date.toFormattedString()
-        homeworkDialogEntryDate.text = homework.entryDate.toFormattedString()
-        homeworkDialogSubject.text = homework.subject
-        homeworkDialogTeacher.text = homework.teacher
-        homeworkDialogContent.text = homework.content
-        homeworkDialogClose.setOnClickListener { dismiss() }
-    }
-}
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 01fdc909..f3052957 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
@@ -1,29 +1,29 @@
 package io.github.wulkanowy.ui.modules.homework
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-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 android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.FragmentHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_homework.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.dpToPx
 import javax.inject.Inject
 
-class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
+class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
+    HomeworkView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: HomeworkPresenter
 
     @Inject
-    lateinit var homeworkAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var homeworkAdapter: HomeworkAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -31,86 +31,103 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         fun newInstance() = HomeworkFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.homework_title
+    override val titleStringId get() = R.string.homework_title
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_homework, container, false)
-    }
+    override val isViewEmpty get() = homeworkAdapter.items.isEmpty()
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = homeworkRecycler
-        presenter.onAttachView(this, savedInstanceState?.getLong(HomeworkFragment.SAVED_DATE_KEY))
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentHomeworkBinding.bind(view)
+        messageContainer = binding.homeworkRecycler
+        presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        homeworkAdapter.run {
-            setOnItemClickListener { presenter.onHomeworkItemSelected(it) }
+        homeworkAdapter.onClickListener = presenter::onHomeworkItemSelected
+
+        with(binding.homeworkRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = homeworkAdapter
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        homeworkRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = homeworkAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+        with(binding) {
+            homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
+            homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+            homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+
+            homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
         }
-        homeworkSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        homeworkNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
-    override fun updateData(data: List<HomeworkItem>) {
-        homeworkAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<HomeworkItem<*>>) {
+        with(homeworkAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    fun onReloadList() {
+        presenter.reloadData()
     }
 
     override fun clearData() {
-        homeworkAdapter.clear()
+        with(homeworkAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationWeek(date: String) {
-        homeworkNavDate.text = date
+        binding.homeworkNavDate.text = date
     }
 
-    override fun isViewEmpty() = homeworkAdapter.isEmpty
-
     override fun hideRefresh() {
-        homeworkSwipe.isRefreshing = false
+        binding.homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        homeworkEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        binding.homeworkEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.homeworkError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.homeworkErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        homeworkProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.homeworkProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        homeworkSwipe.isEnabled = enable
+        binding.homeworkSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        homeworkRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        binding.homeworkRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        homeworkPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        homeworkNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        (activity as? MainActivity)?.showDialogFragment(HomeworkDialog.newInstance(homework))
+        (activity as? MainActivity)?.showDialogFragment(HomeworkDetailsDialog.newInstance(homework))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(HomeworkFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
deleted file mode 100644
index 49023788..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_homework.*
-import org.threeten.bp.LocalDate
-
-class HomeworkHeader(private val date: LocalDate) : AbstractHeaderItem<HomeworkHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_homework
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<*>>?, holder: HomeworkHeader.ViewHolder,
-        position: Int, payloads: MutableList<Any>?
-    ) {
-        holder.run {
-            homeworkHeaderDay.text = date.weekDayName.capitalize()
-            homeworkHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as HomeworkHeader
-
-        if (date != other.date) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return date.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
index 2de9233f..7e003958 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
@@ -1,50 +1,9 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_homework.*
+data class HomeworkItem<out T>(val value: T, val viewType: ViewType) {
 
-class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
-    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
-
-    override fun getLayoutRes() = R.layout.item_homework
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            homeworkItemSubject.text = homework.subject
-            homeworkItemTeacher.text = homework.teacher
-            homeworkItemContent.text = homework.content
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as HomeworkItem
-
-        if (homework != other.homework) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = homework.hashCode()
-        result = 31 * result + homework.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
     }
 }
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 682e87d4..d39efde1 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -10,13 +9,14 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class HomeworkPresenter @Inject constructor(
@@ -28,14 +28,20 @@ class HomeworkPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
+
     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")
-        loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -54,11 +60,39 @@ class HomeworkPresenter @Inject constructor(
         loadData(currentDate, true)
     }
 
-    fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is HomeworkItem) {
-            Timber.i("Select homework item ${item.homework.id}")
-            view?.showTimetableDialog(item.homework)
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
         }
+        loadData(currentDate, true)
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    fun onHomeworkItemSelected(homework: Homework) {
+        Timber.i("Select homework item ${homework.id}")
+        view?.showTimetableDialog(homework)
+    }
+
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
+    fun reloadData() {
+        loadData(currentDate, false)
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
@@ -67,10 +101,11 @@ class HomeworkPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .delay(200, TimeUnit.MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
-                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
                 .map { createHomeworkItem(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -86,25 +121,37 @@ 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 createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
-        return items.flatMap {
-            HomeworkHeader(it.key).let { header ->
-                it.value.reversed().map { item -> HomeworkItem(header, item) }
-            }
+    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: List<Homework>): List<HomeworkItem<*>> {
+        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
+            listOf(HomeworkItem(date, HomeworkItem.ViewType.HEADER)) + exams.reversed().map { exam ->
+                HomeworkItem(exam, HomeworkItem.ViewType.ITEM)
+            }
+        }.flatten()
+    }
+
     private fun reloadView() {
         Timber.i("Reload homework view with the date ${currentDate.toFormattedString()}")
         view?.apply {
@@ -112,9 +159,16 @@ class HomeworkPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
-            showNextButton(!currentDate.plusDays(7).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
+            showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
                 currentDate.friday.toFormattedString("dd.MM"))
         }
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 977a5b73..2a678cd4 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,20 +5,24 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface HomeworkView : BaseView {
 
+    val isViewEmpty: Boolean
+
     fun initView()
 
-    fun updateData(data: List<HomeworkItem>)
+    fun updateData(data: List<HomeworkItem<*>>)
 
     fun clearData()
 
     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/homework/details/HomeworkDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
new file mode 100644
index 00000000..5d6ee162
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
@@ -0,0 +1,102 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentBinding
+import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentsHeaderBinding
+import io.github.wulkanowy.databinding.ItemHomeworkDialogDetailsBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class HomeworkDetailsAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        DETAILS(1),
+        ATTACHMENTS_HEADER(2),
+        ATTACHMENT(3)
+    }
+
+    private var attachments = emptyList<Pair<String, String>>()
+
+    var homework: Homework? = null
+        set(value) {
+            field = value
+            attachments = value?.attachments.orEmpty()
+        }
+
+    var onAttachmentClickListener: (url: String) -> Unit = {}
+
+    var onFullScreenClickListener = {}
+
+    var onFullScreenExitClickListener = {}
+
+    override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.DETAILS.id
+        1 -> ViewType.ATTACHMENTS_HEADER.id
+        else -> ViewType.ATTACHMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(ItemHomeworkDialogAttachmentsHeaderBinding.inflate(inflater, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemHomeworkDialogAttachmentBinding.inflate(inflater, parent, false))
+            else -> DetailsViewHolder(ItemHomeworkDialogDetailsBinding.inflate(inflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is DetailsViewHolder -> bindDetailsViewHolder(holder)
+            is AttachmentViewHolder -> bindAttachmentViewHolder(holder, position - 2)
+        }
+    }
+
+    private fun bindDetailsViewHolder(holder: DetailsViewHolder) {
+        with(holder.binding) {
+            homeworkDialogDate.text = homework?.date?.toFormattedString()
+            homeworkDialogEntryDate.text = homework?.entryDate?.toFormattedString()
+            homeworkDialogSubject.text = homework?.subject
+            homeworkDialogTeacher.text = homework?.teacher
+            homeworkDialogContent.text = homework?.content
+            homeworkDialogFullScreen.setOnClickListener {
+                homeworkDialogFullScreen.visibility = GONE
+                homeworkDialogFullScreenExit.visibility = VISIBLE
+                onFullScreenClickListener()
+            }
+            homeworkDialogFullScreenExit.setOnClickListener {
+                homeworkDialogFullScreen.visibility = VISIBLE
+                homeworkDialogFullScreenExit.visibility = GONE
+                onFullScreenExitClickListener()
+            }
+        }
+    }
+
+    private fun bindAttachmentViewHolder(holder: AttachmentViewHolder, position: Int) {
+        val item = attachments[position]
+
+        with(holder.binding) {
+            homeworkDialogAttachment.text = item.second
+            root.setOnClickListener {
+                onAttachmentClickListener(item.first)
+            }
+        }
+    }
+
+    class DetailsViewHolder(val binding: ItemHomeworkDialogDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentsHeaderViewHolder(val binding: ItemHomeworkDialogAttachmentsHeaderBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentViewHolder(val binding: ItemHomeworkDialogAttachmentBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
new file mode 100644
index 00000000..7b3b9821
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -0,0 +1,84 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.DialogHomeworkBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.utils.openInternetBrowser
+import javax.inject.Inject
+
+class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
+
+    @Inject
+    lateinit var presenter: HomeworkDetailsPresenter
+
+    @Inject
+    lateinit var detailsAdapter: HomeworkDetailsAdapter
+
+    private lateinit var homework: Homework
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(homework: Homework): HomeworkDetailsDialog {
+            return HomeworkDetailsDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            homework = getSerializable(ARGUMENT_KEY) as Homework
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun initView() {
+        with(binding) {
+            homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+            homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
+            homeworkDialogClose.setOnClickListener { dismiss() }
+        }
+
+        with(binding.homeworkDialogRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = detailsAdapter.apply {
+                onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
+                onFullScreenClickListener = { dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT) }
+                onFullScreenExitClickListener = { dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT) }
+                homework = this@HomeworkDetailsDialog.homework
+            }
+        }
+    }
+
+    override fun updateMarkAsDoneLabel(isDone: Boolean) {
+        (parentFragment as? HomeworkFragment)?.onReloadList()
+        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
new file mode 100644
index 00000000..04a97b8c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+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 HomeworkDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val homeworkRepository: HomeworkRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: HomeworkDetailsView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("Homework details view was initialized")
+    }
+
+    fun toggleDone(homework: Homework) {
+        Timber.i("Homework details update start")
+        disposable.add(homeworkRepository.toggleDone(homework)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Homework details update: Success")
+                view?.run {
+                    updateMarkAsDoneLabel(homework.isDone)
+                }
+                analytics.logEvent("homework_mark_as_done")
+            }) {
+                Timber.i("Homework details update result: An exception occurred")
+                errorHandler.dispatch(it)
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
new file mode 100644
index 00000000..697f2233
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface HomeworkDetailsView : BaseView {
+
+    fun initView()
+
+    fun updateMarkAsDoneLabel(isDone: 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 5e707b8a..ffb36fe6 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,18 +3,20 @@ package io.github.wulkanowy.ui.modules.login
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import io.github.wulkanowy.R
+import android.view.MenuItem
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
 
-class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
+class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
@@ -23,43 +25,56 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
     lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
+
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
 
-    override val currentViewIndex: Int
-        get() = loginViewpager.currentItem
+    override val currentViewIndex get() = binding.loginViewpager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-        messageContainer = loginContainer
+        setContentView(ActivityLoginBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.loginToolbar)
+        messageContainer = binding.loginContainer
 
         presenter.onAttachView(this)
     }
 
-    override fun initAdapter() {
-        loginAdapter.apply {
-            containerId = loginViewpager.id
+    override fun initView() {
+        with(requireNotNull(supportActionBar)) {
+            setDisplayHomeAsUpEnabled(true)
+            setDisplayShowTitleEnabled(false)
+        }
+
+        with(loginAdapter) {
+            containerId = binding.loginViewpager.id
             addFragments(listOf(
                 LoginFormFragment.newInstance(),
                 LoginSymbolFragment.newInstance(),
-                LoginStudentSelectFragment.newInstance()
+                LoginStudentSelectFragment.newInstance(),
+                LoginAdvancedFragment.newInstance(),
+                LoginRecoverFragment.newInstance()
             ))
         }
 
-        loginViewpager.run {
+        with(binding.loginViewpager) {
             offscreenPageLimit = 2
             adapter = loginAdapter
-            setOnSelectPageListener { presenter.onViewSelected(it) }
+            setOnSelectPageListener(presenter::onViewSelected)
         }
     }
 
+    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)
+        binding.loginViewpager.setCurrentItem(index, false)
     }
 
     override fun showActionBar(show: Boolean) {
-        supportActionBar?.apply { if (show) show() else hide() }
+        supportActionBar?.run { if (show) show() else hide() }
     }
 
     override fun onBackPressed() {
@@ -81,4 +96,12 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
     fun onSymbolFragmentAccountLogged(students: List<Student>) {
         presenter.onSymbolViewAccountLogged(students)
     }
+
+    fun onAdvancedLoginClick() {
+        presenter.onAdvancedLoginClick()
+    }
+
+    fun onRecoverClick() {
+        presenter.onRecoverClick()
+    }
 }
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 a70ff2d6..5ed181bf 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
@@ -2,25 +2,39 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
-import com.readystatesoftware.chuck.api.ChuckCollector
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.R
-import io.github.wulkanowy.api.login.BadCredentialsException
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
+import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
+import io.github.wulkanowy.sdk.mobile.exception.InvalidSymbolException
+import io.github.wulkanowy.sdk.mobile.exception.InvalidTokenException
+import io.github.wulkanowy.sdk.mobile.exception.TokenDeadException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
 class LoginErrorHandler @Inject constructor(
     resources: Resources,
-    chuckCollector: ChuckCollector
-) : ErrorHandler(resources, chuckCollector) {
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
+    var onInvalidToken: (String) -> Unit = {}
+
+    var onInvalidPin: (String) -> Unit = {}
+
+    var onInvalidSymbol: (String) -> Unit = {}
+
     var onStudentDuplicate: (String) -> Unit = {}
 
     override fun proceed(error: Throwable) {
         when (error) {
             is BadCredentialsException -> onBadCredentials()
             is SQLiteConstraintException -> onStudentDuplicate(resources.getString(R.string.login_duplicate_student))
+            is TokenDeadException -> onInvalidToken(resources.getString(R.string.login_expired_token))
+            is InvalidTokenException -> onInvalidToken(resources.getString(R.string.login_invalid_token))
+            is InvalidPinException -> onInvalidPin(resources.getString(R.string.login_invalid_pin))
+            is InvalidSymbolException -> onInvalidSymbol(resources.getString(R.string.login_invalid_symbol))
             else -> super.proceed(error)
         }
     }
@@ -28,5 +42,9 @@ class LoginErrorHandler @Inject constructor(
     override fun clear() {
         super.clear()
         onBadCredentials = {}
+        onStudentDuplicate = {}
+        onInvalidToken = {}
+        onInvalidPin = {}
+        onInvalidSymbol = {}
     }
 }
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 7c3e7bac..26a243dc 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
@@ -6,17 +6,18 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
+@Suppress("unused")
 @Module
 internal abstract class LoginModule {
 
-    @Module
     companion object {
 
-        @JvmStatic
         @PerActivity
         @Provides
         fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
@@ -26,6 +27,10 @@ internal abstract class LoginModule {
     @ContributesAndroidInjector
     abstract fun bindLoginFormFragment(): LoginFormFragment
 
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginAdvancedFragment(): LoginAdvancedFragment
+
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
@@ -33,4 +38,8 @@ internal abstract class LoginModule {
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginRecoverFragment(): LoginRecoverFragment
 }
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 87827152..16342de4 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)
-        view.run {
-            initAdapter()
+        with(view) {
+            initView()
             showActionBar(false)
         }
         Timber.i("Login view was initialized")
@@ -45,11 +45,19 @@ class LoginPresenter @Inject constructor(
         }
     }
 
+    fun onAdvancedLoginClick() {
+        view?.switchView(3)
+    }
+
+    fun onRecoverClick() {
+        view?.switchView(4)
+    }
+
     fun onViewSelected(index: Int) {
         view?.apply {
             when (index) {
-                0, 1 -> showActionBar(false)
-                2 -> showActionBar(true)
+                0 -> showActionBar(false)
+                1, 2, 3, 4 -> showActionBar(true)
             }
         }
     }
@@ -58,7 +66,7 @@ class LoginPresenter @Inject constructor(
         Timber.i("Back pressed in login view")
         view?.apply {
             when (currentViewIndex) {
-                1, 2 -> switchView(0)
+                1, 2, 3, 4 -> switchView(0)
                 else -> default()
             }
         }
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 58d356bb..9c98a1d8 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 initAdapter()
+    fun initView()
 
     fun switchView(index: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
new file mode 100644
index 00000000..3b6a985b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -0,0 +1,313 @@
+package io.github.wulkanowy.ui.modules.login.advanced
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.ArrayAdapter
+import androidx.core.widget.doOnTextChanged
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.setOnEditorDoneSignIn
+import io.github.wulkanowy.utils.showSoftInput
+import javax.inject.Inject
+
+class LoginAdvancedFragment :
+    BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
+    LoginAdvancedView {
+
+    @Inject
+    lateinit var presenter: LoginAdvancedPresenter
+
+    companion object {
+        fun newInstance() = LoginAdvancedFragment()
+    }
+
+    override val formLoginType: String
+        get() = when (binding.loginTypeSwitch.checkedRadioButtonId) {
+            R.id.loginTypeApi -> "API"
+            R.id.loginTypeScrapper -> "SCRAPPER"
+            else -> "HYBRID"
+        }
+
+    override val formUsernameValue: String
+        get() = binding.loginFormUsername.text.toString().trim()
+
+    override val formPassValue: String
+        get() = binding.loginFormPass.text.toString().trim()
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
+
+    private lateinit var hostSymbols: Array<String>
+
+    override val formHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+
+    override val formPinValue: String
+        get() = binding.loginFormPin.text.toString().trim()
+
+    override val formSymbolValue: String
+        get() = binding.loginFormSymbol.text.toString().trim()
+
+    override val formTokenValue: String
+        get() = binding.loginFormToken.text.toString().trim()
+
+    override val nicknameLabel: String
+        get() = getString(R.string.login_nickname_hint)
+
+    override val emailLabel: String
+        get() = getString(R.string.login_email_hint)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginAdvancedBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        hostKeys = resources.getStringArray(R.array.hosts_keys)
+        hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
+
+        with(binding) {
+            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+            loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
+            loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+            loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
+            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+
+            loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+                presenter.onLoginModeSelected(when (checkedId) {
+                    R.id.loginTypeApi -> Sdk.Mode.API
+                    R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
+                    else -> Sdk.Mode.HYBRID
+                })
+            }
+
+            loginFormPin.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+
+            loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        }
+
+        with(binding.loginFormHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
+        }
+    }
+
+    override fun showMobileApiWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_mobile_api)
+    }
+
+    override fun showScraperWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_scraper)
+    }
+
+    override fun showHybridWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_hybrid)
+    }
+
+    override fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String) {
+        with(binding) {
+            loginFormUsername.setText(username)
+            loginFormPass.setText(pass)
+            loginFormToken.setText(token)
+            loginFormSymbol.setText(symbol)
+            loginFormPin.setText(pin)
+        }
+    }
+
+    override fun setUsernameLabel(label: String) {
+        binding.loginFormUsernameLayout.hint = label
+    }
+
+    override fun setSymbol(symbol: String) {
+        binding.loginFormSymbol.setText(symbol)
+    }
+
+    override fun setErrorUsernameRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setErrorLoginRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
+    override fun setErrorPassRequired(focus: Boolean) {
+        with(binding.loginFormPassLayout) {
+            if (focus) requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setErrorPassInvalid(focus: Boolean) {
+        with(binding.loginFormPassLayout) {
+            if (focus) requestFocus()
+            error = getString(R.string.login_invalid_password)
+        }
+    }
+
+    override fun setErrorPassIncorrect() {
+        with(binding.loginFormPassLayout) {
+            requestFocus()
+            error = getString(R.string.login_incorrect_password)
+        }
+    }
+
+    override fun setErrorPinRequired() {
+        with(binding.loginFormPinLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setErrorPinInvalid(message: String) {
+        with(binding.loginFormPinLayout) {
+            requestFocus()
+            error = message
+        }
+    }
+
+    override fun setErrorSymbolRequired() {
+        with(binding.loginFormSymbolLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setErrorSymbolInvalid(message: String) {
+        with(binding.loginFormSymbolLayout) {
+            requestFocus()
+            error = message
+        }
+    }
+
+    override fun setErrorTokenRequired() {
+        with(binding.loginFormTokenLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setErrorTokenInvalid(message: String) {
+        with(binding.loginFormTokenLayout) {
+            requestFocus()
+            error = message
+        }
+    }
+
+    override fun clearUsernameError() {
+        binding.loginFormUsernameLayout.error = null
+    }
+
+    override fun clearPassError() {
+        binding.loginFormPassLayout.error = null
+    }
+
+    override fun clearPinKeyError() {
+        binding.loginFormPinLayout.error = null
+    }
+
+    override fun clearSymbolError() {
+        binding.loginFormSymbolLayout.error = null
+    }
+
+    override fun clearTokenError() {
+        binding.loginFormTokenLayout.error = null
+    }
+
+    override fun showOnlyHybridModeInputs() {
+        with(binding) {
+            loginFormUsernameLayout.visibility = VISIBLE
+            loginFormPassLayout.visibility = VISIBLE
+            loginFormHostLayout.visibility = VISIBLE
+            loginFormPinLayout.visibility = GONE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = GONE
+        }
+    }
+
+    override fun showOnlyScrapperModeInputs() {
+        with(binding) {
+            loginFormUsernameLayout.visibility = VISIBLE
+            loginFormPassLayout.visibility = VISIBLE
+            loginFormHostLayout.visibility = VISIBLE
+            loginFormPinLayout.visibility = GONE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = GONE
+        }
+    }
+
+    override fun showOnlyMobileApiModeInputs() {
+        with(binding) {
+            loginFormUsernameLayout.visibility = GONE
+            loginFormPassLayout.visibility = GONE
+            loginFormHostLayout.visibility = GONE
+            loginFormPinLayout.visibility = VISIBLE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = VISIBLE
+        }
+    }
+
+    override fun showSoftKeyboard() {
+        activity?.showSoftInput()
+    }
+
+    override fun hideSoftKeyboard() {
+        activity?.hideSoftInput()
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
+            binding.loginFormUsername.text.toString(),
+            binding.loginFormPass.text.toString(),
+            resources.getStringArray(R.array.hosts_values)[1]
+        ))
+    }
+
+    override fun onResume() {
+        super.onResume()
+        presenter.updateUsernameLabel()
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
new file mode 100644
index 00000000..3a0d4a0d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -0,0 +1,231 @@
+package io.github.wulkanowy.ui.modules.login.advanced
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.ifNullOrBlank
+import io.reactivex.Single
+import timber.log.Timber
+import javax.inject.Inject
+
+class LoginAdvancedPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    studentRepository: StudentRepository,
+    private val loginErrorHandler: LoginErrorHandler,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: LoginAdvancedView) {
+        super.onAttachView(view)
+        view.run {
+            initView()
+            showOnlyScrapperModeInputs()
+            with(loginErrorHandler) {
+                onBadCredentials = ::onBadCredentials
+                onInvalidToken = ::onInvalidToken
+                onInvalidSymbol = ::onInvalidSymbol
+                onInvalidPin = ::onInvalidPin
+            }
+        }
+    }
+
+    private fun onBadCredentials() {
+        view?.run {
+            setErrorPassIncorrect()
+            showSoftKeyboard()
+            Timber.i("Entered wrong username or password")
+        }
+    }
+
+    private fun onInvalidToken(message: String) {
+        view?.run {
+            setErrorTokenInvalid(message)
+            showSoftKeyboard()
+            Timber.i("Entered invalid token")
+        }
+    }
+
+    private fun onInvalidSymbol(message: String) {
+        view?.run {
+            setErrorSymbolInvalid(message)
+            showSoftKeyboard()
+            Timber.i("Entered invalid symbol")
+        }
+    }
+
+    private fun onInvalidPin(message: String) {
+        view?.run {
+            setErrorPinInvalid(message)
+            showSoftKeyboard()
+            Timber.i("Entered invalid PIN")
+        }
+    }
+
+    fun updateUsernameLabel() {
+        view?.apply {
+            setUsernameLabel(if ("vulcan" in formHostValue || "fakelog" in formHostValue) emailLabel else nicknameLabel)
+        }
+    }
+
+    fun onHostSelected() {
+        view?.apply {
+            clearPassError()
+            clearUsernameError()
+            if (formHostValue.contains("fakelog")) {
+                setDefaultCredentials("jan@fakelog.cf", "jan123", "powiatwulkanowy", "FK100000", "999999")
+            }
+            setSymbol(formHostSymbol)
+            updateUsernameLabel()
+        }
+    }
+
+    fun onLoginModeSelected(type: Sdk.Mode) {
+        view?.run {
+            when (type) {
+                Sdk.Mode.API -> {
+                    showOnlyMobileApiModeInputs()
+                    showMobileApiWarningMessage()
+                }
+                Sdk.Mode.SCRAPPER -> {
+                    showOnlyScrapperModeInputs()
+                    showScraperWarningMessage()
+                }
+                Sdk.Mode.HYBRID -> {
+                    showOnlyHybridModeInputs()
+                    showHybridWarningMessage()
+                }
+            }
+        }
+    }
+
+    fun onPassTextChanged() {
+        view?.clearPassError()
+    }
+
+    fun onUsernameTextChanged() {
+        view?.clearUsernameError()
+    }
+
+    fun onPinTextChanged() {
+        view?.clearPinKeyError()
+    }
+
+    fun onSymbolTextChanged() {
+        view?.clearSymbolError()
+    }
+
+    fun onTokenTextChanged() {
+        view?.clearTokenError()
+    }
+
+    fun onSignInClick() {
+        if (!validateCredentials()) return
+
+        disposable.add(getStudentsAppropriatesToLoginType()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
+                    hideSoftKeyboard()
+                    showProgress(true)
+                    showContent(false)
+                }
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
+                }
+            }
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "error" to "No error")
+                view?.notifyParentAccountLogged(it)
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+            }))
+    }
+
+    private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
+        val email = view?.formUsernameValue.orEmpty()
+        val password = view?.formPassValue.orEmpty()
+        val endpoint = view?.formHostValue.orEmpty()
+
+        val pin = view?.formPinValue.orEmpty()
+        val symbol = view?.formSymbolValue.orEmpty()
+        val token = view?.formTokenValue.orEmpty()
+
+        return when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
+            Sdk.Mode.API -> studentRepository.getStudentsApi(pin, symbol, token)
+            Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(email, password, endpoint, symbol)
+            Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(email, password, endpoint, symbol)
+        }
+    }
+
+    private fun validateCredentials(): Boolean {
+        val login = view?.formUsernameValue.orEmpty()
+        val password = view?.formPassValue.orEmpty()
+
+        val host = view?.formHostValue.orEmpty()
+
+        val pin = view?.formPinValue.orEmpty()
+        val symbol = view?.formSymbolValue.orEmpty()
+        val token = view?.formTokenValue.orEmpty()
+
+        var isCorrect = true
+
+        when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
+            Sdk.Mode.API -> {
+                if (pin.isEmpty()) {
+                    view?.setErrorPinRequired()
+                    isCorrect = false
+                }
+
+                if (symbol.isEmpty()) {
+                    view?.setErrorSymbolRequired()
+                    isCorrect = false
+                }
+
+                if (token.isEmpty()) {
+                    view?.setErrorTokenRequired()
+                    isCorrect = false
+                }
+            }
+            Sdk.Mode.HYBRID, Sdk.Mode.SCRAPPER -> {
+                if (login.isEmpty()) {
+                    view?.setErrorUsernameRequired()
+                    isCorrect = false
+                } else {
+                    if ("@" in login && "standard" !in host) {
+                        view?.setErrorLoginRequired()
+                        isCorrect = false
+                    }
+
+                    if ("@" !in login && "standard" in host) {
+                        view?.setErrorEmailRequired()
+                        isCorrect = false
+                    }
+                }
+
+                if (password.isEmpty()) {
+                    view?.setErrorPassRequired(focus = isCorrect)
+                    isCorrect = false
+                }
+
+                if (password.length < 6 && password.isNotEmpty()) {
+                    view?.setErrorPassInvalid(focus = isCorrect)
+                    isCorrect = false
+                }
+            }
+        }
+
+        return isCorrect
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
new file mode 100644
index 00000000..36c9a93f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -0,0 +1,91 @@
+package io.github.wulkanowy.ui.modules.login.advanced
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginAdvancedView : BaseView {
+
+    val formUsernameValue: String
+
+    val formPassValue: String
+
+    val formHostValue: String
+
+    val formHostSymbol: String
+
+    val formLoginType: String
+
+    val formPinValue: String
+
+    val formSymbolValue: String
+
+    val formTokenValue: String
+
+    val nicknameLabel: String
+
+    val emailLabel: String
+
+    fun initView()
+
+    fun showMobileApiWarningMessage()
+
+    fun showScraperWarningMessage()
+
+    fun showHybridWarningMessage()
+
+    fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String)
+
+    fun setUsernameLabel(label: String)
+
+    fun setSymbol(symbol: String)
+
+    fun setErrorUsernameRequired()
+
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
+
+    fun setErrorPassRequired(focus: Boolean)
+
+    fun setErrorPassInvalid(focus: Boolean)
+
+    fun setErrorPassIncorrect()
+
+    fun clearUsernameError()
+
+    fun clearPassError()
+
+    fun clearPinKeyError()
+
+    fun clearSymbolError()
+
+    fun clearTokenError()
+
+    fun showSoftKeyboard()
+
+    fun hideSoftKeyboard()
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun notifyParentAccountLogged(students: List<Student>)
+
+    fun setErrorPinRequired()
+
+    fun setErrorPinInvalid(message: String)
+
+    fun setErrorSymbolRequired()
+
+    fun setErrorSymbolInvalid(message: String)
+
+    fun setErrorTokenRequired()
+
+    fun setErrorTokenInvalid(message: String)
+
+    fun showOnlyHybridModeInputs()
+
+    fun showOnlyScrapperModeInputs()
+
+    fun showOnlyMobileApiModeInputs()
+}
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 93db3679..a2a083c0 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
@@ -2,28 +2,25 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import android.annotation.SuppressLint
 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 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
+import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 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.setOnItemSelectedListener
-import io.github.wulkanowy.utils.setOnTextChangedListener
+import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
 
-class LoginFormFragment : BaseFragment(), LoginFormView {
+class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
+    LoginFormView {
 
     @Inject
     lateinit var presenter: LoginFormPresenter
@@ -35,80 +32,120 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val formNameValue: String
-        get() = loginFormName.text.toString()
+    override val formUsernameValue: String
+        get() = binding.loginFormUsername.text.toString()
 
     override val formPassValue: String
-        get() = loginFormPass.text.toString()
+        get() = binding.loginFormPass.text.toString()
 
-    override val formHostValue: String?
-        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+    override val formHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_form, container, false)
-    }
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override val nicknameLabel: String
+        get() = getString(R.string.login_nickname_hint)
+
+    override val emailLabel: String
+        get() = getString(R.string.login_email_hint)
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
+
+    private lateinit var hostSymbols: Array<String>
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginFormBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
-        loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
-        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
-        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
-        loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+        hostKeys = resources.getStringArray(R.array.hosts_keys)
+        hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        loginFormPass.setOnEditorActionListener { _, id, _ ->
-            if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
+        with(binding) {
+            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+            loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
+            loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+            loginFormFaq.setOnClickListener { presenter.onFaqClick() }
+            loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
+            loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
+            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
         }
 
-        context?.let {
-            loginFormHost.adapter = ArrayAdapter.createFromResource(it, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
-                .apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
+        with(binding.loginFormHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
-    override fun setDefaultCredentials(name: String, pass: String) {
-        loginFormName.setText(name)
-        loginFormPass.setText(pass)
+    override fun setCredentials(username: String, pass: String) {
+        with(binding) {
+            loginFormUsername.setText(username)
+            loginFormPass.setText(pass)
+        }
     }
 
-    override fun setErrorNameRequired() {
-        loginFormNameLayout.run {
+    override fun setUsernameLabel(label: String) {
+        binding.loginFormUsernameLayout.hint = label
+    }
+
+    override fun setErrorUsernameRequired() {
+        with(binding.loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
+    override fun setErrorLoginRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
     override fun setErrorPassRequired(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        loginFormPassLayout.run {
+        with(binding.loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
-    override fun clearNameError() {
-        loginFormNameLayout.error = null
+    override fun clearUsernameError() {
+        binding.loginFormUsernameLayout.error = null
     }
 
     override fun clearPassError() {
-        loginFormPassLayout.error = null
+        binding.loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -120,39 +157,64 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginFormProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginFormContainer.visibility = if (show) VISIBLE else GONE
+        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        loginFormVersion.apply {
-            visibility = VISIBLE
-            text = "${getString(R.string.app_name)} ${appInfo.versionName}"
-        }
+        binding.loginFormVersion.text = "v${appInfo.versionName}"
     }
 
-    override fun showPrivacyPolicy() {
-        loginFormPrivacyLink.visibility = VISIBLE
-    }
-
-    override fun notifyParentAccountLogged(students: List<Student>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
-            loginFormName.text.toString(),
-            loginFormPass.text.toString(),
-            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
-        ))
+    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
     }
 
     override fun openPrivacyPolicyPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
     }
 
+    override fun showContact(show: Boolean) {
+        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun openAdvancedLogin() {
+        (activity as? LoginActivity)?.onAdvancedLoginClick()
+    }
+
+    override fun onRecoverClick() {
+        (activity as? LoginActivity)?.onRecoverClick()
+    }
+
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
+    }
+
+    override fun openFaqPage() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/dlaczego-nie-moge-sie-zalogowac", ::showMessage)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        presenter.updateUsernameLabel()
+    }
+
+    override fun openEmail(lastError: String) {
+        context?.openEmailClient(
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "$formHostValue/$formHostSymbol",
+                lastError
+            )
+        )
     }
 }
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 540a91be..997e1e85 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
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.login.form
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
@@ -14,15 +13,17 @@ class LoginFormPresenter @Inject constructor(
     schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
-    private val analytics: FirebaseAnalyticsHelper,
-    private val appInfo: AppInfo
+    private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
 
+    private var lastError: Throwable? = null
+
     override fun onAttachView(view: LoginFormView) {
         super.onAttachView(view)
         view.run {
             initView()
-            if (appInfo.isDebug) showVersion() else showPrivacyPolicy()
+            showContact(false)
+            showVersion()
 
             loginErrorHandler.onBadCredentials = {
                 setErrorPassIncorrect()
@@ -36,11 +37,24 @@ class LoginFormPresenter @Inject constructor(
         view?.openPrivacyPolicyPage()
     }
 
+    fun onAdvancedLoginClick() {
+        view?.openAdvancedLogin()
+    }
+
     fun onHostSelected() {
         view?.apply {
             clearPassError()
-            clearNameError()
-            if (formHostValue?.contains("fakelog") == true) setDefaultCredentials("jan@fakelog.cf", "jan123")
+            clearUsernameError()
+            if (formHostValue.contains("fakelog")) {
+                setCredentials("jan@fakelog.cf", "jan123")
+            }
+            updateUsernameLabel()
+        }
+    }
+
+    fun updateUsernameLabel() {
+        view?.run {
+            setUsernameLabel(if ("standard" in formHostValue) emailLabel else nicknameLabel)
         }
     }
 
@@ -48,18 +62,19 @@ class LoginFormPresenter @Inject constructor(
         view?.clearPassError()
     }
 
-    fun onNameTextChanged() {
-        view?.clearNameError()
+    fun onUsernameTextChanged() {
+        view?.clearUsernameError()
     }
 
     fun onSignInClick() {
-        val email = view?.formNameValue.orEmpty()
-        val password = view?.formPassValue.orEmpty()
-        val endpoint = view?.formHostValue.orEmpty()
+        val email = view?.formUsernameValue.orEmpty().trim()
+        val password = view?.formPassValue.orEmpty().trim()
+        val host = view?.formHostValue.orEmpty().trim()
+        val symbol = view?.formHostSymbol.orEmpty().trim()
 
-        if (!validateCredentials(email, password)) return
+        if (!validateCredentials(email, password, host)) return
 
-        disposable.add(studentRepository.getStudents(email, password, endpoint)
+        disposable.add(studentRepository.getStudentsScrapper(email, password, host, symbol)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
@@ -78,21 +93,45 @@ 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)
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to host, "error" to "No error")
+                view?.notifyParentAccountLogged(it, Triple(email, password, host))
             }, {
                 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" })
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to host, "error" to it.message.ifNullOrBlank { "No message" })
                 loginErrorHandler.dispatch(it)
+                lastError = it
+                view?.showContact(true)
             }))
     }
 
-    private fun validateCredentials(login: String, password: String): Boolean {
+    fun onFaqClick() {
+        view?.openFaqPage()
+    }
+
+    fun onEmailClick() {
+        view?.openEmail(lastError?.message.ifNullOrBlank { "none" })
+    }
+
+    fun onRecoverClick() {
+        view?.onRecoverClick()
+    }
+
+    private fun validateCredentials(login: String, password: String, host: String): Boolean {
         var isCorrect = true
 
         if (login.isEmpty()) {
-            view?.setErrorNameRequired()
+            view?.setErrorUsernameRequired()
             isCorrect = false
+        } else {
+            if ("@" in login && "standard" !in host) {
+                view?.setErrorLoginRequired()
+                isCorrect = false
+            }
+
+            if ("@" !in login && "standard" in host) {
+                view?.setErrorEmailRequired()
+                isCorrect = false
+            }
         }
 
         if (password.isEmpty()) {
@@ -104,6 +143,7 @@ class LoginFormPresenter @Inject constructor(
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
         }
+
         return isCorrect
     }
 }
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 80a7b5e9..6506fa88 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
@@ -7,15 +7,27 @@ interface LoginFormView : BaseView {
 
     fun initView()
 
-    val formNameValue: String
+    val formUsernameValue: String
 
     val formPassValue: String
 
-    val formHostValue: String?
+    val formHostValue: String
 
-    fun setDefaultCredentials(name: String, pass: String)
+    val formHostSymbol: String
 
-    fun setErrorNameRequired()
+    val nicknameLabel: String
+
+    val emailLabel: String
+
+    fun setCredentials(username: String, pass: String)
+
+    fun setUsernameLabel(label: String)
+
+    fun setErrorUsernameRequired()
+
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
@@ -23,7 +35,7 @@ interface LoginFormView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun clearNameError()
+    fun clearUsernameError()
 
     fun clearPassError()
 
@@ -37,9 +49,17 @@ interface LoginFormView : BaseView {
 
     fun showVersion()
 
-    fun showPrivacyPolicy()
-
-    fun notifyParentAccountLogged(students: List<Student>)
+    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
 
     fun openPrivacyPolicyPage()
+
+    fun showContact(show: Boolean)
+
+    fun openFaqPage()
+
+    fun openEmail(lastError: String)
+
+    fun openAdvancedLogin()
+
+    fun onRecoverClick()
 }
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
new file mode 100644
index 00000000..87fa038e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginSymbolAdapter.kt
@@ -0,0 +1,16 @@
+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/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
new file mode 100644
index 00000000..97e45be9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -0,0 +1,204 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.core.widget.doOnTextChanged
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLoginRecoverBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.showSoftInput
+import javax.inject.Inject
+
+class LoginRecoverFragment :
+    BaseFragment<FragmentLoginRecoverBinding>(R.layout.fragment_login_recover), LoginRecoverView {
+
+    @Inject
+    lateinit var presenter: LoginRecoverPresenter
+
+    companion object {
+        fun newInstance() = LoginRecoverFragment()
+    }
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
+
+    private lateinit var hostSymbols: Array<String>
+
+    override val recoverHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginRecoverHost.text.toString())).orEmpty()
+
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginRecoverHost.text.toString())).orEmpty()
+
+    override val recoverNameValue: String
+        get() = binding.loginRecoverName.text.toString().trim()
+
+    override val emailHintString: String
+        get() = getString(R.string.login_email_hint)
+
+    override val loginPeselEmailHintString: String
+        get() = getString(R.string.login_login_pesel_email_hint)
+
+    override val invalidEmailString: String
+        get() = getString(R.string.login_invalid_email)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginRecoverBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        hostKeys = resources.getStringArray(R.array.hosts_keys)
+        hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
+
+        with(binding) {
+            loginRecoverWebView.setBackgroundColor(Color.TRANSPARENT)
+            loginRecoverName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+            loginRecoverHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
+            loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
+            loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).switchView(0) }
+        }
+
+        with(binding.loginRecoverHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (binding.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
+        }
+    }
+
+    override fun setDefaultCredentials(username: String) {
+        binding.loginRecoverName.setText(username)
+    }
+
+    override fun setErrorNameRequired() {
+        with(binding.loginRecoverNameLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setUsernameHint(hint: String) {
+        binding.loginRecoverNameLayout.hint = hint
+    }
+
+    override fun setUsernameError(message: String) {
+        with(binding.loginRecoverNameLayout) {
+            requestFocus()
+            error = message
+        }
+    }
+
+    override fun clearUsernameError() {
+        binding.loginRecoverNameLayout.error = null
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.loginRecoverProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showRecoverForm(show: Boolean) {
+        binding.loginRecoverFormContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showCaptcha(show: Boolean) {
+        binding.loginRecoverCaptchaContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.loginRecoverError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.loginRecoverErrorMessage.text = message
+    }
+
+    override fun showSuccessView(show: Boolean) {
+        binding.loginRecoverSuccess.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setSuccessTitle(title: String) {
+        binding.loginRecoverSuccessTitle.text = title
+    }
+
+    override fun setSuccessMessage(message: String) {
+        binding.loginRecoverSuccessMessage.text = message
+    }
+
+    override fun showSoftKeyboard() {
+        activity?.showSoftInput()
+    }
+
+    override fun hideSoftKeyboard() {
+        activity?.hideSoftInput()
+    }
+
+    @SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
+    override fun loadReCaptcha(siteKey: String, url: String) {
+        val html = """
+            <div style="position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%);" id="recaptcha"></div>
+            <script src="https://www.google.com/recaptcha/api.js?onload=cl&render=explicit&hl=pl" async defer></script>
+            <script>var cl=()=>grecaptcha.render("recaptcha",{
+            sitekey:'$siteKey',
+            callback:e =>Android.captchaCallback(e)})</script>
+        """.trimIndent()
+
+        with(binding.loginRecoverWebView) {
+            settings.javaScriptEnabled = true
+            webViewClient = object : WebViewClient() {
+                private var recoverWebViewSuccess: Boolean = true
+
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    if (recoverWebViewSuccess) {
+                        showCaptcha(true)
+                        showProgress(false)
+                    } else {
+                        showProgress(false)
+                        showErrorView(true)
+                    }
+                }
+
+                override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
+                    recoverWebViewSuccess = false
+                }
+            }
+
+            loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
+            addJavascriptInterface(object {
+
+                @Suppress("UNUSED")
+                @JavascriptInterface
+                fun captchaCallback(reCaptchaResponse: String) {
+                    activity?.runOnUiThread {
+                        presenter.onReCaptchaVerified(reCaptchaResponse)
+                    }
+                }
+            }, "Android")
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        presenter.updateFields()
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
new file mode 100644
index 00000000..9a21fb91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@@ -0,0 +1,159 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import io.github.wulkanowy.data.repositories.recover.RecoverRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.ifNullOrBlank
+import timber.log.Timber
+import javax.inject.Inject
+
+class LoginRecoverPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    studentRepository: StudentRepository,
+    private val loginErrorHandler: RecoverErrorHandler,
+    private val analytics: FirebaseAnalyticsHelper,
+    private val recoverRepository: RecoverRepository
+) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository, schedulers) {
+
+    private lateinit var lastError: Throwable
+
+    override fun onAttachView(view: LoginRecoverView) {
+        super.onAttachView(view)
+        view.initView()
+
+        with(loginErrorHandler) {
+            showErrorMessage = ::showErrorMessage
+            onInvalidUsername = ::onInvalidUsername
+            onInvalidCaptcha = ::onInvalidCaptcha
+        }
+    }
+
+    fun onNameTextChanged() {
+        view?.clearUsernameError()
+    }
+
+    fun onHostSelected() {
+        view?.run {
+            if ("fakelog" in recoverHostValue) setDefaultCredentials("jan@fakelog.cf")
+            clearUsernameError()
+            updateFields()
+        }
+    }
+
+    fun updateFields() {
+        view?.run {
+            setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString)
+        }
+    }
+
+    fun onRecoverClick() {
+        val username = view?.recoverNameValue.orEmpty()
+        val host = view?.recoverHostValue.orEmpty()
+        val symbol = view?.formHostSymbol.orEmpty()
+
+        if (!validateInput(username, host)) return
+
+        disposable.add(recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" })
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
+                    hideSoftKeyboard()
+                    showRecoverForm(false)
+                    showProgress(true)
+                    showErrorView(false)
+                    showCaptcha(false)
+                }
+            }
+            .subscribe({ (resetUrl, siteKey) ->
+                view?.loadReCaptcha(siteKey, resetUrl)
+            }) {
+                Timber.i("Obtain captcha site key result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+    }
+
+    private fun validateInput(username: String, host: String): Boolean {
+        var isCorrect = true
+
+        if (username.isEmpty()) {
+            view?.setErrorNameRequired()
+            isCorrect = false
+        }
+
+        if ("standard" in host && "@" !in username) {
+            view?.setUsernameError(view?.invalidEmailString.orEmpty())
+            isCorrect = false
+        }
+
+        return isCorrect
+    }
+
+    fun onReCaptchaVerified(reCaptchaResponse: String) {
+        val username = view?.recoverNameValue.orEmpty()
+        val host = view?.recoverHostValue.orEmpty()
+        val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
+
+        with(disposable) {
+            clear()
+            add(recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showProgress(true)
+                        showRecoverForm(false)
+                        showCaptcha(false)
+                    }
+                }
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
+                    view?.run {
+                        showSuccessView(true)
+                        setSuccessTitle(it.substringBefore(". "))
+                        setSuccessMessage(it.substringAfter(". "))
+                    }
+
+                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to true)
+                }) {
+                    Timber.i("Send recover request result: An exception occurred")
+                    errorHandler.dispatch(it)
+                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
+                })
+        }
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    private fun showErrorMessage(message: String, error: Throwable) {
+        view?.run {
+            lastError = error
+            showProgress(false)
+            setErrorDetails(message)
+            showErrorView(true)
+        }
+    }
+
+    private fun onInvalidUsername(message: String) {
+        view?.run {
+            setUsernameError(message)
+            showRecoverForm(true)
+        }
+    }
+
+    private fun onInvalidCaptcha(message: String, error: Throwable) {
+        view?.run {
+            lastError = error
+            setErrorDetails(message)
+            showCaptcha(false)
+            showRecoverForm(false)
+            showErrorView(true)
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
new file mode 100644
index 00000000..2e21d335
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginRecoverView : BaseView {
+
+    val recoverHostValue: String
+
+    val formHostSymbol: String
+
+    val recoverNameValue: String
+
+    val emailHintString: String
+
+    val loginPeselEmailHintString: String
+
+    val invalidEmailString: String
+
+    fun initView()
+
+    fun setDefaultCredentials(username: String)
+
+    fun clearUsernameError()
+
+    fun setErrorNameRequired()
+
+    fun setUsernameHint(hint: String)
+
+    fun setUsernameError(message: String)
+
+    fun showSoftKeyboard()
+
+    fun hideSoftKeyboard()
+
+    fun showProgress(show: Boolean)
+
+    fun showRecoverForm(show: Boolean)
+
+    fun showCaptcha(show: Boolean)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun showSuccessView(show: Boolean)
+
+    fun setSuccessMessage(message: String)
+
+    fun setSuccessTitle(title: String)
+
+    fun loadReCaptcha(siteKey: String, url: String)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
new file mode 100644
index 00000000..110dd82e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import android.content.res.Resources
+import com.chuckerteam.chucker.api.ChuckerCollector
+import io.github.wulkanowy.sdk.scrapper.exception.InvalidCaptchaException
+import io.github.wulkanowy.sdk.scrapper.exception.InvalidEmailException
+import io.github.wulkanowy.sdk.scrapper.exception.NoAccountFoundException
+import io.github.wulkanowy.ui.base.ErrorHandler
+import javax.inject.Inject
+
+class RecoverErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
+
+    var onInvalidUsername: (String) -> Unit = {}
+
+    var onInvalidCaptcha: (String, Throwable) -> Unit = { _, _ -> }
+
+    override fun proceed(error: Throwable) {
+        when (error) {
+            is InvalidEmailException, is NoAccountFoundException -> onInvalidUsername(error.localizedMessage.orEmpty())
+            is InvalidCaptchaException -> onInvalidCaptcha(error.localizedMessage.orEmpty(), error)
+            else -> super.proceed(error)
+        }
+    }
+
+    override fun clear() {
+        super.clear()
+        onInvalidUsername = {}
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
new file mode 100644
index 00000000..7383a5ec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
@@ -0,0 +1,51 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
+import javax.inject.Inject
+
+class LoginStudentSelectAdapter @Inject constructor() :
+    RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Pair<Student, Boolean>>()
+
+    var onClickListener: (Student, alreadySaved: Boolean) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemLoginStudentSelectBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (student, alreadySaved) = items[position]
+
+        with(holder.binding) {
+            loginItemName.text = "${student.studentName} ${student.className}"
+            loginItemSchool.text = student.schoolName
+            loginItemName.isEnabled = !alreadySaved
+            loginItemSchool.isEnabled = !alreadySaved
+            loginItemCheck.isEnabled = !alreadySaved
+            loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
+
+            root.setOnClickListener {
+                onClickListener(student, alreadySaved)
+
+                with(loginItemCheck) {
+                    if (isEnabled) {
+                        isChecked = !isChecked
+                    }
+                }
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemLoginStudentSelectBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 5c48cf2f..b0df5199 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
@@ -1,30 +1,33 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 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.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_login_student_select.*
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.openEmailClient
+import io.github.wulkanowy.utils.openInternetBrowser
 import java.io.Serializable
 import javax.inject.Inject
 
-class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
+class LoginStudentSelectFragment :
+    BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
+    LoginStudentSelectView {
 
     @Inject
     lateinit var presenter: LoginStudentSelectPresenter
 
     @Inject
-    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var loginAdapter: LoginStudentSelectAdapter
+
+    @Inject
+    lateinit var appInfo: AppInfo
 
     companion object {
         const val SAVED_STUDENTS = "STUDENTS"
@@ -32,27 +35,32 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
         fun newInstance() = LoginStudentSelectFragment()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_student_select, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginStudentSelectBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_STUDENTS))
     }
 
     override fun initView() {
-        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
-        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
+        loginAdapter.onClickListener = presenter::onItemSelected
 
-        loginStudentSelectRecycler.apply {
-            adapter = loginAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding) {
+            loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
+            loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
+            loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
+
+            with(loginStudentSelectRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = loginAdapter
+            }
         }
     }
 
-    override fun updateData(data: List<LoginStudentSelectItem>) {
-        loginAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
+        with(loginAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun openMainView() {
@@ -60,15 +68,15 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSignIn(enable: Boolean) {
-        loginStudentSelectSignIn.isEnabled = enable
+        binding.loginStudentSelectSignIn.isEnabled = enable
     }
 
     fun onParentInitStudentSelectFragment(students: List<Student>) {
@@ -80,8 +88,30 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
         outState.putSerializable(SAVED_STUDENTS, presenter.students as Serializable)
     }
 
+    override fun showContact(show: Boolean) {
+        binding.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(lastError: String) {
+        context?.openEmailClient(
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text, appInfo.systemModel,
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "Select users to log in",
+                lastError
+            )
+        )
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
deleted file mode 100644
index 27723c53..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.studentselect
-
-import android.annotation.SuppressLint
-import android.view.View
-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.Student
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_login_student_select.*
-
-class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_login_student_select
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
-        return ItemViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
-            loginItemName.text = "${student.studentName} ${student.className}"
-            loginItemSchool.text = student.schoolName
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as LoginStudentSelectItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return student.hashCode()
-    }
-
-    class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View
-            get() = itemView
-
-        init {
-            loginItemCheck.setOnClickListener { super.onClick(loginItemContainer) }
-        }
-
-        override fun onClick(view: View?) {
-            super.onClick(view)
-            loginItemCheck.apply { isChecked = !isChecked }
-        }
-    }
-}
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 e02227cb..b2d0aed9 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -19,6 +18,8 @@ class LoginStudentSelectPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
 
+    private var lastError: Throwable? = null
+
     var students = emptyList<Student>()
 
     private var selectedStudents = mutableListOf<Student>()
@@ -27,6 +28,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         super.onAttachView(view)
         view.run {
             initView()
+            showContact(false)
             enableSignIn(false)
             loginErrorHandler.onStudentDuplicate = {
                 showMessage(it)
@@ -48,20 +50,42 @@ class LoginStudentSelectPresenter @Inject constructor(
         if (students.size == 1) registerStudents(students)
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is LoginStudentSelectItem) {
-            selectedStudents.removeAll { it == item.student }
-                .let { if (!it) selectedStudents.add(item.student) }
+    fun onItemSelected(student: Student, alreadySaved: Boolean) {
+        if (alreadySaved) return
 
-            view?.enableSignIn(selectedStudents.isNotEmpty())
-        }
+        selectedStudents
+            .removeAll { it == student }
+            .let { if (!it) selectedStudents.add(student) }
+
+        view?.enableSignIn(selectedStudents.isNotEmpty())
+    }
+
+    private fun compareStudents(a: Student, b: Student): Boolean {
+        return a.email == b.email
+            && a.symbol == b.symbol
+            && a.studentId == b.studentId
+            && a.schoolSymbol == b.schoolSymbol
+            && a.classId == b.classId
     }
 
     private fun loadData(students: List<Student>) {
         this.students = students
-        view?.apply {
-            updateData(students.map { LoginStudentSelectItem(it) })
-        }
+        disposable.add(studentRepository.getSavedStudents()
+            .map { savedStudents ->
+                students.map { student ->
+                    student to savedStudents.any { compareStudents(student, it) }
+                }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view?.updateData(it)
+            }, {
+                errorHandler.dispatch(it)
+                lastError = it
+                view?.updateData(students.map { student -> student to false })
+            })
+        )
     }
 
     private fun registerStudents(students: List<Student>) {
@@ -78,17 +102,27 @@ class LoginStudentSelectPresenter @Inject constructor(
                 Timber.i("Registration started")
             }
             .subscribe({
-                students.forEach { analytics.logEvent("registration_student_select", "success" to true, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to "No error") }
+                students.forEach { analytics.logEvent("registration_student_select", "success" to true, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to "No error") }
                 Timber.i("Registration result: Success")
                 view?.openMainView()
             }, { error ->
-                students.forEach { analytics.logEvent("registration_student_select", "success" to false, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
+                students.forEach { analytics.logEvent("registration_student_select", "success" to false, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
                 Timber.i("Registration result: An exception occurred ")
                 loginErrorHandler.dispatch(error)
+                lastError = error
                 view?.apply {
                     showProgress(false)
                     showContent(true)
+                    showContact(true)
                 }
             }))
     }
+
+    fun onDiscordClick() {
+        view?.openDiscordInvite()
+    }
+
+    fun onEmailClick() {
+        view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
+    }
 }
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 3967313c..89431dfc 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
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<LoginStudentSelectItem>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     fun openMainView()
 
@@ -15,4 +16,10 @@ interface LoginStudentSelectView : BaseView {
     fun showContent(show: Boolean)
 
     fun enableSignIn(enable: Boolean)
+
+    fun showContact(show: Boolean)
+
+    fun openDiscordInvite()
+
+    fun openEmail(lastError: String)
 }
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 87de0a81..befbffd5 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
@@ -1,29 +1,34 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
 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 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
+import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 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.setOnTextChangedListener
+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
 
-class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
+class LoginSymbolFragment :
+    BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
 
     @Inject
     lateinit var presenter: LoginSymbolPresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         private const val SAVED_LOGIN_DATA = "LOGIN_DATA"
 
@@ -31,27 +36,28 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override val symbolNameError: CharSequence?
-        get() = loginSymbolNameLayout.error
+        get() = binding.loginSymbolNameLayout.error
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_symbol, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginSymbolBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_LOGIN_DATA))
     }
 
     override fun initView() {
-        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+        with(binding) {
+            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+            loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
+            loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-        loginSymbolName.setOnTextChangedListener { presenter.onSymbolTextChanged() }
+            loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
-        loginSymbolName.apply {
-            setOnEditorActionListener { _, id, _ ->
-                if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
+            loginSymbolName.apply {
+                setOnEditorActionListener { _, id, _ ->
+                    if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
+                }
+                setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
             }
-            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
         }
     }
 
@@ -60,25 +66,25 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override fun setErrorSymbolIncorrect() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_incorrect_symbol)
         }
     }
 
     override fun setErrorSymbolRequire() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun clearSymbolError() {
-        loginSymbolNameLayout.error = null
+        binding.loginSymbolNameLayout.error = null
     }
 
     override fun clearAndFocusSymbol() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             editText?.text = null
             requestFocus()
         }
@@ -93,11 +99,11 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginSymbolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+        binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
     override fun notifyParentAccountLogged(students: List<Student>) {
@@ -109,8 +115,31 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
         outState.putSerializable(SAVED_LOGIN_DATA, presenter.loginData)
     }
 
+    override fun showContact(show: Boolean) {
+        binding.loginSymbolContact.visibility = if (show) VISIBLE else GONE
+    }
+
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
+    }
+
+    override fun openFaqPage() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/co-to-jest-symbol", ::showMessage)
+    }
+
+    override fun openEmail(host: String, lastError: String) {
+        context?.openEmailClient(
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "$host/${binding.loginSymbolName.text}",
+                lastError
+            )
+        )
     }
 }
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 5a7a3777..1f9e66b7 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
@@ -18,12 +18,17 @@ class LoginSymbolPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
 
+    private var lastError: Throwable? = null
+
     var loginData: Triple<String, String, String>? = null
 
     @Suppress("UNCHECKED_CAST")
     fun onAttachView(view: LoginSymbolView, savedLoginData: Serializable?) {
         super.onAttachView(view)
-        view.initView()
+        view.run {
+            initView()
+            showContact(false)
+        }
         if (savedLoginData is Triple<*, *, *>) {
             loginData = savedLoginData as Triple<String, String, String>
         }
@@ -34,14 +39,16 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun attemptLogin(symbol: String) {
+        if (loginData == null) throw IllegalArgumentException("Login data is null")
+
         if (symbol.isBlank()) {
             view?.setErrorSymbolRequire()
             return
         }
 
         disposable.add(
-            Single.fromCallable { if (loginData == null) throw IllegalArgumentException("Login data is null") else loginData }
-                .flatMap { studentRepository.getStudents(it.first, it.second, it.third, symbol) }
+            Single.fromCallable { loginData }
+                .flatMap { studentRepository.getStudentsScrapper(it.first, it.second, it.third, symbol) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doOnSubscribe {
@@ -59,11 +66,12 @@ class LoginSymbolPresenter @Inject constructor(
                     }
                 }
                 .subscribe({
-                    analytics.logEvent("registration_symbol", "success" to true, "students" to it.size, "endpoint" to loginData?.third, "symbol" to symbol, "error" to "No error")
+                    analytics.logEvent("registration_symbol", "success" to true, "students" to it.size, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to "No error")
                     view?.apply {
                         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)
@@ -71,8 +79,10 @@ 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" })
+                    analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
                     loginErrorHandler.dispatch(it)
+                    lastError = it
+                    view?.showContact(true)
                 }))
     }
 
@@ -83,4 +93,12 @@ class LoginSymbolPresenter @Inject constructor(
             showSoftKeyboard()
         }
     }
+
+    fun onFaqClick() {
+        view?.openFaqPage()
+    }
+
+    fun onEmailClick() {
+        view?.openEmail(loginData?.third.orEmpty(), lastError?.message.ifNullOrBlank { "empty" })
+    }
 }
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 2e5143ef..6938bf13 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,4 +26,10 @@ interface LoginSymbolView : BaseView {
     fun showContent(show: Boolean)
 
     fun notifyParentAccountLogged(students: List<Student>)
+
+    fun showContact(show: Boolean)
+
+    fun openFaqPage()
+
+    fun openEmail(host: String, lastError: String)
 }
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 00204a87..0775ce18 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
@@ -1,17 +1,19 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
-import kotlinx.android.synthetic.main.fragment_lucky_number.*
 import javax.inject.Inject
 
-class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView {
+class LuckyNumberFragment :
+    BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: LuckyNumberPresenter
@@ -23,49 +25,57 @@ class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView
     override val titleStringId: Int
         get() = R.string.lucky_number_title
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_lucky_number, container, false)
-    }
+    override val isViewEmpty get() = binding.luckyNumberText.text.isBlank()
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLuckyNumberBinding.bind(view)
+        messageContainer = binding.luckyNumberSwipe
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        with(binding) {
+            luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
+            luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
     override fun updateData(data: LuckyNumber) {
-        luckyNumberText.text = data.luckyNumber.toString()
+        binding.luckyNumberText.text = data.luckyNumber.toString()
     }
 
     override fun hideRefresh() {
-        luckyNumberSwipe.isRefreshing = false
+        binding.luckyNumberSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        luckyNumberEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        binding.luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.luckyNumberError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.luckyNumberErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        luckyNumberProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.luckyNumberProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        luckyNumberSwipe.isEnabled = enable
+        binding.luckyNumberSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        luckyNumberContent.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun isViewEmpty(): Boolean {
-        return luckyNumberText.text.isBlank()
+        binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.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 ee7260e6..1d3a17bd 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
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-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
@@ -15,10 +14,11 @@ class LuckyNumberPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
-    private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
+    private lateinit var lastError: Throwable
+
     override fun onAttachView(view: LuckyNumberView) {
         super.onAttachView(view)
         view.run {
@@ -27,6 +27,7 @@ class LuckyNumberPresenter @Inject constructor(
             enableSwipe(false)
         }
         Timber.i("Lucky number view was initialized")
+        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
@@ -35,7 +36,6 @@ class LuckyNumberPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
                 .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -52,25 +52,49 @@ 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)
+                        showErrorView(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 9ead2b1f..a680c83e 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,6 +5,8 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberView : BaseView {
 
+    val isViewEmpty: Boolean
+
     fun initView()
 
     fun updateData(data: LuckyNumber)
@@ -13,11 +15,13 @@ 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 3dd0e5df..961ac633 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
@@ -4,31 +4,39 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.activity_widget_configure.*
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigurePresenter>(),
+class LuckyNumberWidgetConfigureActivity :
+    BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     LuckyNumberWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var configureAdapter: WidgetConfigureAdapter
 
     @Inject
     override lateinit var presenter: LuckyNumberWidgetConfigurePresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    private var dialog: AlertDialog? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(R.layout.activity_widget_configure)
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -36,15 +44,35 @@ class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigu
     }
 
     override fun initView() {
-        widgetConfigureRecycler.apply {
+        with(binding.widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+            layoutManager = LinearLayoutManager(context)
         }
-        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+
+        configureAdapter.onClickListener = presenter::onItemSelect
     }
 
-    override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
-        configureAdapter.updateDataSet(data)
+    override fun showThemeDialog() {
+        var items = arrayOf(
+            getString(R.string.widget_timetable_theme_light),
+            getString(R.string.widget_timetable_theme_dark)
+        )
+        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += (getString(R.string.widget_timetable_theme_system))
+
+        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()
+    }
+
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
+        with(configureAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateLuckyNumberWidget(widgetId: Int) {
@@ -70,4 +98,9 @@ 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/LuckyNumberWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
deleted file mode 100644
index bba0974b..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumberwidget
-
-import android.annotation.SuppressLint
-import android.view.View
-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.Student
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
-
-class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolean) :
-    AbstractFlexibleItem<LuckyNumberWidgetConfigureItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableWidgetConfigureItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(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/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 2ed0fa6f..468f9b57 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
@@ -1,12 +1,12 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 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
 
@@ -14,11 +14,13 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
+    private var selectedStudent: Student? = null
+
     fun onAttachView(view: LuckyNumberWidgetConfigureView, appWidgetId: Int?) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
@@ -26,35 +28,50 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(item: AbstractFlexibleItem<*>) {
-        if (item is LuckyNumberWidgetConfigureItem) {
-            registerStudent(item.student)
+    fun onItemSelect(student: Student) {
+        selectedStudent = student
+        view?.showThemeDialog()
+    }
+
+    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) } }
             .map { (students, currentStudentId) ->
-                students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
+                students.map { student -> student to (student.id == currentStudentId) }
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
                 when {
                     it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 -> registerStudent(it.single().student)
+                    it.size == 1 -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
                     else -> view?.updateData(it)
                 }
             }, { errorHandler.dispatch(it) }))
     }
 
-    private fun registerStudent(student: Student) {
-        appWidgetId?.also {
-            sharedPref.putLong(getStudentWidgetKey(it), student.id)
-            view?.apply {
-                updateLuckyNumberWidget(it)
-                setSuccessResult(it)
+    private fun registerStudent(student: Student?) {
+        requireNotNull(student)
+
+        appWidgetId?.let { id ->
+            sharedPref.putLong(getStudentWidgetKey(id), student.id)
+            view?.run {
+                updateLuckyNumberWidget(id)
+                setSuccessResult(id)
             }
         }
         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 49c3f1dc..c8c348ed 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,15 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
 
 interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
+    fun showThemeDialog()
+
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     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 66141c91..55a048b3 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
@@ -1,46 +1,37 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import android.annotation.TargetApi
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_OPTIONS
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
-import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH
-import android.content.BroadcastReceiver
+import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
+import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
-import android.os.Build
+import android.content.res.Configuration
+import android.os.Bundle
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Maybe
 import timber.log.Timber
 import javax.inject.Inject
 
-class LuckyNumberWidgetProvider : BroadcastReceiver() {
+class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
 
-    @Inject
-    lateinit var semesterRepository: SemesterRepository
-
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
@@ -51,42 +42,99 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
     lateinit var appWidgetManager: AppWidgetManager
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     companion object {
+
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
+
+        fun getThemeWidgetKey(appWidgetId: Int) = "lucky_number_widget_theme_$appWidgetId"
+
+        fun getHeightWidgetKey(appWidgetId: Int) = "lucky_number_widget_height_$appWidgetId"
+
+        fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     override fun onReceive(context: Context, intent: Intent) {
         AndroidInjection.inject(this, context)
-        when (intent.action) {
-            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-            ACTION_APPWIDGET_DELETED -> onDelete(intent)
-            ACTION_APPWIDGET_OPTIONS_CHANGED -> onOptionsChange(context, intent)
+        super.onReceive(context, intent)
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        appWidgetIds?.forEach { appWidgetId ->
+
+            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, getCorrectLayoutId(appWidgetId, context)).apply {
+                setTextViewText(R.id.luckyNumberWidgetNumber, luckyNumber?.luckyNumber?.toString() ?: "#")
+                setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
+            }
+
+            setStyles(remoteView, appWidgetId)
+            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
         }
     }
 
-    private fun onUpdate(context: Context, intent: Intent) {
-        intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
-            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, MenuView.LUCKY_NUMBER.id,
-                        MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
-            }.also {
-                setStyles(it, intent)
-                appWidgetManager.updateAppWidget(appWidgetId, it)
+    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
+        super.onDeleted(context, appWidgetIds)
+        appWidgetIds?.forEach { appWidgetId ->
+            with(sharedPref) {
+                delete(getHeightWidgetKey(appWidgetId))
+                delete(getStudentWidgetKey(appWidgetId))
+                delete(getThemeWidgetKey(appWidgetId))
+                delete(getWidthWidgetKey(appWidgetId))
             }
         }
     }
 
-    private fun onDelete(intent: Intent) {
-        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
-            if (it != 0) sharedPref.delete(getStudentWidgetKey(it))
+    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+
+        val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
+
+        setStyles(remoteView, appWidgetId, newOptions)
+        appWidgetManager.updateAppWidget(appWidgetId, remoteView)
+    }
+
+    private fun setStyles(views: RemoteViews, appWidgetId: Int, options: Bundle? = null) {
+        val width = options?.getInt(OPTION_APPWIDGET_MIN_WIDTH) ?: sharedPref.getLong(getWidthWidgetKey(appWidgetId), 74).toInt()
+        val height = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: sharedPref.getLong(getHeightWidgetKey(appWidgetId), 74).toInt()
+
+        with(sharedPref) {
+            putLong(getWidthWidgetKey(appWidgetId), width.toLong())
+            putLong(getHeightWidgetKey(appWidgetId), height.toLong())
         }
+
+        val rows = getCellsForSize(height)
+        val cols = getCellsForSize(width)
+
+        Timber.d("New lucky number widget measurement: %dx%d", width, height)
+        Timber.d("Widget size: $cols x $rows")
+
+        when {
+            1 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = false)
+            1 == cols && 1 < rows -> views.setVisibility(imageTop = true, imageLeft = false)
+            1 < cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
+            1 == cols && 1 == rows -> views.setVisibility(imageTop = true, imageLeft = false)
+            2 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
+            else -> views.setVisibility(imageTop = false, imageLeft = false, title = true)
+        }
+    }
+
+    private fun RemoteViews.setVisibility(imageTop: Boolean, imageLeft: Boolean, title: Boolean = false) {
+        setViewVisibility(R.id.luckyNumberWidgetImageTop, if (imageTop) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetImageLeft, if (imageLeft) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetTitle, if (title) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+    }
+
+    private fun getCellsForSize(size: Int): Int {
+        var n = 2
+        while (74 * n - 30 < size) ++n
+        return n - 1
     }
 
     private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
@@ -95,89 +143,37 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                 .filter { true }
                 .flatMap { studentRepository.getSavedStudents().toMaybe() }
                 .flatMap { students ->
-                    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()
-                            }
+                    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) }
                         }
+                        else -> Maybe.empty()
+                    }
                 }
-                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
                 .flatMap { luckyNumberRepository.getLuckyNumber(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in lucky number provider")
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in lucky number provider")
+            }
             null
         }
     }
 
-    private fun onOptionsChange(context: Context, intent: Intent) {
-        intent.extras?.let { extras ->
-            RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
-                setStyles(this, intent)
-                appWidgetManager.updateAppWidget(extras.getInt(EXTRA_APPWIDGET_ID), this)
-            }
-        }
-    }
+    private fun getCorrectLayoutId(appWidgetId: Int, context: Context): Int {
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    private fun setStyles(views: RemoteViews, intent: Intent) {
-        val options = intent.extras?.getBundle(EXTRA_APPWIDGET_OPTIONS)
-
-        val maxWidth = options?.getInt(OPTION_APPWIDGET_MAX_WIDTH) ?: 150
-        val maxHeight = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: 40
-
-        Timber.d("New lucky number widget measurement: %dx%d", maxWidth, maxHeight)
-
-        when {
-            // 1x1
-            maxWidth < 150 && maxHeight < 110 -> {
-                Timber.d("Lucky number widget size: 1x1")
-                views.run {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 1x2
-            maxWidth < 150 && maxHeight > 110 -> {
-                Timber.d("Lucky number widget size: 1x2")
-                views.run {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 2x1
-            maxWidth >= 150 && maxHeight <= 110 -> {
-                Timber.d("Lucky number widget size: 2x1")
-                views.run {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 2x2 and bigger
-            else -> {
-                Timber.d("Lucky number widget size: 2x2 and bigger")
-                views.run {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
+        return if (savedTheme == 1L || (savedTheme == 2L && isSystemDarkMode)) {
+            R.layout.widget_luckynumber_dark
+        } else {
+            R.layout.widget_luckynumber
         }
     }
 }
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 779f0a49..9ce19079 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
@@ -4,17 +4,22 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
+import dagger.Lazy
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -26,13 +31,14 @@ 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.timetable.TimetableFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.safelyPopFragment
+import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
-import kotlinx.android.synthetic.main.activity_main.*
+import timber.log.Timber
 import javax.inject.Inject
 
-class MainActivity : BaseActivity<MainPresenter>(), MainView {
+class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
@@ -40,10 +46,13 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     @Inject
     lateinit var navController: FragNavController
 
+    @Inject
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
+
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
 
-        fun getStartIntent(context: Context, startMenu: MainView.MenuView? = null, clear: Boolean = false): Intent {
+        fun getStartIntent(context: Context, startMenu: MainView.Section? = null, clear: Boolean = false): Intent {
             return Intent(context, MainActivity::class.java)
                 .apply {
                     if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
@@ -52,37 +61,36 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         }
     }
 
-    override val isRootView: Boolean
-        get() = navController.isRootFragment
+    override val isRootView get() = navController.isRootFragment
 
-    override val currentViewTitle: String?
-        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
+    override val currentStackSize get() = navController.currentStack?.size
 
-    override val currentStackSize: Int?
-        get() = navController.currentStack?.size
+    override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
+
+    override val currentViewSubtitle get() = (navController.currentFrag as? MainView.TitledView)?.subtitleString
 
     override var startMenuIndex = 0
 
     override var startMenuMoreIndex = -1
 
-    private val moreMenuFragments = listOf<Fragment>(
-        MessageFragment.newInstance(),
-        HomeworkFragment.newInstance(),
-        NoteFragment.newInstance(),
-        LuckyNumberFragment.newInstance()
+    private val moreMenuFragments = mapOf<Int, Fragment>(
+        MainView.Section.MESSAGE.id to MessageFragment.newInstance(),
+        MainView.Section.HOMEWORK.id to HomeworkFragment.newInstance(),
+        MainView.Section.NOTE.id to NoteFragment.newInstance(),
+        MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(mainToolbar)
-        messageContainer = mainFragmentContainer
+        setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.mainToolbar)
+        messageContainer = binding.mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.MenuView)
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
-        navController.run {
+        with(navController) {
             initialize(startMenuIndex, savedInstanceState)
-            pushFragment(moreMenuFragments.getOrNull(startMenuMoreIndex))
+            pushFragment(moreMenuFragments[startMenuMoreIndex])
         }
     }
 
@@ -92,30 +100,31 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     }
 
     override fun initView() {
-        mainBottomNav.run {
-            addItems(
-                listOf(
-                    AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_menu_main_grade_26dp, 0),
-                    AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_menu_main_attendance_24dp, 0),
-                    AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_menu_main_exam_24dp, 0),
-                    AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_menu_main_timetable_24dp, 0),
-                    AHBottomNavigationItem(R.string.more_title, R.drawable.ic_menu_main_more_24dp, 0)
-                )
-            )
-            accentColor = ContextCompat.getColor(context, R.color.colorPrimary)
-            inactiveColor = getThemeAttrColor(android.R.attr.textColorSecondary)
-            defaultBackgroundColor = getThemeAttrColor(R.attr.bottomNavBackground)
+        with(binding.mainToolbar) {
+            if (SDK_INT >= LOLLIPOP) stateListAnimator = null
+            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
+        }
+
+        with(binding.mainBottomNav) {
+            addItems(listOf(
+                AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
+                AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
+                AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
+                AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_main_timetable, 0),
+                AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
+            ))
+            accentColor = getThemeAttrColor(R.attr.colorPrimary)
+            inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
+            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
             setTitleTextSizeInSp(10f, 10f)
-            setOnTabSelectedListener { position, wasSelected ->
-                presenter.onTabSelected(position, wasSelected)
-            }
+            setOnTabSelectedListener(presenter::onTabSelected)
         }
 
-        navController.run {
-            setOnViewChangeListener { presenter.onViewChange() }
+        with(navController) {
+            setOnViewChangeListener(presenter::onViewChange)
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -144,6 +153,10 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         supportActionBar?.title = title
     }
 
+    override fun setViewSubTitle(subtitle: String?) {
+        supportActionBar?.subtitle = subtitle
+    }
+
     override fun showHomeArrow(show: Boolean) {
         supportActionBar?.setDisplayHomeAsUpEnabled(show)
     }
@@ -152,10 +165,19 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.showDialogFragment(AccountDialog.newInstance())
     }
 
+    override fun showActionBarElevation(show: Boolean) {
+        ViewCompat.setElevation(binding.mainToolbar, if (show) dpToPx(4f) else 0f)
+    }
+
     override fun notifyMenuViewReselected() {
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
 
+    override fun notifyMenuViewChanged() {
+        Timber.d("Menu view changed")
+        (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentChanged()
+    }
+
     fun showDialogFragment(dialog: DialogFragment) {
         navController.showDialogFragment(dialog)
     }
@@ -164,8 +186,8 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.pushFragment(fragment)
     }
 
-    override fun popView() {
-        navController.safelyPopFragment()
+    override fun popView(depth: Int) {
+        navController.safelyPopFragments(depth)
     }
 
     override fun onBackPressed() {
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 cc69005e..03f6ac38 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.main
 
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import dagger.Module
 import dagger.Provides
@@ -7,7 +8,10 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.about.AboutModule
+import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseModule
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
@@ -15,30 +19,34 @@ import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeModule
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.MessageModule
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
-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
 abstract class MainModule {
 
-    @Module
     companion object {
 
-        @JvmStatic
         @Provides
-        fun provideFragNavController(activity: MainActivity): FragNavController {
-            return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
-        }
+        fun provideFragNavController(activity: MainActivity) =
+            FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
+
+        //In activities must be injected as Lazy
+        @Provides
+        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
     }
 
     @PerFragment
@@ -74,7 +82,7 @@ abstract class MainModule {
     abstract fun bindTimetableFragment(): TimetableFragment
 
     @PerFragment
-    @ContributesAndroidInjector(modules = [AboutModule::class])
+    @ContributesAndroidInjector
     abstract fun bindAboutFragment(): AboutFragment
 
     @PerFragment
@@ -89,6 +97,10 @@ abstract class MainModule {
     @ContributesAndroidInjector
     abstract fun bindHomeworkFragment(): HomeworkFragment
 
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindHomeworkDetailsDialog(): HomeworkDetailsDialog
+
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
@@ -102,10 +114,26 @@ abstract class MainModule {
     abstract fun bindAccountDialog(): AccountDialog
 
     @PerFragment
-    @ContributesAndroidInjector(modules = [MobileDeviceModule::class])
+    @ContributesAndroidInjector
     abstract fun bindMobileDevices(): MobileDeviceFragment
 
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLogViewerFragment(): LogViewerFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindContributorFragment(): ContributorFragment
+
+    @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 a74226bf..f5a49004 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
@@ -5,6 +5,9 @@ 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.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
@@ -19,7 +22,7 @@ class MainPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
-    fun onAttachView(view: MainView, initMenu: MainView.MenuView?) {
+    fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
         view.apply {
             getProperViewIndexes(initMenu).let { (main, more) ->
@@ -30,13 +33,15 @@ class MainPresenter @Inject constructor(
             Timber.i("Main view was initialized with $startMenuIndex menu index and $startMenuMoreIndex more index")
         }
 
-        syncManager.startSyncWorker()
+        syncManager.startPeriodicSyncWorker()
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange() {
+    fun onViewChange(section: MainView.Section?) {
         view?.apply {
+            showActionBarElevation(section != GRADE && section != MESSAGE && section != SCHOOL)
             currentViewTitle?.let { setViewTitle(it) }
+            currentViewSubtitle?.let { setViewSubTitle(it.ifBlank { null }) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
                 else showHomeArrow(false)
@@ -71,16 +76,17 @@ class MainPresenter @Inject constructor(
                 notifyMenuViewReselected()
                 false
             } else {
+                notifyMenuViewChanged()
                 switchMenuView(index)
                 true
             }
         } == true
     }
 
-    private fun getProperViewIndexes(initMenu: MainView.MenuView?): Pair<Int, Int> {
-        return when {
-            initMenu?.id in 0..3 -> initMenu!!.id to -1
-            (initMenu?.id ?: 0) > 3 -> 4 to initMenu!!.id - 4
+    private fun getProperViewIndexes(initMenu: MainView.Section?): Pair<Int, Int> {
+        return when (initMenu?.id) {
+            in 0..3 -> initMenu!!.id to -1
+            in 4..10 -> 4 to initMenu!!.id
             else -> prefRepository.startMenuIndex to -1
         }
     }
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 6aef573e..97b556e3 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
@@ -12,6 +12,8 @@ interface MainView : BaseView {
 
     val currentViewTitle: String?
 
+    val currentViewSubtitle: String?
+
     val currentStackSize: Int?
 
     fun initView()
@@ -22,30 +24,46 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
+    fun showActionBarElevation(show: Boolean)
+
     fun notifyMenuViewReselected()
 
+    fun notifyMenuViewChanged()
+
     fun setViewTitle(title: String)
 
-    fun popView()
+    fun setViewSubTitle(subtitle: String?)
+
+    fun popView(depth: Int = 1)
 
     interface MainChildView {
 
         fun onFragmentReselected()
+
+        fun onFragmentChanged() {}
     }
 
     interface TitledView {
 
         val titleStringId: Int
+
+        var subtitleString: String
+            get() = ""
+            set(_) {}
     }
 
-    enum class MenuView(val id: Int) {
+    enum class Section(val id: Int) {
         GRADE(0),
         ATTENDANCE(1),
         EXAM(2),
         TIMETABLE(3),
-        MESSAGE(4),
-        HOMEWORK(5),
-        NOTE(6),
-        LUCKY_NUMBER(7),
+        MORE(4),
+        MESSAGE(5),
+        HOMEWORK(6),
+        NOTE(7),
+        LUCKY_NUMBER(8),
+        SETTINGS(9),
+        ABOUT(10),
+        SCHOOL(11)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 7bd35f2d..4a9d217b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -1,26 +1,26 @@
 package io.github.wulkanowy.ui.modules.message
 
 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.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
+import io.github.wulkanowy.databinding.FragmentMessageBinding
 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.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
 
-class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
+class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
+    MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
@@ -32,24 +32,19 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
         fun newInstance() = MessageFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.message_title
+    override val titleStringId get() = R.string.message_title
 
-    override val currentPageIndex: Int
-        get() = messageViewPager.currentItem
+    override val currentPageIndex get() = binding.messageViewPager.currentItem
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessageBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        pagerAdapter.apply {
-            containerId = messageViewPager.id
+        with(pagerAdapter) {
+            containerId = binding.messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
                 MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
@@ -57,23 +52,29 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
             ))
         }
 
-        messageViewPager.run {
+        with(binding.messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
         }
-        messageTabLayout.setupWithViewPager(messageViewPager)
 
-        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
+        with(binding.messageTabLayout) {
+            setupWithViewPager(binding.messageViewPager)
+            setElevationCompat(context.dpToPx(4f))
+        }
+
+        binding.openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
-        messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        with(binding) {
+            messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        messageProgress.visibility = if (show) VISIBLE else INVISIBLE
+        binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onDeleteMessage(message: Message) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
deleted file mode 100644
index 26568e22..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package io.github.wulkanowy.ui.modules.message
-
-import android.graphics.Typeface.BOLD
-import android.graphics.Typeface.NORMAL
-import android.view.View
-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.Message
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_message.*
-
-class MessageItem(val message: Message, private val noSubjectString: String) :
-    AbstractFlexibleItem<MessageItem.ViewHolder>() {
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun getLayoutRes() = R.layout.item_message
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            val style = if (message.unread) BOLD else NORMAL
-
-            messageItemAuthor.run {
-                text = if (message.recipient.isNotBlank()) message.recipient else message.sender
-                setTypeface(null, style)
-            }
-            messageItemSubject.run {
-                text = if (message.subject.isNotBlank()) message.subject else noSubjectString
-                setTypeface(null, style)
-            }
-            messageItemDate.run {
-                text = message.date.toFormattedString()
-                setTypeface(null, style)
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MessageItem
-
-        if (message != other.message) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return message.hashCode()
-    }
-
-    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/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
index e4c202d9..bf795020 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
@@ -8,13 +8,12 @@ import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
+@Suppress("unused")
 @Module
 abstract class MessageModule {
 
-    @Module
     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/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
new file mode 100644
index 00000000..436dee53
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
@@ -0,0 +1,92 @@
+package io.github.wulkanowy.ui.modules.message.preview
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
+import io.github.wulkanowy.databinding.ItemMessageDividerBinding
+import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class MessagePreviewAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    enum class ViewType(val id: Int) {
+        MESSAGE(1),
+        DIVIDER(2),
+        ATTACHMENT(3)
+    }
+
+    var messageWithAttachment: MessageWithAttachment? = null
+        set(value) {
+            field = value
+            attachments = value?.attachments.orEmpty()
+        }
+
+    private var attachments: List<MessageAttachment> = emptyList()
+
+    override fun getItemCount() = if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.MESSAGE.id
+        1 -> ViewType.DIVIDER.id
+        else -> ViewType.ATTACHMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.MESSAGE.id -> MessageViewHolder(ItemMessagePreviewBinding.inflate(inflater, parent, false))
+            ViewType.DIVIDER.id -> DividerViewHolder(ItemMessageDividerBinding.inflate(inflater, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemMessageAttachmentBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is MessageViewHolder -> bindMessage(holder, requireNotNull(messageWithAttachment).message)
+            is AttachmentViewHolder -> bindAttachment(holder, requireNotNull(messageWithAttachment).attachments[position - 2])
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindMessage(holder: MessageViewHolder, message: Message) {
+        with(holder.binding) {
+            messagePreviewSubject.text = if (message.subject.isNotBlank()) message.subject else root.context.getString(R.string.message_no_subject)
+            messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+            messagePreviewContent.text = message.content
+            messagePreviewAuthor.text = if (message.folderId == MessageFolder.SENT.id) "${root.context.getString(R.string.message_to)} ${message.recipient}"
+            else "${root.context.getString(R.string.message_from)} ${message.sender}"
+        }
+    }
+
+    private fun bindAttachment(holder: AttachmentViewHolder, attachment: MessageAttachment) {
+        with(holder.binding) {
+            messagePreviewAttachment.visibility = View.VISIBLE
+            messagePreviewAttachment.text = attachment.filename
+            root.setOnClickListener {
+                root.context.openInternetBrowser(attachment.url) { }
+            }
+        }
+    }
+
+    class MessageViewHolder(val binding: ItemMessagePreviewBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class DividerViewHolder(val binding: ItemMessageDividerBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentViewHolder(val binding: ItemMessageAttachmentBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 93ef502f..99eede15 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
@@ -1,30 +1,34 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
 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 androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.databinding.FragmentMessagePreviewBinding
 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.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
-import kotlinx.android.synthetic.main.fragment_message_preview.*
 import javax.inject.Inject
 
-class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.TitledView {
+class MessagePreviewFragment :
+    BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
+    MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
 
+    @Inject
+    lateinit var previewAdapter: MessagePreviewAdapter
+
     private var menuReplyButton: MenuItem? = null
 
     private var menuForwardButton: MenuItem? = null
@@ -34,18 +38,15 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
     override val titleStringId: Int
         get() = R.string.message_title
 
-    override val noSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
-        fun newInstance(messageId: Long): MessagePreviewFragment {
+        fun newInstance(message: Message): MessagePreviewFragment {
             return MessagePreviewFragment().apply {
-                arguments = Bundle().apply { putLong(MESSAGE_ID_KEY, messageId) }
+                arguments = Bundle().apply { putSerializable(MESSAGE_ID_KEY, message) }
             }
         }
     }
@@ -55,14 +56,20 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message_preview, container, false)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessagePreviewBinding.bind(view)
+        messageContainer = binding.messagePreviewContainer
+        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = messagePreviewContainer
-        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
+    override fun initView() {
+        binding.messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+        with(binding.messagePreviewRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = previewAdapter
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -82,34 +89,19 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         }
     }
 
-    override fun setSubject(subject: String) {
-        messagePreviewSubject.text = subject
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun setRecipient(recipient: String) {
-        messagePreviewAuthor.text = "${getString(R.string.message_to)} $recipient"
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun setSender(sender: String) {
-        messagePreviewAuthor.text = "${getString(R.string.message_from)} $sender"
-    }
-
-    override fun setDate(date: String) {
-        messagePreviewDate.text = getString(R.string.message_date, date)
-    }
-
-    override fun setContent(content: String) {
-        messagePreviewContent.text = content
+    override fun setMessageWithAttachment(item: MessageWithAttachment) {
+        with(previewAdapter) {
+            messageWithAttachment = item
+            notifyDataSetChanged()
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+        binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        messagePreviewContentContainer.visibility = if (show) VISIBLE else GONE
+        binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showOptions(show: Boolean) {
@@ -126,8 +118,16 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         menuDeleteButton?.setTitle(R.string.message_move_to_bin)
     }
 
-    override fun showMessageError() {
-        messagePreviewError.visibility = VISIBLE
+    override fun showErrorView(show: Boolean) {
+        binding.messagePreviewError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.messagePreviewErrorMessage.text = message
+    }
+
+    override fun setErrorRetryCallback(callback: () -> Unit) {
+        binding.messagePreviewErrorRetry.setOnClickListener { callback() }
     }
 
     override fun openMessageReply(message: Message?) {
@@ -143,12 +143,12 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
     }
 
     override fun notifyParentMessageDeleted(message: Message) {
-        fragmentManager?.fragments?.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
+        parentFragmentManager.fragments.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
+        outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
-        outState.putLong(MESSAGE_ID_KEY, presenter.messageId)
     }
 
     override fun onDestroyView() {
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 a230c0b3..62ac5a53 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
@@ -7,7 +7,6 @@ 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 io.github.wulkanowy.utils.toFormattedString
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -19,43 +18,52 @@ class MessagePreviewPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
 
-    var messageId = 0L
+    var message: Message? = null
 
-    private var message: Message? = null
+    private lateinit var lastError: Throwable
 
-    fun onAttachView(view: MessagePreviewView, id: Long) {
+    private var retryCallback: () -> Unit = {}
+
+    fun onAttachView(view: MessagePreviewView, message: Message?) {
         super.onAttachView(view)
-        loadData(id)
+        view.initView()
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        this.message = message
+        loadData(requireNotNull(message))
     }
 
-    private fun loadData(id: Long) {
-        Timber.i("Loading message $id preview started")
-        messageId = id
+    private fun onMessageLoadRetry(message: Message) {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData(message)
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    private fun loadData(message: Message) {
+        Timber.i("Loading message ${message.messageId} preview started")
         disposable.apply {
             clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { messageRepository.getMessage(it, messageId, true) }
+            add(studentRepository.getStudentById(message.studentId)
+                .flatMap { messageRepository.getMessage(it, message, true) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally { view?.showProgress(false) }
                 .subscribe({ message ->
-                    Timber.i("Loading message $id preview result: Success ")
-                    this@MessagePreviewPresenter.message = message
-                    view?.run {
-                        message.let {
-                            setSubject(if (it.subject.isNotBlank()) it.subject else noSubjectString)
-                            setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
-                            setContent(it.content.orEmpty())
-                            initOptions()
-
-                            if (it.recipient.isNotBlank()) setRecipient(it.recipient)
-                            else setSender(it.sender)
-                        }
+                    Timber.i("Loading message ${message.message.messageId} preview result: Success ")
+                    this@MessagePreviewPresenter.message = message.message
+                    view?.apply {
+                        setMessageWithAttachment(message)
+                        initOptions()
                     }
-                    analytics.logEvent("load_message_preview", "length" to message.content?.length)
+                    analytics.logEvent("load_message_preview", "length" to message.message.content.length)
                 }) {
-                    Timber.i("Loading message $id preview result: An exception occurred ")
-                    view?.showMessageError()
+                    Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
+                    retryCallback = { onMessageLoadRetry(message) }
                     errorHandler.dispatch(it)
                 })
         }
@@ -77,7 +85,8 @@ class MessagePreviewPresenter @Inject constructor(
 
     private fun deleteMessage() {
         message?.let { message ->
-            disposable.add(messageRepository.deleteMessage(message)
+            disposable.add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.deleteMessage(it, message) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doOnSubscribe {
@@ -85,6 +94,7 @@ class MessagePreviewPresenter @Inject constructor(
                         showContent(false)
                         showProgress(true)
                         showOptions(false)
+                        showErrorView(false)
                     }
                 }
                 .doFinally {
@@ -97,15 +107,22 @@ class MessagePreviewPresenter @Inject constructor(
                         popView()
                     }
                 }, { error ->
-                    view?.showMessageError()
+                    retryCallback = { onMessageDelete() }
                     errorHandler.dispatch(error)
-                }, {
-                    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 373dee11..3d620459 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
@@ -1,41 +1,38 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
 
 interface MessagePreviewView : BaseView {
 
-    val noSubjectString: String
-
     val deleteMessageSuccessString: String
 
-    fun setSubject(subject: String)
+    fun initView()
 
-    fun setRecipient(recipient: String)
-
-    fun setSender(sender: String)
-
-    fun setDate(date: String)
-
-    fun setContent(content: String)
+    fun setMessageWithAttachment(item: MessageWithAttachment)
 
     fun showProgress(show: Boolean)
 
     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/send/RecipientChip.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
deleted file mode 100644
index be433b00..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.send
-
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import com.pchmn.materialchips.model.ChipInterface
-import io.github.wulkanowy.data.db.entities.Recipient
-
-class RecipientChip(var recipient: Recipient) : ChipInterface {
-
-    override fun getAvatarDrawable(): Drawable? = null
-
-    override fun getAvatarUri(): Uri? = null
-
-    override fun getId(): Any = recipient.id
-
-    override fun getLabel(): String = recipient.name
-
-    override fun getInfo(): String {
-        return recipient.realName.run {
-            substringBeforeLast("-").let { sub ->
-                when {
-                    (sub == this) -> this
-                    (sub.indexOf('(') != -1) -> indexOf("(").let { substring(if (it != -1) it else 0) }
-                    (sub.indexOf('[') != -1) -> indexOf("[").let { substring(if (it != -1) it else 0) }
-                    else -> substringAfter('-')
-                }
-            }.trim()
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
new file mode 100644
index 00000000..dd2d2b9b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.materialchipsinput.ChipItem
+
+data class RecipientChipItem(
+
+    override val title: String,
+
+    override val summary: String,
+
+    val recipient: Recipient
+
+) : ChipItem
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 5c6e74b0..7b750343 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -2,24 +2,26 @@ package io.github.wulkanowy.ui.modules.message.send
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.TouchDelegate
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.activity_send_message.*
 import javax.inject.Inject
 
-class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageView {
+class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
 
     @Inject
     override lateinit var presenter: SendMessagePresenter
@@ -38,14 +40,18 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         }
     }
 
-    override val formRecipientsData: List<Recipient>
-        get() = (sendMessageRecipientsInput.selectedChipList).map { (it as RecipientChip).recipient }
+    override val isDropdownListVisible: Boolean
+        get() = binding.sendMessageTo.isDropdownListVisible
+
+    @Suppress("UNCHECKED_CAST")
+    override val formRecipientsData: List<RecipientChipItem>
+        get() = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = sendMessageSubjectInput.text.toString()
+        get() = binding.sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = sendMessageContentInput.text.toString()
+        get() = binding.sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -58,14 +64,22 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_send_message)
-        setSupportActionBar(sendMessageToolbar)
+        setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        messageContainer = sendMessageContainer
+        messageContainer = binding.sendMessageContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
+    override fun initView() {
+        setUpExtendedHitArea()
+        with(binding) {
+            sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+            sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.action_menu_send_message, menu)
         return true
@@ -81,27 +95,27 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        sendMessageFromTextView.setText(unit.senderName)
+        binding.sendMessageFrom.text = unit.senderName
     }
 
-    override fun setRecipients(recipients: List<Recipient>) {
-        sendMessageRecipientsInput.filterableList = recipients.map { RecipientChip(it) }
+    override fun setRecipients(recipients: List<RecipientChipItem>) {
+        binding.sendMessageTo.filterableChipItems = recipients
     }
 
-    override fun setSelectedRecipients(recipients: List<Recipient>) {
-        recipients.map { sendMessageRecipientsInput.addChip(RecipientChip(it)) }
+    override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
+        binding.sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
-        sendMessageProgress.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        sendMessageContent.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showActionBar(show: Boolean) {
@@ -109,11 +123,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setSubject(subject: String) {
-        sendMessageSubjectInput.setText(subject)
+        binding.sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        sendMessageContentInput.setText(content)
+        binding.sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -124,7 +138,43 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         if (show) showSoftInput() else hideSoftInput()
     }
 
+    override fun hideDropdownList() {
+        binding.sendMessageTo.hideDropdownList()
+    }
+
+    override fun scrollToRecipients() {
+        with(binding.sendMessageScroll) {
+            post {
+                scrollTo(0, binding.sendMessageTo.bottom - dpToPx(53f).toInt())
+            }
+        }
+    }
+
     override fun popView() {
-        onBackPressed()
+        finish()
+    }
+
+    private fun setUpExtendedHitArea() {
+        fun extendHitArea() {
+            val containerHitRect = Rect().apply {
+                binding.sendMessageContent.getHitRect(this)
+            }
+
+            val contentHitRect = Rect().apply {
+                binding.sendMessageMessageContent.getHitRect(this)
+            }
+
+            contentHitRect.top = contentHitRect.bottom
+            contentHitRect.bottom = containerHitRect.bottom
+
+            binding.sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
+        }
+
+        with(binding.sendMessageMessageContent) {
+            post {
+                addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> extendHitArea() }
+                extendHitArea()
+            }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 4808fafc..aec79f9d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -32,6 +32,7 @@ class SendMessagePresenter @Inject constructor(
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
         view.apply {
@@ -54,15 +55,47 @@ class SendMessagePresenter @Inject constructor(
         }
     }
 
+    fun onTouchScroll(): Boolean {
+        return view?.run {
+            if (isDropdownListVisible) {
+                hideDropdownList()
+                true
+            } else false
+        } == true
+    }
+
+    fun onRecipientsTextChange(text: String) {
+        if (text.isBlank()) return
+        view?.scrollToRecipients()
+    }
+
     fun onUpNavigate(): Boolean {
         view?.popView()
         return true
     }
 
+    fun onSend(): Boolean {
+        view?.run {
+            when {
+                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                else -> {
+                    sendMessage(
+                        subject = formSubjectValue,
+                        content = formContentValue,
+                        recipients = formRecipientsData.map { it.recipient }
+                    )
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     private fun loadData(message: Message?, reply: Boolean?) {
         var reportingUnit: ReportingUnit? = null
-        var recipients: List<Recipient> = emptyList()
-        var selectedRecipient: List<Recipient> = emptyList()
+        var recipientChips: List<RecipientChipItem> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
         Timber.i("Loading recipients started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -73,14 +106,14 @@ class SendMessagePresenter @Inject constructor(
                     .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
                     .doOnSuccess {
                         Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
-                        recipients = it
+                        recipientChips = createChips(it)
                     }
                     .flatMapCompletable {
                         if (message == null || reply != true) Completable.complete()
                         else recipientRepository.getMessageRecipients(student, message)
                             .doOnSuccess {
                                 Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
-                                selectedRecipient = it
+                                selectedRecipientChips = createChips(it)
                             }
                             .ignoreElement()
                     }
@@ -95,19 +128,19 @@ class SendMessagePresenter @Inject constructor(
             }
             .doFinally { view?.run { showProgress(false) } }
             .subscribe({
-                view?.apply {
+                view?.run {
                     if (reportingUnit !== null) {
                         reportingUnit?.let { setReportingUnit(it) }
-                        setRecipients(recipients)
-                        if (selectedRecipient.isNotEmpty()) setSelectedRecipients(selectedRecipient)
+                        setRecipients(recipientChips)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
                         showContent(true)
                     } else {
-                        Timber.e("Loading recipients result: Can't find the reporting unit")
+                        Timber.i("Loading recipients result: Can't find the reporting unit")
                         view?.showEmpty(true)
                     }
                 }
             }, {
-                Timber.e("Loading recipients result: An exception occurred")
+                Timber.i("Loading recipients result: An exception occurred")
                 view?.showContent(true)
                 errorHandler.dispatch(it)
             }))
@@ -115,7 +148,8 @@ class SendMessagePresenter @Inject constructor(
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
         Timber.i("Sending message started")
-        disposable.add(messageRepository.sendMessage(subject, content, recipients)
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { messageRepository.sendMessage(it, subject, content, recipients) }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
@@ -145,21 +179,29 @@ class SendMessagePresenter @Inject constructor(
         )
     }
 
-    fun onSend(): Boolean {
-        view?.run {
-            when {
-                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
-                formContentValue.length < 3 -> showMessage(messageContentMinLength)
-                else -> {
-                    sendMessage(
-                        subject = formSubjectValue,
-                        content = formContentValue,
-                        recipients = formRecipientsData
-                    )
-                    return true
+    private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
+        fun generateCorrectSummary(recipientRealName: String): String {
+            val substring = recipientRealName.substringBeforeLast("-")
+            return when {
+                substring == recipientRealName -> recipientRealName
+                substring.indexOf("(") != -1 -> {
+                    recipientRealName.indexOf("(")
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
                 }
-            }
+                substring.indexOf("[") != -1 -> {
+                    recipientRealName.indexOf("[")
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
+                }
+                else -> recipientRealName.substringAfter("-")
+            }.trim()
+        }
+
+        return recipients.map {
+            RecipientChipItem(
+                title = it.name,
+                summary = generateCorrectSummary(it.realName),
+                recipient = it
+            )
         }
-        return false
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
index 8a2cb4f6..2839f9ce 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.ui.base.BaseView
 
 interface SendMessageView : BaseView {
 
-    val formRecipientsData: List<Recipient>
+    val isDropdownListVisible: Boolean
+
+    val formRecipientsData: List<RecipientChipItem>
 
     val formSubjectValue: String
 
@@ -18,11 +19,13 @@ interface SendMessageView : BaseView {
 
     val messageSuccess: String
 
+    fun initView()
+
     fun setReportingUnit(unit: ReportingUnit)
 
-    fun setRecipients(recipients: List<Recipient>)
+    fun setRecipients(recipients: List<RecipientChipItem>)
 
-    fun setSelectedRecipients(recipients: List<Recipient>)
+    fun setSelectedRecipients(recipients: List<RecipientChipItem>)
 
     fun showProgress(show: Boolean)
 
@@ -38,5 +41,9 @@ interface SendMessageView : BaseView {
 
     fun showSoftInput(show: Boolean)
 
+    fun hideDropdownList()
+
+    fun scrollToRecipients()
+
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
new file mode 100644
index 00000000..a889dfef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -0,0 +1,85 @@
+package io.github.wulkanowy.ui.modules.message.tab
+
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SortedList
+import androidx.recyclerview.widget.SortedListAdapterCallback
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.databinding.ItemMessageBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class MessageTabAdapter @Inject constructor() :
+    RecyclerView.Adapter<MessageTabAdapter.ItemViewHolder>() {
+
+    var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
+
+    private val items = SortedList(Message::class.java, object :
+        SortedListAdapterCallback<Message>(this) {
+
+        override fun compare(item1: Message, item2: Message): Int {
+            return item2.date.compareTo(item1.date)
+        }
+
+        override fun areContentsTheSame(oldItem: Message?, newItem: Message?): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areItemsTheSame(item1: Message, item2: Message): Boolean {
+            return item1 == item2
+        }
+    })
+
+    fun replaceAll(models: List<Message>) {
+        items.beginBatchedUpdates()
+        for (i in items.size() - 1 downTo 0) {
+            val model = items.get(i)
+            if (model !in models) {
+                items.remove(model)
+            }
+        }
+        items.addAll(models)
+        items.endBatchedUpdates()
+    }
+
+    fun updateItem(position: Int, item: Message) {
+        items.updateItemAt(position, item)
+    }
+
+    override fun getItemCount() = items.size()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            val style = if (item.unread) Typeface.BOLD else Typeface.NORMAL
+
+            messageItemAuthor.run {
+                text = if (item.folderId == MessageFolder.SENT.id) item.recipient else item.sender
+                setTypeface(null, style)
+            }
+            messageItemSubject.run {
+                text = if (item.subject.isNotBlank()) item.subject else context.getString(R.string.message_no_subject)
+                setTypeface(null, style)
+            }
+            messageItemDate.run {
+                text = item.date.toFormattedString()
+                setTypeface(null, style)
+            }
+            messageItemAttachmentIcon.visibility = if (item.hasAttachments) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(item, position) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
+}
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 326cd6a7..909bb687 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
@@ -1,34 +1,33 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 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 androidx.appcompat.widget.SearchView
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.databinding.FragmentMessageTabBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
-import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_message_tab.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class MessageTabFragment : BaseFragment(), MessageTabView {
+class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
+    MessageTabView {
 
     @Inject
     lateinit var presenter: MessageTabPresenter
 
     @Inject
-    lateinit var tabAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var tabAdapter: MessageTabAdapter
 
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
@@ -42,72 +41,96 @@ class MessageTabFragment : BaseFragment(), MessageTabView {
         }
     }
 
-    override val noSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
     override val isViewEmpty
-        get() = tabAdapter.isEmpty
+        get() = tabAdapter.itemCount == 0
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message_tab, container, false)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = messageTabRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessageTabBinding.bind(view)
+        messageContainer = binding.messageTabRecycler
         presenter.onAttachView(this, MessageFolder.valueOf(
             (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
     override fun initView() {
-        tabAdapter.setOnItemClickListener { presenter.onMessageItemSelected(it) }
+        tabAdapter.onClickListener = presenter::onMessageItemSelected
 
-        messageTabRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.messageTabRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = tabAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
+            messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
-    override fun updateData(data: List<MessageItem>) {
-        tabAdapter.updateDataSet(data)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.action_menu_message_tab, menu)
+
+        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
+        searchView.queryHint = getString(R.string.all_search_hint)
+        searchView.maxWidth = Int.MAX_VALUE
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String) = false
+            override fun onQueryTextChange(query: String): Boolean {
+                presenter.onSearchQueryTextChange(query)
+                return true
+            }
+        })
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        tabAdapter.updateItem(item)
+    override fun updateData(data: List<Message>) {
+        tabAdapter.replaceAll(data)
     }
 
-    override fun clearView() {
-        tabAdapter.clear()
+    override fun updateItem(item: Message, position: Int) {
+        tabAdapter.updateItem(position, item)
     }
 
     override fun showProgress(show: Boolean) {
-        messageTabProgress.visibility = if (show) VISIBLE else GONE
+        binding.messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        messageTabSwipe.isEnabled = enable
+        binding.messageTabSwipe.isEnabled = enable
+    }
+
+    override fun resetListPosition() {
+        binding.messageTabRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.messageTabError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.messageTabErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        messageTabSwipe.isRefreshing = show
+        binding.messageTabSwipe.isRefreshing = show
     }
 
-    override fun openMessage(messageId: Long) {
-        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(messageId))
+    override fun openMessage(message: Message) {
+        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(message))
     }
 
     override fun notifyParentDataLoaded() {
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 af576293..f96fb6c2 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
@@ -1,15 +1,16 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.annotation.SuppressLint
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
+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.ui.modules.message.MessageItem
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.toFormattedString
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -18,14 +19,22 @@ class MessageTabPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
+    private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MessageTabView>(errorHandler, studentRepository, schedulers) {
 
     lateinit var folder: MessageFolder
 
+    private lateinit var lastError: Throwable
+
+    private var lastSearchQuery = ""
+
+    private var messages = emptyList<Message>()
+
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
+        errorHandler.showErrorMessage = ::showErrorViewOnError
         this.folder = folder
     }
 
@@ -34,6 +43,18 @@ 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)
     }
@@ -42,16 +63,13 @@ class MessageTabPresenter @Inject constructor(
         loadData(forceRefresh)
     }
 
-    fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item is MessageItem) {
-            Timber.i("Select message ${item.message.id} item")
-            view?.run {
-                openMessage(item.message.id)
-                if (item.message.unread) {
-                    item.message.unread = false
-                    updateItem(item)
-                    updateMessage(item.message)
-                }
+    fun onMessageItemSelected(message: Message, position: Int) {
+        Timber.i("Select message ${message.id} item")
+        view?.run {
+            openMessage(message)
+            if (message.unread) {
+                message.unread = false
+                updateItem(message, position)
             }
         }
     }
@@ -61,8 +79,10 @@ class MessageTabPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { messageRepository.getMessages(it, folder, forceRefresh) }
-                .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student)
+                        .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+                }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -75,29 +95,53 @@ class MessageTabPresenter @Inject constructor(
                 }
                 .subscribe({
                     Timber.i("Loading $folder message result: Success")
-                    view?.run {
-                        showEmpty(it.isEmpty())
-                        showContent(it.isNotEmpty())
-                        updateData(it)
-                    }
+                    messages = it
+                    onSearchQueryTextChange(lastSearchQuery)
                     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 updateMessage(message: Message) {
-        Timber.i("Attempt to update message ${message.id}")
-        disposable.add(messageRepository.updateMessage(message)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({ Timber.d("Update message ${message.id} result: Success") })
-            { error ->
-                Timber.i("Update message ${message.id} result: An exception occurred")
-                errorHandler.dispatch(error)
-            })
+    private fun showErrorViewOnError(message: String, error: Throwable) {
+        view?.run {
+            if (isViewEmpty) {
+                lastError = error
+                setErrorDetails(message)
+                showErrorView(true)
+                showEmpty(false)
+            } else showError(message, error)
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    fun onSearchQueryTextChange(query: String) {
+        lastSearchQuery = query
+
+        val lowerCaseQuery = query.toLowerCase()
+        val filteredList = mutableListOf<Message>()
+        messages.forEach {
+            if (lowerCaseQuery in it.subject.toLowerCase() ||
+                lowerCaseQuery in it.sender.toLowerCase() ||
+                lowerCaseQuery in it.recipient.toLowerCase() ||
+                lowerCaseQuery in it.date.toFormattedString()
+            ) {
+                filteredList.add(it)
+            }
+        }
+
+        updateData(filteredList)
+    }
+
+    private fun updateData(data: List<Message>) {
+        view?.run {
+            showEmpty(data.isEmpty())
+            showContent(data.isNotEmpty())
+            showErrorView(false)
+            updateData(data)
+            resetListPosition()
+        }
     }
 }
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 967863de..f521191c 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
@@ -1,22 +1,19 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.message.MessageItem
 
 interface MessageTabView : BaseView {
 
-    val noSubjectString: String
-
     val isViewEmpty: Boolean
 
     fun initView()
 
-    fun updateData(data: List<MessageItem>)
+    fun resetListPosition()
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateData(data: List<Message>)
 
-    fun clearView()
+    fun updateItem(item: Message, position: Int)
 
     fun showProgress(show: Boolean)
 
@@ -26,9 +23,13 @@ interface MessageTabView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showRefresh(show: Boolean)
 
-    fun openMessage(messageId: Long)
+    fun openMessage(message: Message)
 
     fun notifyParentDataLoaded()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
index 27c72ce6..4bc3097d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
@@ -1,10 +1,38 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.databinding.ItemMobileDeviceBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
 
-class MobileDeviceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
+class MobileDeviceAdapter @Inject constructor() :
+    RecyclerView.Adapter<MobileDeviceAdapter.ItemViewHolder>() {
+
+    var items = mutableListOf<MobileDevice>()
 
     var onDeviceUnregisterListener: (device: MobileDevice, position: Int) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMobileDeviceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val device = items[position]
+
+        with(holder.binding) {
+            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
+            mobileDeviceItemName.text = device.name
+            mobileDeviceItemUnregister.setOnClickListener {
+                onDeviceUnregisterListener(device, position)
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMobileDeviceBinding) :
+        RecyclerView.ViewHolder(binding.root)
 }
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 1d9104a8..6a3e5a44 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
@@ -1,31 +1,31 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
 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.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.helpers.UndoHelper
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.core.view.postDelayed
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.databinding.FragmentMobileDeviceBinding
 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.mobiledevice.token.MobileDeviceTokenDialog
-import kotlinx.android.synthetic.main.fragment_mobile_device.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledView {
+class MobileDeviceFragment :
+    BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: MobileDevicePresenter
 
     @Inject
-    lateinit var devicesAdapter: MobileDeviceAdapter<AbstractFlexibleItem<*>>
+    lateinit var devicesAdapter: MobileDeviceAdapter
 
     companion object {
         fun newInstance() = MobileDeviceFragment()
@@ -35,82 +35,95 @@ class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledVi
         get() = R.string.mobile_devices_title
 
     override val isViewEmpty: Boolean
-        get() = devicesAdapter.isEmpty
+        get() = devicesAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_mobile_device, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = mobileDevicesRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMobileDeviceBinding.bind(view)
+        messageContainer = binding.mobileDevicesRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(mobileDevicesRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        devicesAdapter.onDeviceUnregisterListener = presenter::onUnregisterDevice
+
+        with(binding.mobileDevicesRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = devicesAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
         }
+
+        with(binding) {
+            mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
+            mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
+        }
+    }
+
+    override fun updateData(data: List<MobileDevice>) {
         with(devicesAdapter) {
-            isPermanentDelete = false
-            onDeviceUnregisterListener = presenter::onUnregisterDevice
+            items = data.toMutableList()
+            notifyDataSetChanged()
         }
-        mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
     }
 
-    override fun updateData(data: List<MobileDeviceItem>) {
-        devicesAdapter.updateDataSet(data)
-    }
-
-    override fun restoreDeleteItem() {
-        devicesAdapter.restoreDeletedItems()
-    }
-
-    override fun clearData() {
-        devicesAdapter.clear()
-    }
-
-    override fun showUndo(position: Int, device: MobileDevice) {
-        val onActionListener = object : UndoHelper.OnActionListener {
-            override fun onActionConfirmed(action: Int, event: Int) {
-                presenter.onUnregisterConfirmed(device)
-            }
-
-            override fun onActionCanceled(action: Int, positions: MutableList<Int>?) {
-                presenter.onUnregisterCancelled()
-            }
+    override fun deleteItem(device: MobileDevice, position: Int) {
+        with(devicesAdapter) {
+            items.removeAt(position)
+            notifyItemRemoved(position)
+            notifyItemRangeChanged(position, itemCount)
         }
+    }
 
-        UndoHelper(devicesAdapter, onActionListener)
-            .withConsecutive(false)
-            .withAction(UndoHelper.Action.REMOVE)
-            .start(listOf(position), mobileDevicesRecycler, R.string.mobile_device_removed, R.string.all_undo, 3000)
+    override fun restoreDeleteItem(device: MobileDevice, position: Int) {
+        with(devicesAdapter) {
+            items.add(position, device)
+            notifyItemInserted(position)
+            notifyItemRangeChanged(position, itemCount)
+        }
+    }
+
+    override fun showUndo(device: MobileDevice, position: Int) {
+        var confirmed = true
+
+        Snackbar.make(binding.mobileDevicesRecycler, getString(R.string.mobile_device_removed), 3000)
+            .setAction(R.string.all_undo) {
+                confirmed = false
+                presenter.onUnregisterCancelled(device, position)
+            }.show()
+
+        view?.postDelayed(3000) {
+            if (confirmed) presenter.onUnregisterConfirmed(device)
+        }
     }
 
     override fun hideRefresh() {
-        mobileDevicesSwipe.isRefreshing = false
+        binding.mobileDevicesSwipe.isRefreshing = false
     }
 
     override fun showProgress(show: Boolean) {
-        mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.mobileDevicesError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.mobileDevicesErrorMessage.text = message
     }
 
     override fun enableSwipe(enable: Boolean) {
-        mobileDevicesSwipe.isEnabled = enable
+        binding.mobileDevicesSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showTokenDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
deleted file mode 100644
index 436c2d0e..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.mobiledevice
-
-import android.view.View
-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.MobileDevice
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_mobile_device.*
-
-class MobileDeviceItem(val device: MobileDevice) : AbstractFlexibleItem<MobileDeviceItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_mobile_device
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
-            mobileDeviceItemName.text = device.name
-            mobileDeviceItemUnregister.setOnClickListener {
-                (adapter as MobileDeviceAdapter).onDeviceUnregisterListener(device, holder.flexibleAdapterPosition)
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MobileDeviceItem
-
-        if (device.id != other.device.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = device.hashCode()
-        result = 31 * result + device.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/mobiledevice/MobileDeviceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
deleted file mode 100644
index 59bbaa9f..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.mobiledevice
-
-import dagger.Module
-import dagger.Provides
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-
-@Module
-class MobileDeviceModule {
-
-    @Provides
-    fun provideMobileDeviceFlexibleAdapter() = MobileDeviceAdapter<AbstractFlexibleItem<*>>()
-}
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 71359a52..d8c99b22 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,10 +20,13 @@ 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()
     }
 
@@ -31,12 +34,26 @@ 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()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { mobileDeviceRepository.getDevices(it, forceRefresh) }
-            .map { items -> items.map { MobileDeviceItem(it) } }
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getDevices(student, semester, forceRefresh)
+                }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -51,6 +68,7 @@ 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)
             }) {
@@ -59,20 +77,32 @@ 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()
     }
 
     fun onUnregisterDevice(device: MobileDevice, position: Int) {
         view?.run {
-            showUndo(position, device)
+            deleteItem(device, position)
+            showUndo(device, position)
             showEmpty(isViewEmpty)
         }
     }
 
-    fun onUnregisterCancelled() {
+    fun onUnregisterCancelled(device: MobileDevice, position: Int) {
         view?.run {
-            restoreDeleteItem()
+            restoreDeleteItem(device, position)
             showEmpty(isViewEmpty)
         }
     }
@@ -80,12 +110,12 @@ class MobileDevicePresenter @Inject constructor(
     fun onUnregisterConfirmed(device: MobileDevice) {
         Timber.i("Unregister device started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { semester ->
-                mobileDeviceRepository.unregisterDevice(semester, device)
-                    .flatMap { mobileDeviceRepository.getDevices(semester, it) }
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.unregisterDevice(student, semester, device)
+                        .flatMap { mobileDeviceRepository.getDevices(student, semester, it) }
+                }
             }
-            .map { items -> items.map { MobileDeviceItem(it) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
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 58804e24..ec2d3f87 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
@@ -9,14 +9,16 @@ interface MobileDeviceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<MobileDeviceItem>)
+    fun updateData(data: List<MobileDevice>)
 
-    fun restoreDeleteItem()
+    fun deleteItem(device: MobileDevice, position: Int)
+
+    fun restoreDeleteItem(device: MobileDevice, position: Int)
+
+    fun showUndo(device: MobileDevice, position: Int)
 
     fun hideRefresh()
 
-    fun clearData()
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -25,7 +27,9 @@ interface MobileDeviceView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showUndo(position: Int, device: MobileDevice)
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
 
     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 a4110128..9ac6049e 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,5 +1,7 @@
 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
@@ -9,15 +11,14 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Toast
-import dagger.android.support.DaggerDialogFragment
+import androidx.core.content.getSystemService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRemote
-import io.github.wulkanowy.ui.base.BaseActivity
-import kotlinx.android.synthetic.main.dialog_mobile_device.*
+import io.github.wulkanowy.databinding.DialogMobileDeviceBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import javax.inject.Inject
 
-class MobileDeviceTokenDialog : DaggerDialogFragment(), MobileDeviceTokenVIew {
+class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
@@ -32,7 +33,7 @@ class MobileDeviceTokenDialog : DaggerDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_mobile_device, container, false)
+        return DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -41,47 +42,46 @@ class MobileDeviceTokenDialog : DaggerDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun initView() {
-        mobileDeviceDialogClose.setOnClickListener { dismiss() }
+        binding.mobileDeviceDialogClose.setOnClickListener { dismiss() }
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        mobileDeviceDialogToken.text = token.token
-        mobileDeviceDialogSymbol.text = token.symbol
-        mobileDeviceDialogPin.text = token.pin
+        with(binding.mobileDeviceDialogToken) {
+            text = token.token
+            setOnClickListener { clickCopy(token.token) }
+        }
+        with(binding.mobileDeviceDialogSymbol) {
+            text = token.symbol
+            setOnClickListener { clickCopy(token.symbol) }
+        }
+        with(binding.mobileDeviceDialogPin) {
+            text = token.pin
+            setOnClickListener { clickCopy(token.pin) }
+        }
 
-        mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
+        binding.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
+        binding.mobileDeviceDialogProgress.visibility = GONE
     }
 
     override fun showContent() {
-        mobileDeviceDialogContent.visibility = VISIBLE
+        binding.mobileDeviceDialogContent.visibility = VISIBLE
     }
 
     override fun closeDialog() {
         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/mobiledevice/token/MobileDeviceTokenPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
index a778cbed..6a2a6b98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
@@ -29,8 +29,11 @@ class MobileDeviceTokenPresenter @Inject constructor(
     private fun loadData() {
         Timber.i("Mobile device registration data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { mobileDeviceRepository.getToken(it) }
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getToken(student, semester)
+                }
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally { view?.hideLoading() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
new file mode 100644
index 00000000..70587b0c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.more
+
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemMoreBinding
+import javax.inject.Inject
+
+class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Pair<String, Drawable?>>()
+
+    var onClickListener: (name: String) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMoreBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (title, drawable) = items[position]
+
+        with(holder.binding) {
+            moreItemTitle.text = title
+            moreItemImage.setImageDrawable(drawable)
+
+            root.setOnClickListener { onClickListener(title) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMoreBinding) : RecyclerView.ViewHolder(binding.root)
+}
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 8b50a1c8..a79087de 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
@@ -2,14 +2,10 @@ package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -19,18 +15,19 @@ 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.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_more.*
+import io.github.wulkanowy.utils.getCompatDrawable
 import javax.inject.Inject
 
-class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.MainChildView {
+class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MorePresenter
 
     @Inject
-    lateinit var moreAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var moreAdapter: MoreAdapter
 
     companion object {
         fun newInstance() = MoreFragment()
@@ -39,75 +36,41 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     override val titleStringId: Int
         get() = R.string.more_title
 
-
     override val messagesRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.message_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_messages_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.message_title) to getCompatDrawable(R.drawable.ic_more_messages) }
 
     override val homeworkRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.homework_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_homework_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.homework_title) to getCompatDrawable(R.drawable.ic_more_homework) }
 
     override val noteRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.note_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_note_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.note_title) to getCompatDrawable(R.drawable.ic_more_note) }
 
     override val luckyNumberRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.lucky_number_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_lucky_number_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
 
     override val mobileDevicesRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.mobile_devices_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_menu_main_mobile_devices_24dp)
-            }
-        }
+        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() {
-            return context?.run {
-                getString(R.string.settings_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_settings_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
 
     override val aboutRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.about_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_all_about_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_more, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMoreBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        moreAdapter.run { setOnItemClickListener { presenter.onItemSelected(it) } }
+        moreAdapter.onClickListener = presenter::onItemSelected
 
-        moreRecycler.apply {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.moreRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = moreAdapter
         }
     }
@@ -116,8 +79,11 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
-    override fun updateData(data: List<MoreItem>) {
-        moreAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<String, Drawable?>>) {
+        with(moreAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun openMessagesView() {
@@ -140,6 +106,10 @@ 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())
     }
@@ -148,8 +118,8 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(AboutFragment.newInstance())
     }
 
-    override fun popView() {
-        (activity as? MainActivity)?.popView()
+    override fun popView(depth: Int) {
+        (activity as? MainActivity)?.popView(depth)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
deleted file mode 100644
index 85b604e7..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.ui.modules.more
-
-import android.graphics.drawable.Drawable
-import android.view.View
-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 kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_more.*
-
-class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFlexibleItem<MoreItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_more
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            moreItemTitle.text = title
-            moreItemImage.setImageDrawable(drawable)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MoreItem
-
-        if (title != other.title) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return title.hashCode()
-    }
-
-    class ViewHolder(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/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index f9fd5bbf..593645c1 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.more
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -21,40 +20,40 @@ class MorePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is MoreItem) {
-            Timber.i("Select more item \"${item.title}\"")
-            view?.run {
-                when (item.title) {
-                    messagesRes?.first -> openMessagesView()
-                    homeworkRes?.first -> openHomeworkView()
-                    noteRes?.first -> openNoteView()
-                    luckyNumberRes?.first -> openLuckyNumberView()
-                    mobileDevicesRes?.first -> openMobileDevicesView()
-                    settingsRes?.first -> openSettingsView()
-                    aboutRes?.first -> openAboutView()
-                }
+    fun onItemSelected(title: String) {
+        Timber.i("Select more item \"${title}\"")
+        view?.run {
+            when (title) {
+                messagesRes?.first -> openMessagesView()
+                homeworkRes?.first -> openHomeworkView()
+                noteRes?.first -> openNoteView()
+                luckyNumberRes?.first -> openLuckyNumberView()
+                mobileDevicesRes?.first -> openMobileDevicesView()
+                schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
+                settingsRes?.first -> openSettingsView()
+                aboutRes?.first -> openAboutView()
             }
         }
     }
 
     fun onViewReselected() {
         Timber.i("More view is reselected")
-        view?.popView()
+        view?.popView(2)
     }
 
     private fun loadData() {
         Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
-                messagesRes?.let { MoreItem(it.first, it.second) },
-                homeworkRes?.let { MoreItem(it.first, it.second) },
-                noteRes?.let { MoreItem(it.first, it.second) },
-                luckyNumberRes?.let { MoreItem(it.first, it.second) },
-                mobileDevicesRes?.let { MoreItem(it.first, it.second) },
-                settingsRes?.let { MoreItem(it.first, it.second) },
-                aboutRes?.let { MoreItem(it.first, it.second) })
-            )
+                messagesRes,
+                homeworkRes,
+                noteRes,
+                luckyNumberRes,
+                mobileDevicesRes,
+                schoolAndTeachersRes,
+                settingsRes,
+                aboutRes
+            ))
         }
     }
 }
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 9c1abb90..922afdfd 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,19 +15,21 @@ interface MoreView : BaseView {
 
     val mobileDevicesRes: Pair<String, Drawable?>?
 
+    val schoolAndTeachersRes: Pair<String, Drawable?>?
+
     val settingsRes: Pair<String, Drawable?>?
 
     val aboutRes: Pair<String, Drawable?>?
 
     fun initView()
 
-    fun updateData(data: List<MoreItem>)
+    fun updateData(data: List<Pair<String, Drawable?>>)
 
     fun openSettingsView()
 
     fun openAboutView()
 
-    fun popView()
+    fun popView(depth: Int)
 
     fun openMessagesView()
 
@@ -38,4 +40,6 @@ interface MoreView : BaseView {
     fun openLuckyNumberView()
 
     fun openMobileDevicesView()
+
+    fun openSchoolAndTeachersView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
new file mode 100644
index 00000000..2ffcad94
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.ui.modules.note
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.ItemNoteBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemViewHolder>() {
+
+    var items = mutableListOf<Note>()
+
+    var onClickListener: (Note, position: Int) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            with(noteItemDate) {
+                text = item.date.toFormattedString()
+                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
+            }
+            with(noteItemType) {
+                text = item.category
+                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
+            }
+            with(noteItemPoints) {
+                text = "${if (item.points > 0) "+" else ""}${item.points}"
+                visibility = if (item.isPointsShow) View.VISIBLE else View.GONE
+                setTextColor(when (CategoryType.getByValue(item.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
+                    else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
+            }
+            noteItemTeacher.text = item.teacher
+            noteItemContent.text = item.content
+
+            root.setOnClickListener { onClickListener(item, position) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemNoteBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index 492aeab2..6d1b181a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -1,17 +1,24 @@
 package io.github.wulkanowy.ui.modules.note
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.DialogNoteBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_note.*
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 class NoteDialog : DialogFragment() {
 
+    private var binding: DialogNoteBinding by lifecycleAwareVariable()
+
     private lateinit var note: Note
 
     companion object {
@@ -33,16 +40,31 @@ class NoteDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_note, container, false)
+        return DialogNoteBinding.inflate(inflater).apply { binding = this }.root
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        noteDialogDate.text = note.date.toFormattedString()
-        noteDialogCategory.text = note.category
-        noteDialogTeacher.text = note.teacher
-        noteDialogContent.text = note.content
-        noteDialogClose.setOnClickListener { dismiss() }
+        with(binding) {
+            noteDialogDate.text = note.date.toFormattedString()
+            noteDialogCategory.text = note.category
+            noteDialogTeacher.text = note.teacher
+            noteDialogContent.text = note.content
+        }
+
+        if (note.isPointsShow) {
+            with(binding.noteDialogPoints) {
+                text = "${if (note.points > 0) "+" else ""}${note.points}"
+                setTextColor(when (CategoryType.getByValue(note.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
+                    else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
+            }
+        }
+
+        binding.noteDialogClose.setOnClickListener { dismiss() }
     }
 }
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 6117ae24..47338165 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
@@ -1,31 +1,27 @@
 package io.github.wulkanowy.ui.modules.note
 
 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 androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.FragmentNoteBinding
 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.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_note.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
+class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: NotePresenter
 
     @Inject
-    lateinit var noteAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var noteAdapter: NoteAdapter
 
     companion object {
         fun newInstance() = NoteFragment()
@@ -35,67 +31,80 @@ class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
         get() = R.string.note_title
 
     override val isViewEmpty: Boolean
-        get() = noteAdapter.isEmpty
+        get() = noteAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_note, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentNoteBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        noteAdapter.run {
-            setOnItemClickListener { presenter.onNoteItemSelected(it) }
-        }
+        noteAdapter.onClickListener = presenter::onNoteItemSelected
 
-        noteRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.noteRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = noteAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            noteErrorRetry.setOnClickListener { presenter.onRetry() }
+            noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun showNoteDialog(note: Note) {
         (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
-    override fun updateData(data: List<NoteItem>) {
-        noteAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Note>) {
+        with(noteAdapter) {
+            items = data.toMutableList()
+            notifyDataSetChanged()
+        }
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        noteAdapter.updateItem(item)
+    override fun updateItem(item: Note, position: Int) {
+        with(noteAdapter) {
+            items[position] = item
+            notifyItemChanged(position)
+        }
     }
 
     override fun clearData() {
-        noteAdapter.clear()
+        with(noteAdapter) {
+            items = mutableListOf()
+            notifyDataSetChanged()
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        noteEmpty.visibility = if (show) VISIBLE else GONE
+        binding.noteEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.noteError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.noteErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        noteProgress.visibility = if (show) VISIBLE else GONE
+        binding.noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        noteSwipe.isEnabled = enable
+        binding.noteSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        noteRecycler.visibility = if (show) VISIBLE else GONE
+        binding.noteRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        noteSwipe.isRefreshing = false
+        binding.noteSwipe.isRefreshing = false
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
deleted file mode 100644
index dabeef74..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.ui.modules.note
-
-import android.graphics.Typeface.BOLD
-import android.graphics.Typeface.NORMAL
-import android.view.View
-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.Note
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_note.*
-
-class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_note
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): NoteItem.ViewHolder {
-        return NoteItem.ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            noteItemDate.apply {
-                text = note.date.toFormattedString()
-                setTypeface(null, if (note.isRead) NORMAL else BOLD)
-            }
-            noteItemType.apply {
-                text = note.category
-                setTypeface(null, if (note.isRead) NORMAL else BOLD)
-            }
-            noteItemTeacher.text = note.teacher
-            noteItemContent.text = note.content
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as NoteItem
-
-        if (note != other.note) return false
-        if (note.id != other.note.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = note.hashCode()
-        result = 31 * result + note.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/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index df98ab88..00df71b9 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.note
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -21,10 +20,13 @@ 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()
     }
 
@@ -33,13 +35,24 @@ 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()
             .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
             .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
-            .map { items -> items.map { NoteItem(it) } }
-            .map { items -> items.sortedByDescending { it.note.date } }
+            .map { items -> items.sortedByDescending { it.date } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doFinally {
@@ -53,27 +66,36 @@ 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)
             })
         )
     }
 
-    fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is NoteItem) {
-            Timber.i("Select note item ${item.note.id}")
-            view?.run {
-                showNoteDialog(item.note)
-                if (!item.note.isRead) {
-                    item.note.isRead = true
-                    updateItem(item)
-                    updateNote(item.note)
-                }
+    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(note: Note, position: Int) {
+        Timber.i("Select note item ${note.id}")
+        view?.run {
+            showNoteDialog(note)
+            if (!note.isRead) {
+                note.isRead = true
+                updateItem(note, position)
+                updateNote(note)
             }
         }
     }
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 9a2c12eb..a7cbab8f 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.note
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -10,14 +9,18 @@ interface NoteView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<NoteItem>)
+    fun updateData(data: List<Note>)
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateItem(item: Note, position: Int)
 
     fun clearData()
 
     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
new file mode 100644
index 00000000..b5eedb6f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersChildView.kt
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..0245aa07
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
@@ -0,0 +1,86 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
+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 javax.inject.Inject
+
+class SchoolAndTeachersFragment :
+    BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
+    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() = binding.schoolandteachersViewPager.currentItem
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentSchoolandteachersBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(pagerAdapter) {
+            containerId = binding.schoolandteachersViewPager.id
+            addFragmentsWithTitle(mapOf(
+                SchoolFragment.newInstance() to getString(R.string.school_title),
+                TeacherFragment.newInstance() to getString(R.string.teachers_title)
+            ))
+        }
+
+        with(binding.schoolandteachersViewPager) {
+            adapter = pagerAdapter
+            offscreenPageLimit = 2
+            setOnSelectPageListener(presenter::onPageSelected)
+        }
+
+        with(binding.schoolandteachersTabLayout) {
+            setupWithViewPager(binding.schoolandteachersViewPager)
+            setElevationCompat(context.dpToPx(4f))
+        }
+    }
+
+    override fun showContent(show: Boolean) {
+        with(binding) {
+            schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.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
new file mode 100644
index 00000000..2087b0b4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
@@ -0,0 +1,30 @@
+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
+abstract class SchoolAndTeachersModule {
+
+    companion object {
+
+        @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
new file mode 100644
index 00000000..1856803c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 00000000..594441ec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersView.kt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 00000000..722999f8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
@@ -0,0 +1,109 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.school
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.databinding.FragmentSchoolBinding
+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 javax.inject.Inject
+
+class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
+    MainView.TitledView, SchoolAndTeachersChildView {
+
+    @Inject
+    lateinit var presenter: SchoolPresenter
+
+    override val titleStringId get() = R.string.school_title
+
+    override val isViewEmpty get() = binding.schoolName.text.isBlank()
+
+    companion object {
+        fun newInstance() = SchoolFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentSchoolBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding) {
+            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) {
+        with(binding) {
+            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) {
+        binding.schoolEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.schoolError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.schoolErrorMessage.text = message
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.schoolProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        binding.schoolSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.schoolContent.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun hideRefresh() {
+        binding.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
new file mode 100644
index 00000000..e2eb614d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
@@ -0,0 +1,116 @@
+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()
+            .flatMapMaybe { student ->
+                semesterRepository.getCurrentSemester(student).flatMapMaybe {
+                    schoolRepository.getSchoolInfo(student, 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
new file mode 100644
index 00000000..c42c2f91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolView.kt
@@ -0,0 +1,32 @@
+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/TeacherAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
new file mode 100644
index 00000000..8deeae05
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.databinding.ItemTeacherBinding
+import javax.inject.Inject
+
+class TeacherAdapter @Inject constructor() : RecyclerView.Adapter<TeacherAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Teacher>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemTeacherBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val teacher = items[position]
+
+        with(holder.binding) {
+            teacherItemName.text = teacher.name
+            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else root.context.getString(R.string.teacher_no_subject)
+            if (teacher.shortName.isNotBlank()) {
+                teacherItemShortName.visibility = View.VISIBLE
+                teacherItemShortName.text = "[${teacher.shortName}]"
+            } else {
+                teacherItemShortName.visibility = View.GONE
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemTeacherBinding) : RecyclerView.ViewHolder(binding.root)
+}
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
new file mode 100644
index 00000000..aa50339c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
@@ -0,0 +1,105 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.databinding.FragmentTeacherBinding
+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.ui.widgets.DividerItemDecoration
+import javax.inject.Inject
+
+class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
+    TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
+
+    @Inject
+    lateinit var presenter: TeacherPresenter
+
+    @Inject
+    lateinit var teacherAdapter: TeacherAdapter
+
+    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.items.isEmpty()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTeacherBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding.teacherRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = teacherAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            teacherErrorRetry.setOnClickListener { presenter.onRetry() }
+            teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
+    }
+
+    override fun updateData(data: List<Teacher>) {
+        with(teacherAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun showEmpty(show: Boolean) {
+        binding.teacherEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.teacherError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.teacherErrorMessage.text = message
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.teacherProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        binding.teacherSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.teacherRecycler.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun hideRefresh() {
+        binding.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/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
new file mode 100644
index 00000000..e888308f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -0,0 +1,95 @@
+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 { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    teacherRepository.getTeachers(student, semester, forceRefresh)
+                }
+            }
+            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
+            .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
new file mode 100644
index 00000000..c655bfad
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import io.github.wulkanowy.data.db.entities.Teacher
+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<Teacher>)
+
+    fun hideRefresh()
+
+    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 60de9920..0d1d2565 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
@@ -3,15 +3,21 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import com.takisoft.preferencex.PreferenceFragmentCompat
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.thelittlefireman.appkillermanager.AppKillerManager
+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
@@ -20,26 +26,48 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var lingver: Lingver
+
     companion object {
         fun newInstance() = SettingsFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.settings_title
+    override val titleStringId get() = R.string.settings_title
+
+    override val syncSuccessString get() = getString(R.string.pref_services_message_sync_success)
+
+    override val syncFailedString get() = getString(R.string.pref_services_message_sync_failed)
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 
+    override fun initView() {
+        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                presenter.onSyncNowClicked()
+                true
+            }
+        }
+        findPreference<Preference>(getString(R.string.pref_key_notifications_fix_issues))?.run {
+            isVisible = AppKillerManager.isDeviceSupported() && AppKillerManager.isAnyActionAvailable(requireContext())
+            setOnPreferenceClickListener {
+                presenter.onFixSyncIssuesClicked()
+                true
+            }
+        }
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
-    override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.scheme_preferences)
-        findPreference(getString(R.string.pref_key_notification_debug)).isVisible = appInfo.isDebug
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
+        findPreference<Preference>(getString(R.string.pref_key_notification_debug))?.isVisible = appInfo.isDebug
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
@@ -50,27 +78,66 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         activity?.recreate()
     }
 
+    override fun updateLanguage(langCode: String) {
+        lingver.setLocale(requireContext(), langCode)
+    }
+
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        findPreference(serviceEnablesKey).run {
+        findPreference<Preference>(serviceEnablesKey)?.run {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
             isEnabled = !isHolidays
         }
     }
 
+    override fun setSyncInProgress(inProgress: Boolean) {
+        if (activity == null || !isAdded) return
+
+        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
+            isEnabled = !inProgress
+            summary = if (inProgress) getString(R.string.pref_services_sync_in_progress) else ""
+        }
+    }
+
     override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*>)?.showError(text, error)
+        (activity as? BaseActivity<*, *>)?.showError(text, error)
     }
 
     override fun showMessage(text: String) {
-        (activity as? BaseActivity<*>)?.showMessage(text)
+        (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+    }
+
+    override fun showErrorDetailsDialog(error: Throwable) {
+        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+    }
+
+    override fun showForceSyncDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_services_dialog_force_sync_title)
+            .setMessage(R.string.pref_services_dialog_force_sync_summary)
+            .setPositiveButton(android.R.string.ok) { _, _ -> presenter.onForceSyncDialogSubmit() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    override fun showFixSyncDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_notify_fix_sync_issues)
+            .setMessage(R.string.pref_notify_fix_sync_issues_message)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .setPositiveButton(R.string.pref_notify_fix_sync_issues_settings_button) { _, _ ->
+                AppKillerManager.doActionPowerSaving(requireContext())
+                AppKillerManager.doActionAutoStart(requireContext())
+                AppKillerManager.doActionNotification(requireContext())
+            }
+            .show()
     }
 
     override fun onResume() {
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 3c3d4990..bccb6f0b 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
@@ -1,11 +1,14 @@
 package io.github.wulkanowy.ui.modules.settings
 
-import com.readystatesoftware.chuck.api.ChuckCollector
+import androidx.work.WorkInfo
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 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
@@ -18,27 +21,74 @@ class SettingsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
+    private val timetableNotificationHelper: TimetableNotificationSchedulerHelper,
     private val analytics: FirebaseAnalyticsHelper,
     private val syncManager: SyncManager,
-    private val chuckCollector: ChuckCollector
+    private val chuckerCollector: ChuckerCollector,
+    private val appInfo: AppInfo
 ) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
         Timber.i("Settings view was initialized")
         view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
+        view.initView()
     }
 
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
+
         preferencesRepository.apply {
             when (key) {
-                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
-                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
-                isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
+                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startPeriodicSyncWorker() else stopSyncWorker() }
+                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startPeriodicSyncWorker(true)
+                isDebugNotificationEnableKey -> chuckerCollector.showNotification = isDebugNotificationEnable
                 appThemeKey -> view?.recreateView()
+                isUpcomingLessonsNotificationsEnableKey -> if (!isUpcomingLessonsNotificationsEnable) timetableNotificationHelper.cancelNotification()
+                appLanguageKey -> view?.run {
+                    updateLanguage(if (appLanguage == "system") appInfo.systemLanguage else appLanguage)
+                    recreateView()
+                }
             }
         }
         analytics.logEvent("setting_changed", "name" to key)
     }
+
+    fun onSyncNowClicked() {
+        view?.showForceSyncDialog()
+    }
+
+    fun onFixSyncIssuesClicked() {
+        view?.showFixSyncDialog()
+    }
+
+    fun onForceSyncDialogSubmit() {
+        view?.run {
+            val successString = syncSuccessString
+            val failedString = syncFailedString
+            disposable.add(syncManager.startOneTimeSyncWorker()
+                .doOnSubscribe {
+                    setSyncInProgress(true)
+                    Timber.i("Setting sync now started")
+                    analytics.logEvent("sync_now", "status" to "started")
+                }
+                .doFinally { setSyncInProgress(false) }
+                .subscribe({ workInfo ->
+                    when (workInfo.state) {
+                        WorkInfo.State.SUCCEEDED -> {
+                            showMessage(successString)
+                            analytics.logEvent("sync_now", "status" to "success")
+                        }
+                        WorkInfo.State.FAILED -> {
+                            showError(failedString, Throwable(workInfo.outputData.getString("error")))
+                            analytics.logEvent("sync_now", "status" to "failed")
+                        }
+                        else -> Timber.d("Sync now state: ${workInfo.state}")
+                    }
+                }, {
+                    Timber.e(it, "Sync now failed")
+                })
+            )
+        }
+    }
 }
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 1c4bf3b0..3786ba4b 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
@@ -4,7 +4,20 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface SettingsView : BaseView {
 
+    val syncSuccessString: String
+
+    val syncFailedString: String
+
+    fun initView()
+
     fun recreateView()
 
+    fun updateLanguage(langCode: String)
+
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
+
+    fun setSyncInProgress(inProgress: Boolean)
+
+    fun showForceSyncDialog()
+    fun showFixSyncDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 3e0106d1..23a43750 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -3,12 +3,13 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.viewbinding.ViewBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-class SplashActivity : BaseActivity<SplashPresenter>(), SplashView {
+class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
 
     @Inject
     override lateinit var presenter: SplashPresenter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
new file mode 100644
index 00000000..5354442a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -0,0 +1,294 @@
+package io.github.wulkanowy.ui.modules.timetable
+
+import android.graphics.Paint
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.databinding.ItemTimetableBinding
+import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.isJustFinished
+import io.github.wulkanowy.utils.isShowTimeUntil
+import io.github.wulkanowy.utils.left
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.until
+import org.threeten.bp.LocalDateTime
+import timber.log.Timber
+import java.util.Timer
+import javax.inject.Inject
+import kotlin.concurrent.timer
+
+class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        ITEM_NORMAL(1),
+        ITEM_SMALL(2)
+    }
+
+    var items = mutableListOf<Timetable>()
+        set(value) {
+            field = value
+            resetTimers()
+        }
+
+    var onClickListener: (Timetable) -> Unit = {}
+
+    var showWholeClassPlan: String = "no"
+
+    var showTimers: Boolean = false
+
+    private val timers = mutableMapOf<Int, Timer>()
+
+    private fun resetTimers() {
+        Timber.d("Timetable timers reset")
+        with(timers) {
+            forEach { (_, timer) -> timer.cancel() }
+            clear()
+        }
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = when {
+        !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.id
+        else -> ViewType.ITEM_NORMAL.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ITEM_NORMAL.id -> ItemViewHolder(ItemTimetableBinding.inflate(inflater, parent, false))
+            ViewType.ITEM_SMALL.id -> SmallItemViewHolder(ItemTimetableSmallBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        resetTimers()
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val lesson = items[position]
+
+        when (holder) {
+            is ItemViewHolder -> bindNormalView(holder.binding, lesson, position)
+            is SmallItemViewHolder -> bindSmallView(holder.binding, lesson)
+        }
+    }
+
+    private fun bindSmallView(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            timetableSmallItemNumber.text = lesson.number.toString()
+            timetableSmallItemSubject.text = lesson.subject
+            timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableSmallItemRoom.text = lesson.room
+            timetableSmallItemTeacher.text = lesson.teacher
+
+            bindSubjectStyle(timetableSmallItemSubject, lesson)
+            bindSmallDescription(binding, lesson)
+            bindSmallColors(binding, lesson)
+
+            root.setOnClickListener { onClickListener(lesson) }
+        }
+    }
+
+    private fun bindNormalView(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
+        with(binding) {
+            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")
+
+            bindSubjectStyle(timetableItemSubject, lesson)
+            bindNormalDescription(binding, lesson)
+            bindNormalColors(binding, lesson)
+
+            if (lesson.isStudentPlan && showTimers) timers[position] = timer(period = 1000) {
+                root.post { updateTimeLeft(binding, lesson, position) }
+            } else {
+                // reset item on set changed
+                timetableItemTimeUntil.visibility = GONE
+                timetableItemTimeLeft.visibility = GONE
+            }
+
+            root.setOnClickListener { onClickListener(lesson) }
+        }
+    }
+
+    private fun getPreviousLesson(position: Int): LocalDateTime? {
+        return items.filter { it.isStudentPlan }.getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)?.let {
+            if (!it.canceled && it.isStudentPlan) it.end
+            else null
+        }
+    }
+
+    private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
+        with(binding) {
+            when {
+                // before lesson
+                lesson.isShowTimeUntil(getPreviousLesson(position)) -> {
+                    Timber.d("Show time until lesson: $position")
+                    timetableItemTimeLeft.visibility = GONE
+                    with(timetableItemTimeUntil) {
+                        visibility = VISIBLE
+                        text = context.getString(R.string.timetable_time_until,
+                            if (lesson.until.seconds <= 60) {
+                                context.getString(R.string.timetable_seconds, lesson.until.seconds.toString(10))
+                            } else {
+                                context.getString(R.string.timetable_minutes, lesson.until.toMinutes().toString(10))
+                            }
+                        )
+                    }
+                }
+                // after lesson start
+                lesson.left != null -> {
+                    Timber.d("Show time left lesson: $position")
+                    timetableItemTimeUntil.visibility = GONE
+                    with(timetableItemTimeLeft) {
+                        visibility = VISIBLE
+                        text = context.getString(
+                            R.string.timetable_time_left,
+                            if (lesson.left!!.seconds < 60) {
+                                context.getString(R.string.timetable_seconds, lesson.left?.seconds?.toString(10))
+                            } else {
+                                context.getString(R.string.timetable_minutes, lesson.left?.toMinutes()?.toString(10))
+                            }
+                        )
+                    }
+                }
+                // right after lesson finish
+                lesson.isJustFinished -> {
+                    Timber.d("Show just finished lesson: $position")
+                    timetableItemTimeUntil.visibility = GONE
+                    timetableItemTimeLeft.visibility = VISIBLE
+                    timetableItemTimeLeft.text = root.context.getString(R.string.timetable_finished)
+                }
+                else -> {
+                    timetableItemTimeUntil.visibility = GONE
+                    timetableItemTimeLeft.visibility = GONE
+                }
+            }
+        }
+    }
+
+    private fun bindSubjectStyle(subjectView: TextView, lesson: Timetable) {
+        subjectView.paintFlags = if (lesson.canceled) subjectView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+        else subjectView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+    }
+
+    private fun bindSmallDescription(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableSmallItemDescription.visibility = VISIBLE
+                timetableSmallItemDescription.text = lesson.info
+
+                timetableSmallItemRoom.visibility = GONE
+                timetableSmallItemTeacher.visibility = GONE
+
+                timetableSmallItemDescription.setTextColor(root.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableSmallItemDescription.visibility = GONE
+                timetableSmallItemRoom.visibility = VISIBLE
+                timetableSmallItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun bindNormalDescription(binding: ItemTimetableBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableItemDescription.visibility = VISIBLE
+                timetableItemDescription.text = lesson.info
+
+                timetableItemRoom.visibility = GONE
+                timetableItemTeacher.visibility = GONE
+
+                timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableItemDescription.visibility = GONE
+                timetableItemRoom.visibility = VISIBLE
+                timetableItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun bindSmallColors(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
+            } else {
+                updateNumberColor(timetableSmallItemNumber, lesson)
+                updateSubjectColor(timetableSmallItemSubject, lesson)
+                updateRoomColor(timetableSmallItemRoom, lesson)
+                updateTeacherColor(timetableSmallItemTeacher, lesson)
+            }
+        }
+    }
+
+    private fun bindNormalColors(binding: ItemTimetableBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableItemNumber, timetableItemSubject)
+            } else {
+                updateNumberColor(timetableItemNumber, lesson)
+                updateSubjectColor(timetableItemSubject, lesson)
+                updateRoomColor(timetableItemRoom, lesson)
+                updateTeacherColor(timetableItemTeacher, lesson)
+            }
+        }
+    }
+
+    private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
+    }
+
+    private fun updateNumberColor(numberView: TextView, lesson: Timetable) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(
+            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateSubjectColor(subjectView: TextView, lesson: Timetable) {
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(
+            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateRoomColor(roomView: TextView, lesson: Timetable) {
+        roomView.setTextColor(roomView.context.getThemeAttrColor(
+            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    private fun updateTeacherColor(teacherTextView: TextView, lesson: Timetable) {
+        teacherTextView.setTextColor(teacherTextView.context.getThemeAttrColor(
+            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    private class ItemViewHolder(val binding: ItemTimetableBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class SmallItemViewHolder(val binding: ItemTimetableSmallBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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 7e286c92..8efecf07 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,12 +11,16 @@ 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.databinding.DialogTimetableBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_timetable.*
 import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
+    private var binding: DialogTimetableBinding by lifecycleAwareVariable()
+
     private lateinit var lesson: Timetable
 
     companion object {
@@ -38,13 +42,13 @@ class TimetableDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_timetable, container, false)
+        return DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        lesson.run {
+        with(lesson) {
             setInfo(info, teacher, canceled, changes)
             setSubject(subject, subjectOld)
             setTeacher(teacher, teacherOld)
@@ -53,65 +57,81 @@ class TimetableDialog : DialogFragment() {
             setTime(start, end)
         }
 
-        timetableDialogClose.setOnClickListener { dismiss() }
+        binding.timetableDialogClose.setOnClickListener { dismiss() }
     }
 
     private fun setSubject(subject: String, subjectOld: String) {
-        timetableDialogSubject.text = subject
-        if (subjectOld.isNotBlank() && subjectOld != subject) {
-            timetableDialogSubject.run {
-                paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                text = subjectOld
-            }
-            timetableDialogSubjectNew.run {
-                visibility = VISIBLE
-                text = subject
+        with(binding) {
+            timetableDialogSubject.text = subject
+            if (subjectOld.isNotBlank() && subjectOld != subject) {
+                timetableDialogSubject.run {
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = subjectOld
+                }
+                timetableDialogSubjectNew.run {
+                    visibility = VISIBLE
+                    text = subject
+                }
             }
         }
     }
 
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
-        when {
-            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
+        with(binding) {
+            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 -> {
+                    timetableDialogChangesTitle.visibility = GONE
+                    timetableDialogChanges.visibility = GONE
+                }
             }
         }
     }
 
     private fun setTeacher(teacher: String, teacherOld: String) {
-        when {
-            teacherOld.isNotBlank() && teacherOld != teacher -> {
-                timetableDialogTeacher.run {
-                    visibility = VISIBLE
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = teacherOld
-                }
-                if (teacher.isNotBlank()) {
-                    timetableDialogTeacherNew.run {
+        with(binding) {
+            when {
+                teacherOld.isNotBlank() && teacherOld != teacher -> {
+                    timetableDialogTeacher.run {
                         visibility = VISIBLE
-                        text = teacher
+                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                        text = teacherOld
+                    }
+                    if (teacher.isNotBlank()) {
+                        timetableDialogTeacherNew.run {
+                            visibility = VISIBLE
+                            text = teacher
+                        }
                     }
                 }
-            }
-            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
-            else -> {
-                timetableDialogTeacherTitle.visibility = GONE
-                timetableDialogTeacher.visibility = GONE
+                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+                else -> {
+                    timetableDialogTeacherTitle.visibility = GONE
+                    timetableDialogTeacher.visibility = GONE
+                }
             }
         }
     }
 
     private fun setGroup(group: String) {
-        group.let {
+        with(binding) {
             when {
-                it.isNotBlank() -> timetableDialogGroup.text = it
+                group.isNotBlank() -> timetableDialogGroup.text = group
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
                     timetableDialogGroup.visibility = GONE
@@ -121,30 +141,32 @@ class TimetableDialog : DialogFragment() {
     }
 
     private fun setRoom(room: String, roomOld: String) {
-        when {
-            roomOld.isNotBlank() && roomOld != room -> {
-                timetableDialogRoom.run {
-                    visibility = VISIBLE
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = roomOld
-                }
-                if (room.isNotBlank()) {
-                    timetableDialogRoomNew.run {
+        with(binding) {
+            when {
+                roomOld.isNotBlank() && roomOld != room -> {
+                    timetableDialogRoom.run {
                         visibility = VISIBLE
-                        text = room
+                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                        text = roomOld
+                    }
+                    if (room.isNotBlank()) {
+                        timetableDialogRoomNew.run {
+                            visibility = VISIBLE
+                            text = room
+                        }
                     }
                 }
-            }
-            room.isNotBlank() -> timetableDialogRoom.text = room
-            else -> {
-                timetableDialogRoomTitle.visibility = GONE
-                timetableDialogRoom.visibility = GONE
+                room.isNotBlank() -> timetableDialogRoom.text = room
+                else -> {
+                    timetableDialogRoomTitle.visibility = GONE
+                    timetableDialogRoom.visibility = GONE
+                }
             }
         }
     }
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
+        binding.timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
     }
 }
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 e60be74c..2f01511a 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
@@ -1,33 +1,35 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-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 android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.databinding.FragmentTimetableBinding
 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.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_timetable.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.dpToPx
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView, MainView.TitledView {
+class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
+    TimetableView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
 
     @Inject
-    lateinit var timetableAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var timetableAdapter: TimetableAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -35,49 +37,44 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         fun newInstance() = TimetableFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.timetable_title
+    override val titleStringId get() = R.string.timetable_title
 
-    override val roomString: String
-        get() = getString(R.string.timetable_room)
+    override val isViewEmpty get() = timetableAdapter.items.isEmpty()
 
-    override val isViewEmpty: Boolean
-        get() = timetableAdapter.isEmpty
-
-    override val currentStackSize: Int?
-        get() = (activity as? MainActivity)?.currentStackSize
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_timetable, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = timetableRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTimetableBinding.bind(view)
+        messageContainer = binding.timetableRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        timetableAdapter.run {
-            setOnItemClickListener { presenter.onTimetableItemSelected(it) }
+        timetableAdapter.onClickListener = presenter::onTimetableItemSelected
+
+        with(binding.timetableRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = timetableAdapter
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        timetableRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = timetableAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+        with(binding) {
+            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))
         }
-        timetableSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        timetableNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -89,24 +86,32 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         else false
     }
 
-    override fun updateData(data: List<TimetableItem>) {
-        timetableAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean) {
+        with(timetableAdapter) {
+            items = data.toMutableList()
+            showTimers = showTimetableTimers
+            showWholeClassPlan = showWholeClassPlanType
+            notifyDataSetChanged()
+        }
     }
 
     override fun clearData() {
-        timetableAdapter.clear()
+        with(timetableAdapter) {
+            items = mutableListOf()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        timetableNavDate.text = date
+        binding.timetableNavDate.text = date
     }
 
     override fun hideRefresh() {
-        timetableSwipe.isRefreshing = false
+        binding.timetableSwipe.isRefreshing = false
     }
 
     override fun resetView() {
-        timetableRecycler.smoothScrollToPosition(0)
+        binding.timetableRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -118,33 +123,56 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun showEmpty(show: Boolean) {
-        timetableEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        binding.timetableEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.timetableError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.timetableErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        timetableProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.timetableProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        timetableSwipe.isEnabled = enable
+        binding.timetableSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        timetableRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        binding.timetableRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        timetablePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        timetableNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.timetableNextButton.visibility = if (show) 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
deleted file mode 100644
index c721401f..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable
-
-import android.annotation.SuppressLint
-import android.graphics.Paint
-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.Timetable
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_timetable.*
-
-class TimetableItem(val lesson: Timetable, private val roomText: String) :
-    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_timetable
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        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()
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableItem
-
-        if (lesson != other.lesson) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = lesson.hashCode()
-        result = 31 * result + lesson.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/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index bead4228..50c12364 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,8 @@
 package io.github.wulkanowy.ui.modules.timetable
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.annotation.SuppressLint
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
@@ -8,6 +10,7 @@ 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 io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -15,9 +18,9 @@ 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
 import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
@@ -26,17 +29,24 @@ class TimetablePresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val timetableRepository: TimetableRepository,
     private val semesterRepository: SemesterRepository,
+    private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     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")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -50,16 +60,37 @@ 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 ->
             if (view.currentStackSize == 1) {
-                now().nextOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -69,11 +100,9 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is TimetableItem) {
-            Timber.i("Select exam item ${item.lesson.id}")
-            view?.showTimetableDialog(item.lesson)
-        }
+    fun onTimetableItemSelected(lesson: Timetable) {
+        Timber.i("Select timetable item ${lesson.id}")
+        view?.showTimetableDialog(lesson)
     }
 
     fun onCompletedLessonsSwitchSelected(): Boolean {
@@ -81,17 +110,33 @@ class TimetablePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading timetable data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .delay(200, MILLISECONDS)
-                .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
-                .map { items -> items.map { TimetableItem(it, view?.roomString.orEmpty()) } }
-                .map { items -> items.sortedBy { it.lesson.number } }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .map { items -> items.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -104,19 +149,30 @@ class TimetablePresenter @Inject constructor(
                 .subscribe({
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(it)
+                        updateData(it, prefRepository.showWholeClassPlan, prefRepository.showTimetableTimers)
                         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 {
@@ -124,10 +180,18 @@ class TimetablePresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            showNextButton(!currentDate.plusDays(1).isHolidays)
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").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 80a2f9b8..1efa320f 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,18 +2,17 @@ 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?
 
     fun initView()
 
-    fun updateData(data: List<TimetableItem>)
+    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean)
 
     fun updateNavigationDay(date: String)
 
@@ -25,6 +24,10 @@ interface TimetableView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -37,6 +40,8 @@ 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/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index 8f7b1ec5..56ea16cf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -6,12 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import kotlinx.android.synthetic.main.dialog_lesson_completed.*
+import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 class CompletedLessonDialog : DialogFragment() {
 
+    private var binding: DialogLessonCompletedBinding by lifecycleAwareVariable()
+
     private lateinit var completedLesson: CompletedLesson
 
     companion object {
@@ -28,46 +30,54 @@ class CompletedLessonDialog : DialogFragment() {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
-            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
+            completedLesson = getSerializable(ARGUMENT_KEY) as CompletedLesson
         }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
+        return DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
     }
 
     @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        completedLessonDialogSubject.text = completedLesson.subject
-        completedLessonDialogTopic.text = completedLesson.topic
-        completedLessonDialogTeacher.text = completedLesson.teacher
-        completedLessonDialogAbsence.text = completedLesson.absence
-        completedLessonDialogChanges.text = completedLesson.substitution
-        completedLessonDialogResources.text = completedLesson.resources
+        with(binding) {
+            completedLessonDialogSubject.text = completedLesson.subject
+            completedLessonDialogTopic.text = completedLesson.topic
+            completedLessonDialogTeacher.text = completedLesson.teacher
+            completedLessonDialogAbsence.text = completedLesson.absence
+            completedLessonDialogChanges.text = completedLesson.substitution
+            completedLessonDialogResources.text = completedLesson.resources
+        }
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
-                completedLessonDialogChangesTitle.visibility = View.GONE
-                completedLessonDialogChanges.visibility = View.GONE
-            } else completedLessonDialogChanges.text = it
+                with(binding) {
+                    completedLessonDialogChangesTitle.visibility = View.GONE
+                    completedLessonDialogChanges.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogChanges.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
-                completedLessonDialogAbsenceTitle.visibility = View.GONE
-                completedLessonDialogAbsence.visibility = View.GONE
-            } else completedLessonDialogAbsence.text = it
+                with(binding) {
+                    completedLessonDialogAbsenceTitle.visibility = View.GONE
+                    completedLessonDialogAbsence.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogAbsence.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
-                completedLessonDialogResourcesTitle.visibility = View.GONE
-                completedLessonDialogResources.visibility = View.GONE
-            } else completedLessonDialogResources.text = it
+                with(binding) {
+                    completedLessonDialogResourcesTitle.visibility = View.GONE
+                    completedLessonDialogResources.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogResources.text = it
         }
 
-        completedLessonDialogClose.setOnClickListener { dismiss() }
+        binding.completedLessonDialogClose.setOnClickListener { dismiss() }
     }
 }
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
deleted file mode 100644
index 716903f5..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.completed
-
-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.CompletedLesson
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_completed_lesson.*
-
-class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexibleItem<CompletedLessonItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_completed_lesson
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): CompletedLessonItem.ViewHolder {
-        return CompletedLessonItem.ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
-        holder?.apply {
-            completedLessonItemNumber.text = completedLesson.number.toString()
-            completedLessonItemSubject.text = completedLesson.subject
-            completedLessonItemTopic.text = completedLesson.topic
-            completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as CompletedLessonItem
-
-        if (completedLesson != other.completedLesson) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return completedLesson.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
new file mode 100644
index 00000000..3399a8a2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.databinding.ItemCompletedLessonBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class CompletedLessonsAdapter @Inject constructor() :
+    RecyclerView.Adapter<CompletedLessonsAdapter.ItemViewHolder>() {
+
+    var items = emptyList<CompletedLesson>()
+
+    var onClickListener: (CompletedLesson) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemCompletedLessonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            completedLessonItemNumber.text = item.number.toString()
+            completedLessonItemNumber.setTextColor(root.context.getThemeAttrColor(
+                if (item.substitution.isNotEmpty()) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            ))
+            completedLessonItemSubject.text = item.subject
+            completedLessonItemTopic.text = item.topic
+            completedLessonItemAlert.visibility = if (item.substitution.isNotEmpty()) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemCompletedLessonBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
index ed11607c..c1389ced 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.api.interceptor.FeatureDisabledException
+import com.chuckerteam.chucker.api.ChuckerCollector
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
 class CompletedLessonsErrorHandler @Inject constructor(
     resources: Resources,
-    chuckCollector: ChuckCollector
-) : ErrorHandler(resources, chuckCollector) {
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onFeatureDisabled: () -> Unit = {}
 
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 f56652d5..2efd30a3 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
@@ -1,29 +1,34 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
 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.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_timetable_completed.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getCompatDrawable
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.TitledView {
+class CompletedLessonsFragment :
+    BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
+    CompletedLessonsView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: CompletedLessonsPresenter
 
     @Inject
-    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var completedLessonsAdapter: CompletedLessonsAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -31,90 +36,122 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
         fun newInstance() = CompletedLessonsFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.completed_lessons_title
+    override val titleStringId get() = R.string.completed_lessons_title
 
-    override val isViewEmpty
-        get() = completedLessonsAdapter.isEmpty
+    override val isViewEmpty get() = completedLessonsAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = completedLessonsRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTimetableCompletedBinding.bind(view)
+        messageContainer = binding.completedLessonsRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        completedLessonsAdapter.run {
-            setOnItemClickListener { presenter.onCompletedLessonsItemSelected(it) }
+        completedLessonsAdapter.onClickListener = presenter::onCompletedLessonsItemSelected
+
+        with(binding.completedLessonsRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = completedLessonsAdapter
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        completedLessonsRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = completedLessonsAdapter
+        with(binding) {
+            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))
         }
-        completedLessonsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
-    override fun updateData(data: List<CompletedLessonItem>) {
-        completedLessonsAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<CompletedLesson>) {
+        with(completedLessonsAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun clearData() {
-        completedLessonsAdapter.clear()
+        with(completedLessonsAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        completedLessonsNavDate.text = date
+        binding.completedLessonsNavDate.text = date
     }
 
     override fun hideRefresh() {
-        completedLessonsSwipe.isRefreshing = false
+        binding.completedLessonsSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        completedLessonsEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        binding.completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.completedLessonError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.completedLessonErrorMessage.text = message
     }
 
     override fun showFeatureDisabled() {
-        context?.let {
+        with(binding) {
             completedLessonsInfo.text = getString(R.string.error_feature_disabled)
-            completedLessonsInfoImage.setImageDrawable(ContextCompat.getDrawable(it, R.drawable.ic_all_close_circle_24dp))
+            completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
         }
     }
 
     override fun showProgress(show: Boolean) {
-        completedLessonsProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.completedLessonsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        completedLessonsSwipe.isEnabled = enable
+        binding.completedLessonsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        completedLessonsRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        binding.completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        completedLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        completedLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.completedLessonsNextButton.visibility = if (show) VISIBLE else 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(CompletedLessonsFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {
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 0db5210f..355411eb 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,12 +1,14 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.annotation.SuppressLint
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 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.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -16,7 +18,6 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class CompletedLessonsPresenter @Inject constructor(
@@ -28,19 +29,25 @@ class CompletedLessonsPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     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()
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
-        reloadView()
+        completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         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() {
@@ -53,16 +60,49 @@ 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 onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is CompletedLessonItem) {
-            Timber.i("Select completed lessons item ${item.completedLesson.id}")
-            view?.showCompletedLessonDialog(item.completedLesson)
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
         }
+        loadData(currentDate, true)
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    fun onCompletedLessonsItemSelected(completedLesson: CompletedLesson) {
+        Timber.i("Select completed lessons item ${completedLesson.id}")
+        view?.showCompletedLessonDialog(completedLesson)
+    }
+
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
@@ -71,11 +111,12 @@ class CompletedLessonsPresenter @Inject constructor(
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .delay(200, TimeUnit.MILLISECONDS)
-                .flatMap { completedLessonsRepository.getCompletedLessons(it, currentDate, currentDate, forceRefresh) }
-                .map { items -> items.map { CompletedLessonItem(it) } }
-                .map { items -> items.sortedBy { it.completedLesson.number } }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .map { items -> items.sortedBy { it.number } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
@@ -90,17 +131,28 @@ 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 {
@@ -108,10 +160,18 @@ class CompletedLessonsPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
+            showNextButton(!currentDate.plusDays(1).isHolidays)
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").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 a8bef66f..170e1969 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,6 +2,7 @@ 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 {
 
@@ -9,7 +10,7 @@ interface CompletedLessonsView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<CompletedLessonItem>)
+    fun updateData(data: List<CompletedLesson>)
 
     fun clearData()
 
@@ -19,6 +20,10 @@ interface CompletedLessonsView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showFeatureDisabled()
 
     fun showProgress(show: Boolean)
@@ -32,4 +37,6 @@ 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 79dd59bf..3dc7a3a8 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
@@ -4,33 +4,41 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.activity_widget_configure.*
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePresenter>(),
+class TimetableWidgetConfigureActivity :
+    BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     TimetableWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var configureAdapter: WidgetConfigureAdapter
 
     @Inject
     override lateinit var presenter: TimetableWidgetConfigurePresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    private var dialog: AlertDialog? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(R.layout.activity_widget_configure)
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
@@ -38,15 +46,35 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
     }
 
     override fun initView() {
-        widgetConfigureRecycler.apply {
+        with(binding.widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+            layoutManager = LinearLayoutManager(context)
         }
-        configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+
+        configureAdapter.onClickListener = presenter::onItemSelect
     }
 
-    override fun updateData(data: List<TimetableWidgetConfigureItem>) {
-        configureAdapter.updateDataSet(data)
+    override fun showThemeDialog() {
+        var items = arrayOf(
+            getString(R.string.widget_timetable_theme_light),
+            getString(R.string.widget_timetable_theme_dark)
+        )
+        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += getString(R.string.widget_timetable_theme_system)
+
+        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()
+    }
+
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
+        with(configureAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateTimetableWidget(widgetId: Int) {
@@ -72,4 +100,9 @@ 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/TimetableWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
deleted file mode 100644
index f6ec1519..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetablewidget
-
-import android.annotation.SuppressLint
-import android.view.View
-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.Student
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
-
-class TimetableWidgetConfigureItem(val student: Student, private val isCurrent: Boolean) :
-    AbstractFlexibleItem<TimetableWidgetConfigureItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableWidgetConfigureItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(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/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index 60fd03aa..57dde824 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
@@ -1,12 +1,12 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 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
 
@@ -14,13 +14,15 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
     private var isFromProvider = false
 
+    private var selectedStudent: Student? = null
+
     fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
@@ -29,35 +31,52 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(item: AbstractFlexibleItem<*>) {
-        if (item is TimetableWidgetConfigureItem) {
-            registerStudent(item.student)
+    fun onItemSelect(student: Student) {
+        selectedStudent = student
+
+        if (isFromProvider) registerStudent(selectedStudent)
+        else view?.showThemeDialog()
+    }
+
+    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) } }
             .map { (students, currentStudentId) ->
-                students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
+                students.map { student -> student to (student.id == currentStudentId) }
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
                 when {
                     it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 && !isFromProvider -> registerStudent(it.single().student)
+                    it.size == 1 && !isFromProvider -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
                     else -> view?.updateData(it)
                 }
             }, { errorHandler.dispatch(it) }))
     }
 
-    private fun registerStudent(student: Student) {
-        appWidgetId?.also {
-            sharedPref.putLong(getStudentWidgetKey(it), student.id)
-            view?.apply {
-                updateTimetableWidget(it)
-                setSuccessResult(it)
+    private fun registerStudent(student: Student?) {
+        requireNotNull(student)
+
+        appWidgetId?.let { id ->
+            sharedPref.putLong(getStudentWidgetKey(id), student.id)
+            view?.run {
+                updateTimetableWidget(id)
+                setSuccessResult(id)
             }
         }
         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 98c800d4..056225ab 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
@@ -1,15 +1,18 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<TimetableWidgetConfigureItem>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     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 b288f7b7..dd223ad8 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,5 +1,6 @@
 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
@@ -11,14 +12,17 @@ import android.widget.AdapterView.INVALID_POSITION
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 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.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 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
@@ -28,7 +32,8 @@ class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val sharedPref: SharedPrefHelper,
+    private val prefRepository: PreferencesRepository,
+    private val sharedPref: SharedPrefProvider,
     private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
@@ -36,13 +41,21 @@ class TimetableWidgetFactory(
 
     private var lessons = emptyList<Timetable>()
 
+    private var savedCurrentTheme: Long? = null
+
+    private var primaryColor: Int? = null
+
+    private var textColor: Int? = null
+
+    private var timetableChangeColor: Int? = null
+
     override fun getLoadingView() = null
 
     override fun hasStableIds() = true
 
     override fun getCount() = lessons.size
 
-    override fun getViewTypeCount() = 1
+    override fun getViewTypeCount() = 2
 
     override fun getItemId(position: Int) = position.toLong()
 
@@ -55,65 +68,159 @@ class TimetableWidgetFactory(
             val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
-            lessons = try {
-                studentRepository.isStudentSaved()
-                    .filter { true }
-                    .flatMap { studentRepository.getSavedStudents().toMaybe() }
-                    .flatMap {
-                        if (studentId == 0L) throw IllegalArgumentException("Student id is 0")
-
-                        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()
-            }
+            updateTheme(appWidgetId)
+            updateLessons(date, studentId)
         }
     }
 
+    private fun updateTheme(appWidgetId: Int) {
+        savedCurrentTheme = sharedPref.getLong(getCurrentThemeWidgetKey(appWidgetId), 0)
+
+        if (savedCurrentTheme == 0L) {
+            primaryColor = R.color.colorPrimary
+            textColor = android.R.color.black
+            timetableChangeColor = R.color.timetable_change_dark
+        } else {
+            primaryColor = R.color.colorPrimaryLight
+            textColor = android.R.color.white
+            timetableChangeColor = R.color.timetable_change_light
+        }
+    }
+
+    private fun getItemLayout(lesson: Timetable): Int {
+        return when {
+            prefRepository.showWholeClassPlan == "small" && !lesson.isStudentPlan -> {
+                if (savedCurrentTheme == 0L) R.layout.item_widget_timetable_small
+                else R.layout.item_widget_timetable_small_dark
+            }
+            savedCurrentTheme == 1L -> R.layout.item_widget_timetable_dark
+            else -> R.layout.item_widget_timetable
+        }
+    }
+
+    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 { student ->
+                    semesterRepository.getCurrentSemester(student).toMaybe().flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, date, date).toMaybe()
+                    }
+                }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .map { lessons -> lessons.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .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, 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")}")
+        val lesson = lessons[position]
+        return RemoteViews(context.packageName, getItemLayout(lesson)).apply {
+            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 (it.canceled) {
-                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags",
-                        STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG)
-                } else {
-                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", ANTI_ALIAS_FLAG)
-                }
+            if (lesson.canceled) {
+                updateStylesCanceled(this)
+            } else {
+                updateStylesNotCanceled(this, lesson)
             }
+
             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 a462ca7b..79888f83 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
@@ -12,21 +13,22 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.res.Configuration
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.shortcutWeekDayName
 import io.github.wulkanowy.utils.toFormattedString
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@@ -43,7 +45,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     lateinit var studentRepository: StudentRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider
@@ -52,21 +54,26 @@ 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"
+
+        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -100,44 +107,69 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     }
 
     private fun onDelete(intent: Intent) {
-        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
-            if (it != 0) {
-                sharedPref.apply {
-                    delete(getStudentWidgetKey(it))
-                    delete(getDateWidgetKey(it))
-                }
+        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
+
+        if (appWidgetId != 0) {
+            with(sharedPref) {
+                delete(getStudentWidgetKey(appWidgetId))
+                delete(getDateWidgetKey(appWidgetId))
+                delete(getThemeWidgetKey(appWidgetId))
+                delete(getCurrentThemeWidgetKey(appWidgetId))
             }
         }
     }
 
+    @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
-        RemoteViews(context.packageName, R.layout.widget_timetable).apply {
+        val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        var currentTheme = 0L
+        var layoutId = R.layout.widget_timetable
+
+        if (savedConfigureTheme == 1L || (savedConfigureTheme == 2L && isSystemDarkMode)) {
+            currentTheme = 1L
+            layoutId = 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 {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-            setTextViewText(R.id.timetableWidgetDate, "${date.shortcutWeekDayName.capitalize()} ${date.toFormattedString()}")
+            setTextViewText(R.id.timetableWidgetDate, date.toFormattedString("EEEE, dd.MM").capitalize())
             setTextViewText(R.id.timetableWidgetName, student?.studentName ?: context.getString(R.string.all_no_data))
-            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, MenuView.TIMETABLE.id,
-                    MainActivity.getStartIntent(context, MenuView.TIMETABLE, true), FLAG_UPDATE_CURRENT))
-        }.also {
-            sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
-            appWidgetManager.apply {
-                notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-                updateAppWidget(appWidgetId, it)
-            }
+            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)
+        }
+
+        with(sharedPref) {
+            putLong(getCurrentThemeWidgetKey(appWidgetId), currentTheme)
+            putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+        }
+
+        with(appWidgetManager) {
+            notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+            updateAppWidget(appWidgetId, remoteView)
         }
     }
 
@@ -156,24 +188,24 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                 .filter { true }
                 .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
                 .flatMap { students ->
-                    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()
-                            }
+                    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) }
                         }
+                        else -> Maybe.empty()
+                    }
                 }
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in timetable widget provider")
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in timetable widget provider")
+            }
             null
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
new file mode 100644
index 00000000..b0b6999e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.graphics.Canvas
+import android.view.View
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+
+class DividerItemDecoration(context: Context) : DividerItemDecoration(context, VERTICAL) {
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        canvas.save()
+        val dividerLeft = parent.paddingLeft
+        val dividerRight = parent.width - parent.paddingRight
+        val childCount = parent.childCount
+
+        for (i in 0..childCount - 2) {
+            val child: View = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+            val dividerTop: Int = child.bottom + params.bottomMargin
+            val dividerBottom = dividerTop + drawable!!.intrinsicHeight
+            drawable?.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom)
+            drawable?.draw(canvas)
+        }
+        canvas.restore()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
rename to app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
index e6f01497..0f121dc5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
@@ -1,14 +1,13 @@
-package io.github.wulkanowy.ui.modules.grade
+package io.github.wulkanowy.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
-import com.google.android.material.tabs.TabLayout
 
 /**
  * @see <a href="https://stackoverflow.com/a/50382854">Tabs don't fit to screen with tabmode=scrollable, Even with a Custom Tab Layout</a>
  */
-class CustomTabLayout : TabLayout {
+class FittedScrollableTabLayout : MaterialTabLayout {
 
     constructor(context: Context) : super(context)
 
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
new file mode 100644
index 00000000..a04922e5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.google.android.material.shape.MaterialShapeDrawable
+
+class MaterialLinearLayout : LinearLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int) : super(context, attr, defStyleAttr)
+
+    init {
+        val drawable = MaterialShapeDrawable.createWithElevationOverlay(context, ViewCompat.getElevation(this))
+        ViewCompat.setBackground(this, drawable)
+    }
+
+    override fun setElevation(elevation: Float) {
+        super.setElevation(elevation)
+        if (background is MaterialShapeDrawable) {
+            (background as MaterialShapeDrawable).elevation = elevation
+        }
+    }
+
+    fun setElevationCompat(elevation: Float) {
+        if (SDK_INT >= LOLLIPOP) {
+            setElevation(elevation)
+        } else {
+            setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(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
new file mode 100644
index 00000000..e19d0111
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.google.android.material.tabs.TabLayout
+
+open class MaterialTabLayout : TabLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int) : super(context, attr, defStyleAttr)
+
+    fun setElevationCompat(elevation: Float) {
+        if (SDK_INT >= LOLLIPOP) {
+            setElevation(elevation)
+        } else {
+            setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(elevation))
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
index 93781a9f..e9cac72e 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
@@ -1,17 +1,15 @@
 package io.github.wulkanowy.utils
 
 import android.app.Activity
-import android.content.Context.INPUT_METHOD_SERVICE
 import android.view.inputmethod.InputMethodManager
+import androidx.core.content.getSystemService
 
 fun Activity.showSoftInput() {
-    (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
-        if (currentFocus != null) showSoftInput(currentFocus, 0)
+    getSystemService<InputMethodManager>()?.let { manager ->
+        currentFocus?.let { manager.showSoftInput(it, 0) }
     }
 }
 
 fun Activity.hideSoftInput() {
-    (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
-        hideSoftInputFromWindow(window.decorView.applicationWindowToken, 0)
-    }
+    getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(window.decorView.applicationWindowToken, 0)
 }
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 3fa83a04..6912baa3 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -1,9 +1,9 @@
 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
-import io.github.wulkanowy.BuildConfig.CRASHLYTICS_ENABLED
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_CODE
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
@@ -12,8 +12,6 @@ import javax.inject.Singleton
 @Singleton
 open class AppInfo {
 
-    open val isCrashlyticsEnabled get() = CRASHLYTICS_ENABLED
-
     open val isDebug get() = DEBUG
 
     open val versionCode get() = VERSION_CODE
@@ -25,4 +23,8 @@ 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 c367ecd0..489e7e6f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -2,10 +2,15 @@ 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
 import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import io.github.wulkanowy.R
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
@@ -17,12 +22,47 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
     }
 }
 
+@ColorInt
+fun Context.getThemeAttrColor(@AttrRes colorAttr: Int, alpha: Int): Int {
+    return ColorUtils.setAlphaComponent(getThemeAttrColor(colorAttr), alpha)
+}
+
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
+fun Context.getCompatDrawable(@DrawableRes drawableRes: Int) = ContextCompat.getDrawable(this, drawableRes)
+
 fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
     Intent.parseUri(uri, 0).let {
         if (it.resolveActivity(packageManager) != null) startActivity(it)
         else onActivityNotFound(uri)
     }
 }
+
+fun Context.openEmailClient(chooserTitle: String, email: String, subject: String, body: String, onActivityNotFound: () -> Unit = {}) {
+    val intent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:")).apply {
+        putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+        putExtra(Intent.EXTRA_SUBJECT, subject)
+        putExtra(Intent.EXTRA_TEXT, body)
+    }
+
+    if (intent.resolveActivity(packageManager) != null) {
+        startActivity(Intent.createChooser(intent, chooserTitle))
+    } else onActivityNotFound()
+}
+
+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/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
index caa977ec..58c93729 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
@@ -1,16 +1,10 @@
 package io.github.wulkanowy.utils
 
-import android.text.Editable
-import android.text.TextWatcher
+import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 
-inline fun EditText.setOnTextChangedListener(crossinline listener: () -> Unit) {
-    addTextChangedListener(object : TextWatcher {
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            listener()
-        }
-
-        override fun afterTextChanged(s: Editable?) {}
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-    })
+fun EditText.setOnEditorDoneSignIn(callback: () -> Boolean) {
+    setOnEditorActionListener { _, id, _ ->
+        if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) callback() else false
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
deleted file mode 100644
index bd6867a3..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.utils
-
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-
-inline fun FlexibleAdapter<*>.setOnItemClickListener(crossinline listener: (item: AbstractFlexibleItem<*>) -> Unit) {
-    addListener(FlexibleAdapter.OnItemClickListener { _, position ->
-        listener(getItem(position) as AbstractFlexibleItem<*>)
-        true
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index dcf47754..9cec331f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -2,19 +2,20 @@ package io.github.wulkanowy.utils
 
 import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
+import io.github.wulkanowy.ui.modules.main.MainView
 
-inline fun FragNavController.setOnViewChangeListener(crossinline listener: (fragment: Fragment?) -> Unit) {
+inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?) -> Unit) {
     transactionListener = object : FragNavController.TransactionListener {
         override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
-            listener(fragment)
+            listener(fragment?.toSection())
         }
 
         override fun onTabTransaction(fragment: Fragment?, index: Int) {
-            listener(fragment)
+            listener(fragment?.toSection())
         }
     }
 }
 
-fun FragNavController.safelyPopFragment() {
-    if (!isRootFragment) popFragment()
+fun FragNavController.safelyPopFragments(depth: Int) {
+    if (!isRootFragment) popFragments(depth)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
new file mode 100644
index 00000000..0b71c964
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.utils
+
+import androidx.fragment.app.Fragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+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
+
+fun Fragment.toSection(): MainView.Section? {
+    return when (this) {
+        is GradeFragment -> MainView.Section.GRADE
+        is AttendanceFragment -> MainView.Section.ATTENDANCE
+        is ExamFragment -> MainView.Section.EXAM
+        is TimetableFragment -> MainView.Section.TIMETABLE
+        is MoreFragment -> MainView.Section.MORE
+        is MessageFragment -> MainView.Section.MESSAGE
+        is HomeworkFragment -> MainView.Section.HOMEWORK
+        is NoteFragment -> MainView.Section.NOTE
+        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 c863b030..c57b6247 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -24,15 +24,8 @@ fun List<GradeSummary>.calcAverage(): Double {
 
 fun Grade.getBackgroundColor(theme: String): Int {
     return when (theme) {
-        "grade_color" -> when (color) {
-            "000000" -> R.color.grade_black
-            "F04C4C" -> R.color.grade_red
-            "20A4F7" -> R.color.grade_blue
-            "6ECD07" -> R.color.grade_green
-            "B16CF1" -> R.color.grade_purple
-            else -> R.color.grade_material_default
-        }
-        "material" -> when (value) {
+        "grade_color" -> getGradeColor()
+        "material" -> when (value.toInt()) {
             6 -> R.color.grade_material_six
             5 -> R.color.grade_material_five
             4 -> R.color.grade_material_four
@@ -41,7 +34,7 @@ fun Grade.getBackgroundColor(theme: String): Int {
             1 -> R.color.grade_material_one
             else -> R.color.grade_material_default
         }
-        else -> when (value) {
+        else -> when (value.toInt()) {
             6 -> R.color.grade_vulcan_six
             5 -> R.color.grade_vulcan_five
             4 -> R.color.grade_vulcan_four
@@ -53,6 +46,17 @@ fun Grade.getBackgroundColor(theme: String): Int {
     }
 }
 
+fun Grade.getGradeColor(): Int {
+    return when (color) {
+        "000000" -> R.color.grade_black
+        "F04C4C" -> R.color.grade_red
+        "20A4F7" -> R.color.grade_blue
+        "6ECD07" -> R.color.grade_green
+        "B16CF1" -> R.color.grade_purple
+        else -> R.color.grade_material_default
+    }
+}
+
 inline val Grade.colorStringId: Int
     get() {
         return when (color) {
@@ -67,8 +71,8 @@ inline val Grade.colorStringId: Int
 
 fun Grade.changeModifier(plusModifier: Double, minusModifier: Double): Grade {
     return when {
-        modifier != .0 && plusModifier != .0 && modifier > 0 -> copy(modifier = plusModifier)
-        modifier != .0 && minusModifier != .0 && modifier < 0 -> copy(modifier = -minusModifier)
+        modifier > 0 -> copy(modifier = plusModifier)
+        modifier < 0 -> copy(modifier = -minusModifier)
         else -> this
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt
deleted file mode 100644
index d21b998b..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.view.View
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.aboutlibraries.LibsConfiguration
-
-inline fun LibsBuilder.withOnExtraListener(crossinline listener: (Libs.SpecialButton?) -> Unit): LibsBuilder {
-    withListener(object : LibsConfiguration.LibsListenerImpl() {
-        override fun onExtraClicked(v: View?, specialButton: Libs.SpecialButton?): Boolean {
-            listener(specialButton)
-            return true
-        }
-    })
-    return this
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
new file mode 100644
index 00000000..2c49ee97
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.utils
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, LifecycleObserver {
+
+    private var _value: T? = null
+
+    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
+        thisRef.viewLifecycleOwner.lifecycle.removeObserver(this)
+        _value = value
+        thisRef.viewLifecycleOwner.lifecycle.addObserver(this)
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>) = _value
+        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
+
+    @Suppress("unused")
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun onDestroyView() {
+        _value = null
+    }
+}
+
+class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>, LifecycleObserver {
+
+    private var _value: T? = null
+
+    override fun setValue(thisRef: AppCompatActivity, property: KProperty<*>, value: T) {
+        thisRef.lifecycle.removeObserver(this)
+        _value = value
+        thisRef.lifecycle.addObserver(this)
+    }
+
+    override fun getValue(thisRef: AppCompatActivity, property: KProperty<*>) = _value
+        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
+
+    @Suppress("unused")
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun onDestroyView() {
+        _value = null
+    }
+}
+
+
+@Suppress("unused")
+fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
+
+fun <T : Any> AppCompatActivity.lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index f9db0465..fc352849 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -18,6 +18,8 @@ class DebugLogTree : Timber.DebugTree() {
     }
 }
 
+private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
+
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityPaused(activity: Activity?) {
@@ -45,7 +47,7 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}") }
+        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}") }
     }
 }
 
@@ -53,7 +55,7 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLifecycleCallbacks() {
 
     override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} VIEW CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} VIEW CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
@@ -61,7 +63,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
@@ -89,7 +91,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
@@ -100,5 +102,3 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} DETACHED")
     }
 }
-
-private fun checkSavedState(savedInstanceState: Bundle?) = if (savedInstanceState == null) "(STATE IS NULL)" else ""
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
new file mode 100644
index 00000000..a2d0384e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.utils
+
+import android.content.res.Resources
+import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.exception.NotLoggedInException
+import io.github.wulkanowy.sdk.exception.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+fun Resources.getString(error: Throwable) = when (error) {
+    is UnknownHostException -> getString(R.string.error_no_internet)
+    is SocketTimeoutException, is InterruptedIOException -> getString(R.string.error_timeout)
+    is NotLoggedInException -> getString(R.string.error_login_failed)
+    is PasswordChangeRequiredException -> getString(R.string.error_password_change_required)
+    is ServiceUnavailableException -> getString(R.string.error_service_unavailable)
+    is FeatureDisabledException -> getString(R.string.error_feature_disabled)
+    is FeatureNotAvailableException -> getString(R.string.error_feature_not_available)
+    else -> getString(R.string.error_unknown)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
new file mode 100644
index 00000000..922aafbd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
@@ -0,0 +1,51 @@
+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/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
new file mode 100644
index 00000000..e4d4163b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import timber.log.Timber
+
+fun Sdk.init(student: Student): Sdk {
+    email = student.email
+    password = student.password
+    symbol = student.symbol
+    schoolSymbol = student.schoolSymbol
+    studentId = student.studentId
+    classId = student.classId
+
+    if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+        scrapperBaseUrl = student.scrapperBaseUrl
+        loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+    }
+    loginId = student.userLoginId
+
+    mode = Sdk.Mode.valueOf(student.loginMode)
+    mobileBaseUrl = student.mobileBaseUrl
+    certKey = student.certificateKey
+    privateKey = student.privateKey
+
+    Timber.d("Sdk in ${student.loginMode} mode reinitialized")
+
+    return this
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
new file mode 100644
index 00000000..b3c479c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Semester
+import org.threeten.bp.LocalDate.now
+
+inline val Semester.isCurrent: Boolean
+    get() = now() in start..end
+
+fun List<Semester>.getCurrentOrLast(): Semester {
+    if (isEmpty()) throw RuntimeException("Empty semester list")
+
+    // when there is only one current semester
+    singleOrNull { it.isCurrent }?.let { return it }
+
+    // when there is more than one current semester - find one with higher id
+    singleOrNull { semester -> semester.semesterId == maxBy { it.semesterId }?.semesterId }?.let { return it }
+
+    throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
index d9e34e87..1f721690 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
@@ -7,14 +7,15 @@ import android.widget.Spinner
 /**
  * @see <a href="https://stackoverflow.com/a/29602298">How to keep onItemSelected from firing off on a newly instantiated Spinner?</a>
  */
-inline fun Spinner.setOnItemSelectedListener(crossinline listener: (view: View?) -> Unit) {
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> Spinner.setOnItemSelectedListener(crossinline listener: (view: T?) -> Unit) {
     onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
         override fun onNothingSelected(parent: AdapterView<*>?) {}
         override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
             onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onNothingSelected(parent: AdapterView<*>?) {}
                 override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                    listener(view)
+                    listener(view as T?)
                 }
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 426816f4..8d022fc5 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,48 +1,38 @@
 package io.github.wulkanowy.utils
 
-import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.DayOfWeek.FRIDAY
 import org.threeten.bp.DayOfWeek.MONDAY
 import org.threeten.bp.DayOfWeek.SATURDAY
 import org.threeten.bp.DayOfWeek.SUNDAY
-import org.threeten.bp.Instant
+import org.threeten.bp.Instant.ofEpochMilli
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.ofInstant
 import org.threeten.bp.Month
 import org.threeten.bp.ZoneId
-import org.threeten.bp.format.DateTimeFormatter
+import org.threeten.bp.ZoneOffset
 import org.threeten.bp.format.DateTimeFormatter.ofPattern
 import org.threeten.bp.format.TextStyle.FULL_STANDALONE
 import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
 import org.threeten.bp.temporal.TemporalAdjusters.next
 import org.threeten.bp.temporal.TemporalAdjusters.previous
-import java.util.Date
 import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
 
-fun Date.toLocalDate(): LocalDate {
-    return Instant.ofEpochMilli(this.time).atZone(ZoneId.systemDefault()).toLocalDate()
-}
+fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
 
-fun Date.toLocalDateTime(): LocalDateTime {
-    return Instant.ofEpochMilli(this.time).atZone(ZoneId.systemDefault()).toLocalDateTime()
-}
+fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
 
-fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate {
-    return LocalDate.parse(this, DateTimeFormatter.ofPattern(format))
-}
+fun Long.toLocalDateTime() = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
 
-fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
+fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
-fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
-
-fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
+fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 /**
  * https://github.com/ThreeTen/threetenbp/issues/55
  */
-
 fun Month.getFormattedName(): String {
     return getDisplayName(FULL_STANDALONE, Locale.getDefault())
         .let {
@@ -66,62 +56,76 @@ fun Month.getFormattedName(): String {
 
 inline val LocalDate.nextSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            FRIDAY, SATURDAY, SUNDAY -> this.with(next(MONDAY))
-            else -> this.plusDays(1)
+        return when (dayOfWeek) {
+            FRIDAY, SATURDAY, SUNDAY -> with(next(MONDAY))
+            else -> plusDays(1)
         }
     }
 
 inline val LocalDate.previousSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY, MONDAY -> this.with(previous(FRIDAY))
-            else -> this.minusDays(1)
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY, MONDAY -> with(previous(FRIDAY))
+            else -> minusDays(1)
         }
     }
 
 inline val LocalDate.nextOrSameSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY -> this.with(next(MONDAY))
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY -> with(next(MONDAY))
             else -> this
         }
     }
 
 inline val LocalDate.previousOrSameSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY -> this.with(previous(FRIDAY))
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY -> with(previous(FRIDAY))
             else -> this
         }
     }
 
 inline val LocalDate.weekDayName: String
-    get() = this.format(ofPattern("EEEE", Locale.getDefault()))
-
-inline val LocalDate.shortcutWeekDayName: String
-    get() = this.format(ofPattern("EEE", Locale.getDefault()))
+    get() = format(ofPattern("EEEE", Locale.getDefault()))
 
 inline val LocalDate.monday: LocalDate
-    get() = this.with(MONDAY)
+    get() = with(MONDAY)
 
 inline val LocalDate.friday: LocalDate
-    get() = this.with(FRIDAY)
+    get() = with(FRIDAY)
 
 /**
  * [Dz.U. 2016 poz. 1335](http://prawo.sejm.gov.pl/isap.nsf/DocDetails.xsp?id=WDU20160001335)
  */
-
 inline val LocalDate.isHolidays: Boolean
-    get() {
-        return LocalDate.of(this.year, 9, 1).run {
-            when (dayOfWeek) {
-                FRIDAY, SATURDAY, SUNDAY -> with(firstInMonth(MONDAY))
-                else -> this
-            }
-        }.let { firstSchoolDay ->
-            LocalDate.of(this.year, 6, 20)
-                .with(next(FRIDAY))
-                .let { lastSchoolDay -> this.isBefore(firstSchoolDay) && this.isAfter(lastSchoolDay) }
+    get() = isBefore(firstSchoolDay) && isAfter(lastSchoolDay)
+
+inline val LocalDate.firstSchoolDay: LocalDate
+    get() = LocalDate.of(year, 9, 1).run {
+        when (dayOfWeek) {
+            FRIDAY, SATURDAY, SUNDAY -> with(firstInMonth(MONDAY))
+            else -> this
         }
     }
+
+inline val LocalDate.lastSchoolDay: LocalDate
+    get() = LocalDate.of(year, 6, 20)
+        .with(next(FRIDAY))
+
+private fun Int.getSchoolYearByMonth(monthValue: Int): Int {
+    return when (monthValue) {
+        in 9..12 -> this
+        else -> this + 1
+    }
+}
+
+fun LocalDate.getLastSchoolDayIfHoliday(schoolYear: Int): LocalDate {
+    val date = LocalDate.of(schoolYear.getSchoolYearByMonth(monthValue), monthValue, dayOfMonth)
+
+    if (date.isHolidays) {
+        return date.lastSchoolDay
+    }
+
+    return date
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
new file mode 100644
index 00000000..ccb2afeb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Timetable
+import org.threeten.bp.Duration
+import org.threeten.bp.Duration.between
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+
+fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
+    !isStudentPlan -> false
+    canceled -> false
+    now().isAfter(start) -> false
+    previousLessonEnd != null && now().isBefore(previousLessonEnd) -> false
+    else -> between(now(), start) <= Duration.ofMinutes(60)
+}
+
+inline val Timetable.left: Duration?
+    get() = when {
+        canceled -> null
+        !isStudentPlan -> null
+        end.isAfter(now()) && start.isBefore(now()) -> between(now(), end)
+        else -> null
+    }
+
+inline val Timetable.until: Duration
+    get() = between(now(), start)
+
+inline val Timetable.isJustFinished: Boolean
+    get() = end.isBefore(now()) && end.plusSeconds(15).isAfter(now()) && !canceled
diff --git a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
index 24e6d3ff..264f4542 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
@@ -14,7 +14,6 @@ import android.security.keystore.KeyProperties.DIGEST_SHA512
 import android.security.keystore.KeyProperties.ENCRYPTION_PADDING_RSA_OAEP
 import android.security.keystore.KeyProperties.PURPOSE_DECRYPT
 import android.security.keystore.KeyProperties.PURPOSE_ENCRYPT
-import android.util.Base64
 import android.util.Base64.DEFAULT
 import android.util.Base64.decode
 import android.util.Base64.encode
@@ -60,7 +59,7 @@ fun encrypt(plainText: String, context: Context): String {
     if (plainText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
 
     if (SDK_INT < JELLY_BEAN_MR2) {
-        return String(Base64.encode(plainText.toByteArray(KEY_CHARSET), DEFAULT), KEY_CHARSET)
+        return String(encode(plainText.toByteArray(KEY_CHARSET), DEFAULT), KEY_CHARSET)
     }
 
     return try {
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 d33cb56f..641b7706 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 we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami.
+Aplikacja jest przeznaczona dla użytkowników dziennika VULCAN UONET+.
 
 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
new file mode 100644
index 00000000..56768bf5
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png 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
new file mode 100644
index 00000000..83d9353a
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png 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
new file mode 100644
index 00000000..f83a7af8
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png 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
new file mode 100644
index 00000000..90d5fef4
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png 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
new file mode 100644
index 00000000..eadbf2db
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png 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
new file mode 100644
index 00000000..2a11a3db
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png 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
new file mode 100644
index 00000000..d9b2f1c7
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png 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
deleted file mode 100644
index 8a52d8de..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png and /dev/null 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
deleted file mode 100644
index c6508574..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png and /dev/null 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
deleted file mode 100644
index 376fc3c3..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png and /dev/null 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
deleted file mode 100644
index 6b4089b0..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png and /dev/null 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
deleted file mode 100644
index c3dc523f..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png and /dev/null 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
deleted file mode 100644
index 511433d4..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png and /dev/null 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
deleted file mode 100644
index 1d502470..00000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png and /dev/null 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 2bb64db6..427ad4dc 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,8 +1,10 @@
-Wersja 0.9.3
-
-Naprawiliśmy:
-- problemy z logowaniem jeśli symbol zawierał cyfry
-- bardzo rzadkie problemy z ładowaniem ocen
-- jeszcze rzadsze problemy ze stabilnością podczas logowania
+Wersja 0.18.0
+- naprawiliśmy odświeżanie zadań domowych
+- naprawiliśmy powiadomienia na androidzie 8.0
+- oceny powinny się teraz odświeżać trochę szybciej
+- dodaliśmy tryb pełnoekranowy w zadaniach
+- dodaliśmy wyszukiwanie w wiadomościach
+- dodaliśmy opcje oznaczania bieżącej lekcji na planie/w powiadomieniu (domyślnie wyłączone)
+- dodaliśmy testową opcję naprawy powiadomień na np. Huawei, Xiaomi (znajdziesz ją w ustawieniach)
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
new file mode 100644
index 00000000..21b406fd
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2 2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
new file mode 100644
index 00000000..bee1c707
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2, 9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83, 12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22, 8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
new file mode 100644
index 00000000..89a8aef2
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
new file mode 100644
index 00000000..0f335336
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
deleted file mode 100644
index 00538168..00000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="26.086956"
-    android:viewportHeight="26.086956"
-    android:tint="#FFFFFF">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_grade.png
new file mode 100644
index 00000000..d97efb5d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_grade.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_message.png b/app/src/main/res/drawable-hdpi/ic_stat_message.png
new file mode 100644
index 00000000..ce0fdabc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_message.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_note.png b/app/src/main/res/drawable-hdpi/ic_stat_note.png
new file mode 100644
index 00000000..7318c419
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_note.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png
deleted file mode 100644
index ea5b85c8..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png
deleted file mode 100644
index 86d63c58..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png
deleted file mode 100644
index b49e4ad2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_push.png b/app/src/main/res/drawable-hdpi/ic_stat_push.png
new file mode 100644
index 00000000..84578183
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png
new file mode 100644
index 00000000..201419d5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_grade.png b/app/src/main/res/drawable-mdpi/ic_stat_grade.png
new file mode 100644
index 00000000..c85b2702
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_grade.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_message.png b/app/src/main/res/drawable-mdpi/ic_stat_message.png
new file mode 100644
index 00000000..b357b321
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_message.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_note.png b/app/src/main/res/drawable-mdpi/ic_stat_note.png
new file mode 100644
index 00000000..55a4fbbf
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_note.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png
deleted file mode 100644
index 64fd285d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png
deleted file mode 100644
index 73a1653a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png
deleted file mode 100644
index 3498f71c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_push.png b/app/src/main/res/drawable-mdpi/ic_stat_push.png
new file mode 100644
index 00000000..d1e954b0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png
new file mode 100644
index 00000000..dcfe95f2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-night/background_header_note.xml b/app/src/main/res/drawable-night/background_header_note.xml
new file mode 100644
index 00000000..6b594e7c
--- /dev/null
+++ b/app/src/main/res/drawable-night/background_header_note.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimaryLight" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable-night/ic_all_divider.xml b/app/src/main/res/drawable-night/ic_all_divider.xml
index ca44eb29..cd444a28 100644
--- a/app/src/main/res/drawable-night/ic_all_divider.xml
+++ b/app/src/main/res/drawable-night/ic_all_divider.xml
@@ -5,5 +5,5 @@
         android:angle="270"
         android:centerColor="@android:color/transparent"
         android:centerX="0.01"
-        android:startColor="#494949" />
+        android:startColor="@color/colorDividerInverse" />
 </shape>
diff --git a/app/src/main/res/drawable-v23/layer_splash_background.xml b/app/src/main/res/drawable-v23/layer_splash_background.xml
index 5fa58e90..1b4b64ec 100644
--- a/app/src/main/res/drawable-v23/layer_splash_background.xml
+++ b/app/src/main/res/drawable-v23/layer_splash_background.xml
@@ -1,12 +1,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#9a0007" />
+            <solid android:color="@color/colorPrimaryDark" />
         </shape>
     </item>
     <item
         android:width="200dp"
         android:height="200dp"
-        android:gravity="center"
-        android:drawable="@drawable/img_splash_logo" />
+        android:drawable="@drawable/img_splash_logo"
+        android:gravity="center" />
 </layer-list>
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xhdpi/ic_stat_grade.png
new file mode 100644
index 00000000..c55ca7fd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_grade.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_message.png
new file mode 100644
index 00000000..0e67ade3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_message.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_note.png
new file mode 100644
index 00000000..ea674a79
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_note.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png
deleted file mode 100644
index 83b2c443..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png
deleted file mode 100644
index b373ffd4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png
deleted file mode 100644
index 5aa30e5f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_push.png b/app/src/main/res/drawable-xhdpi/ic_stat_push.png
new file mode 100644
index 00000000..79b38e63
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png
new file mode 100644
index 00000000..7264bd92
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png
new file mode 100644
index 00000000..eeb6fa41
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_message.png b/app/src/main/res/drawable-xxhdpi/ic_stat_message.png
new file mode 100644
index 00000000..2e881824
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_message.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png
new file mode 100644
index 00000000..174e1509
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png
deleted file mode 100644
index cba48ec2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png
deleted file mode 100644
index dc15bbd9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png
deleted file mode 100644
index db3ec517..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxhdpi/ic_stat_push.png
new file mode 100644
index 00000000..bc33cb5b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png
new file mode 100644
index 00000000..1fb37b09
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png
deleted file mode 100644
index 3b40ad3f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png
deleted file mode 100644
index 06a9299a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png
new file mode 100644
index 00000000..b354bd06
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png
new file mode 100644
index 00000000..a95cc4f5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable/background_header_note.xml b/app/src/main/res/drawable/background_header_note.xml
new file mode 100644
index 00000000..c21e55c6
--- /dev/null
+++ b/app/src/main/res/drawable/background_header_note.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimary" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_rounded_corner.xml b/app/src/main/res/drawable/background_luckynumber_widget.xml
similarity index 78%
rename from app/src/main/res/drawable/background_rounded_corner.xml
rename to app/src/main/res/drawable/background_luckynumber_widget.xml
index 116973b5..f29744d0 100644
--- a/app/src/main/res/drawable/background_rounded_corner.xml
+++ b/app/src/main/res/drawable/background_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="#ffffffff" />
+    <solid android:color="@android:color/white" />
     <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
new file mode 100644
index 00000000..fa15fd85
--- /dev/null
+++ b/app/src/main/res/drawable/background_luckynumber_widget_dark.xml
@@ -0,0 +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="@color/colorWidgetBackground" />
+    <corners android:radius="5dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_timetable_time_left.xml b/app/src/main/res/drawable/background_timetable_time_left.xml
new file mode 100644
index 00000000..0f332611
--- /dev/null
+++ b/app/src/main/res/drawable/background_timetable_time_left.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="3dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_about_creator.xml b/app/src/main/res/drawable/ic_about_creator.xml
new file mode 100644
index 00000000..c3daf609
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_creator.xml
@@ -0,0 +1,9 @@
+<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="M9,13.75c-2.34,0 -7,1.17 -7,3.5L2,19h14v-1.75c0,-2.33 -4.66,-3.5 -7,-3.5zM4.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25L4.34,17zM9,12c1.93,0 3.5,-1.57 3.5,-3.5S10.93,5 9,5 5.5,6.57 5.5,8.5 7.07,12 9,12zM9,7c0.83,0 1.5,0.67 1.5,1.5S9.83,10 9,10s-1.5,-0.67 -1.5,-1.5S8.17,7 9,7zM16.04,13.81c1.16,0.84 1.96,1.96 1.96,3.44L18,19h4v-1.75c0,-2.02 -3.5,-3.17 -5.96,-3.44zM15,12c1.93,0 3.5,-1.57 3.5,-3.5S16.93,5 15,5c-0.54,0 -1.04,0.13 -1.5,0.35 0.63,0.89 1,1.98 1,3.15s-0.37,2.26 -1,3.15c0.46,0.22 0.96,0.35 1.5,0.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_discord.xml b/app/src/main/res/drawable/ic_about_discord.xml
new file mode 100644
index 00000000..bcca42bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_discord.xml
@@ -0,0 +1,9 @@
+<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="M9.375,4.031 L8.75,4.094c0,0 -2.742,0.296 -4.75,1.875L3.969,5.969L3.938,6C3.488,6.406 3.308,6.898 3,7.625 2.6336,8.5013 2.3203,9.399 2.062,10.313 1.478,12.37 1,14.843 1,17.125v0.219l0.094,0.187c0.726,1.246 2.023,2.047 3.218,2.594 1.196,0.547 2.223,0.82 2.938,0.844L7.719,21 8.812,18.656C9.722,18.856 10.797,19 12,19c1.203,0 2.246,-0.145 3.156,-0.344L16.25,21 16.719,20.969c0.715,-0.024 1.742,-0.297 2.937,-0.844 1.196,-0.547 2.492,-1.348 3.219,-2.594l0.094,-0.187v-0.219c0,-2.281 -0.446,-4.754 -1.032,-6.813C21.6789,9.3987 21.366,8.5017 21,7.626 20.691,6.899 20.48,6.407 20.031,6.001L20,5.969C17.992,4.391 15.219,4.094 15.219,4.094L14.625,4.031c0,0 -0.453,1.516 -0.594,2.157C13.3576,6.0959 12.6795,6.0432 12,6.03 11.582,6.03 10.86,6.07 9.969,6.187 9.829,5.546 9.375,4.03 9.375,4.03ZM8.125,6.188C8.16,6.289 8.223,6.418 8.25,6.5L9.1478,8.2815C10.3888,8.0461 11.5032,8 12,8c0.5086,0 1.6647,0.0483 2.9411,0.2987L15.813,6.5c0.027,-0.082 0.12,-0.21 0.156,-0.313 1.0837,0.1962 2.1092,0.6344 3,1.282 -0.008,0.004 0.324,0.406 0.593,1 0.278,0.61 0.567,1.426 0.844,2.344 0.532,1.761 0.934,4.082 0.969,5.968 -0.492,0.696 -1.406,1.336 -2.375,1.75 -0.848,0.364 -1.29,0.496 -1.688,0.563l-0.406,-0.875c0.23,-0.078 0.27,-0.074 0.469,-0.157 1.207,-0.488 1.844,-1.03 1.844,-1.03l-0.813,-1.563c0,0 -0.441,0.367 -1.468,0.781C15.91,16.664 14.133,17.094 12,17.094 9.867,17.094 8.469,16.664 7.437,16.25 6.407,15.836 5.969,15.469 5.969,15.469L4.75,17.03c0,0 0.668,0.543 1.875,1.032 0.2,0.082 0.266,0.078 0.5,0.156L6.687,19.093C6.289,19.026 5.817,18.893 4.969,18.53 3.996,18.112 3.086,17.476 2.594,16.78 2.629,14.894 3.031,12.573 3.563,10.812 3.84,9.894 4.16,9.077 4.437,8.468 4.707,7.874 5.007,7.472 5,7.468 6.156,6.628 7.395,6.323 8.125,6.187ZM9.5,11C8.672,11 8,11.895 8,13c0,1.105 0.672,2 1.5,2 0.828,0 1.5,-0.895 1.5,-2 0,-1.105 -0.672,-2 -1.5,-2zM14.5,11c-0.828,0 -1.5,0.895 -1.5,2 0,1.105 0.672,2 1.5,2 0.828,0 1.5,-0.895 1.5,-2 0,-1.105 -0.672,-2 -1.5,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_faq.xml b/app/src/main/res/drawable/ic_about_faq.xml
new file mode 100644
index 00000000..d6ab255b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_faq.xml
@@ -0,0 +1,9 @@
+<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_about_feedback.xml b/app/src/main/res/drawable/ic_about_feedback.xml
new file mode 100644
index 00000000..a348cb6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_feedback.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5s-0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM16,12v3c0,0.22 -0.03,0.47 -0.07,0.7l-0.1,0.65 -0.37,0.65c-0.72,1.24 -2.04,2 -3.46,2s-2.74,-0.77 -3.46,-2l-0.37,-0.64 -0.1,-0.65C8.03,15.48 8,15.23 8,15v-4c0,-0.23 0.03,-0.48 0.07,-0.7l0.1,-0.65 0.37,-0.65c0.3,-0.52 0.72,-0.97 1.21,-1.31l0.57,-0.39 0.74,-0.18c0.31,-0.08 0.63,-0.12 0.94,-0.12 0.32,0 0.63,0.04 0.95,0.12l0.68,0.16 0.61,0.42c0.5,0.34 0.91,0.78 1.21,1.31l0.38,0.65 0.1,0.65c0.04,0.22 0.07,0.47 0.07,0.69v1zM10,14h4v2h-4zM10,10h4v2h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_delete_24dp.xml b/app/src/main/res/drawable/ic_about_homepage.xml
similarity index 58%
rename from app/src/main/res/drawable/ic_message_delete_24dp.xml
rename to app/src/main/res/drawable/ic_about_homepage.xml
index 4a577483..1ec60812 100644
--- a/app/src/main/res/drawable/ic_message_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_about_homepage.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#000"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+        android:fillColor="#FFF"
+        android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_about_licenses.xml b/app/src/main/res/drawable/ic_about_licenses.xml
new file mode 100644
index 00000000..1a052734
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_licenses.xml
@@ -0,0 +1,9 @@
+<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="M12,3a3,3 0,0 0,-2.8 2H3v2h2l-3,7c-0.5,2 1,3 3.5,3s4,-1 3.5,-3L6,7h3.2c0.3,0.8 1,1.5 1.8,1.8V20H2v2h20v-2h-9V8.8A3,3 0,0 0,14.8 7H18L15,14c-0.5,2 1,3 3.5,3s4,-1 3.5,-3l-3,-7h2V5h-6.2A3, 3 0,0 0,12 3m0,2a1,1 0,0 1,1 1,1 1,0 0,1 -1,1 1,1 0,0 1,-1 -1,1 1,0 0,1 1,-1m-6.5,5.3L7,14H4l1.5,-3.8m13,0L20, 14h-3l1.5,-3.8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_privacy.xml b/app/src/main/res/drawable/ic_about_privacy.xml
new file mode 100644
index 00000000..109f05df
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_privacy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_account_circular_border.xml b/app/src/main/res/drawable/ic_account_circular_border.xml
deleted file mode 100644
index 8ba66975..00000000
--- a/app/src/main/res/drawable/ic_account_circular_border.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@android:color/transparent" />
-    <stroke
-        android:width="3dp"
-        android:color="@color/colorPrimary" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_all_about_24dp.xml b/app/src/main/res/drawable/ic_all_about.xml
similarity index 69%
rename from app/src/main/res/drawable/ic_all_about_24dp.xml
rename to app/src/main/res/drawable/ic_all_about.xml
index 550f312e..3dfbbda1 100644
--- a/app/src/main/res/drawable/ic_all_about_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_about.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M11,7h2v2h-2zM11,11h2v6h-2z" />
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M12,2a10,10 0,1 0,0 20,10 10,0 0,0 0,-20zM12,20a8,8 0,1 1,0 -16,8 8,0 0,1 0,16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_account.xml b/app/src/main/res/drawable/ic_all_account.xml
new file mode 100644
index 00000000..0e917d5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_account.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_account_24dp.xml b/app/src/main/res/drawable/ic_all_account_24dp.xml
deleted file mode 100644
index dea10cb3..00000000
--- a/app/src/main/res/drawable/ic_all_account_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2
-            12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22
-            0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml b/app/src/main/res/drawable/ic_all_add.xml
similarity index 60%
rename from app/src/main/res/drawable/ic_menu_send_message_24dp.xml
rename to app/src/main/res/drawable/ic_all_add.xml
index fcc5acfb..e4566293 100644
--- a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_add.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+        android:fillColor="#FFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml b/app/src/main/res/drawable/ic_all_close_circle.xml
similarity index 69%
rename from app/src/main/res/drawable/ic_all_close_circle_24dp.xml
rename to app/src/main/res/drawable/ic_all_close_circle.xml
index 3809c797..3f89a8fa 100644
--- a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_close_circle.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,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,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
+        android:fillColor="#FFF"
+        android:pathData="M12,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,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59, 8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_divider.xml b/app/src/main/res/drawable/ic_all_divider.xml
index f46b3ad7..61e96497 100644
--- a/app/src/main/res/drawable/ic_all_divider.xml
+++ b/app/src/main/res/drawable/ic_all_divider.xml
@@ -5,5 +5,5 @@
         android:angle="270"
         android:centerColor="@android:color/transparent"
         android:centerX="0.01"
-        android:startColor="#60606060" />
+        android:startColor="@color/colorDivider" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_message_forward_24dp.xml b/app/src/main/res/drawable/ic_all_done.xml
similarity index 76%
rename from app/src/main/res/drawable/ic_message_forward_24dp.xml
rename to app/src/main/res/drawable/ic_all_done.xml
index 2b7c32c7..bb657f6e 100644
--- a/app/src/main/res/drawable/ic_message_forward_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_done.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,8V4l8,8 -8,8v-4H4V8z" />
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_messages_24dp.xml b/app/src/main/res/drawable/ic_all_done_all.xml
similarity index 52%
rename from app/src/main/res/drawable/ic_more_messages_24dp.xml
rename to app/src/main/res/drawable/ic_all_done_all.xml
index 65f32169..e27672ef 100644
--- a/app/src/main/res/drawable/ic_more_messages_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_done_all.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_note_24dp.xml b/app/src/main/res/drawable/ic_all_mark.xml
similarity index 63%
rename from app/src/main/res/drawable/ic_all_note_24dp.xml
rename to app/src/main/res/drawable/ic_all_mark.xml
index 988df22c..12721649 100644
--- a/app/src/main/res/drawable/ic_all_note_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_mark.xml
@@ -1,10 +1,9 @@
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#FFF"
         android:pathData="M11 5h2v11h-2V5m2 13v2h-2v-2h2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_round_note_24dp.xml b/app/src/main/res/drawable/ic_all_round_mark.xml
similarity index 51%
rename from app/src/main/res/drawable/ic_all_round_note_24dp.xml
rename to app/src/main/res/drawable/ic_all_round_mark.xml
index f4f1f2c5..91afb233 100644
--- a/app/src/main/res/drawable/ic_all_round_note_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_round_mark.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/colorPrimary"
-        android:pathData="M13 13h-2V7h2m0 10h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10
-            0 0 0 10-10A10 10 0 0 0 12 2z" />
+        android:fillColor="#FFF"
+        android:pathData="M13 13h-2V7h2m0 10h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_attachment.xml b/app/src/main/res/drawable/ic_attachment.xml
new file mode 100644
index 00000000..c18714f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_attachment.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 00000000..3c728c59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_add_24dp.xml b/app/src/main/res/drawable/ic_chevron_left.xml
similarity index 66%
rename from app/src/main/res/drawable/ic_all_add_24dp.xml
rename to app/src/main/res/drawable/ic_chevron_left.xml
index e3979cd7..ee3ff4be 100644
--- a/app/src/main/res/drawable/ic_all_add_24dp.xml
+++ b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -1,5 +1,5 @@
 <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="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <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
new file mode 100644
index 00000000..a6d73497
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_right.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 00000000..bb4cb302
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,9 @@
+<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_message_reply_24dp.xml b/app/src/main/res/drawable/ic_excuse_denied.xml
similarity index 59%
rename from app/src/main/res/drawable/ic_message_reply_24dp.xml
rename to app/src/main/res/drawable/ic_excuse_denied.xml
index 010cb250..218cfbdc 100644
--- a/app/src/main/res/drawable/ic_message_reply_24dp.xml
+++ b/app/src/main/res/drawable/ic_excuse_denied.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_excuse_waiting.xml b/app/src/main/res/drawable/ic_excuse_waiting.xml
new file mode 100644
index 00000000..863418b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_excuse_waiting.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.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,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
new file mode 100644
index 00000000..86b7649b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen.xml
@@ -0,0 +1,5 @@
+<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="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
new file mode 100644
index 00000000..bb7140f2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen_exit.xml
@@ -0,0 +1,5 @@
+<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="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index cfec6390..ee11f89d 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,27 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="1926.9231"
-        android:viewportHeight="1926.9231">
-    <group android:translateX="462.46155"
-            android:translateY="462.46155">
-      <path
-          android:pathData="M-1001,-1002h3006v3006h-3006z"
-          android:fillColor="#D32F2F"/>
-      <path
-          android:pathData="M2003,1441.1V2003h-759.9l-1002,-1002h0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8c1.6,-3.1 3.4,-6 5,-9.1c0.4,-0.8 0.6,-1.6 0.6,-2.5c9.2,-15.1 20.2,-28.9 31.4,-42.6c0.1,-0.2 0.3,-0.3 0.4,-0.5c5.1,-6.3 10.3,-12.6 15.3,-18.9c1,-1.2 1.9,-2.4 2.9,-3.7c0.2,-0.2 0.3,-0.4 0.5,-0.6c7.6,-9.7 14.8,-19.7 21.2,-30.2c1,-1.7 2,-3.4 2.9,-5.1c0.1,-0.2 0.2,-0.3 0.3,-0.5c6.2,-11.4 11.3,-23.3 17.7,-34.6c4.5,-8 9.3,-15.9 13.8,-23.9c0.1,-0.2 0.2,-0.3 0.3,-0.5c0.8,-1.5 1.6,-3 2.4,-4.4c0.2,-0.3 0.3,-0.6 0.5,-0.9c2,-3.7 3.8,-7.4 5.6,-11.2c6.2,-13.4 10.2,-27.7 14,-41.9c0,-0.2 0.1,-0.3 0.1,-0.5c0.3,-1 0.5,-2 0.8,-2.9c4,-15.3 7.3,-31.4 13.5,-45.9c1.4,-3.3 3,-6.5 4.6,-9.6c0.1,-0.2 0.2,-0.3 0.3,-0.5c5,-9.7 10.6,-19.1 13.5,-29.7c2.6,-9.2 3.5,-19 3.6,-28.8c0,-0.2 0,-0.3 0,-0.5c0.1,-7.2 -0.1,-14.4 -0.4,-21.3c0.9,-5.6 1.9,-11.3 3,-16.9c0.2,-0.9 0.3,-1.7 0.5,-2.6c1.2,-5.9 2.5,-11.7 4.2,-17.4c0,-0.1 0.1,-0.3 0.1,-0.4c0,-0.2 0.1,-0.3 0.1,-0.5c0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9c12.8,-3.9 24.9,-9.9 36.3,-16.8c2.8,-1.7 5.6,-3.4 8.3,-5.2c0.2,-0.1 0.3,-0.2 0.5,-0.3c7.7,-4.9 15.2,-10.2 22.1,-16c3.1,-2.7 5.9,-5.6 8.3,-8.9c0.1,-0.2 0.2,-0.3 0.4,-0.5c2.3,-3.4 4.2,-7.2 5.3,-11.4c2.4,-9.2 1.9,-19 1.9,-28.4c0,-0.2 0,-0.4 0,-0.6l5.7,-5.6l-0.3,0.1l4.1,1.3l45.3,45l9.6,9.6l14.3,14.3l100.8,100.8l17.2,17.2l16.3,16.3l30.3,-30.3L442.3,348.5c0.5,-0.5 1.1,-1.6 1.4,-2.3c0.3,-0.6 0.5,-1.2 0.4,-1.9c0,-0.8 -0.2,-1.6 -0.6,-2.3c-0.1,-0.3 -0.3,-0.7 -0.4,-1c-0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8l191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7c4.1,0 8.2,0.1 11.9,1.9c0.5,0.3 1.3,0.7 2.1,1.1c1.7,2.3 3.5,4.5 5.7,6.2c2.7,2.1 8.2,3 9.4,0.3L2003,1441.1z"
-          android:fillColor="#AD2A2A"/>
-      <path
-          android:pathData="M619.3,797.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3H416.2c-4,0 -7.7,-2.3 -9.5,-5.6L375.8,821c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2l37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3L619.3,797.7z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M389.7,254.5c0,-22.9 14.5,-42.6 35.3,-51.8c-1.5,-2.5 -2.4,-5.2 -2.4,-8.1c0,-11.1 12.8,-20.1 28.5,-20.1c0.4,0 0.7,0 1.1,0c6.5,-10.8 18.9,-18.1 33.1,-18.1c1,0 2,0 3,0.1c1.3,0.1 2.6,-0.5 3.3,-1.5c10.5,-16 37.1,-27.4 68.2,-27.4c11.5,0 22.4,1.6 32.1,4.3c2.3,-3.8 7.4,-6.4 13.3,-6.4c6.7,0 12.4,3.4 14.1,8.1c8.2,-9.5 22.1,-15.7 37.9,-15.7c25.2,0 45.6,15.9 45.6,35.5c0,2.4 -0.3,4.7 -0.9,7c-0.4,1.6 0.5,3.2 2.2,3.8c16.1,5.9 27,17.1 27,29.9c0,14.6 -14.1,27.1 -34,32c-1.6,0.4 -2.6,1.8 -2.6,3.3c0,0.1 0,0.2 0,0.3c0,11.3 -11.2,20.6 -25.6,21.6c0.1,0.5 0.1,1 0.1,1.6c0,21.7 -41.3,39.2 -92.2,39.2c-11,0 -21.5,-0.8 -31.2,-2.3c0,0.2 0,0.3 0,0.5c0,9 -11.6,16.3 -25.8,16.3c-0.8,0 -1.5,0 -2.2,-0.1c1,2.2 1.5,4.5 1.5,6.9c0,14 -17.7,25.3 -39.6,25.3c-2.4,0 -4.7,-0.1 -7,-0.4c-1.8,-0.2 -3.5,0.9 -3.9,2.6c-1.9,7 -8,12.1 -15.3,12.1c-8.8,0 -15.8,-7.5 -15.8,-16.7c0,-4.3 1.5,-8.2 4,-11.1c0.9,-1 1.2,-2.4 0.6,-3.6c-1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3C410.1,304.1 389.7,281.5 389.7,254.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M873.4,884H749c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5L613.6,638c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7L506.9,581c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5L669,563.3c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6C887.3,873.9 882.4,884 873.4,884z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M338.8,839.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1H128.7c-8.4,0 -13.5,-8.8 -9,-15.4L236,697.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4L317,761.5c-0.9,2.1 -1.1,4.4 -0.4,6.5L338.8,839.9z"
-          android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#ad2a2a"
+        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login_outlined_border.xml b/app/src/main/res/drawable/ic_login_outlined_border.xml
deleted file mode 100644
index c5d3c686..00000000
--- a/app/src/main/res/drawable/ic_login_outlined_border.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@null" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/spinner_stroke" />
-    <corners android:radius="4dip" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_main_attendance.xml b/app/src/main/res/drawable/ic_main_attendance.xml
new file mode 100644
index 00000000..c42a17b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_attendance.xml
@@ -0,0 +1,9 @@
+<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="M4,2C2.8954,2 2,2.8954 2,4v14c0,1.1046 0.8954,2 2,2h6l2,-2v-4h4l2,-2L12,12L12,8h6v4l2,-2L20,4C20,2.8954 19.1046,2 18,2ZM4,4L18,4L18,6L4,6ZM4,8h6v4L4,12ZM20,13 L19,14 21,16 22,15zM4,14h6v4L4,18ZM18,15 L12,21v2h2l6,-6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_exam.xml b/app/src/main/res/drawable/ic_main_exam.xml
new file mode 100644
index 00000000..a705c0a4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_exam.xml
@@ -0,0 +1,9 @@
+<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="M19,3L18,3L18,1L16,1L16,3L8,3L8,1L6,1L6,3L5,3C3.89,3 3.01,3.9 3.01,5L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5C21,3.9 20.1,3 19,3ZM19,19L5,19L5,9L19,9ZM19,7L5,7L5,5h14zM12,12h5v5h-5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_grade.xml b/app/src/main/res/drawable/ic_main_grade.xml
new file mode 100644
index 00000000..bf4c2cf2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_grade.xml
@@ -0,0 +1,9 @@
+<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="M13,11H15V13H13M13,15H15A2,2 0 0,0 17,13V11C17,9.89 16.1,9 15,9H13V7H17V5H13A2,2 0 0,0 11,7V13C11,14.11 11.9,15 13,15M21,17H7V3H21M21,1H7A2,2 0 0,0 5,3V17A2,2 0 0,0 7,19H21A2,2 0 0,0 23,17V3A2,2 0 0,0 21,1M3,5H1V21A2,2 0 0,0 3,23H19V21H3V5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_more.xml b/app/src/main/res/drawable/ic_main_more.xml
new file mode 100644
index 00000000..f57a7245
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_more.xml
@@ -0,0 +1,9 @@
+<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="M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_timetable.xml b/app/src/main/res/drawable/ic_main_timetable.xml
new file mode 100644
index 00000000..b8f5cb85
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_timetable.xml
@@ -0,0 +1,9 @@
+<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="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM7,11h10v2L7,13zM7,15h7v2L7,17z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_attendance_summary.xml b/app/src/main/res/drawable/ic_menu_attendance_summary.xml
new file mode 100644
index 00000000..f0dab549
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_attendance_summary.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7,10h2v7L7,17zM11,7h2v10h-2zM15,13h2v4h-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester.xml b/app/src/main/res/drawable/ic_menu_grade_semester.xml
new file mode 100644
index 00000000..8eb86922
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_grade_semester.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M8,1L8,3L7,3C5.8954,3 5,3.8954 5,5v12c0,1.1 0.89,2 2,2h14c1.1046,0 2,-0.8954 2,-2L23,5C23,3.8954 22.1046,3 21,3L20,3L20,1L18,1L18,3L10,3L10,1ZM7,5L21,5L21,6.9414L7,6.9414ZM7,9h14v8L7,17ZM1,9v12c0,1.1 0.89,2 2,2L17,23L17,21L3,21L3,9ZM15,11v4h4v-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml b/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
deleted file mode 100644
index 2a03f630..00000000
--- a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.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.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M21,17V8H7V17H21M21,3A2,2 0,0 1,23 5V17A2,2 0,0 1,21 19H7C5.89,19 5,18.1 5,17V5A2,2 0,0 1,7 3H8V1H10V3H18V1H20V3H21M3,21H17V23H3C1.89,23 1,22.1 1,21V9H3V21M19,15H15V11H19V15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml b/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml
deleted file mode 100644
index eccc338f..00000000
--- a/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- drawable/table_edit.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M22 13l-1 1-2-2 1-1 2 2m-10 6l6-6 2 2-6 6h-2v-2M4 2h14a2 2 0 0 1 2 2v4l-4 4h-4v4l-2
-            2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2m0 4v4h6V6H4m8 0v4h6V6h-6m-8 6v4h6v-4H4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml b/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
deleted file mode 100644
index 13cfc8fa..00000000
--- a/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.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="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml b/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml
deleted file mode 100644
index 13179b7c..00000000
--- a/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3a2,2 0,0 0,-2 2v14c0,1.1 0.9,2
-            2,2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml b/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml
deleted file mode 100644
index 3866cd3c..00000000
--- a/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportHeight="26"
-    android:viewportWidth="26">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2
-            2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2
-            2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml b/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml
deleted file mode 100644
index 449f0e28..00000000
--- a/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--https://materialdesignicons.com/icon/notebook-->
-<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="#000"
-        android:pathData="M3,7V5H5V4C5,2.89 5.9,2 7,2H13V9L15.5,7.5L18,9V2H19C20.05,2 21,2.95
-            21,4V20C21,21.05 20.05,22 19,22H7C5.95,22 5,21.05 5,20V19H3V17H5V13H3V11H5V7H3M7,
-            11H5V13H7V11M7,7V5H5V7H7M7,19V17H5V19H7Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
deleted file mode 100644
index c0664c37..00000000
--- a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.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="#FFFFFFFF"
-        android:pathData="M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5A2,2 0,0 0,19 3M16.53,11.06L15.47,10L10.59,14.88L8.47,12.76L7.41,13.82L10.59,17L16.53,11.06Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_more_24dp.xml b/app/src/main/res/drawable/ic_menu_main_more_24dp.xml
deleted file mode 100644
index 26932b2b..00000000
--- a/app/src/main/res/drawable/ic_menu_main_more_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_note_24dp.xml b/app/src/main/res/drawable/ic_menu_main_note_24dp.xml
deleted file mode 100644
index 6b3172ba..00000000
--- a/app/src/main/res/drawable/ic_menu_main_note_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--https://materialdesignicons.com/icon/trophy-->
-<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="#FF000000"
-        android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13
-            4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3
-            13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11
-            4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml b/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml
deleted file mode 100644
index 1594285f..00000000
--- a/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml
+++ /dev/null
@@ -1,10 +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="#000"
-        android:pathData="M14 14H7v2h7m5 3H5V8h14m0-5h-1V1h-2v2H8V1H6v2H5a2 2 0 0 0-2 2v14a2
-            2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2m-2 7H7v2h10v-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_delete.xml b/app/src/main/res/drawable/ic_menu_message_delete.xml
new file mode 100644
index 00000000..e60947c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_forward.xml b/app/src/main/res/drawable/ic_menu_message_forward.xml
new file mode 100644
index 00000000..97e34dda
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_forward.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M14,8.83L17.17,12 14,15.17V14H6v-4h8V8.83M12,4v4H4v8h8v4l8,-8 -8,-8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_reply.xml b/app/src/main/res/drawable/ic_menu_message_reply.xml
new file mode 100644
index 00000000..d9c66711
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_reply.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M10,5L3,12L10,19L10,14.9004C15,14.9004 18.5,16.5 21,20C20,15 17,10 10,9L10,5zM8,9.8281L8,10.7344L9.7168,10.9805C12.4581,11.3721 14.2573,12.4578 15.6641,13.8516C13.929,13.2778 12.0718,12.9004 10,12.9004L8,12.9004L8,14.1719L5.8281,12L8,9.8281z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_send.xml b/app/src/main/res/drawable/ic_menu_message_send.xml
new file mode 100644
index 00000000..fe72265f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_send.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_write.xml b/app/src/main/res/drawable/ic_menu_message_write.xml
new file mode 100644
index 00000000..7068aa5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_write.xml
@@ -0,0 +1,9 @@
+<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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM5.92,19H5v-0.92l9.06,-9.06 0.92,0.92L5.92,19zM20.71,5.63l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
new file mode 100644
index 00000000..a521adee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
@@ -0,0 +1,9 @@
+<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="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM10.56,17.46l5.93,-5.93 -1.06,-1.06 -4.87,4.87 -2.11,-2.11 -1.06,1.06z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_homework.xml b/app/src/main/res/drawable/ic_more_homework.xml
new file mode 100644
index 00000000..9641ff70
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_homework.xml
@@ -0,0 +1,9 @@
+<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="M7,2C5.9,2 5,2.89 5,4L5,5L3,5v2h2v4L3,11v2h2v4L3,17v2h2v1c0,1.05 0.95,2 2,2h12c1.05,0 2,-0.95 2,-2L21,4C21,2.95 20.05,2 19,2ZM7,4h4v6.5996L14.5,8.5 18,10.5996L18,4h1L19,20L7,20L7,5ZM13,4h3L16,7.4004L14.5,6.5 13,7.4004Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number.xml b/app/src/main/res/drawable/ic_more_lucky_number.xml
new file mode 100644
index 00000000..d644288c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_lucky_number.xml
@@ -0,0 +1,9 @@
+<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="M9.6895,2C8.1895,2 7,3.25 7,4.75C7,6.64 8.7,8.1797 12,11.1797C15.3,8.1797 17,6.6395 17,4.6895C17,3.1895 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.6095,2 9.6895,2zM9.6895,4C10.0877,4 10.3217,4.1233 10.5059,4.3301L12,6.0078L13.4941,4.3301C13.6783,4.1233 13.9481,4 14.25,4C14.6922,4 15,4.3006 15,4.6895C15,5.0833 14.8867,5.4382 14.2012,6.2598C13.7754,6.7701 12.8089,7.6367 11.998,8.3965C11.187,7.6372 10.2202,6.77 9.793,6.2617C9.1048,5.4431 9,5.0954 9,4.75C9,4.3078 9.3006,4 9.6895,4zM4.6895,7C3.1895,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.3905 2,14.3105C2,15.8105 3.25,17 4.75,17C6.64,17 8.1797,15.3 11.1797,12C8.1797,8.7 6.6395,7 4.6895,7zM19.25,7C17.36,7 15.8201,8.7 12.8301,12C15.8201,15.3 17.3605,17 19.3105,17C20.8105,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.6095 22,9.6895C22,8.1895 20.75,7 19.25,7zM4.6895,9C5.0833,9 5.4382,9.1133 6.2598,9.7988C6.7701,10.2246 7.6367,11.1911 8.3965,12.002C7.6372,12.813 6.77,13.7798 6.2617,14.207C5.4431,14.8952 5.0954,15 4.75,15C4.3078,15 4,14.6994 4,14.3105C4,13.9123 4.1233,13.6783 4.3301,13.4941L6.0078,12L4.3301,10.5059C4.1233,10.3217 4,10.0519 4,9.75C4,9.3078 4.3006,9 4.6895,9zM19.25,9C19.6922,9 20,9.3006 20,9.6895C20,10.0877 19.8767,10.3217 19.6699,10.5059L17.9922,12L19.6699,13.4941C19.8767,13.6783 20,13.9481 20,14.25C20,14.6922 19.6994,15 19.3105,15C18.9167,15 18.562,14.888 17.7422,14.2031C17.2327,13.7775 16.3693,12.8091 15.6113,11.998C16.3686,11.187 17.2329,10.22 17.7402,9.793C18.5572,9.1054 18.9046,9 19.25,9zM12,12.8203C8.7,15.8203 7,17.3605 7,19.3105C7,20.8105 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.3905,22 14.3105,22C15.8105,22 17,20.75 17,19.25C17,17.36 15.3,15.8203 12,12.8203zM12.002,15.6035C12.813,16.3628 13.7798,17.23 14.207,17.7383C14.8952,18.5569 15,18.9046 15,19.25C15,19.6922 14.6994,20 14.3105,20C13.9123,20 13.6783,19.8767 13.4941,19.6699L12,17.9922L10.5059,19.6699C10.3217,19.8767 10.0519,20 9.75,20C9.3078,20 9,19.6994 9,19.3105C9,18.9167 9.1133,18.5618 9.7988,17.7402C10.2246,17.2299 11.1911,16.3633 12.002,15.6035z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
deleted file mode 100644
index f2e6152d..00000000
--- a/app/src/main/res/drawable/ic_more_lucky_number_24dp.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="#FF000000"
-      android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_more_messages.xml b/app/src/main/res/drawable/ic_more_messages.xml
new file mode 100644
index 00000000..20c54e01
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_messages.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6zM20,6l-8,5 -8,-5h16zM20,18L4,18L4,8l8,5 8,-5v10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml b/app/src/main/res/drawable/ic_more_mobile_devices.xml
similarity index 59%
rename from app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml
rename to app/src/main/res/drawable/ic_more_mobile_devices.xml
index 150ced43..6adeb6cf 100644
--- a/app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_mobile_devices.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
+        android:fillColor="#FFF"
+        android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_note.xml b/app/src/main/res/drawable/ic_more_note.xml
new file mode 100644
index 00000000..47ba29cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_note.xml
@@ -0,0 +1,9 @@
+<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="M2,2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H2M4,4H6V6L6,11H4V4M18,4H20V11H18V6L18,4M8,6H16V11.5C16,13.43 15.42,15 12,15C8.59,15 8,13.43 8,11.5V6Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_schoolandteachers.xml b/app/src/main/res/drawable/ic_more_schoolandteachers.xml
new file mode 100644
index 00000000..9cb9aee0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_schoolandteachers.xml
@@ -0,0 +1,9 @@
+<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_more_settings.xml b/app/src/main/res/drawable/ic_more_settings.xml
new file mode 100644
index 00000000..334eb11f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_settings_24dp.xml b/app/src/main/res/drawable/ic_more_settings_24dp.xml
deleted file mode 100644
index fc12cdcf..00000000
--- a/app/src/main/res/drawable/ic_more_settings_24dp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,
-            -0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73
-            -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25
-            -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,
-            0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42
-            -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24
-            0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,
-            0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
-            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 00000000..cc2d1e04
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,5 @@
+<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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_school_directions.xml b/app/src/main/res/drawable/ic_school_directions.xml
new file mode 100644
index 00000000..c48db1da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_school_directions.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 00000000..7e3d7991
--- /dev/null
+++ b/app/src/main/res/drawable/ic_school_phone.xml
@@ -0,0 +1,9 @@
+<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/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 00000000..cd9985cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_send_message_24dp.xml b/app/src/main/res/drawable/ic_send_message_24dp.xml
deleted file mode 100644
index 0d82394b..00000000
--- a/app/src/main/res/drawable/ic_send_message_24dp.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="#FF000000"
-        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 00000000..045bbc0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,5 @@
+<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="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timetable_swap_30dp.xml b/app/src/main/res/drawable/ic_timetable_swap.xml
similarity index 85%
rename from app/src/main/res/drawable/ic_timetable_swap_30dp.xml
rename to app/src/main/res/drawable/ic_timetable_swap.xml
index 01eee893..4055623a 100644
--- a/app/src/main/res/drawable/ic_timetable_swap_30dp.xml
+++ b/app/src/main/res/drawable/ic_timetable_swap.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#FFF"
         android:pathData="M7 11l-4 4 4 4v-3h7v-2H7v-3zm14-2l-4-4v3h-7v2h7v3l4-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_widget_chevron_24dp.png b/app/src/main/res/drawable/ic_widget_chevron.png
similarity index 100%
rename from app/src/main/res/drawable/ic_widget_chevron_24dp.png
rename to app/src/main/res/drawable/ic_widget_chevron.png
diff --git a/app/src/main/res/drawable/ic_widget_clover_24dp.png b/app/src/main/res/drawable/ic_widget_clover.png
similarity index 100%
rename from app/src/main/res/drawable/ic_widget_clover_24dp.png
rename to app/src/main/res/drawable/ic_widget_clover.png
diff --git a/app/src/main/res/drawable/layer_splash_background.xml b/app/src/main/res/drawable/layer_splash_background.xml
index 64812f15..2cf46d1d 100644
--- a/app/src/main/res/drawable/layer_splash_background.xml
+++ b/app/src/main/res/drawable/layer_splash_background.xml
@@ -1,7 +1,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#9a0007" />
+            <solid android:color="@color/colorPrimaryDark" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1a86fa92..3841b25c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,10 +1,17 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/loginContainer"
     android:layout_width="match_parent"
-    android:layout_height="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" />
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
         android:id="@+id/loginViewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 70c06ce8..2ea0a4d3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,25 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/mainAppBarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/mainToolbar"
+        style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/WulkanowyTheme.ActionBar"
-        app:elevation="0dp">
+        app:contentInsetStartWithNavigation="0dp" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/mainToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/mainFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/bottom_navigation_height"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:layout_marginTop="?actionBarSize"
+        android:layout_marginBottom="@dimen/bottom_navigation_height" />
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
         android:id="@+id/mainBottomNav"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index 00b0e77c..f59dcabd 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -1,161 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/sendMessageContainer"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/sendMessageAppBarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/sendMessageToolbar"
+        style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/WulkanowyTheme.ActionBar"
-        app:elevation="0dp">
+        android:elevation="4dp"
+        app:layout_constraintBottom_toTopOf="@id/sendMessageScroll"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:targetApi="lollipop" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/sendMessageToolbar"
+    <io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView
+        android:id="@+id/sendMessageScroll"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar">
+
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/sendMessageContent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/sendMessageFromHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/message_from"
+                    android:textColor="?android:textColorHint"
+                    android:textSize="18sp"
+                    app:layout_constraintEnd_toStartOf="@id/sendMessageFrom"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/sendMessageFrom"
+                    android:layout_width="0dp"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:gravity="center_vertical"
+                    android:textSize="18sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/sendMessageFromHint"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Jan Kowalski" />
+
+                <View
+                    android:id="@+id/sendMessageFromDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFrom" />
+
+                <TextView
+                    android:id="@+id/sendMessageToHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/message_to"
+                    android:textColor="?android:textColorHint"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFromDivider" />
+
+                <io.github.wulkanowy.materialchipsinput.MaterialChipInput
+                    android:id="@+id/sendMessageTo"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:paddingTop="13dp"
+                    android:paddingBottom="13dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/sendMessageToHint"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFromDivider" />
+
+                <View
+                    android:id="@+id/sendMessageToDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageTo" />
+
+                <EditText
+                    android:id="@+id/sendMessageSubject"
+                    android:layout_width="match_parent"
+                    android:layout_height="58dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:background="@android:color/transparent"
+                    android:gravity="center_vertical"
+                    android:hint="@string/message_subject"
+                    android:imeOptions="flagNoExtractUi"
+                    android:importantForAutofill="no"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageToDivider"
+                    tools:targetApi="o" />
+
+                <View
+                    android:id="@+id/sendMessageSubjectDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageSubject" />
+
+                <EditText
+                    android:id="@+id/sendMessageMessageContent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:gravity="start"
+                    android:hint="@string/message_content"
+                    android:imeOptions="flagNoExtractUi"
+                    android:importantForAutofill="no"
+                    android:inputType="textMultiLine"
+                    android:minHeight="58dp"
+                    android:paddingStart="16dp"
+                    android:paddingLeft="16dp"
+                    android:paddingTop="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingRight="16dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageSubjectDivider"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:targetApi="o" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
+    </io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView>
 
     <LinearLayout
-        android:id="@+id/sendMessageContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/sendMessageAppBarContainer"
-        android:orientation="vertical">
+        android:id="@+id/sendMessageEmpty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar"
+        tools:ignore="UseCompoundDrawables">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center_horizontal"
+            app:srcCompat="@drawable/ic_more_messages"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="14dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/message_from"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="18sp" />
-
-            <androidx.appcompat.widget.AppCompatEditText
-                android:id="@+id/sendMessageFromTextView"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:background="@android:color/transparent"
-                android:enabled="false"
-                android:textColor="?android:attr/textColorPrimaryNoDisable"
-                tools:text="Jan Kowalski" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:paddingStart="14dp"
-            android:paddingLeft="14dp"
-            tools:ignore="RtlSymmetry">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/message_to"
-                android:textAlignment="center"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="18sp" />
-
-            <com.pchmn.materialchips.ChipsInput
-                android:id="@+id/sendMessageRecipientsInput"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@android:color/transparent"
-                app:horizontalScroll="true"
-                tools:layout_height="30dp">
-
-            </com.pchmn.materialchips.ChipsInput>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/sendMessageSubjectInput"
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:background="@android:color/transparent"
-            android:hint="@string/message_subject"
-            android:inputType="text"
-            android:maxLines="1"
-            android:padding="14dp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/sendMessageContentInput"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/transparent"
-            android:gravity="top|start"
-            android:hint="@string/message_content"
-            android:inputType="textMultiLine"
-            android:paddingStart="14dp"
-            android:paddingLeft="14dp"
-            android:paddingTop="18dp"
-            android:paddingEnd="14dp"
-            android:paddingRight="14dp"
-            android:singleLine="false" />
+            android:layout_gravity="center_horizontal"
+            android:text="@string/error_unknown"
+            android:textSize="20sp"
+            tools:text="No messages" />
     </LinearLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/sendMessageAppBarContainer">
-
-        <LinearLayout
-            android:id="@+id/sendMessageEmpty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_more_messages_24dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-        </LinearLayout>
-
-        <ProgressBar
-            android:id="@+id/sendMessageProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-    </FrameLayout>
-</RelativeLayout>
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/sendMessageProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
index 192776e6..9a463284 100644
--- a/app/src/main/res/layout/activity_widget_configure.xml
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -5,16 +5,13 @@
     android:layout_width="280dp"
     android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/widgetConfigureTitle"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:paddingStart="24dp"
-        android:paddingLeft="24dp"
         android:paddingEnd="24dp"
-        android:paddingRight="24dp"
         android:text="@string/account_title"
-        android:textColor="?android:textColorPrimary"
         android:textSize="20sp"
         android:textStyle="bold"
         app:firstBaselineToTopHeight="40dp" />
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index 9469aae1..6e975c80 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -2,10 +2,10 @@
 <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="280dp"
+    android:layout_width="300dp"
     android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountDialogTitle"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -27,24 +27,23 @@
         tools:itemCount="3"
         tools:listitem="@layout/item_account" />
 
-    <androidx.appcompat.widget.AppCompatButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/accountDialogAdd"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/accountDialogRecycler"
         android:layout_margin="8dp"
-        android:text="@string/account_add_new" />
+        android:text="@string/account_add_new"
+        android:textColor="?android:textColorPrimary" />
 
-    <androidx.appcompat.widget.AppCompatButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/accountDialogRemove"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/accountDialogRecycler"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_margin="8dp"
-        android:text="@string/account_logout"
-        android:textColor="@color/colorPrimary" />
+        android:text="@string/account_logout" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index fe680d68..22268aac 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -80,15 +80,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 904d04eb..2d4e5d0b 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -1,70 +1,101 @@
 <LinearLayout 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:minWidth="300dp"
     android:orientation="vertical">
 
-    <LinearLayout
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingTop="20dp"
+        android:text="@string/all_details"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/errorDialogMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="10dp"
+        android:textSize="21sp"
+        tools:text="@tools:sample/lorem" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/errorDialogNestedScroll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:overScrollMode="ifContentScrolls"
-            tools:ignore="UselessParent">
+            android:paddingHorizontal="24dp"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintHeight_max="300dp"
+            app:layout_constraintHeight_min="200dp"
+            app:layout_constraintTop_toTopOf="parent">
 
             <HorizontalScrollView
-                android:layout_width="350dp"
-                android:layout_height="wrap_content"
-                android:paddingLeft="24dp"
-                android:paddingTop="24dp"
-                android:paddingRight="24dp">
+                android:id="@+id/errorDialogHorizontalScroll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:id="@+id/errorDialogContent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:scrollHorizontally="true"
+                    android:gravity="start"
                     android:textIsSelectable="true"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    tools:text="@tools:sample/lorem/random" />
             </HorizontalScrollView>
-        </ScrollView>
-    </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:background="@drawable/ic_all_divider"
         android:gravity="end"
         android:minHeight="52dp"
         android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/errorDialogCancel"
-            style="@style/Widget.AppCompat.Button.Borderless"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/errorDialogReport"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:gravity="center"
-            android:text="@android:string/cancel"
-            android:textColor="@color/colorPrimary" />
+            android:text="@string/about_feedback" />
 
-        <Button
-            android:id="@+id/errorDialogCopy"
-            style="@style/Widget.AppCompat.Button.Borderless"
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/errorDialogCancel"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:gravity="center"
-            android:text="@android:string/copy"
-            android:textColor="@color/colorPrimary" />
+            android:text="@android:string/cancel" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/errorDialogCopy"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp"
+            android:text="@android:string/copy" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 1f25195c..8e46dc4f 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -101,16 +101,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="20dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
-
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_excuse.xml b/app/src/main/res/layout/dialog_excuse.xml
new file mode 100644
index 00000000..4ed9294c
--- /dev/null
+++ b/app/src/main/res/layout/dialog_excuse.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/excuseReason"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/attendance_excuse_dialog_reason" />
+
+        <requestFocus />
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index 7a670878..be0570c2 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
@@ -17,90 +17,84 @@
             android:padding="20dp"
             tools:ignore="UselessParent">
 
-            <TextView
-                android:id="@+id/gradeDialogValue"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+            <LinearLayout
+                android:id="@+id/gradeDialogValueLayout"
+                android:layout_width="86dp"
+                android:layout_height="match_parent"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_gravity="end"
-                android:background="@color/grade_material_default"
-                android:gravity="center"
-                android:textColor="@color/grade_text"
-                android:textSize="30sp"
-                tools:text="6" />
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/gradeDialogSubject"
-                android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/gradeDialogValue"
+                    android:layout_width="match_parent"
+                    android:layout_height="86dp"
+                    android:background="@color/grade_material_default"
+                    android:gravity="center"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    tools:text="6" />
+
+                <TextView
+                    android:id="@+id/gradeDialogColorAndWeightValue"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/grade_black"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:minHeight="32dp"
+                    android:textColor="@android:color/white"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"
+                    tools:text="Waga: 1.00" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gradeDialogHeader"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:layout_toLeftOf="@+id/gradeDialogValueLayout"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
-                android:layout_gravity="start"
-                android:layout_marginEnd="90dp"
-                android:layout_marginRight="90dp"
-                android:layout_marginBottom="10dp"
                 android:gravity="center_vertical"
-                android:maxLines="5"
-                android:minHeight="80dp"
-                android:minLines="2"
-                android:text="@string/grade_header"
-                android:textIsSelectable="true"
-                android:textSize="20sp" />
+                android:minHeight="120dp"
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/gradeDialogDescription"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogSubject"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:text="@string/all_description"
-                android:textIsSelectable="true"
-                android:textSize="17sp" />
+                <TextView
+                    android:id="@+id/gradeDialogSubject"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"
+                    android:text="@string/grade_header"
+                    android:textIsSelectable="true"
+                    android:textSize="20sp" />
 
-            <TextView
-                android:id="@+id/gradeDialogDescriptionValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogDescription"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_description"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogWeight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogDescriptionValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/grade_weight"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogWeightValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogWeight"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/grade_weight"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
+                <TextView
+                    android:id="@+id/gradeDialogDescriptionValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/all_no_description"
+                    android:textColor="?android:textColorSecondary"
+                    android:textIsSelectable="true"
+                    android:textSize="16sp" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/gradeDialogComment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogWeightValue"
+                android:layout_below="@+id/gradeDialogHeader"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="10dp"
@@ -188,8 +182,9 @@
                 android:textIsSelectable="true"
                 android:textSize="12sp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDialogClose"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/gradeDialogDateValue"
@@ -197,13 +192,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:layout_marginTop="25dp"
-                android:background="?attr/selectableItemBackground"
-                android:focusable="true"
-                android:text="@string/all_close"
-                android:textAllCaps="true"
-                android:textColor="?android:attr/android:textColorSecondary"
-                android:textSize="15sp" />
-
+                android:text="@string/all_close" />
         </RelativeLayout>
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index fdfabc6f..7c149d4b 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -1,111 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:id="@+id/parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/homeworkDialogRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:minWidth="300dp"
+        tools:itemCount="1"
+        tools:listitem="@layout/item_homework_dialog_details" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:background="@drawable/ic_all_divider"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="5dp">
 
-        <TextView
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/homeworkDialogRead"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
-            android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
+            android:text="@string/homework_mark_as_done"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/all_subject"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_teacher"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_date"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_entry_date"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogEntryDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_content"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:lineSpacingMultiplier="1.2"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
             android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
-    </LinearLayout>
-</ScrollView>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 161eb4c5..31ca7dd3 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
@@ -17,12 +17,14 @@
             android:layout_marginTop="20dp"
             android:layout_marginBottom="20dp"
             android:text="@string/all_details"
+            android:textColor="?android:textColorPrimary"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/timetable_lesson"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -31,6 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -39,6 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_topic"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -47,6 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -56,6 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/all_teacher"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -64,6 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -73,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/timetable_changes"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textSize="17sp" />
 
         <TextView
@@ -82,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -92,7 +99,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_absence"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -101,7 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -111,6 +118,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_resources"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -120,19 +128,18 @@
             android:layout_marginTop="3dp"
             android:autoLink="web"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
 
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index c514205a..7b128605 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
@@ -23,10 +23,11 @@
                 android:id="@+id/mobileDeviceQr"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
                 android:layout_gravity="center"
+                android:layout_marginBottom="12dp"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/mobile_device_qr"
-                android:layout_marginBottom="12dp" />
+                tools:src="@tools:sample/avatars" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -75,24 +76,23 @@
                 android:textIsSelectable="true"
                 android:textSize="12sp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/mobileDeviceDialogClose"
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:layout_marginTop="15dp"
-                android:text="@string/all_close"
-                android:textAllCaps="true"
-                android:textSize="15sp" />
+                android:text="@string/all_close" />
         </LinearLayout>
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/mobileDeviceDialogProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:indeterminate="true"
             tools:visibility="invisible" />
     </FrameLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index e04683f8..71506b01 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -64,6 +64,22 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/note_points"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/noteDialogPoints"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -81,15 +97,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/noteDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index 1cb65026..f3d4cf1c 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:layout_width="300dp"
@@ -22,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/timetable_changes"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textSize="17sp" />
 
         <TextView
@@ -31,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -57,10 +58,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
@@ -85,10 +87,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
@@ -130,10 +133,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
             android:textSize="12sp"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -151,16 +155,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
-
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 00000000..6747b7d0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,12 @@
+<?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">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/aboutRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_about" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 4627ffd1..cd8b6036 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -2,15 +2,17 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.attendance.AttendanceFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/attendanceProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -24,7 +26,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/attendanceRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_attendance" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -34,15 +37,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_attendance_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_attendance"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -53,44 +55,120 @@
                 android:text="@string/attendance_no_items"
                 android:textSize="20sp" />
         </LinearLayout>
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/attendanceExcuseButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/attendance_excuse_title"
+            android:tint="?colorOnSecondary"
+            android:visibility="gone"
+            app:icon="@drawable/ic_all_done_all"
+            tools:visibility="visible" />
+
+        <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>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/attendanceNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:gravity="center"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <ImageButton
             android:id="@+id/attendancePreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
-            android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            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" />
 
         <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:text="@string/app_name"
+            android:textSize="16sp" />
 
-        <Button
+        <ImageButton
             android:id="@+id/attendanceNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
-            android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            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" />
+    </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 5d03c2f4..da0ce7f2 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -10,24 +10,23 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <LinearLayout
+        <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
             android:id="@+id/attendanceSummarySubjectsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:attr/windowBackground"
-            android:elevation="5dp"
+            android:background="?android:windowBackground"
             android:padding="5dp"
             android:visibility="invisible"
+            tools:ignore="UnusedAttribute"
             tools:listitem="@layout/item_attendance_summary"
-            tools:targetApi="lollipop"
             tools:visibility="visible">
 
-            <androidx.appcompat.widget.AppCompatSpinner
+            <Spinner
                 android:id="@+id/attendanceSummarySubjects"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
-                android:entries="@array/endpoints_keys"
+                android:entries="@array/hosts_keys"
                 android:paddingStart="10dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="10dp"
@@ -35,7 +34,7 @@
                 android:paddingRight="30dp"
                 android:paddingBottom="10dp"
                 android:spinnerMode="dialog" />
-        </LinearLayout>
+        </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/attendanceSummarySwipe"
@@ -50,12 +49,14 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/attendanceSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/attendanceSummaryEmpty"
@@ -63,15 +64,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_attendance_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_attendance"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -82,4 +82,55 @@
             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_contributor.xml b/app/src/main/res/layout/fragment_contributor.xml
new file mode 100644
index 00000000..399ab599
--- /dev/null
+++ b/app/src/main/res/layout/fragment_contributor.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/creatorProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/creatorRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/creatorSeeMore"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="32dp"
+            android:layout_marginRight="32dp"
+            android:text="@string/contributor_see_more" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 5dbd2c79..1e1b0c99 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -2,15 +2,17 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.exam.ExamFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/examProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -24,7 +26,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/examRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/header_exam" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -34,15 +37,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_exam_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_exam"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -53,44 +55,105 @@
                 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>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/examNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:gravity="center"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <ImageButton
             android:id="@+id/examPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
-            android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            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" />
 
         <TextView
             android:id="@+id/examNavDate"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
-        <Button
+        <ImageButton
             android:id="@+id/examNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
-            android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            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" />
+    </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 bf805175..0bc864b2 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -5,34 +5,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <io.github.wulkanowy.ui.modules.grade.CustomTabLayout
+    <io.github.wulkanowy.ui.widgets.FittedScrollableTabLayout
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
         android:visibility="invisible"
-        app:tabIndicatorColor="@android:color/white"
         app:tabMode="scrollable"
-        app:tabTextColor="@android:color/white"
+        app:tabSelectedTextColor="?colorPrimary"
+        app:tabTextColor="@color/material_on_surface_emphasis_medium"
+        tools:ignore="UnusedAttribute"
         tools:visibility="visible" />
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/gradeSwipe"
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/gradeViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="48dp">
+        android:layout_marginTop="48dp"
+        android:visibility="invisible"
+        tools:visibility="visible" />
 
-        <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>
-
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -40,29 +35,53 @@
         tools:visibility="invisible" />
 
     <LinearLayout
-        android:id="@+id/gradeEmpty"
+        android:id="@+id/gradeError"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
         android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
         tools:visibility="visible">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_error"
+            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:text="@string/grade_no_items"
+            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/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 610006e1..a1faefe7 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -13,11 +13,13 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeDetailsRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_grade_details" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeDetailsProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -30,15 +32,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_grade"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -49,4 +50,55 @@
             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 9c7f3795..b3fcac44 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -6,24 +6,22 @@
     android:orientation="vertical"
     tools:context=".ui.modules.grade.statistics.GradeStatisticsFragment">
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/gradeStatisticsSubjectsContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/windowBackground"
-        android:elevation="5dp"
+        android:background="?android:windowBackground"
         android:padding="5dp"
-        android:visibility="invisible"
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
-        tools:targetApi="lollipop"
         tools:visibility="visible">
 
-        <androidx.appcompat.widget.AppCompatSpinner
+        <Spinner
             android:id="@+id/gradeStatisticsSubjects"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="middle"
-            android:entries="@array/endpoints_keys"
             android:paddingStart="10dp"
             android:paddingLeft="10dp"
             android:paddingTop="10dp"
@@ -31,15 +29,15 @@
             android:paddingRight="30dp"
             android:paddingBottom="10dp"
             android:spinnerMode="dialog" />
-    </LinearLayout>
-
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeStatisticsSwipe"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/gradeStatisticsScroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true">
@@ -49,49 +47,57 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <RadioGroup
-                    android:id="@+id/gradeStatisticsTypeSwitch"
-                    android:layout_width="fill_parent"
+                <HorizontalScrollView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:paddingTop="5dp"
-                    android:visibility="invisible"
-                    tools:visibility="visible">
+                    android:layout_gravity="center">
 
-                    <RadioButton
-                        android:id="@+id/gradeStatisticsTypePartial"
+                    <RadioGroup
+                        android:id="@+id/gradeStatisticsTypeSwitch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:checked="true"
-                        android:tag="partial"
-                        android:text="@string/grade_statistics_partial" />
+                        android:orientation="horizontal"
+                        android:paddingStart="16dp"
+                        android:paddingTop="5dp"
+                        android:paddingEnd="16dp">
 
-                    <RadioButton
-                        android:id="@+id/gradeStatisticsTypeSemester"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:tag="annual"
-                        android:text="@string/grade_statistics_semester" />
-                </RadioGroup>
+                        <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>
 
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <com.github.mikephil.charting.charts.PieChart
-                        android:id="@+id/gradeStatisticsChart"
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/gradeStatisticsRecycler"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:background="?android:attr/windowBackground"
-                        android:minHeight="400dp"
-                        android:visibility="gone"
-                        tools:visibility="visible" />
+                        tools:listitem="@layout/item_grade_statistics_pie" />
 
-                    <ProgressBar
+                    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                         android:id="@+id/gradeStatisticsProgress"
+                        style="@style/Widget.MaterialProgressBar.ProgressBar"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -104,15 +110,14 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:visibility="invisible">
+                        android:visibility="invisible"
+                        tools:ignore="UseCompoundDrawables">
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:minWidth="100dp"
-                            android:minHeight="100dp"
-                            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-                            app:tint="?android:attr/textColorPrimary"
+                        <ImageView
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            app:srcCompat="@drawable/ic_main_grade"
+                            app:tint="?colorOnBackground"
                             tools:ignore="contentDescription" />
 
                         <TextView
@@ -123,8 +128,60 @@
                             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>
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 92a34f71..3f21e61c 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -13,11 +13,13 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gradeSummaryRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_grade_summary" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -30,15 +32,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_grade"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -49,4 +50,55 @@
             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 a2e87bcc..0fcde9c0 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -2,15 +2,17 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.homework.HomeworkFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/homeworkProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -24,7 +26,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/homeworkRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_homework" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -34,15 +37,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_homework_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_more_homework"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -53,44 +55,105 @@
                 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>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/homeworkNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:gravity="center"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <ImageButton
             android:id="@+id/homeworkPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
-            android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            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" />
 
         <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:text="@string/app_name"
+            android:textSize="16sp" />
 
-        <Button
+        <ImageButton
             android:id="@+id/homeworkNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
-            android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            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" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
new file mode 100644
index 00000000..80ecd6b1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/licenseProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/licenseRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
new file mode 100644
index 00000000..65af0b54
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -0,0 +1,287 @@
+<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.login.advanced.LoginAdvancedFragment">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/loginFormProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/loginFormContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <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="32dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_header_default"
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginTypeSwitch"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <RadioGroup
+                android:id="@+id/loginTypeSwitch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingTop="24dp"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedWarningInfo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
+
+                <RadioButton
+                    android:id="@+id/loginTypeApi"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:tag="api"
+                    android:text="@string/login_type_api" />
+
+                <RadioButton
+                    android:id="@+id/loginTypeScrapper"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:tag="scrapper"
+                    android:text="@string/login_type_scrapper" />
+
+                <RadioButton
+                    android:id="@+id/loginTypeHybrid"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:tag="hybrid"
+                    android:text="@string/login_type_hybrid" />
+            </RadioGroup>
+
+            <TextView
+                android:id="@+id/loginFormAdvancedWarningInfo"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginRight="24dp"
+                android:gravity="center_horizontal"
+                android:lineSpacingExtra="3sp"
+                android:text="@string/login_advanced_warning_scraper"
+                android:textColor="?colorTimetableChange"
+                app:layout_constraintBottom_toTopOf="@id/loginFormUsernameLayout"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginTypeSwitch" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormUsernameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_nickname_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormAdvancedWarningInfo">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormUsername"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1"
+                    tools:targetApi="o" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormPassLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_password_hint"
+                app:errorEnabled="true"
+                app:errorIconDrawable="@null"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormPass"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:imeActionLabel="@string/login_sign_in"
+                    android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    app:fontFamily="sans-serif"
+                    tools:targetApi="o" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormHostLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginBottom="16dp"
+                android:hint="@string/login_host_hint"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormTokenLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+
+                <AutoCompleteTextView
+                    android:id="@+id/loginFormHost"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    tools:ignore="Deprecated,LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormTokenLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_token_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormSymbolLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormToken"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textCapCharacters"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormSymbolLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_symbol_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormPinLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormTokenLayout">
+
+                <AutoCompleteTextView
+                    android:id="@+id/loginFormSymbol"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeActionLabel="@string/login_sign_in"
+                    android:imeOptions="actionDone"
+                    android:importantForAutofill="no"
+                    android:inputType="textAutoComplete|textNoSuggestions"
+                    android:maxLines="1"
+                    tools:ignore="LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormPinLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_pin_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@id/loginFormSignIn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginFormSymbolLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormPin"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeActionLabel="@string/login_sign_in"
+                    android:imeOptions="actionDone"
+                    android:inputType="number"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormSignIn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="8dp"
+                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="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPinLayout" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 553c8726..e4a5fab7 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -2,10 +2,12 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.login.form.LoginFormFragment">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginFormProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -22,7 +24,73 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/loginFormContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp">
+
+            <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"
@@ -30,22 +98,22 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="48dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
                 android:gravity="center_horizontal"
                 android:text="@string/login_header_default"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormUsernameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
                 app:layout_constraintVertical_chainStyle="packed" />
 
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFormNameLayout"
+                android:id="@+id/loginFormUsernameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -61,12 +129,15 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/loginFormName"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormUsername"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
-                    android:maxLines="1" />
+                    android:maxLines="1"
+                    tools:targetApi="o" />
 
                 <requestFocus />
             </com.google.android.material.textfield.TextInputLayout>
@@ -83,67 +154,88 @@
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_password_hint"
                 app:errorEnabled="true"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
+                app:errorIconDrawable="@null"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormRecoverLink"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
                 app:passwordToggleEnabled="true">
 
-                <androidx.appcompat.widget.AppCompatEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginFormPass"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
-                    app:fontFamily="sans-serif" />
+                    app:fontFamily="sans-serif"
+                    tools:targetApi="o" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <LinearLayout
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormRecoverLink"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:text="@string/login_recover_button"
+                android:textAppearance="?android:textAppearance"
+                app:backgroundTint="?android:windowBackground"
+                app:fontFamily="sans-serif-medium"
+                app:layout_constraintBottom_toTopOf="@id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout"
+                tools:visibility="visible" />
+
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginLeft="24dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="24dp"
                 android:layout_marginRight="24dp"
-                android:background="@drawable/ic_login_outlined_border"
+                android:hint="@string/login_host_hint"
                 android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedButton"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormRecoverLink">
 
-                <androidx.appcompat.widget.AppCompatSpinner
+                <AutoCompleteTextView
                     android:id="@+id/loginFormHost"
                     android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:entries="@array/endpoints_keys" />
-            </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    tools:ignore="Deprecated,LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormAdvancedButton"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginBottom="48dp"
-                android:background="?android:windowBackground"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
-                android:text="@string/login_host_hint"
-                android:textColor="?android:textColorHint"
-                android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="@+id/loginFormHostLayout"
-                app:layout_constraintEnd_toEndOf="@+id/loginFormHostLayout"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
+                android:text="@string/login_advanced"
+                android:textAppearance="?android:textAppearance"
+                app:backgroundTint="?android:windowBackground"
+                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_constraintStart_toStartOf="@id/loginFormHostLayout"
+                app:layout_constraintTop_toTopOf="@+id/loginFormSignIn" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormSignIn"
-                style="@style/Widget.MaterialComponents.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -152,50 +244,36 @@
                 android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
-                android:textAppearance="?android:textAppearanceSmall"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
 
+            <TextView
+                android:id="@+id/loginFormPrivacyLink"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:gravity="start|center_vertical"
+                android:text="@string/login_privacy_policy"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp"
+                app:fontFamily="sans-serif-medium"
+                app:layout_constraintStart_toStartOf="@id/loginFormAdvancedButton"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormAdvancedButton"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/loginFormVersion"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginTop="24dp"
                 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="parent"
-                app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
+                android:visibility="visible"
+                app:layout_constraintEnd_toEndOf="@+id/loginFormSignIn"
+                app:layout_constraintTop_toBottomOf="@id/loginFormSignIn"
                 tools:text="Version 1.0.0" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginFormPrivacyLink"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:text="@string/login_privacy_policy"
-                android:textAppearance="?android:textAppearance"
-                android:textColor="@color/colorPrimary"
-                android:visibility="invisible"
-                app:backgroundTint="?android:windowBackground"
-                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" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
new file mode 100644
index 00000000..205a4bea
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_recover.xml
@@ -0,0 +1,259 @@
+<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.login.recover.LoginRecoverFragment">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/loginRecoverProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        tools:visibility="visible">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/loginRecoverFormContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp"
+            android:visibility="visible">
+
+            <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_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_recover_title"
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverInfoMessage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/loginRecoverInfoMessage"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_recover_warning"
+                android:textColor="?colorTimetableChange"
+                app:layout_constraintBottom_toTopOf="@id/loginRecoverNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginFormHeader" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginRecoverNameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_email_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverInfoMessage">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginRecoverName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="emailAddress"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1"
+                    android:imeOptions="actionDone"
+                    tools:targetApi="o" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginRecoverHostLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_host_hint"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverButton"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverNameLayout">
+
+                <AutoCompleteTextView
+                    android:id="@+id/loginRecoverHost"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    tools:ignore="Deprecated,LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Button
+                android:id="@+id/loginRecoverButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:text="@string/login_recover"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverHostLayout" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginRecoverCaptchaContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <WebView
+            android:id="@+id/loginRecoverWebView"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/loginRecoverError"
+        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/loginRecoverErrorMessage"
+            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/loginRecoverErrorDetails"
+                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/loginRecoverErrorRetry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all_retry" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/loginRecoverSuccess"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        android:visibility="invisible"
+        tools:visibility="invisible">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            tools:ignore="UseCompoundDrawables">
+
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_all_done"
+                app:tint="?colorOnBackground"
+                tools:ignore="contentDescription" />
+
+            <TextView
+                android:id="@+id/loginRecoverSuccessTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginEnd="35dp"
+                android:gravity="center"
+                android:textSize="20sp"
+                tools:text="Pomyślnie wysłano email!" />
+
+            <TextView
+                android:id="@+id/loginRecoverSuccessMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="35dp"
+                android:lineSpacingMultiplier="1.5"
+                android:scrollbars="vertical"
+                android:text="@string/login_recover"
+                android:textSize="14sp"
+                tools:text="@tools:sample/lorem/random" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginRecoverLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="30dp"
+                android:layout_marginBottom="30dp"
+                android:text="@android:string/ok" />
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
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 a94978bb..64e06cbd 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginStudentSelectProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -18,15 +19,85 @@
         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"
@@ -35,7 +106,7 @@
             app:layout_constraintBottom_toTopOf="@id/loginStudentSelectRecycler"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectContact"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -54,7 +125,6 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/loginStudentSelectSignIn"
-            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
@@ -62,9 +132,6 @@
             android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
             android:text="@string/login_sign_in"
-            android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="@android:color/white"
-            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 6c820889..77f44d21 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -2,10 +2,12 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.login.symbol.LoginSymbolFragment">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginSymbolProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -23,12 +25,82 @@
             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"
@@ -36,11 +108,27 @@
                 android:text="@string/login_header_symbol"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginSymbolNameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginSymbolHelper"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/loginSymbolHelper"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_symbol_helper"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@id/loginSymbolNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginSymbolHeader"
                 app:layout_constraintVertical_chainStyle="packed" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -48,35 +136,28 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="48dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_margin="24dp"
                 android:hint="@string/login_symbol_hint"
-                app:helperText="@string/login_symbol_helper"
-                app:helperTextEnabled="true"
                 app:layout_constraintBottom_toTopOf="@+id/loginSymbolSignIn"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHeader">
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHelper">
 
-                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
                     style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:inputType="textAutoComplete"
+                    android:inputType="textAutoComplete|textNoSuggestions"
                     android:maxLines="1"
                     tools:ignore="LabelFor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginSymbolSignIn"
-                style="@style/Widget.MaterialComponents.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="48dp"
@@ -84,10 +165,6 @@
                 android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
-                android:textAppearance="?android:textAppearanceSmall"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout" />
diff --git a/app/src/main/res/layout/fragment_logviewer.xml b/app/src/main/res/layout/fragment_logviewer.xml
new file mode 100644
index 00000000..64f9125f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_logviewer.xml
@@ -0,0 +1,34 @@
+<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"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.logviewer.LogViewerFragment">
+
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="3dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/logViewerRecycler"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
+    </HorizontalScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/logViewRefreshButton"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/logviewer_refresh"
+        android:tint="?colorOnSecondary"
+        app:srcCompat="@drawable/ic_refresh" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index b881f1bd..a6b9b822 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -5,8 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/luckyNumberProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -38,9 +39,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="52sp"
                 tools:text="14" />
-
         </LinearLayout>
-
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <LinearLayout
@@ -50,15 +49,15 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_lucky_number_24dp"
-            app:tint="?android:attr/textColorPrimary" />
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_lucky_number"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -67,7 +66,56 @@
             android:gravity="center"
             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 78edbb03..b4cc0c2f 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,21 +1,24 @@
 <?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">
 
-    <com.google.android.material.tabs.TabLayout
+    <io.github.wulkanowy.ui.widgets.MaterialTabLayout
         android:id="@+id/messageTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
         android:visibility="invisible"
         app:tabGravity="fill"
-        app:tabIndicatorColor="@android:color/white"
+        app:tabIndicatorColor="?colorPrimary"
         app:tabMaxWidth="0dp"
         app:tabMode="fixed"
-        app:tabTextColor="@android:color/white" />
+        app:tabSelectedTextColor="?colorPrimary"
+        app:tabTextColor="@color/material_on_surface_emphasis_medium"
+        tools:ignore="UnusedAttribute"
+        tools:visibility="visible" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/messageViewPager"
@@ -24,7 +27,7 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/openSendMessageButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,14 +35,15 @@
         android:layout_margin="16dp"
         android:clickable="true"
         android:focusable="true"
-        android:tint="#FFFFFF"
-        app:srcCompat="@drawable/ic_send_message_24dp" />
+        android:text="@string/send_message_title"
+        android:tint="?colorOnSecondary"
+        app:icon="@drawable/ic_menu_message_write" />
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageProgress"
+        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_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 962d94ac..0931990f 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -5,54 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/messagePreviewRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/messagePreviewContentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <TextView
-                android:id="@+id/messagePreviewSubject"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="15dp"
-                android:lineSpacingMultiplier="1.2"
-                android:textSize="22sp"
-                tools:text="@tools:sample/lorem" />
-
-            <TextView
-                android:id="@+id/messagePreviewAuthor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="15sp"
-                tools:text="@tools:sample/full_names" />
-
-            <TextView
-                android:id="@+id/messagePreviewDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="15dp"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textSize="15sp"
-                tools:text="@tools:sample/date/ddmmyy" />
-
-            <TextView
-                android:id="@+id/messagePreviewContent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:lineSpacingMultiplier="1.2"
-                android:textIsSelectable="true"
-                tools:text="@tools:sample/lorem" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+        android:layout_height="match_parent"
+        tools:itemCount="1"
+        tools:listitem="@layout/item_message_preview" />
 
     <LinearLayout
         android:id="@+id/messagePreviewError"
@@ -60,29 +18,53 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="invisible">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_messages_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_error"
+            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:text="@string/message_preview_error"
+            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/messagePreviewErrorDetails"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="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>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messagePreviewProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index 31f1c8aa..e83d913e 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -12,11 +12,13 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/messageTabRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_message" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageTabProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -28,15 +30,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_messages_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_messages"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -47,4 +48,55 @@
             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 289cf2f4..cf11c283 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -5,14 +5,27 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.mobiledevice.MobileDeviceFragment">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/mobileDevicesProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         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"
@@ -20,7 +33,8 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
         <TextView
             android:layout_width="wrap_content"
@@ -35,22 +49,61 @@
             android:layout_height="wrap_content"
             android:minWidth="100dp"
             android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_mobile_devices_24dp"
+            app:srcCompat="@drawable/ic_more_mobile_devices"
             app:tint="?android:attr/textColorPrimary"
             tools:ignore="contentDescription" />
     </LinearLayout>
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/mobileDevicesSwipe"
+    <LinearLayout
+        android:id="@+id/mobileDevicesError"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="invisible">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mobileDevicesRecycler"
+        <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
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_mobile_device" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            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>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/mobileDeviceAddButton"
@@ -58,8 +111,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:tint="#FFFFFF"
-        app:srcCompat="@drawable/ic_all_add_24dp" />
+        android:tint="?colorOnSecondary"
+        app:srcCompat="@drawable/ic_all_add" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index bc70682f..e55f0007 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/noteProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -29,15 +30,14 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_note_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_note"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -48,4 +48,55 @@
             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
new file mode 100644
index 00000000..a7e9a213
--- /dev/null
+++ b/app/src/main/res/layout/fragment_school.xml
@@ -0,0 +1,286 @@
+<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
new file mode 100644
index 00000000..6414abb9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_schoolandteachers.xml
@@ -0,0 +1,38 @@
+<?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
new file mode 100644
index 00000000..484bf065
--- /dev/null
+++ b/app/src/main/res/layout/fragment_teacher.xml
@@ -0,0 +1,103 @@
+<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 72621b2f..98ccabbf 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -2,15 +2,17 @@
     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">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.timetable.TimetableFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/timetableProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -24,7 +26,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/timetableRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_timetable" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -34,15 +37,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_timetable_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_timetable"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -53,44 +55,106 @@
                 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>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/timetableNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:gravity="center"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <ImageButton
             android:id="@+id/timetablePreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
-            android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            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" />
 
         <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:text="@string/app_name"
+            android:textSize="16sp" />
 
-        <Button
+        <ImageButton
             android:id="@+id/timetableNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
-            android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            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" />
+    </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 381ae36c..11067044 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/completedLessonsProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -38,12 +39,12 @@
             android:visibility="gone">
 
             <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/completedLessonsInfoImage"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="100dp"
                 android:minHeight="100dp"
-                android:id="@+id/completedLessonsInfoImage"
-                app:srcCompat="@drawable/ic_menu_main_lessons_completed_24dp"
+                app:srcCompat="@drawable/ic_menu_timetable_lessons_completed"
                 app:tint="?android:attr/textColorPrimary"
                 tools:ignore="contentDescription" />
 
@@ -56,44 +57,106 @@
                 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>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/completedLessonsNavContainer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:gravity="center"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <ImageButton
             android:id="@+id/completedLessonsPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
-            android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            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"/>
 
         <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:text="@string/app_name"
+            android:textSize="16sp" />
 
-        <Button
+        <ImageButton
             android:id="@+id/completedLessonsNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
-            android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            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" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index e5b5af3d..43f089f7 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -10,24 +10,22 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.exam.ExamHeader">
+    tools:context=".ui.modules.exam.ExamAdapter">
 
     <TextView
         android:id="@+id/examHeaderDay"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/app_name"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        tools:text="Monday" />
 
     <TextView
         android:id="@+id/examHeaderDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
-
+        android:textSize="13sp"
+        tools:text="25.01.2020" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index 75e8388a..f2ba9a8c 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,60 +1,93 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:paddingLeft="16dp"
-    android:paddingTop="10dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="10dp"
-    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
+    android:background="?android:windowBackground">
 
-    <TextView
-        android:id="@+id/gradeHeaderSubject"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gradeHeaderContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeHeaderNote"
-        android:layout_toLeftOf="@id/gradeHeaderNote"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="15sp" />
+        android:background="?selectableItemBackground"
+        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
 
-    <TextView
-        android:id="@+id/gradeHeaderAverage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gradeHeaderSubject"
-        android:layout_marginTop="5dp"
-        android:text="@string/app_name"
-        android:textColor="?android:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        <View
+            android:id="@+id/gradeHeaderDivider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/gradeHeaderNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/gradeHeaderSubject"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@+id/gradeHeaderAverage"
-        android:layout_toRightOf="@+id/gradeHeaderAverage"
-        android:text="@string/app_name"
-        android:textColor="?android:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        <TextView
+            android:id="@+id/gradeHeaderSubject"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="20dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toStartOf="@id/gradeHeaderNote"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/lorem/random" />
 
-    <ImageView
-        android:id="@+id/gradeHeaderNote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tools:ignore="contentDescription" />
-</RelativeLayout>
+        <TextView
+            android:id="@+id/gradeHeaderAverage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="10dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@id/gradeHeaderSubject"
+            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
+            tools:text="Average: 6,00" />
+
+        <TextView
+            android:id="@+id/gradeHeaderPointsSum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
+            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
+            tools:text="Points: 123/200 (61,5%)" />
+
+        <TextView
+            android:id="@+id/gradeHeaderNumber"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderPointsSum"
+            app:layout_constraintTop_toBottomOf="@id/gradeHeaderSubject"
+            tools:text="12 grades" />
+
+        <TextView
+            android:id="@+id/gradeHeaderNote"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/background_header_note"
+            android:gravity="center"
+            android:minWidth="20dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:textColor="?colorOnPrimary"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="255" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
index 526e8150..e1c6608f 100644
--- a/app/src/main/res/layout/header_homework.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.homework.HomeworkHeader">
+    tools:context=".ui.modules.homework.HomeworkAdapter">
 
     <TextView
         android:id="@+id/homeworkHeaderDay"
@@ -18,16 +18,14 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:textSize="18sp"
-        tools:text="@tools:sample/date/day_of_week" />
+        tools:text="Monday" />
 
     <TextView
         android:id="@+id/homeworkHeaderDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
-        tools:text="@tools:sample/date/ddmmyy" />
-
+        tools:text="22.02.2022" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
new file mode 100644
index 00000000..f988c47b
--- /dev/null
+++ b/app/src/main/res/layout/item_about.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="72dp"
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.about.AboutAdapter">
+
+    <ImageView
+        android:id="@+id/aboutItemImage"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="32dp"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/ic_all_about" />
+
+    <TextView
+        android:id="@+id/aboutItemTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/aboutItemImage"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/aboutItemSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_below="@id/aboutItemTitle"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/aboutItemImage"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 5f76dded..614e4d2d 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,54 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="56dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:orientation="horizontal"
     android:paddingStart="24dp"
     android:paddingLeft="24dp"
     android:paddingEnd="24dp"
     android:paddingRight="24dp"
-    tools:context=".ui.modules.account.AccountItem">
+    tools:context=".ui.modules.account.AccountAdapter">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_centerVertical="true"
-        android:background="@drawable/ic_account_circular_border"
-        android:tint="#7E7E7E"
-        app:srcCompat="@drawable/ic_all_account_24dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_all_account"
+        tools:ignore="ContentDescription"
+        tools:tint="@color/colorPrimary" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountItemName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/accountItemImage"
         android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_toEndOf="@id/accountItemImage"
-        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem/random"
-        android:textColor="?android:textColorSecondary"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toTopOf="@+id/accountItemImage"
+        tools:text="@tools:sample/full_names" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountItemSchool"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/accountItemName"
         android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
         android:layout_marginTop="3dp"
-        android:layout_toEndOf="@id/accountItemImage"
-        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index be54b91b..6917c6ce 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -4,25 +4,49 @@
     android:id="@+id/attendanceItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    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.attendance.AttendanceItem">
+    tools:context=".ui.modules.attendance.AttendanceAdapter">
 
-    <TextView
-        android:id="@+id/attendanceItemNumber"
+    <LinearLayout
+        android:id="@+id/attendanceItemNumberContainer"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_centerVertical="true"
         android:gravity="center"
-        android:maxLength="2"
-        android:text="0"
-        android:textSize="32sp"
-        tools:ignore="all" />
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/attendanceItemNumber"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLength="2"
+            android:textSize="32sp"
+            android:visibility="gone"
+            tools:text="5"
+            tools:visibility="visible" />
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/attendanceItemExcuseCheckbox"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:text="@null"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/attendanceItemExcuseInfo"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_excuse_waiting"
+            app:tint="?attr/colorOnSurface" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/attendanceItemSubject"
@@ -30,37 +54,32 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/attendanceItemNumber"
-        android:layout_toRightOf="@+id/attendanceItemNumber"
+        android:layout_toStartOf="@id/attendanceItemAlert"
+        android:layout_toEndOf="@+id/attendanceItemNumberContainer"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textSize="17sp"
-        tools:ignore="all" />
+        tools:text="Matematyka" />
 
     <TextView
         android:id="@+id/attendanceItemDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/attendanceItemSubject"
-        android:layout_alignLeft="@id/attendanceItemSubject"
-        android:layout_alignBottom="@+id/attendanceItemNumber"
+        android:layout_alignBottom="@+id/attendanceItemNumberContainer"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textColor="?android:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Present" />
 
     <ImageView
         android:id="@+id/attendanceItemAlert"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_note_24dp"
+        app:srcCompat="@drawable/ic_all_mark"
+        app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 07392e56..15552629 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,7 +21,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="January" />
@@ -46,7 +46,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_present"
             android:textSize="14sp" />
@@ -57,15 +56,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="50" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -77,7 +74,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_unexcused"
             android:textSize="14sp" />
@@ -88,15 +84,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -108,7 +102,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_excused"
             android:textSize="14sp" />
@@ -119,15 +112,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="25" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -139,7 +130,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_school"
             android:textSize="14sp" />
@@ -150,15 +140,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -170,7 +158,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_exemption"
             android:textSize="14sp" />
@@ -181,15 +168,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="6" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -201,7 +186,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_unexcused_lateness"
             android:textSize="14sp" />
@@ -212,15 +196,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -232,7 +214,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_excused_lateness"
             android:textSize="14sp" />
@@ -243,9 +224,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml
index 6e19a081..263c08a7 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceSummaryItemSubject"
     android:layout_width="match_parent"
     android:layout_height="48dp"
@@ -11,5 +12,5 @@
     android:textAlignment="textStart"
     android:paddingBottom="12dp"
     android:ellipsize="end"
-    android:text="@string/app_name"
+    tools:text="Geografia"
     android:textSize="16sp" />
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index a437bf8c..b9beec80 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -1,18 +1,14 @@
 <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:id="@+id/completedLesson_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:paddingStart="12dp"
-    android:paddingLeft="12dp"
-    android:paddingTop="7dp"
+    android:background="?selectableItemBackground"
+    android:paddingStart="8dp"
+    android:paddingTop="6dp"
     android:paddingEnd="12dp"
-    android:paddingRight="12dp"
-    android:paddingBottom="7dp"
-    tools:context=".ui.modules.timetable.completed.CompletedLessonItem">
+    android:paddingBottom="6dp"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonsAdapter">
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
@@ -20,6 +16,7 @@
         android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
+        android:includeFontPadding="false"
         android:maxLength="2"
         android:textSize="32sp"
         tools:ignore="all"
@@ -30,16 +27,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
+        android:layout_toStartOf="@id/completedLessonItemAlert"
         android:layout_toEndOf="@+id/completedLessonItemNumber"
-        android:layout_toRightOf="@+id/completedLessonItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
-        tools:ignore="RelativeOverlap"
         tools:text="@tools:sample/lorem" />
 
     <TextView
@@ -47,15 +41,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/completedLessonItemSubject"
-        android:layout_alignLeft="@id/completedLessonItemSubject"
         android:layout_alignEnd="@+id/completedLessonItemAlert"
-        android:layout_alignRight="@+id/completedLessonItemAlert"
         android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:attr/android:textColorSecondary"
+        android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
         tools:text="@tools:sample/lorem" />
 
@@ -64,9 +55,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_timetable_swap_30dp"
+        android:layout_centerVertical="true"
+        android:tint="?colorTimetableChange"
+        app:srcCompat="@drawable/ic_timetable_swap"
         tools:ignore="contentDescription" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
new file mode 100644
index 00000000..36eb64ec
--- /dev/null
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -0,0 +1,33 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:minHeight="56dp"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.contributor.ContributorAdapter">
+
+    <ImageView
+        android:id="@+id/creatorItemAvatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:contentDescription="@string/contributor_avatar_description" />
+
+    <TextView
+        android:id="@+id/creatorItemName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/creatorItemAvatar"
+        android:gravity="bottom"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index 801e1dea..bd1d4731 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -3,18 +3,17 @@
     android:id="@+id/exams_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    tools:context=".ui.modules.exam.ExamItem">
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.exam.ExamAdapter">
 
     <TextView
         android:id="@+id/examItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
-        android:text="@string/app_name"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/examItemType"
@@ -22,11 +21,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignStart="@id/examItemSubject"
-        android:layout_alignLeft="@id/examItemSubject"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/examItemTeacher"
@@ -34,16 +32,12 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
         android:layout_marginBottom="10dp"
         android:layout_toEndOf="@id/examItemType"
-        android:layout_toRightOf="@id/examItemType"
         android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 36632d04..ccc968c0 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,81 +1,82 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingLeft="12dp"
-    android:paddingTop="7dp"
-    android:paddingEnd="12dp"
-    android:paddingRight="12dp"
-    android:paddingBottom="7dp"
-    tools:context=".ui.modules.grade.details.GradeDetailsItem">
+    android:background="?android:windowBackground">
 
-    <TextView
-        android:id="@+id/gradeItemValue"
-        android:layout_width="45dp"
-        android:layout_height="40dp"
-        android:layout_centerVertical="true"
-        android:background="@color/grade_material_default"
-        android:gravity="center"
-        android:maxLength="5"
-        android:textColor="@color/grade_text"
-        android:textSize="16sp"
-        tools:text="6" />
-
-    <TextView
-        android:id="@+id/gradeItemDescription"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gradeSubItemContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeItemNote"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toEndOf="@+id/gradeItemValue"
-        android:layout_toRightOf="@+id/gradeItemValue"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/all_description"
-        android:textSize="14sp" />
+        android:background="?selectableItemBackground"
+        android:paddingStart="12dp"
+        android:paddingTop="7dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="7dp"
+        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
 
-    <TextView
-        android:id="@+id/gradeItemDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/gradeItemDescription"
-        android:layout_alignLeft="@+id/gradeItemDescription"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:text="@string/all_date"
-        android:textSize="12sp" />
+        <TextView
+            android:id="@+id/gradeItemValue"
+            android:layout_width="45dp"
+            android:layout_height="40dp"
+            android:background="@color/grade_material_default"
+            android:gravity="center"
+            android:maxLength="5"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="6" />
 
-    <TextView
-        android:id="@+id/gradeItemWeight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeItemNote"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toEndOf="@+id/gradeItemDate"
-        android:layout_toRightOf="@+id/gradeItemDate"
-        android:text="@string/grade_weight"
-        android:textSize="12sp" />
+        <TextView
+            android:id="@+id/gradeItemDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="20dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
+            app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/lorem" />
 
-    <ImageView
-        android:id="@+id/gradeItemNote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tools:ignore="contentDescription" />
-</RelativeLayout>
+        <TextView
+            android:id="@+id/gradeItemDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
+            app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
+            tools:text="@tools:sample/date/ddmmyy" />
+
+        <TextView
+            android:id="@+id/gradeItemWeight"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="20dp"
+            android:maxLines="1"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
+            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
+            app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
+            tools:text="@tools:sample/lorem" />
+
+        <ImageView
+            android:id="@+id/gradeItemNote"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_all_round_mark"
+            app:tint="?colorPrimary"
+            tools:ignore="contentDescription" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_bar.xml b/app/src/main/res/layout/item_grade_statistics_bar.xml
new file mode 100644
index 00000000..4557412f
--- /dev/null
+++ b/app/src/main/res/layout/item_grade_statistics_bar.xml
@@ -0,0 +1,27 @@
+<LinearLayout 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:orientation="vertical">
+
+    <TextView
+        android:id="@+id/gradeStatisticsBarTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorControlHighlight"
+        android:paddingLeft="20dp"
+        android:paddingTop="10dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        tools:text="Matematyka" />
+
+    <com.github.mikephil.charting.charts.BarChart
+        android:id="@+id/gradeStatisticsBar"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:layout_margin="10dp"
+        android:background="?android:windowBackground"
+        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_pie.xml b/app/src/main/res/layout/item_grade_statistics_pie.xml
new file mode 100644
index 00000000..15992a37
--- /dev/null
+++ b/app/src/main/res/layout/item_grade_statistics_pie.xml
@@ -0,0 +1,27 @@
+<LinearLayout 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:orientation="vertical">
+
+    <TextView
+        android:id="@+id/gradeStatisticsPieTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorControlHighlight"
+        android:paddingLeft="20dp"
+        android:paddingTop="10dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        tools:text="Matematyka" />
+
+    <com.github.mikephil.charting.charts.PieChart
+        android:id="@+id/gradeStatisticsPie"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:layout_margin="10dp"
+        android:background="?android:windowBackground"
+        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index b08c8780..85a78571 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
+    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,10 +21,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
-            tools:text="Fizyka" />
+            tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/gradeSummaryItemAverage"
@@ -48,7 +47,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_points"
             android:textSize="14sp" />
@@ -59,9 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="123/150" />
@@ -79,7 +75,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_predicted_grade"
             android:textSize="14sp" />
@@ -90,12 +85,10 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
-            tools:text="dobry" />
+            tools:text="5" />
     </LinearLayout>
 
     <LinearLayout
@@ -110,7 +103,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
@@ -121,11 +113,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
-            tools:text="bardzo dobry" />
+            tools:text="5" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 4e90a582..89c3c688 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -1,50 +1,83 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/homework_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    tools:context=".ui.modules.homework.HomeworkItem">
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.homework.HomeworkAdapter">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/all_date"
-        android:textSize="17sp" />
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@+id/homeworkItemTeacher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/homeworkItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_toEndOf="@id/homeworkItemSubject"
-        android:layout_toRightOf="@id/homeworkItemSubject"
+        android:ellipsize="end"
         android:gravity="end"
-        android:text="@string/all_teacher"
-        android:textSize="13sp" />
+        android:maxWidth="200dp"
+        android:minWidth="80dp"
+        android:singleLine="true"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/homeworkItemSubject"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/homeworkItemContent"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/homeworkItemSubject"
-        android:layout_alignStart="@id/homeworkItemSubject"
-        android:layout_alignLeft="@id/homeworkItemSubject"
-        android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="50dp"
         android:layout_marginBottom="15dp"
+        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
-        android:text="@string/all_content"
-        android:textSize="14sp" />
-</RelativeLayout>
+        android:maxLines="2"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/homeworkItemSubject"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemSubject"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/homeworkItemCheckImage"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
+        app:srcCompat="@drawable/ic_check"
+        app:tint="?android:textColorSecondary"
+        tools:ignore="ContentDescription"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/homeworkItemAttachmentImage"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
+        app:srcCompat="@drawable/ic_attachment"
+        app:tint="?android:textColorSecondary"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachment.xml b/app/src/main/res/layout/item_homework_dialog_attachment.xml
new file mode 100644
index 00000000..ec0b37f2
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_attachment.xml
@@ -0,0 +1,21 @@
+<LinearLayout 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="20dp"
+    android:paddingTop="3dp"
+    android:paddingEnd="10dp"
+    android:paddingBottom="3dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/homeworkDialogAttachment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="10dp"
+        android:textSize="12sp"
+        app:drawableStartCompat="@drawable/ic_attachment"
+        app:drawableTint="?colorOnBackground"
+        tools:text="@tools:sample/lorem" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
new file mode 100644
index 00000000..383cbeaf
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="3dp"
+        android:text="@string/homework_attachments"
+        android:textSize="17sp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
new file mode 100644
index 00000000..3b5705bf
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -0,0 +1,124 @@
+<LinearLayout 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:orientation="vertical"
+    android:paddingStart="20dp"
+    android:paddingTop="20dp"
+    android:paddingEnd="20dp">
+
+    <ImageButton
+        android:id="@+id/homework_dialog_full_screen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="5dp"
+        app:srcCompat="@drawable/ic_fullscreen"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
+
+    <ImageButton
+        android:id="@+id/homework_dialog_full_screen_exit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="5dp"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_fullscreen_exit"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="@string/all_details"
+        android:textSize="20sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/all_subject"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_teacher"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogTeacher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_date"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_entry_date"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogEntryDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_content"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="10dp"
+        android:autoLink="web"
+        android:lineSpacingMultiplier="1.2"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem/random" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
new file mode 100644
index 00000000..aaa7cd34
--- /dev/null
+++ b/app/src/main/res/layout/item_license.xml
@@ -0,0 +1,32 @@
+<?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:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:background="?selectableItemBackground"
+    android:orientation="vertical"
+    android:paddingStart="16dp"
+    android:paddingLeft="16dp"
+    android:paddingEnd="16dp"
+    android:paddingRight="16dp"
+    tools:context=".ui.modules.about.license.LicenseAdapter">
+
+    <TextView
+        android:id="@+id/licenseItemName"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:singleLine="true"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem/random" />
+
+    <TextView
+        android:id="@+id/licenseItemSummary"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:gravity="bottom"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index f896d99f..04858196 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -2,47 +2,63 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
+    android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    android:orientation="horizontal">
+    android:minHeight="72dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.login.studentselect.LoginStudentSelectAdapter">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/loginItemCheck"
         android:layout_width="32dp"
         android:layout_height="24dp"
+        android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="24dp"
         android:layout_marginEnd="28dp"
-        android:layout_marginRight="28dp"
-        android:layout_marginBottom="24dp"
+        android:background="@android:color/transparent"
         tools:text=" " />
 
     <TextView
         android:id="@+id/loginItemName"
         android:layout_width="wrap_content"
-        android:layout_height="34dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
-        android:layout_toRightOf="@id/loginItemCheck"
+        android:ellipsize="end"
         android:gravity="bottom"
+        android:maxLines="1"
         android:textSize="16sp"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/loginItemSchool"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
         android:layout_below="@id/loginItemName"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
-        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
-        android:maxLines="1"
+        android:maxLines="2"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
+        android:textSize="14sp"
         tools:text="@tools:sample/lorem/random" />
+
+    <TextView
+        android:id="@+id/loginItemSignedIn"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_below="@id/loginItemSchool"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/loginItemCheck"
+        android:ellipsize="end"
+        android:enabled="false"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:text="@string/login_signed_in"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        android:visibility="gone"
+        tools:visibility="visible" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index e7322afa..111de88c 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,52 +1,64 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.message.MessageItem">
+    tools:context=".ui.modules.message.tab.MessageTabAdapter">
 
     <TextView
         android:id="@+id/messageItemAuthor"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
+        android:layout_marginEnd="10dp"
         android:ellipsize="end"
-        android:maxLines="1"
+        android:singleLine="true"
         android:textSize="15sp"
-        tools:text="@tools:sample/full_names" />
+        app:layout_constraintEnd_toStartOf="@+id/messageItemDate"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/messageItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_toEndOf="@id/messageItemAuthor"
-        android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
-        tools:text="@tools:sample/date/mmddyy" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/messageItemAuthor"
-        android:layout_alignStart="@id/messageItemAuthor"
-        android:layout_alignLeft="@id/messageItemAuthor"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="10dp"
         android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:attr/android:textColorSecondary"
+        android:singleLine="true"
+        android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        tools:text="@tools:sample/lorem" />
+        app:layout_constraintEnd_toStartOf="@id/messageItemAttachmentIcon"
+        app:layout_constraintStart_toStartOf="@id/messageItemAuthor"
+        app:layout_constraintTop_toBottomOf="@+id/messageItemAuthor"
+        app:layout_goneMarginEnd="0dp"
+        tools:text="@tools:sample/lorem/random" />
 
-</RelativeLayout>
+    <ImageView
+        android:id="@+id/messageItemAttachmentIcon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/messageItemSubject"
+        app:layout_constraintEnd_toEndOf="@id/messageItemDate"
+        app:srcCompat="@drawable/ic_attachment"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_attachment.xml b/app/src/main/res/layout/item_message_attachment.xml
new file mode 100644
index 00000000..fa30e9af
--- /dev/null
+++ b/app/src/main/res/layout/item_message_attachment.xml
@@ -0,0 +1,22 @@
+<LinearLayout 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="16dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="10dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/messagePreviewAttachment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="10dp"
+        android:visibility="gone"
+        app:drawableStartCompat="@drawable/ic_attachment"
+        app:drawableTint="?colorOnBackground"
+        tools:text="@tools:sample/lorem"
+        tools:visibility="visible" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_message_divider.xml b/app/src/main/res/layout/item_message_divider.xml
new file mode 100644
index 00000000..2f4ad3e6
--- /dev/null
+++ b/app/src/main/res/layout/item_message_divider.xml
@@ -0,0 +1,6 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="2dp"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="10dp"
+    android:background="?android:attr/listDivider" />
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
new file mode 100644
index 00000000..6c130909
--- /dev/null
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -0,0 +1,45 @@
+<?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/messagePreviewContentContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/messagePreviewSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:lineSpacingMultiplier="1.2"
+        android:textSize="22sp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/messagePreviewAuthor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        tools:text="@tools:sample/full_names" />
+
+    <TextView
+        android:id="@+id/messagePreviewDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        tools:text="@tools:sample/date/ddmmyy" />
+
+    <TextView
+        android:id="@+id/messagePreviewContent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:lineSpacingMultiplier="1.2"
+        android:textIsSelectable="true"
+        tools:text="@tools:sample/lorem/random" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 97245f97..3f3d0a75 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -4,16 +4,14 @@
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    tools:context=".ui.modules.mobiledevice.MobileDeviceItem">
+    tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
-        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -26,9 +24,7 @@
         android:layout_height="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
-        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
@@ -39,7 +35,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
@@ -47,6 +42,6 @@
         android:layout_marginRight="4dp"
         android:background="?selectableItemBackgroundBorderless"
         android:contentDescription="@string/mobile_devices_unregister"
-        app:srcCompat="@drawable/ic_message_delete_24dp"
-        app:tint="?android:textColorSecondary" />
+        app:srcCompat="@drawable/ic_menu_message_delete"
+        app:tint="?colorOnBackground" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index 07eb3344..c9063ccf 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -4,29 +4,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:orientation="horizontal"
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
     android:paddingRight="16dp"
     android:paddingBottom="8dp"
-    tools:context=".ui.modules.more.MoreItem">
+    tools:context=".ui.modules.more.MoreAdapter">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/moreItemImage"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
-        app:srcCompat="@drawable/ic_more_settings_24dp"
-        app:tint="?android:attr/android:textColorSecondary" />
+        app:srcCompat="@drawable/ic_more_settings"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/moreItemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
-        android:text="@string/app_name"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 76fb6a8c..660f32e0 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,61 +1,84 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/note_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    tools:context=".ui.modules.note.NoteItem">
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.note.NoteAdapter">
 
     <TextView
         android:id="@+id/noteItemDate"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
-        android:text="@string/all_date"
-        android:textSize="15sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintRight_toLeftOf="@+id/noteItemTeacher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/noteItemTeacher"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_toEndOf="@id/noteItemDate"
-        android:layout_toRightOf="@id/noteItemDate"
+        android:ellipsize="end"
         android:gravity="end"
-        android:text="@string/all_teacher"
-        android:textSize="13sp" />
+        android:singleLine="true"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/noteItemDate"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/noteItemType"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/noteItemDate"
-        android:layout_alignStart="@id/noteItemDate"
-        android:layout_alignLeft="@id/noteItemDate"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/exam_type"
-        android:textSize="13sp" />
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textSize="16sp"
+        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
+        app:layout_constraintRight_toLeftOf="@id/noteItemPoints"
+        app:layout_constraintTop_toBottomOf="@id/noteItemDate"
+        app:layout_goneMarginEnd="0dp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/noteItemPoints"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintRight_toRightOf="@id/noteItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/noteItemTeacher"
+        tools:text="-5"
+        tools:textColor="@color/note_positive"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/noteItemContent"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/noteItemType"
-        android:layout_alignStart="@id/noteItemDate"
-        android:layout_alignLeft="@id/noteItemDate"
-        android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_marginBottom="15dp"
+        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
-        android:text="@string/all_description"
-        android:textSize="14sp" />
-</RelativeLayout>
+        android:maxLines="2"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
+        app:layout_constraintRight_toRightOf="@+id/noteItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/noteItemType"
+        tools:text="@tools:sample/lorem/random" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
new file mode 100644
index 00000000..a30eb560
--- /dev/null
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -0,0 +1,48 @@
+<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.TeacherAdapter">
+
+    <TextView
+        android:id="@+id/teacherItemName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="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_marginEnd="40dp"
+        android:layout_toEndOf="@+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: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 6afc4153..4e278261 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,83 +1,157 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/timetable_subitem_container"
+    android:id="@+id/relativeLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingLeft="12dp"
-    android:paddingTop="7dp"
+    android:background="?selectableItemBackground"
+    android:paddingStart="8dp"
+    android:paddingTop="6dp"
     android:paddingEnd="12dp"
-    android:paddingRight="12dp"
-    android:paddingBottom="7dp"
-    tools:context=".ui.modules.timetable.TimetableItem">
+    android:paddingBottom="6dp"
+    tools:context=".ui.modules.timetable.TimetableAdapter">
 
     <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:text="0"
+        android:textColor="?android:textColorPrimary"
         android:textSize="32sp"
-        tools:ignore="all" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="5" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/timetableItemNumber"
-        android:layout_toRightOf="@+id/timetableItemNumber"
+        android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="17sp"
-        tools:ignore="RelativeOverlap" />
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
-        android:id="@+id/timetableItemTime"
+        android:id="@+id/timetableItemTimeStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignStart="@id/timetableItemSubject"
-        android:layout_alignLeft="@id/timetableItemSubject"
-        android:layout_alignBottom="@+id/timetableItemNumber"
+        android:layout_marginStart="8dp"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textColor="?android:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toTopOf="@id/timetableItemNumber"
+        tools:text="11:11" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeFinish"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        tools:text="12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
         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="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/timetableItemTime"
-        android:layout_toRightOf="@+id/timetableItemTime"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textColor="?android:attr/android:textColorSecondary"
-        android:textSize="12sp"
-        tools:ignore="RelativeOverlap" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        tools:text="22"
+        tools:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/timetableItemAlert"
+    <TextView
+        android:id="@+id/timetableItemTeacher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@id/timetableItemRoom"
+        tools:text="Agata Kowalska - Błaszczyk"
+        tools:visibility="gone" />
+
+    <TextView
+        android:id="@+id/timetableItemDescription"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="16dp"
+        android:textColor="?colorTimetableChange"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
+        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/timetableItemTimeBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="start"
+        app:constraint_referenced_ids="timetableItemTimeUntil,timetableItemTimeLeft" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeUntil"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:textColor="?colorPrimary"
+        android:textSize="13sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="za 15 min"
+        tools:visibility="gone" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeLeft"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_timetable_swap_30dp"
-        tools:ignore="contentDescription" />
-
-</RelativeLayout>
+        android:layout_marginStart="4dp"
+        android:background="@drawable/background_timetable_time_left"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:paddingLeft="7dp"
+        android:paddingTop="2dp"
+        android:paddingRight="7dp"
+        android:paddingBottom="2dp"
+        android:textColor="?colorOnPrimary"
+        android:textSize="13sp"
+        android:visibility="gone"
+        app:backgroundTint="?colorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="jeszcze 15 min"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_timetable_small.xml b/app/src/main/res/layout/item_timetable_small.xml
new file mode 100644
index 00000000..98a213ec
--- /dev/null
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -0,0 +1,83 @@
+<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"
+    tools:context=".ui.modules.timetable.TimetableAdapter">
+
+    <TextView
+        android:id="@+id/timetableSmallItemNumber"
+        android:layout_width="40dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:gravity="center"
+        android:maxLength="2"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        tools:text="5" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemTimeStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/timetableSmallItemNumber"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@id/timetableSmallItemNumber"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="11:11" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="10dp"
+        android:layout_toEndOf="@+id/timetableSmallItemTimeStart"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        tools:text="Sieci komputerowe" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemRoom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@+id/timetableSmallItemSubject"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="22" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemTeacher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@id/timetableSmallItemRoom"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="Agata" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/timetableSmallItemTeacher"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="zastępstwo jakieś tam gdzieś tam" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index aa808864..33f686da 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -1,85 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="@drawable/ic_all_divider"
     android:minHeight="45dp"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
-    <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"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        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" />
+        android:background="@android:color/white"
+        android:paddingStart="6dp"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="12dp"
+        android:paddingRight="12dp"
+        android:paddingBottom="6dp">
 
-    <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="Język polski" />
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLength="2"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="28sp"
+            tools:text="5" />
 
-    <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/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:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="@tools:sample/lorem" />
 
-    <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>
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@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="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_marginTop="0dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            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>
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
new file mode 100644
index 00000000..3dfc3f54
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -0,0 +1,117 @@
+<?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:paddingStart="6dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="6dp">
+
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLength="2"
+            android:textColor="@android:color/white"
+            android:textSize="28sp"
+            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_marginEnd="40dp"
+            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="@tools:sample/lorem" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
+            android:layout_marginStart="6dp"
+            android:layout_toEndOf="@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_toEndOf="@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_toEndOf="@+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_marginEnd="16dp"
+            android:layout_toEndOf="@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_marginTop="0dp"
+            android:layout_marginEnd="16dp"
+            android:layout_toEndOf="@+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/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
new file mode 100644
index 00000000..3a3a2d65
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -0,0 +1,97 @@
+<LinearLayout 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="@android:color/white"
+    android:orientation="vertical"
+    android:paddingStart="6dp"
+    android:paddingLeft="6dp"
+    android:paddingEnd="6dp"
+    android:paddingRight="6dp"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLength="2"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="5" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            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:visibility="gone" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="Sieci komputerowe" />
+
+
+        <TextView
+            android:id="@+id/timetableWidgetItemRoom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="22" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="Agata" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            android:visibility="visible"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/colorDivider" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
new file mode 100644
index 00000000..0cc29709
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
@@ -0,0 +1,100 @@
+<LinearLayout 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="@color/colorWidgetBackground"
+    android:orientation="vertical"
+    android:paddingStart="6dp"
+    android:paddingLeft="6dp"
+    android:paddingEnd="6dp"
+    android:paddingRight="6dp"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLength="2"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="5" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
+            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:visibility="gone" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="Sieci komputerowe" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemRoom"
+            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="22" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="Agata" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            android:visibility="visible"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/colorDividerInverse" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
new file mode 100644
index 00000000..72186bf7
--- /dev/null
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="104dp"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.AboutAdapter">
+
+    <ImageView
+        android:id="@+id/aboutScrollableHeaderIcon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/aboutScrollableHeaderName"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription"
+        tools:src="@mipmap/ic_launcher" />
+
+    <TextView
+        android:id="@+id/aboutScrollableHeaderName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="@id/aboutScrollableHeaderIcon"
+        app:layout_constraintLeft_toRightOf="@id/aboutScrollableHeaderIcon"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/aboutScrollableHeaderIcon" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/scrollable_header_attendance_summary.xml b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
index 37bbb32b..4593a5b6 100644
--- a/app/src/main/res/layout/scrollable_header_attendance_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
@@ -1,11 +1,13 @@
 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="20dp"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
 
     <TextView
         android:layout_width="match_parent"
@@ -20,6 +22,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:text="100%"
-        android:textSize="21sp" />
+        android:textSize="21sp"
+        tools:text="100%" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml
index cb28d43e..2eea20f4 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -1,17 +1,18 @@
 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
 
     <LinearLayout
         android:layout_width="150dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_marginTop="20dp"
+        android:layout_marginEnd="5dp"
         android:orientation="vertical">
 
         <TextView
@@ -27,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="6,00"
-            android:textSize="21sp" />
+            android:textSize="21sp"
+            tools:text="6,00" />
     </LinearLayout>
 
     <LinearLayout
@@ -50,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="6,00"
-            android:textSize="21sp" />
+            android:textSize="21sp"
+            tools:text="6,00" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_luckynumber.xml b/app/src/main/res/layout/widget_luckynumber.xml
index 026ac953..360a1970 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_rounded_corner"
+    android:background="@drawable/background_luckynumber_widget"
     android:gravity="center"
     android:padding="10dp"
     tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
@@ -18,7 +18,7 @@
         android:layout_marginBottom="20dp"
         android:contentDescription="@string/lucky_number_title"
         android:gravity="center"
-        android:src="@drawable/ic_widget_clover_24dp"
+        android:src="@drawable/ic_widget_clover"
         android:visibility="gone"
         tools:visibility="visible" />
 
@@ -42,7 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/luckyNumberWidgetNumber"
         android:contentDescription="@string/lucky_number_title"
-        android:src="@drawable/ic_widget_clover_24dp"
+        android:src="@drawable/ic_widget_clover"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/widget_luckynumber_dark.xml b/app/src/main/res/layout/widget_luckynumber_dark.xml
new file mode 100644
index 00000000..77174730
--- /dev/null
+++ b/app/src/main/res/layout/widget_luckynumber_dark.xml
@@ -0,0 +1,65 @@
+<?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.xml b/app/src/main/res/layout/widget_timetable.xml
index 52469699..8a08b5d2 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -16,9 +16,7 @@
             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
@@ -26,7 +24,6 @@
                 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"
@@ -37,7 +34,6 @@
                 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"
@@ -49,7 +45,6 @@
             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" />
@@ -60,10 +55,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron_24dp"
+            android:src="@drawable/ic_widget_chevron"
             tools:targetApi="lollipop" />
 
         <ImageButton
@@ -72,11 +66,10 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
-            android:src="@drawable/ic_widget_chevron_24dp"
+            android:src="@drawable/ic_widget_chevron"
             tools:targetApi="lollipop" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
new file mode 100644
index 00000000..5533eaee
--- /dev/null
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -0,0 +1,92 @@
+<?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_toEndOf="@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: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: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: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: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: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 94baf338..bb20c8ec 100644
--- a/app/src/main/res/menu/action_menu_attendance.xml
+++ b/app/src/main/res/menu/action_menu_attendance.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/attendanceMenuSummary"
-        android:icon="@drawable/ic_menu_main_attendance_summary_24dp"
+        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: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 fdc1dbd0..6357cbb5 100644
--- a/app/src/main/res/menu/action_menu_grade.xml
+++ b/app/src/main/res/menu/action_menu_grade.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/gradeMenuSemester"
-        android:icon="@drawable/ic_menu_grade_semester_24dp"
+        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: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 93890829..62516cbd 100644
--- a/app/src/main/res/menu/action_menu_grade_details.xml
+++ b/app/src/main/res/menu/action_menu_grade_details.xml
@@ -3,7 +3,9 @@
     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:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_logviewer.xml b/app/src/main/res/menu/action_menu_logviewer.xml
new file mode 100644
index 00000000..84b076b1
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_logviewer.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/logViewerMenuShare"
+        android:icon="@drawable/ic_share"
+        android:orderInCategory="1"
+        android:title="@string/logviewer_share"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_main.xml b/app/src/main/res/menu/action_menu_main.xml
index 7acc58c1..72bea25a 100644
--- a/app/src/main/res/menu/action_menu_main.xml
+++ b/app/src/main/res/menu/action_menu_main.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/mainMenuAccount"
-        android:icon="@drawable/ic_all_account_24dp"
+        android:icon="@drawable/ic_all_account"
         android:orderInCategory="2"
         android:title="@string/main_account_picker"
+        app:iconTint="@color/material_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 c3272aa2..dfc12e23 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -3,20 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/messagePreviewMenuReply"
-        android:icon="@drawable/ic_message_reply_24dp"
+        android:icon="@drawable/ic_menu_message_reply"
         android:orderInCategory="1"
         android:title="@string/message_reply"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuForward"
-        android:icon="@drawable/ic_message_forward_24dp"
+        android:icon="@drawable/ic_menu_message_forward"
         android:orderInCategory="1"
         android:title="@string/message_forward"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuDelete"
-        android:icon="@drawable/ic_message_delete_24dp"
+        android:icon="@drawable/ic_menu_message_delete"
         android:orderInCategory="1"
         android:title="@string/message_delete"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_tab.xml b/app/src/main/res/menu/action_menu_message_tab.xml
new file mode 100644
index 00000000..18d34875
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_message_tab.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/all_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="collapseActionView|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 d512fc76..4b43764a 100644
--- a/app/src/main/res/menu/action_menu_send_message.xml
+++ b/app/src/main/res/menu/action_menu_send_message.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sendMessageMenuSend"
-        android:icon="@drawable/ic_menu_send_message_24dp"
+        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: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 0a13494a..c3d0222c 100644
--- a/app/src/main/res/menu/action_menu_timetable.xml
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/timetableMenuCompletedLessons"
-        android:icon="@drawable/ic_menu_main_lessons_completed_24dp"
+        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:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/context_menu_excuse.xml b/app/src/main/res/menu/context_menu_excuse.xml
new file mode 100644
index 00000000..4eff14e3
--- /dev/null
+++ b/app/src/main/res/menu/context_menu_excuse.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/excuseMenuSubmit"
+        android:icon="@drawable/ic_all_done"
+        android:title="@string/attendance_excuse_dialog_submit"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="always" />
+</menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1..d59ec8e1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1..d59ec8e1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/raw/custom_license_mappings.prop b/app/src/main/res/raw/custom_license_mappings.prop
new file mode 100644
index 00000000..f4ab5516
--- /dev/null
+++ b/app/src/main/res/raw/custom_license_mappings.prop
@@ -0,0 +1 @@
+io_github_wulkanowy__sdk:apache_2_0
diff --git a/app/src/main/res/raw/custom_license_year_mappings.prop b/app/src/main/res/raw/custom_license_year_mappings.prop
new file mode 100644
index 00000000..9605dada
--- /dev/null
+++ b/app/src/main/res/raw/custom_license_year_mappings.prop
@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:2019
+io_github_wulkanowy__uonet_request_signer:2019
+io_github_wulkanowy__sdk:2020
diff --git a/app/src/main/res/raw/custom_name_mappings.prop b/app/src/main/res/raw/custom_name_mappings.prop
new file mode 100644
index 00000000..05e89680
--- /dev/null
+++ b/app/src/main/res/raw/custom_name_mappings.prop
@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:Material Chips Input
+io_github_wulkanowy__uonet_request_signer:UONET+ Request Signer
+io_github_wulkanowy__sdk:VULCAN UONET+ SDK
diff --git a/app/src/main/res/values-de-v29/preferences_values.xml b/app/src/main/res/values-de-v29/preferences_values.xml
new file mode 100644
index 00000000..c07650d6
--- /dev/null
+++ b/app/src/main/res/values-de-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?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 Thema</item>
+        <item>Licht</item>
+        <item>Dunkel</item>
+        <item>Schwarz (AMOLED)</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
new file mode 100644
index 00000000..28ad08bc
--- /dev/null
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -0,0 +1,46 @@
+<?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>Licht</item>
+        <item>Dunkel</item>
+        <item>Schwarz (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>System Sprache</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 Minuten</item>
+        <item>30 Minuten</item>
+        <item>1 Stunde</item>
+        <item>2 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</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>Farben der Bewertungen im Logbuch</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Durchschnittsnote für das 2. Semester</item>
+        <item>Durchschnitt der Bewertungen für das ganze Jahr</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Nicht zeigen</item>
+        <item>Alle zeigen</item>
+        <item>Zeigen die reduzierte</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000..f92186c4
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Wulkanowy</string>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Anmelden</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Noten</string>
+    <string name="attendance_title">Schulbesuch</string>
+    <string name="exam_title">Prüfungen</string>
+    <string name="timetable_title">Zeitplan</string>
+    <string name="settings_title">Einstellungen</string>
+    <string name="more_title">Mehr</string>
+    <string name="about_title">Über die Applikation</string>
+    <string name="logviewer_title">Log Viewer</string>
+    <string name="contributors_title">Mitarbeiter</string>
+    <string name="license_title">Lizenzen</string>
+    <string name="message_title">Nachrichten</string>
+    <string name="send_message_title">neue Nachricht</string>
+    <string name="note_title">Eintragen und Erfolgen</string>
+    <string name="homework_title">Hausaufgaben</string>
+    <string name="account_title">Wählen Sie ein Konto</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %d, %d/%d</string>
+    <!--Login-->
+    <string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
+    <string name="login_header_symbol">Geben Sie das Symbol</string>
+    <string name="login_nickname_hint">Benutzername</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Anmeldung, PESEL oder e-mail</string>
+    <string name="login_password_hint">Passwort</string>
+    <string name="login_host_hint">UONET+ Klassenbuch</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybride</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">API Schlüssel</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Anmelden</string>
+    <string name="login_invalid_password">Passwort ist zu kurz</string>
+    <string name="login_incorrect_password">Anmeldedaten sind falsch. Stellen Sie sicher, dass das richtige UONET+-Register ausgewählt ist</string>
+    <string name="login_invalid_pin">Ungültige PIN</string>
+    <string name="login_invalid_token">Ungültige token</string>
+    <string name="login_expired_token">Token ist nicht mehr gültig</string>
+    <string name="login_invalid_email">Ungültige email</string>
+    <string name="login_invalid_login">Ungültige login</string>
+    <string name="login_invalid_symbol">Ungültige symbol</string>
+    <string name="login_incorrect_symbol">Student nicht gefunden. Überprüfen Sie das Symbol</string>
+    <string name="login_field_required">Dieses Datenfeld ist erforderlich</string>
+    <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
+    <string name="login_symbol_helper">Das Symbol finden Sie auf der Registerseite unter&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen.</string>
+    <string name="login_advanced">Andere Optionen</string>
+    <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
+    <string name="login_advanced_warning_scraper">In diesem Modus werden dieselben Daten angezeigt, die auf der Klassenbuch-Website angezeigt werden</string>
+    <string name="login_advanced_warning_hybrid">Die Kombination der besten Eigenschaften der beiden anderen Modus. Es arbeitet schneller als Scraper und bietet Funktionen, die im mobilen API-Modus nicht verfügbar sind. Es ist in der experimentellen Phase</string>
+    <string name="login_privacy_policy">Datenschutzerklärung</string>
+    <string name="login_contact_header">Probleme bei der Anmeldung? Kontaktieren Sie uns!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">email senden</string>
+    <string name="login_email_details">Beschreiben Sie die Details des Problems:</string>
+    <string name="login_recover_warning">Stellen Sie sicher, dass das richtige UONET + Klassenbuch ausgewählt ist!</string>
+    <string name="login_recover_button">Ich habe mein Passwort vergessen.</string>
+    <string name="login_recover_title">Ihr Konto wiederherstellen</string>
+    <string name="login_recover">Wiederherstellen</string>
+    <string name="login_signed_in">Student ist bereits angemeldet</string>
+    <!--Main-->
+    <string name="main_account_picker">Kundenbetreuer</string>
+    <string name="main_log_in">Anmelden</string>
+    <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
+    <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
+    <!--Grade-->
+    <string name="grade_header">Note</string>
+    <string name="grade_semester">Semester %d</string>
+    <string name="grade_switch_semester">Semester wechseln</string>
+    <string name="grade_no_items">Keine Noten</string>
+    <string name="grade_weight">Gewichtung</string>
+    <string name="grade_weight_value">Gewichtung: %s</string>
+    <string name="grade_comment">Kommentar</string>
+    <string name="grade_no_new_items">Keine neuen Noten</string>
+    <string name="grade_number_new_items">Anzahl der neuen Bewertungen: %1$d</string>
+    <string name="grade_average">Durchschnitt: %1$.2f</string>
+    <string name="grade_points_sum">Punkte: %s</string>
+    <string name="grade_no_average">Kein Durchschnitt</string>
+    <string name="grade_predicted">Vorausgesagt: %1$s</string>
+    <string name="grade_final">Finale: %1$s</string>
+    <string name="grade_summary_points">Gesamtpunkte</string>
+    <string name="grade_summary_final_grade">Finaler Note</string>
+    <string name="grade_summary_predicted_grade">Vorhergesagte Note</string>
+    <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
+    <string name="grade_summary_final_average">Finaler Durchschnitt</string>
+    <string name="grade_menu_summary">Zusammenfassung</string>
+    <string name="grade_menu_statistics">Klasse</string>
+    <string name="grade_menu_read">Als gelesen markieren</string>
+    <string name="grade_statistics_partial">Partiell</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Punkte</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d Note</item>
+        <item quantity="other">%d Noten</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">Neue Note</item>
+        <item quantity="other">Neue Noten</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">Du hast %1$d Note bekommen</item>
+        <item quantity="other">Du hast %1$d Noten bekommen</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lektion</string>
+    <string name="timetable_room">Klassenzimmer</string>
+    <string name="timetable_group">Gruppe</string>
+    <string name="timetable_time">Stunden</string>
+    <string name="timetable_changes">Änderungen</string>
+    <string name="timetable_no_items">Kein Unterricht an diesem Tag</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sek</string>
+    <string name="timetable_time_left">noch %1$s</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Fertig</string>
+    <string name="timetable_now">Jetzt: %s</string>
+    <string name="timetable_next">In einem Moment: %s</string>
+    <string name="timetable_later">Später: %s</string>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Beendete Lektionen</string>
+    <string name="completed_lessons_button">Beendete Lektionen anzeigen</string>
+    <string name="completed_lessons_no_items">Keine Informationen über beendete Lektionen</string>
+    <string name="completed_lessons_topic">Thema</string>
+    <string name="completed_lessons_absence">Abwesenheit</string>
+    <string name="completed_lessons_resources">Ressourcen</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
+    <string name="attendance_absence_school">Aus schulischen Gründen abwesend</string>
+    <string name="attendance_absence_excused">Entschuldigte Abwesenheit</string>
+    <string name="attendance_absence_unexcused">Unentschuldigtes Abwesenheit</string>
+    <string name="attendance_exemption">Befreiung</string>
+    <string name="attendance_excused_lateness">Entschuldigte Verspätung</string>
+    <string name="attendance_unexcused_lateness">Unentschuldigte Verspätung</string>
+    <string name="attendance_present">Anwesend</string>
+    <string name="attendance_number">Lektion Nummer</string>
+    <string name="attendance_no_items">Keine Einträgen</string>
+    <plurals name="attendance_number_absences">
+        <item quantity="one">%1$d abwesenheit</item>
+        <item quantity="other">%1$d Abwesenheiten</item>
+    </plurals>
+    <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Senden</string>
+    <string name="attendance_excuse_success">Abwesenheit erfolgreich entschuldigt!</string>
+    <string name="attendance_excuse_no_selection">Sie müssen mindestens eine Abwesenheit auswählen!</string>
+    <string name="attendance_excuse_title">Verzeihung</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Schulbesuch</string>
+    <string name="attendance_summary_total">Gesamt</string>
+    <!--Exam-->
+    <string name="exam_no_items">Diese Woche keine Prüfungen</string>
+    <string name="exam_type">Form</string>
+    <string name="exam_entry_date">Eintrittsdatum</string>
+    <!--Message-->
+    <string name="message_inbox">Posteingang</string>
+    <string name="message_sent">Gesendet</string>
+    <string name="message_trash">Korb</string>
+    <string name="message_no_subject">(kein Thema)</string>
+    <string name="message_no_items">Keine Nachrichten</string>
+    <string name="message_preview_error">Beim Herunterladen des Nachrichteninhalts ist ein Fehler aufgetreten</string>
+    <string name="message_from">Von:</string>
+    <string name="message_to">An:</string>
+    <string name="message_date">Datum: %s</string>
+    <string name="message_reply">Antwort</string>
+    <string name="message_forward">Weiterleiten</string>
+    <string name="message_delete">Löschen</string>
+    <string name="message_move_to_bin">In den Korb wandern</string>
+    <string name="message_delete_forever">Dauerhaft löschen</string>
+    <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
+    <string name="message_subject">Thema</string>
+    <string name="message_content">Inhalt</string>
+    <string name="message_send_successful">Nachricht erfolgreich gesendet</string>
+    <string name="message_required_recipients">Sie müssen mindestens 1 Empfänger auswählen.</string>
+    <string name="message_content_min_length">Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein.</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%d nachricht</item>
+        <item quantity="other">%d nachrichten</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">Neu nachricht</item>
+        <item quantity="other">Neue nachrichten</item>
+    </plurals>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">Du hast %1$d nachricht bekommen</item>
+        <item quantity="other">Du hast %1$d nachrichten bekommen</item>
+    </plurals>
+    <!--Note-->
+    <string name="note_no_items">Keine Informationen über Eintragen</string>
+    <string name="note_points">Punkte</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d Eintrag</item>
+        <item quantity="other">%d Eintragen</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">Neu Eintrag</item>
+        <item quantity="other">Neue Eintragen</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">Du hast %1$d Eintrag bekommen</item>
+        <item quantity="other">Du hast %1$d Eintragen bekommen</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
+    <string name="homework_mark_as_done">Gemacht</string>
+    <string name="homework_mark_as_undone">Unvollständig</string>
+    <string name="homework_attachments">Anhänge</string>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Glückliche Nummer</string>
+    <string name="lucky_number_header">Die heutige Glücksnummer ist </string>
+    <string name="lucky_number_empty">Keine Information über die Glücksnummer.</string>
+    <string name="lucky_number_notify_new_item_title">Glücksnummer für heute</string>
+    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: </string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile Geräte</string>
+    <string name="mobile_devices_no_items">Keine Geräte</string>
+    <string name="mobile_devices_unregister">Abmelden</string>
+    <string name="mobile_device_removed">Gerät entfernt</string>
+    <string name="mobile_device_qr">QR Code</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">Schule und Lehrer</string>
+    <!--School-->
+    <string name="school_title">Schule</string>
+    <string name="school_no_info">Keine Informationen über die Schule</string>
+    <string name="school_name">Name der Schule</string>
+    <string name="school_address">Adresse der Schule</string>
+    <string name="school_telephone">Telefon</string>
+    <string name="school_headmaster">Name des Schulleiters</string>
+    <string name="school_pedagogue">Name des Pädagogen</string>
+    <string name="school_address_button">Auf Karte anzeigen</string>
+    <string name="school_telephone_button">Rufen Sie an</string>
+    <!--Teacher-->
+    <string name="teachers_title">Lehrerinnen und Lehrer</string>
+    <string name="teacher_no_items">Keine Informationen über Lehrer</string>
+    <string name="teacher_no_subject">Kein Thema</string>
+    <!--Account-->
+    <string name="account_add_new">Konto hinzufügen</string>
+    <string name="account_logout">Abmelden</string>
+    <string name="account_confirm">Wollen Sie sich von einem aktiven Studenten abmelden?</string>
+    <string name="account_logout_student">Abmeldung von Student</string>
+    <!--About-->
+    <string name="about_version">Version der App</string>
+    <string name="about_contributor">Mitarbeiter</string>
+    <string name="about_contributor_summary">Liste der Wulkanowy-Entwickler</string>
+    <string name="about_feedback">Melden Sie einen Fehler</string>
+    <string name="about_feedback_summary">Senden Sie einen Fehlerbericht per E-Mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Lesen Sie Häufig gestellte Fragen</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Treten Sie der Wulkanowy-Gemeinschaft bei</string>
+    <string name="about_privacy">Datenschutzerklärung</string>
+    <string name="about_privacy_summary">Regeln für die Sammlung persönlicher Daten</string>
+    <string name="about_homepage">Startseite</string>
+    <string name="about_homepage_summary">Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung</string>
+    <string name="about_licenses">Lizenzen</string>
+    <string name="about_licenses_summary">Lizenzen der in der Anwendung verwendeten Bibliotheken</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">Lizenz</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Benutzerbild</string>
+    <string name="contributor_see_more">Sehen Sie mehr auf GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Logs teilen</string>
+    <string name="logviewer_refresh">Aktualisieren</string>
+    <!--Generic-->
+    <string name="all_content">Inhalt</string>
+    <string name="all_retry">Wiederhol</string>
+    <string name="all_description">Beschreibung</string>
+    <string name="all_no_description">Keine Beschreibung</string>
+    <string name="all_teacher">Lehrer</string>
+    <string name="all_date">Datum</string>
+    <string name="all_entry_date">Eintrittsdatum</string>
+    <string name="all_color">Farbe</string>
+    <string name="all_details">Einzelheiten</string>
+    <string name="all_category">Kategorie</string>
+    <string name="all_close">Schließ</string>
+    <string name="all_no_data">Keine Daten</string>
+    <string name="all_subject">Thema</string>
+    <string name="all_prev">Zurück</string>
+    <string name="all_next">Nächste</string>
+    <string name="all_search">Suchen</string>
+    <string name="all_search_hint">Suchen...</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">Keine Lektionen</string>
+    <string name="widget_timetable_theme_title">Thema wählen</string>
+    <string name="widget_timetable_theme_light">Licht</string>
+    <string name="widget_timetable_theme_dark">Dunkel</string>
+    <string name="widget_timetable_theme_system">Systemthema</string>
+    <!--Preferences-->
+    <string name="pref_view_header">Erscheinungsbild</string>
+    <string name="pref_view_list">Standard Ansicht</string>
+    <string name="pref_view_grade_average_mode">Berechnung des Jahresenddurchschnitts</string>
+    <string name="pref_view_grade_average_force_calc">Mittelwertberechnung durch App erzwingen</string>
+    <string name="pref_view_present">Anwesenheit in Schulbesuch zeigen</string>
+    <string name="pref_view_app_theme">Thema der Anwendung</string>
+    <string name="pref_view_expand_grade">Noten erweitern</string>
+    <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</string>
+    <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
+    <string name="pref_view_timetable_show_whole_class">Unterricht der ganzen Klasse anzeigen</string>
+    <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
+    <string name="pref_view_app_language">App Sprache</string>
+    <string name="pref_notify_header">Benachrichtigungen</string>
+    <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
+    <string name="pref_notify_upcoming_lessons_switch">Benachrichtigungen über bevorstehende Lektionen anzeigen</string>
+    <string name="pref_notify_fix_sync_issues">Synchronisierungs- und Benachrichtigungsprobleme reparieren</string>
+    <string name="pref_notify_fix_sync_issues_message">Ihr Gerät hat möglicherweise Probleme mit der Datensynchronisierung und Benachrichtigungen.\n\nUm diese zu reparieren, fügen Sie Wulkanowy zum Autostart hinzu und deaktivieren Sie die Batterieoptimierung in den Systemeinstellungen des Geräts.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Gehe zu den Einstellungen</string>
+    <string name="pref_notify_debug_switch">Debug-Benachrichtigungen anzeigen</string>
+    <string name="pref_services_header">Synchronisierung</string>
+    <string name="pref_services_switch">Automatische Aktualisierung</string>
+    <string name="pref_services_suspended">An Feiertagen suspendiert</string>
+    <string name="pref_services_interval">Aktualisierungsintervall</string>
+    <string name="pref_services_wifi">Nur Wi-Fi</string>
+    <string name="pref_services_force_sync">Jetzt synchronisieren</string>
+    <string name="pref_services_message_sync_success">Synchronisiert!</string>
+    <string name="pref_services_message_sync_failed">Synchronisierung fehlgeschlagen</string>
+    <string name="pref_services_sync_in_progress">Synchronisierung läuft</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronisation</string>
+    <string name="pref_services_dialog_force_sync_summary">        Die manuelle Synchronisierung aktualisiert die App-Ansichten nicht.
+        \nUm die synchronisierten Daten anzuzeigen, starten Sie die App nach der Synchronisierung neu.
+    </string>
+    <string name="pref_other_header">Andere</string>
+    <string name="pref_other_grade_modifier_plus">Wert des Plus</string>
+    <string name="pref_other_grade_modifier_minus">Wert des Minus</string>
+    <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
+    <!--Notification Channels-->
+    <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
+    <string name="channel_new_grades">Neue Noten</string>
+    <string name="channel_lucky_number">Glückliche Nummer</string>
+    <string name="channel_new_message">Neue Nachrichten</string>
+    <string name="channel_new_notes">Neue Eintragen</string>
+    <string name="channel_push">Push-Benachrichtigungen</string>
+    <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
+    <string name="channel_debug">Debuggen</string>
+    <!--Colors-->
+    <string name="all_black">Schwarz</string>
+    <string name="all_red">Rot</string>
+    <string name="all_blue">Blau</string>
+    <string name="all_green">Grün</string>
+    <string name="all_purple">Violett</string>
+    <string name="all_empty_color">Keine Farbe</string>
+    <!--Others-->
+    <string name="all_copied">Kopiert</string>
+    <string name="all_undo">lösen</string>
+    <!--Errors-->
+    <string name="error_no_internet">Keine Internetverbindung</string>
+    <string name="error_timeout">Das Zeitlimit für die Verbindung zum Klassenbuch ist abgelaufen</string>
+    <string name="error_login_failed">Anmeldung fehlgeschlagen. Versuchen Sie es noch einmal oder starten Sie die Anwendung neu.</string>
+    <string name="error_password_change_required">Passwortänderung erforderlich</string>
+    <string name="error_service_unavailable">Wartung im Gange UONET + Klassenbuch. Versuchen Sie es später noch einmal</string>
+    <string name="error_unknown">Ein unerwarteter Fehler ist aufgetreten</string>
+    <string name="error_feature_disabled">Funktion, die von Ihrer Schule deaktiviert wurde</string>
+    <string name="error_feature_not_available">Feature in diesem Modus nicht verfügbar</string>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 31a48159..00000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="spinner_stroke">#61FFFFFF</color>
-</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 342329dc..a06a46f0 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,35 +1,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Bridge">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="android:windowBackground">@color/bottom_nav_background</item>
-        <item name="bottomNavBackground">@color/bottom_nav_background</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@color/bottom_nav_background</item>
-        <item name="dividerColor">@color/divider_inverse</item>
-        <item name="chip_backgroundColor">@color/chip_backgroundColor_inverse</item>
-        <item name="android:textColorTertiary">?android:textColorPrimary</item>
-        <item name="chip_labelColor">@color/chip_labelColor_inverse</item>
-        <item name="chip_detailed_backgroundColor">@color/chip_backgroundColor_inverse</item>
-        <item name="filterable_list_backgroundColor">@color/filterable_list_backgroundColor_inverse</item>
-        <item name="filterable_list_textColor">@color/filterable_list_textColor_inverse</item>
-
-        <!--AboutLibraries specific values-->
-        <item name="about_libraries_window_background">@color/about_libraries_window_background_dark</item>
-        <item name="about_libraries_card">@color/about_libraries_card_dark</item>
-        <item name="about_libraries_title_openSource">@color/about_libraries_title_openSource_dark</item>
-        <item name="about_libraries_title_description">@color/about_libraries_title_openSource_dark</item>
-        <item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
-        <item name="about_libraries_special_button_openSource">@color/about_libraries_special_button_openSource_dark</item>
-        <item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
-        <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
+    <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:navigationBarColor" tools:targetApi="lollipop">@android:color/black
+        </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">
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@android:color/black</item>
-        <item name="bottomNavBackground">@android:color/black</item>
+        <item name="colorSurface">@android:color/black</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-pl-v29/preferences_values.xml b/app/src/main/res/values-pl-v29/preferences_values.xml
new file mode 100644
index 00000000..57f20804
--- /dev/null
+++ b/app/src/main/res/values-pl-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?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/value_prefernces.xml b/app/src/main/res/values-pl/preferences_values.xml
similarity index 61%
rename from app/src/main/res/values-pl/value_prefernces.xml
rename to app/src/main/res/values-pl/preferences_values.xml
index 868ead4d..475f7327 100644
--- a/app/src/main/res/values-pl/value_prefernces.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <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>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
         <item>30 minut</item>
@@ -9,29 +22,25 @@
         <item>12 godzin</item>
         <item>24 godziny</item>
     </string-array>
-
-    <string-array name="app_theme_entries">
-        <item>Jasny</item>
-        <item>Ciemny</item>
-        <item>Czarny (AMOLED)</item>
-    </string-array>
-
     <string-array name="grade_modifier_entries">
-        <item>Domyślna</item>
+        <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>Kolory ocen w dzienniku</item>
     </string-array>
-
     <string-array name="grade_average_mode_entries">
         <item>Średnia ocen z 2 semestru</item>
         <item>Średnia ocen z całego roku</item>
     </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Nie pokazuj</item>
+        <item>Pokazuj wszystkie</item>
+        <item>Pokazuj pomniejszone</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 91d980a6..6bf0c324 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Wulkanowy</string>
-
-
     <!--Activity/Fragment title-->
     <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,48 +11,77 @@
     <string name="settings_title">Ustawienia</string>
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
+    <string name="logviewer_title">Przeglądarka logów</string>
+    <string name="contributors_title">Twórcy</string>
+    <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
     <string name="send_message_title">Nowa wiadomość</string>
     <string name="note_title">Uwagi i osiągnięcia</string>
     <string name="homework_title">Zadania domowe</string>
     <string name="account_title">Wybierz konto</string>
-
-
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semestr %d, %d/%d</string>
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
     <string name="login_header_symbol">Podaj symbol</string>
-    <string name="login_nickname_hint">Email lub nick</string>
+    <string name="login_nickname_hint">Nazwa użytkownika</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL lub e-mail</string>
     <string name="login_password_hint">Hasło</string>
-    <string name="login_host_hint">Dziennik</string>
+    <string name="login_host_hint">Dziennik UONET+</string>
+    <string name="login_type_api">Mobilne API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrydowe</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">Klucz API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
-    <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
+    <string name="login_incorrect_password">Dane logowania są niepoprawne. Upewnij się, że został wybrany odpowiedni dziennik UONET+ w polu poniżej</string>
+    <string name="login_invalid_pin">Nieprawidłowy PIN</string>
+    <string name="login_invalid_token">Nieprawidłowy token</string>
+    <string name="login_expired_token">Token stracił ważność</string>
+    <string name="login_invalid_email">Niepoprawny adres email</string>
+    <string name="login_invalid_login">Niepoprawny login</string>
+    <string name="login_invalid_symbol">Niepoprawny symbol</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
-    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
+    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
+    <string name="login_advanced">Inne opcje</string>
+    <string name="login_advanced_warning_mobile_api">W tym trybie nie działa szczęśliwy numerek, uczeń na tle klasy, podsumowanie frekwencji, usprawiedliwianie nieobecności, lekcje zrealizowane, informacje o szkole i podgląd listy zarejestrowanych urządzeń</string>
+    <string name="login_advanced_warning_scraper">Tryb ten wyświetla te same dane, które widoczne są na stronie internetowej dziennika</string>
+    <string name="login_advanced_warning_hybrid">Połączenie najlepszych cech dwóch pozostałych trybów. Działa szybciej niż scraper i zapewnia funkcje niedostępne w trybie Mobilne API. Jest w fazie eksperymentalnej</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>
+    <string name="login_email_details">Opisz problem:</string>
+    <string name="login_recover_warning">Upewnij się, że został wybrany odpowiedni dziennik UONET+!</string>
+    <string name="login_recover_button">Nie pamiętam hasła</string>
+    <string name="login_recover_title">Przywróć swoje konto</string>
+    <string name="login_recover">Przywróć</string>
+    <string name="login_signed_in">Uczeń jest już zalogowany</string>
     <!--Main-->
     <string name="main_account_picker">Menadżer kont</string>
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
-
-
     <!--Grade-->
     <string name="grade_header">Ocena</string>
     <string name="grade_semester">Semestr %d</string>
     <string name="grade_switch_semester">Zmień semestr</string>
     <string name="grade_no_items">Brak ocen</string>
     <string name="grade_weight">Waga</string>
+    <string name="grade_weight_value">Waga: %s</string>
     <string name="grade_comment">Komentarz</string>
     <string name="grade_no_new_items">Brak nowych ocen</string>
     <string name="grade_number_new_items">Ilość nowych ocen: %1$d</string>
     <string name="grade_average">Średnia: %1$.2f</string>
+    <string name="grade_points_sum">Punkty: %s</string>
     <string name="grade_no_average">Brak średniej</string>
     <string name="grade_predicted">Przewidywana: %1$s</string>
     <string name="grade_final">Końcowa: %1$s</string>
@@ -65,8 +93,9 @@
     <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">Oceny cząstkowe</string>
-    <string name="grade_statistics_semester">Oceny semestralne</string>
+    <string name="grade_statistics_partial">Cząstkowe</string>
+    <string name="grade_statistics_semester">Semestralne</string>
+    <string name="grade_statistics_points">Punkty</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d ocena</item>
         <item quantity="few">%d oceny</item>
@@ -77,15 +106,14 @@
         <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>
-        <item quantity="few">"Dostałeś %1$d oceny</item>
-        <item quantity="many">Dostałeś %1$d ocen</item>
-        <item quantity="other">Dostałeś %1$d ocen</item>
+        <item quantity="one">Masz %1$d nową ocenę</item>
+        <item quantity="few">Masz %1$d nowe oceny</item>
+        <item quantity="many">Masz %1$d nowych ocen</item>
+        <item quantity="other">Masz %1$d nowych ocen</item>
     </plurals>
-
-
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -93,45 +121,50 @@
     <string name="timetable_time">Godziny</string>
     <string name="timetable_changes">Zmiany</string>
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
-
-
-    <!--CompletedLesson-->
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sek</string>
+    <string name="timetable_time_left">jeszcze %1$s</string>
+    <string name="timetable_time_until">za %1$s</string>
+    <string name="timetable_finished">Zakończona</string>
+    <string name="timetable_now">Teraz: %s</string>
+    <string name="timetable_next">Za chwilę: %s</string>
+    <string name="timetable_later">Później: %s</string>
+    <!--Completed lessons-->
     <string name="completed_lessons_title">Lekcje zrealizowane</string>
     <string name="completed_lessons_button">Zobacz lekcje zrealizowane</string>
     <string name="completed_lessons_no_items">Brak informacji o lekcjach zrealizowanych</string>
     <string name="completed_lessons_topic">Temat</string>
     <string name="completed_lessons_absence">Nieobecność</string>
     <string name="completed_lessons_resources">Zasoby</string>
-
-
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
-    <string name="attendance_absence_school">Nieobecny z przyczyn szkolnych</string>
+    <string name="attendance_absence_school">Nieobecność z przyczyn szkolnych</string>
     <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 usprawiedliowione</string>
+    <string name="attendance_exemption">Zwolnienie</string>
+    <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
-    <string name="attendance_present">Obecny</string>
+    <string name="attendance_present">Obecność</string>
     <string name="attendance_number">Numer lekcji</string>
     <string name="attendance_no_items">Brak wpisów</string>
     <plurals name="attendance_number_absences">
         <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>
-
-
+    <string name="attendance_excuse_dialog_reason">Powód nieobecności (opcjonalny)</string>
+    <string name="attendance_excuse_dialog_submit">Wyślij</string>
+    <string name="attendance_excuse_success">Usprawiedliwiono pomyślnie!</string>
+    <string name="attendance_excuse_no_selection">Musisz wybrać co najmniej jedną nieobecność!</string>
+    <string name="attendance_excuse_title">Usprawiedliw</string>
     <!--Attendance summary-->
     <string name="attendance_summary_final">Frekwencja</string>
-
-
+    <string name="attendance_summary_total">Razem</string>
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Data wpisu</string>
-
-
     <!--Message-->
     <string name="message_inbox">Odebrane</string>
     <string name="message_sent">Wysłane</string>
@@ -157,21 +190,23 @@
         <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="one">Masz %1$d nową wiadomość</item>
+        <item quantity="few">Masz %1$d nowe wiadomości</item>
+        <item quantity="many">Masz %1$d nowych wiadomości</item>
+        <item quantity="other">Masz %1$d nowych wiadomości</item>
     </plurals>
-
-
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
+    <string name="note_points">Punkty</string>
     <plurals name="note_number_item">
         <item quantity="one">%d uwaga</item>
         <item quantity="few">%d uwagi</item>
@@ -181,29 +216,26 @@
     <plurals name="note_new_items">
         <item quantity="one">Nowa uwaga</item>
         <item quantity="few">Nowe uwagi</item>
-        <item quantity="many">Nowych uwag</item>
-        <item quantity="other">Nowych uwag</item>
+        <item quantity="many">Nowe uwagi</item>
+        <item quantity="other">Nowe uwagi</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">Dostałeś %1$d uwagę</item>
-        <item quantity="few">"Dostałeś %1$d uwagi</item>
-        <item quantity="many">Dostałeś %1$d uwag</item>
-        <item quantity="other">Dostałeś %1$d uwag</item>
+        <item quantity="one">Masz %1$d nową uwagę</item>
+        <item quantity="few">Masz %1$d nowe uwagi</item>
+        <item quantity="many">Masz %1$d nowych uwag</item>
+        <item quantity="other">Masz %1$d nowych uwag</item>
     </plurals>
-
-
     <!--Homework-->
     <string name="homework_no_items">Brak zadań domowych</string>
-
-
+    <string name="homework_mark_as_done">Wykonane</string>
+    <string name="homework_mark_as_undone">Niewykonane</string>
+    <string name="homework_attachments">Załączniki</string>
     <!--Lucky number-->
     <string name="lucky_number_title">Szczęśliwy numerek</string>
     <string name="lucky_number_header">Dzisiejszym szczęśliwym numerkiem jest</string>
     <string name="lucky_number_empty">Brak informacji o szczęśliwym numerku</string>
     <string name="lucky_number_notify_new_item_title">Szczęśliwy numerek na dzisiaj</string>
     <string name="lucky_number_notify_new_item">Dziś szczęśliwym numerkiem jest: %d</string>
-
-
     <!--Mobile devices-->
     <string name="mobile_devices_title">Dostęp mobilny</string>
     <string name="mobile_devices_no_items">Brak urządzeń</string>
@@ -213,23 +245,54 @@
     <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">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 mapie</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>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <string name="account_logout_student">Wylogowanie ucznia</string>
-
-
     <!--About-->
-    <string name="about_discord_invite">Discord</string>
+    <string name="about_version">Wersja aplikacji</string>
+    <string name="about_contributor">Twórcy</string>
+    <string name="about_contributor_summary">Lista programistów Wulkanowego</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>
+    <string name="about_privacy_summary">Zasady zbierania danych osobowych</string>
     <string name="about_homepage">Strona domowa</string>
-
-
+    <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
+    <string name="about_licenses">Licencje</string>
+    <string name="about_licenses_summary">Licencje użytych bibliotek w aplikacji</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">Licencja</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Awatar</string>
+    <string name="contributor_see_more">Zobacz więcej na GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Udostępnij logi</string>
+    <string name="logviewer_refresh">Odśwież</string>
     <!--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>
@@ -243,12 +306,14 @@
     <string name="all_subject">Przedmiot</string>
     <string name="all_prev">Poprzedni</string>
     <string name="all_next">Następny</string>
-
-
+    <string name="all_search">Szukaj</string>
+    <string name="all_search_hint">Szukaj...</string>
     <!--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>
+    <string name="widget_timetable_theme_system">Motyw systemu</string>
     <!--Preferences-->
     <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
@@ -257,29 +322,44 @@
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
+    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję na planie</string>
+    <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
+    <string name="pref_view_timetable_show_whole_class">Pokazuj lekcje całej klasy</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>
+    <string name="pref_notify_upcoming_lessons_switch">Pokazuj powiadomienia o nadchodzących lekcjach</string>
+    <string name="pref_notify_fix_sync_issues">Napraw problemy z synchronizacją i powiadomieniami</string>
+    <string name="pref_notify_fix_sync_issues_message">Na twoim urządzeniu mogą występować problemy z synchronizacją danych i powiadomieniami.\n\nBy je naprawić, dodaj Wulkanowego do autostartu i wyłącz optymalizację/oszczędzanie baterii w ustawieniach systemowych telefonu.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Przejdź do ustawień</string>
     <string name="pref_notify_debug_switch">Pokazuj powiadomienia debugowania</string>
-
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
     <string name="pref_services_suspended">Zawieszona na wakacjach</string>
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</string>
-
+    <string name="pref_services_force_sync">Synchronizuj teraz</string>
+    <string name="pref_services_message_sync_success">Zsynchronizowano!</string>
+    <string name="pref_services_message_sync_failed">Synchronizacja nie powiodła się</string>
+    <string name="pref_services_sync_in_progress">Synchronizacja w trakcie</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronizacja</string>
+    <string name="pref_services_dialog_force_sync_summary">        Ręczna synchronizacja nie odświeża widoków w aplikacji.
+        \nAby zobaczyć zsynchronizowane informacje uruchom ponownie aplikację po zsynchronizowaniu.
+    </string>
     <string name="pref_other_header">Inne</string>
     <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
     <string name="pref_other_grade_modifier_minus">Wartość minusa</string>
     <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
-
-
     <!--Notification Channels-->
     <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
+    <string name="channel_new_grades">Nowe oceny</string>
+    <string name="channel_lucky_number">Szczęśliwy numerek</string>
+    <string name="channel_new_message">Nowe wiadomości</string>
+    <string name="channel_new_notes">Nowe uwagi</string>
+    <string name="channel_push">Powiadomienia push</string>
+    <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
-
-
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -287,18 +367,16 @@
     <string name="all_green">Zielony</string>
     <string name="all_purple">Fioletowy</string>
     <string name="all_empty_color">Brak koloru</string>
-
-
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
-
-
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
-    <string name="error_timeout">Zbyt długie oczekiwanie na połączenie z dziennikiem</string>
+    <string name="error_timeout">Upłynął limit czasu na połączenie z dziennikiem</string>
     <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
-    <string name="error_service_unavailable">Dziennik jest niedostępny. Spróbuj ponownie później</string>
+    <string name="error_password_change_required">Wymagana zmiana hasła</string>
+    <string name="error_service_unavailable">Trwa przerwa techniczna dziennika UONET+. Spróbuj ponownie później</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
     <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
+    <string name="error_feature_not_available">Funkcja niedostępna. Zaloguj się w trybie innym niż Mobilne API</string>
 </resources>
diff --git a/app/src/main/res/values-ru-v29/preferences_values.xml b/app/src/main/res/values-ru-v29/preferences_values.xml
new file mode 100644
index 00000000..2d8606a8
--- /dev/null
+++ b/app/src/main/res/values-ru-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?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
new file mode 100644
index 00000000..6c152268
--- /dev/null
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -0,0 +1,46 @@
+<?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>Тёмная (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>Язык системы</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+    <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="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>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Не показывать</item>
+        <item>Показать все</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
new file mode 100644
index 00000000..c0666e2c
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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="logviewer_title">Просмотр журнала</string>
+    <string name="contributors_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>
+    <!--Subtitles-->
+    <string name="grade_subtitle">%d семестр, %d/%d</string>
+    <!--Login-->
+    <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
+    <string name="login_header_symbol">Впишите \"symbol\"</string>
+    <string name="login_nickname_hint">Имя пользователя</string>
+    <string name="login_email_hint">Электронная почта</string>
+    <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
+    <string name="login_password_hint">Пароль</string>
+    <string name="login_host_hint">Дневник UONET+</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">Ключ API</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_invalid_pin">Неправильный PIN</string>
+    <string name="login_invalid_token">Неправильный token</string>
+    <string name="login_expired_token">Токен просрочен</string>
+    <string name="login_invalid_email">Неверный адрес электронной почты</string>
+    <string name="login_invalid_login">Неправильный логин</string>
+    <string name="login_invalid_symbol">Неправильный symbol</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\" на странице VULCAN по пути <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
+    <string name="login_advanced">Другие варианты</string>
+    <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
+    <string name="login_advanced_warning_scraper">Scraper - режим, который показывает данные так же, как и сайт дневника</string>
+    <string name="login_advanced_warning_hybrid">Hybrid - это комбинация лучших функций остальных двух режимов. Он работает быстрее, чем Scraper, и вводит функции, которых нет в режиме Mobile API. Находится в экспериментальной стадии</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>
+    <string name="login_email_details">Опишите детали проблемы:</string>
+    <string name="login_recover_warning">Убедитесь, что выбран нужный дневник!</string>
+    <string name="login_recover_button">Забыли пароль?</string>
+    <string name="login_recover_title">Восстановите свой аккаунт</string>
+    <string name="login_recover">Восстановить</string>
+    <string name="login_signed_in">Студент уже вошел в систему</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_weight_value">Стоимость: %s</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_points_sum">Баллы: %s</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">Новая оценка</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>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
+    <!--Completed lessons-->
+    <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>
+    <string name="attendance_excuse_dialog_reason">Причина отсутствия (необязательно)</string>
+    <string name="attendance_excuse_dialog_submit">Послать</string>
+    <string name="attendance_excuse_success">Статус отсутствия изменён</string>
+    <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
+    <string name="attendance_excuse_title">Изменить статус</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Посещаемость</string>
+    <string name="attendance_summary_total">Общая</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">Новое сообщение</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>
+    <string name="note_points">Баллы</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">Новое предупреждение</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>
+    <string name="homework_mark_as_done">сделанный</string>
+    <string name="homework_mark_as_undone">Не сделано</string>
+    <string name="homework_attachments">Вложения</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_contributor">Разработчики</string>
+    <string name="about_contributor_summary">Список разработчиков \"Wulkanowy\"</string>
+    <string name="about_feedback">Возникла ошибка?</string>
+    <string name="about_feedback_summary">Сообщить о ошибке</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_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>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Aватар</string>
+    <string name="contributor_see_more">Страница проекта на GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Поделиться логами</string>
+    <string name="logviewer_refresh">Обновить</string>
+    <!--Generic-->
+    <string name="all_content">Содержание</string>
+    <string name="all_retry">Повторить</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>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search...</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>
+    <string name="widget_timetable_theme_system">Тема системы</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_timetable_show_timers">Mark current lesson in timetable</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</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_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</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_services_force_sync">Синхронизировать</string>
+    <string name="pref_services_message_sync_success">Синхронизировано!</string>
+    <string name="pref_services_message_sync_failed">Синхронизация не удалась</string>
+    <string name="pref_services_sync_in_progress">Идёт синхронизация</string>
+    <string name="pref_services_dialog_force_sync_title">Синхронизация</string>
+    <string name="pref_services_dialog_force_sync_summary">Ручная синхронизация не обновляет данные в приложении.
+        \nЧтобы увидеть обновлённые данные, перезапустите приложение.
+    </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_new_grades">Новые оценки</string>
+    <string name="channel_lucky_number">Счастливый номер</string>
+    <string name="channel_new_message">Новые сообщения</string>
+    <string name="channel_new_notes">Новые заметки</string>
+    <string name="channel_push">Показывать push-уведомления</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</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_password_change_required">Требуется смена пароля</string>
+    <string name="error_service_unavailable">Технический перерыв в журнале UONET + продолжается. Попробуйте позже</string>
+    <string name="error_unknown">Произошла неожиданная ошибка</string>
+    <string name="error_feature_disabled">Функция была выключена школой</string>
+    <string name="error_feature_not_available">Функция не доступна в этом режиме</string>
+</resources>
diff --git a/app/src/main/res/values-uk-v29/preferences_values.xml b/app/src/main/res/values-uk-v29/preferences_values.xml
new file mode 100644
index 00000000..52b41b4e
--- /dev/null
+++ b/app/src/main/res/values-uk-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?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-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
new file mode 100644
index 00000000..3c70c9d0
--- /dev/null
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -0,0 +1,46 @@
+<?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>Темна (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>Мова системи</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+    <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="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>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Не показувати</item>
+        <item>Показати все</item>
+        <item>Показати менше</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000..8a991812
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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="logviewer_title">Переглядач журналів</string>
+    <string name="contributors_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>
+    <!--Subtitles-->
+    <string name="grade_subtitle">%d семестр, %d/%d</string>
+    <!--Login-->
+    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
+    <string name="login_header_symbol">Впишіть \"symbol\"</string>
+    <string name="login_nickname_hint">Ім\'я користувача</string>
+    <string name="login_email_hint">Електронна пошта</string>
+    <string name="login_login_pesel_email_hint">Логін, PESEL або електронна пошта</string>
+    <string name="login_password_hint">Пароль</string>
+    <string name="login_host_hint">Щоденник</string>
+    <string name="login_type_api">Мobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">Ключ API</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_invalid_pin">Неправильний PIN</string>
+    <string name="login_invalid_token">Неправильний token</string>
+    <string name="login_expired_token">Минув термін дії токену</string>
+    <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
+    <string name="login_invalid_login">Неправильний логін</string>
+    <string name="login_invalid_symbol">Неправильний symbol</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\" на сторінцi VULCAN стежкою <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
+    <string name="login_advanced">Інші варіанти</string>
+    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності і уроків, інформація про школу і список зареєстрованних пристроїв</string>
+    <string name="login_advanced_warning_scraper">Scraper - режим, котрий показує дані так само, як і сторінка щоденника</string>
+    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, и впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</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>
+    <string name="login_email_details">Опишіть деталі помилки:</string>
+    <string name="login_recover_warning">Переконайтесь, що обрано потрібний щоденник!</string>
+    <string name="login_recover_button">Забули пароль?</string>
+    <string name="login_recover_title">Відновіть свій аккаунт</string>
+    <string name="login_recover">Відновити</string>
+    <string name="login_signed_in">Учень вже увійшов до системи</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_weight_value">Вартість: %s</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_points_sum">точок: %s</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">Нова оцінка</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>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
+    <!--Completed lessons-->
+    <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>
+    <string name="attendance_excuse_dialog_reason">Причина відсутності (необов’язково)</string>
+    <string name="attendance_excuse_dialog_submit">Надіслати</string>
+    <string name="attendance_excuse_success">Змінено статус відсутності</string>
+    <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
+    <string name="attendance_excuse_title">Змінити статус</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Відвідуваність</string>
+    <string name="attendance_summary_total">Загальна</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">Необхідно обрати принаймні 1 адресата</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">Нове повідомлення</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>
+    <string name="note_points">Бали</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">Нова нотатка</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>
+    <string name="homework_mark_as_done">Позначити як зроблене</string>
+    <string name="homework_mark_as_undone">Позначити як не зроблене</string>
+    <string name="homework_attachments">Додатки</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_contributor">Розробники</string>
+    <string name="about_contributor_summary">Список розробників \"Wulkanowy\"</string>
+    <string name="about_feedback">Виникла помилка?</string>
+    <string name="about_feedback_summary">Повідомити о помилці за допомогою e-mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_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>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Аватар</string>
+    <string name="contributor_see_more">Сторінка проекту на GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Поділитися логами</string>
+    <string name="logviewer_refresh">Оновити</string>
+    <!--Generic-->
+    <string name="all_content">Зміст</string>
+    <string name="all_retry">Повторити</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>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search...</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>
+    <string name="widget_timetable_theme_system">Тема системи</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_timetable_show_timers">Mark current lesson in timetable</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</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_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</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_services_force_sync">Синхронізувати</string>
+    <string name="pref_services_message_sync_success">Синхронізовано!</string>
+    <string name="pref_services_message_sync_failed">Синхронізація не вдалася</string>
+    <string name="pref_services_sync_in_progress">Триває синхронізація</string>
+    <string name="pref_services_dialog_force_sync_title">Синхронізація</string>
+    <string name="pref_services_dialog_force_sync_summary">Ручна синхронізація не оновлює дані в додатку.
+        \nЩоб побачити оновлені дані, перезавантажте додаток.
+    </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_new_grades">Нові оцінки</string>
+    <string name="channel_lucky_number">Щасливий номер</string>
+    <string name="channel_new_message">Нові повідомлення</string>
+    <string name="channel_new_notes">Нові нотатки</string>
+    <string name="channel_push">Показувати push-повідомлення</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</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_password_change_required">Потрібно змінити пароль</string>
+    <string name="error_service_unavailable">Технічна перерва в журналі UONET + продовжується. Спробуйте пізніше</string>
+    <string name="error_unknown">Відбулася несподівана помилка</string>
+    <string name="error_feature_disabled">Функція вимкнена школою</string>
+    <string name="error_feature_not_available">Функція не доступна в цьому режимі</string>
+</resources>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..6b7c7890
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
+    </style>
+
+    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 00000000..d33f6422
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
+        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v29/preferences_defaults.xml b/app/src/main/res/values-v29/preferences_defaults.xml
new file mode 100644
index 00000000..bb573d66
--- /dev/null
+++ b/app/src/main/res/values-v29/preferences_defaults.xml
@@ -0,0 +1,4 @@
+<?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
new file mode 100644
index 00000000..f27c1c69
--- /dev/null
+++ b/app/src/main/res/values-v29/preferences_values.xml
@@ -0,0 +1,15 @@
+<?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_endpoints.xml b/app/src/main/res/values/api_endpoints.xml
deleted file mode 100644
index e07f2b4b..00000000
--- a/app/src/main/res/values/api_endpoints.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-array name="endpoints_keys">
-        <item>Vulcan</item>
-        <item>Opolska eSzkoła</item>
-        <item>Gdańska Platforma Edukacyjna</item>
-        <item>EduNet Miasta Tarnowa</item>
-        <item>ResMan Rzeszów</item>
-        <item>Fakelog</item>
-    </string-array>
-    <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://umt.tarnow.pl</item>
-        <item>https://resman.pl</item>
-        <item>http://fakelog.cf</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
new file mode 100644
index 00000000..f661b88c
--- /dev/null
+++ b/app/src/main/res/values/api_hosts.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string-array name="hosts_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>Rawa Mazowiecka - Platforma vEdukacja</item>
+        <item>Zduńska Wola - e-Urząd</item>
+        <item>Sieradz - Portal oświatowy</item>
+        <item>Łask - Platforma vEdukacja</item>
+        <item>Powiat łaski - Platforma edukacyjna</item>
+        <item>Powiat Krasnostawski - Platforma oświatowa</item>
+        <item>Powiat kętrzyński - Platforma e-Usług</item>
+        <item>Gmina Ulan-Majorat - Platforma oświatowa</item>
+        <item>Gmina Ozorków - Platforma edukacyjna</item>
+        <item>Gmina Łopiennik Górny - Platforma oświatowa</item>
+        <item>Fakelog</item>
+    </string-array>
+    <string-array name="hosts_values">
+        <item>https://vulcan.net.pl/?standard</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>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>http://fakelog.tk/?standard</item>
+    </string-array>
+    <string-array name="hosts_symbols">
+        <item>Default</item>
+        <item>opole</item>
+        <item>gdansk</item>
+        <item>lublin</item>
+        <item>tarnow</item>
+        <item>rzeszow</item>
+        <item>rawamazowiecka</item>
+        <item>zdunskawola</item>
+        <item>sieradz</item>
+        <item>lask</item>
+        <item>powiatlaski</item>
+        <item>powiatkrasnostawski</item>
+        <item>powiatketrzynski</item>
+        <item>gminaulanmajorat</item>
+        <item>gminaozorkow</item>
+        <item>gminalopiennikgorny</item>
+        <item>powiatwulkanowy</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/api_symbols.xml b/app/src/main/res/values/api_symbols.xml
index d9f89a23..6f9b1739 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -18,6 +18,8 @@
         <item>Bielsko-Biała</item>
         <item>Bierawa</item>
         <item>Bierutów</item>
+        <item>Biskupice</item>
+        <item>Blachownia</item>
         <item>Błaszki</item>
         <item>Błonie</item>
         <item>Bochnia</item>
@@ -57,6 +59,7 @@
         <item>Dąbrowa Tarnowska</item>
         <item>Dębica</item>
         <item>Dobrzeń Wielki</item>
+        <item>Dobrzyń Nad Wisłą</item>
         <item>Dolnośląskie</item>
         <item>Duszniki-Zdrój</item>
         <item>Dynów</item>
@@ -77,36 +80,53 @@
         <item>Gmina Aleksandrów Kujawski</item>
         <item>Gmina Aleksandrów Łódzki</item>
         <item>Gmina Alwernia</item>
+        <item>Gmina Andrzejewo</item>
         <item>Gmina Annopol</item>
+        <item>Gmina Augustów</item>
         <item>Gmina Babice</item>
+        <item>Gmina Bądkowo</item>
         <item>Gmina Bałtów</item>
         <item>Gmina Baranów</item>
+        <item>Gmina Barciany</item>
         <item>Gmina Barcin</item>
         <item>Gmina Baruchowo</item>
         <item>Gmina Będzino</item>
         <item>Gmina Bełchatów</item>
+        <item>Gmina Białaczów</item>
         <item>Gmina Białe Błota</item>
+        <item>Gmina Bielsk Podlaski</item>
         <item>Gmina Bircza</item>
         <item>Gmina Błażowa</item>
         <item>Gmina Błędów</item>
         <item>Gmina Bobolice</item>
+        <item>Gmina Bobowa</item>
         <item>Gmina Bobowo</item>
         <item>Gmina Bobrowniki</item>
+        <item>Gmina Bodzentyn</item>
+        <item>Gmina Bogoria</item>
+        <item>Gmina Bojanów</item>
         <item>Gmina Bojanowo</item>
         <item>Gmina Bojszowy</item>
         <item>Gmina Bolesławiec</item>
         <item>Gmina Bolków</item>
         <item>Gmina Boronów</item>
+        <item>Gmina Borów</item>
         <item>Gmina Borowa</item>
         <item>Gmina Borzęcin</item>
         <item>Gmina Branice</item>
+        <item>Gmina Braniewo</item>
         <item>Gmina Brąszewice</item>
         <item>Gmina Brenna</item>
         <item>Gmina Brzeg Dolny</item>
         <item>Gmina Brzeziny</item>
         <item>Gmina Brzeźnio</item>
+        <item>Gmina Brzostek</item>
         <item>Gmina Brzozów</item>
+        <item>Gmina Brzuze</item>
         <item>Gmina Brzyska</item>
+        <item>Gmina Buczek</item>
+        <item>Gmina Buczkowice</item>
+        <item>Gmina Budzów</item>
         <item>Gmina Budzyń</item>
         <item>Gmina Bukowsko</item>
         <item>Gmina Byczyna</item>
@@ -115,15 +135,15 @@
         <item>Gmina Ceków-Kolonia</item>
         <item>Gmina Celestynów</item>
         <item>Gmina Cewice</item>
+        <item>Gmina Charsznica</item>
         <item>Gmina Chełm</item>
         <item>Gmina Chełmiec</item>
         <item>Gmina Chełmno</item>
         <item>Gmina Chmielnik</item>
-        <item>Gmina Chodecz</item>
+        <item>Gmina Chocz</item>
         <item>Gmina Chodel</item>
         <item>Gmina Chojnice</item>
         <item>Gmina Chojnów</item>
-        <item>Gmina Chorkówka</item>
         <item>Gmina Chrzypsko Wielkie</item>
         <item>Gmina Chybie</item>
         <item>Gmina Ciasna</item>
@@ -135,12 +155,12 @@
         <item>Gmina Czaplinek</item>
         <item>Gmina Czarna</item>
         <item>Gmina Czarnków</item>
-        <item>Gmina Czarny Bór</item>
         <item>Gmina Czarny Dunajec</item>
         <item>Gmina Czechowice-Dziedzice</item>
         <item>Gmina Czernichów</item>
         <item>Gmina Czerniejewo</item>
         <item>Gmina Czerwionka-Leszczyny</item>
+        <item>Gmina Czerwonka</item>
         <item>Gmina Człuchów</item>
         <item>Gmina Czosnów</item>
         <item>Gmina Damasławek</item>
@@ -148,6 +168,7 @@
         <item>Gmina Darłowo</item>
         <item>Gmina Dębe Wielkie</item>
         <item>Gmina Dębica</item>
+        <item>Gmina Dębno</item>
         <item>Gmina Dłutów</item>
         <item>Gmina Dobczyce</item>
         <item>Gmina Dobra</item>
@@ -159,6 +180,7 @@
         <item>Gmina Dominowo</item>
         <item>Gmina Dorohusk</item>
         <item>Gmina Drzewica</item>
+        <item>Gmina Dubiecko</item>
         <item>Gmina Dukla</item>
         <item>Gmina Dwikozy</item>
         <item>Gmina Dynów</item>
@@ -182,6 +204,7 @@
         <item>Gmina Głuszyca</item>
         <item>Gmina Gniew</item>
         <item>Gmina Gniewoszów</item>
+        <item>Gmina Gniezno</item>
         <item>Gmina Goczałkowice-Zdrój</item>
         <item>Gmina Godkowo</item>
         <item>Gmina Godów</item>
@@ -200,6 +223,7 @@
         <item>Gmina Gózd</item>
         <item>Gmina Grabów</item>
         <item>Gmina Grabowiec</item>
+        <item>Gmina Grabów Nad Pilicą</item>
         <item>Gmina Grajewo</item>
         <item>Gmina Granowo</item>
         <item>Gmina Grębocice</item>
@@ -210,6 +234,7 @@
         <item>Gmina Grodziec</item>
         <item>Gmina Grójec</item>
         <item>Gmina Gromadka</item>
+        <item>Gmina Gromnik</item>
         <item>Gmina Gronowo Elbląskie</item>
         <item>Gmina Grudziądz</item>
         <item>Gmina Gruta</item>
@@ -219,13 +244,17 @@
         <item>Gmina Hańsk</item>
         <item>Gmina Harasiuki</item>
         <item>Gmina Hażlach</item>
+        <item>Gmina Herby</item>
         <item>Gmina Hrubieszów</item>
+        <item>Gmina Huszlew</item>
         <item>Gmina Hyżne</item>
         <item>Gmina Imielno</item>
         <item>Gmina Inowrocław</item>
+        <item>Gmina Istebna</item>
         <item>Gmina Iwierzyce</item>
         <item>Gmina Iwonicz-Zdrój</item>
         <item>Gmina Izabelin</item>
+        <item>Gmina Izbica</item>
         <item>Gmina Jadów</item>
         <item>Gmina Jaktorów</item>
         <item>Gmina Janikowo</item>
@@ -237,19 +266,23 @@
         <item>Gmina Jasło</item>
         <item>Gmina Jastków</item>
         <item>Gmina Jastrowie</item>
+        <item>Gmina Jastrząb</item>
         <item>Gmina Jedlicze</item>
         <item>Gmina Jedlińsk</item>
         <item>Gmina Jedlnia-Letnisko</item>
         <item>Gmina Jejkowice</item>
         <item>Gmina Jemielnica</item>
+        <item>Gmina Jemielno</item>
         <item>Gmina Jerzmanowa</item>
         <item>Gmina Jeżewo</item>
         <item>Gmina Jeziora Wielkie</item>
+        <item>Gmina Jeziorzany</item>
         <item>Gmina Jeżowe</item>
         <item>Gmina Jordanów</item>
         <item>Gmina Józefów</item>
         <item>Gmina Józefów Nad Wisłą</item>
         <item>Gmina Jutrosin</item>
+        <item>Gmina Kąkolewnica</item>
         <item>Gmina Kamień</item>
         <item>Gmina Kamienica</item>
         <item>Gmina Kamieniec</item>
@@ -262,9 +295,11 @@
         <item>Gmina Kiełczygłów</item>
         <item>Gmina Kikół</item>
         <item>Gmina Kiszkowo</item>
+        <item>Gmina Kleczew</item>
         <item>Gmina Klembów</item>
         <item>Gmina Kleszczewo</item>
         <item>Gmina Kleszczów</item>
+        <item>Gmina Klimontów</item>
         <item>Gmina Kłobuck</item>
         <item>Gmina Kłoczew</item>
         <item>Gmina Kłomnice</item>
@@ -272,6 +307,8 @@
         <item>Gmina Klucze</item>
         <item>Gmina Kluczewsko</item>
         <item>Gmina Kobiele Wielkie</item>
+        <item>Gmina Kochanowice</item>
+        <item>Gmina Kock</item>
         <item>Gmina Kodrąb</item>
         <item>Gmina Kołaczyce</item>
         <item>Gmina Kołbaskowo</item>
@@ -280,9 +317,13 @@
         <item>Gmina Komańcza</item>
         <item>Gmina Komorniki</item>
         <item>Gmina Komprachcice</item>
+        <item>Gmina Konarzyny</item>
+        <item>Gmina Kondratowice</item>
+        <item>Gmina Koniusza</item>
         <item>Gmina Konopiska</item>
         <item>Gmina Końskowola</item>
-        <item>Gmina Korczyna</item>
+        <item>Gmina Koprzywnica</item>
+        <item>Gmina Korsze</item>
         <item>Gmina Korycin</item>
         <item>Gmina Korzenna</item>
         <item>Gmina Kosakowo</item>
@@ -291,6 +332,7 @@
         <item>Gmina Kościerzyna</item>
         <item>Gmina Kosów Lacki</item>
         <item>Gmina Kostrzyn</item>
+        <item>Gmina Koszyce</item>
         <item>Gmina Kotla</item>
         <item>Gmina Kotuń</item>
         <item>Gmina Kozłów</item>
@@ -302,22 +344,31 @@
         <item>Gmina Krokowa</item>
         <item>Gmina Krośnice</item>
         <item>Gmina Krupski Młyn</item>
+        <item>Gmina Kruszwica</item>
+        <item>Gmina Krynki</item>
         <item>Gmina Krzanowice</item>
         <item>Gmina Krzemieniewo</item>
         <item>Gmina Krzymów</item>
+        <item>Gmina Krzywiń</item>
         <item>Gmina Krzyżanowice</item>
+        <item>Gmina Książ Wielki</item>
         <item>Gmina Kunice</item>
         <item>Gmina Kunów</item>
         <item>Gmina Kurów</item>
+        <item>Gmina Kuryłówka</item>
         <item>Gmina Kwidzyn</item>
         <item>Gmina Kwilcz</item>
+        <item>Gmina Łabowa</item>
         <item>Gmina Łabunie</item>
         <item>Gmina Łambinowice</item>
         <item>Gmina Lanckorona</item>
         <item>Gmina Łapsze Niżne</item>
+        <item>Gmina Łasin</item>
         <item>Gmina Łaskarzew</item>
         <item>Gmina Lasowice Wielkie</item>
         <item>Gmina Łaszczów</item>
+        <item>Gmina Laszki</item>
+        <item>Gmina Latowicz</item>
         <item>Gmina Łazy</item>
         <item>Gmina Łęczyca</item>
         <item>Gmina Łęczyce</item>
@@ -329,16 +380,20 @@
         <item>Gmina Leśna Podlaska</item>
         <item>Gmina Lesznowola</item>
         <item>Gmina Leżajsk</item>
+        <item>Gmina Lichnowy</item>
         <item>Gmina Limanowa</item>
+        <item>Gmina Linia</item>
         <item>Gmina Lipinki</item>
         <item>Gmina Lipnik</item>
         <item>Gmina Lipowa</item>
         <item>Gmina Lisia Góra</item>
         <item>Gmina Liszki</item>
+        <item>Gmina Liw</item>
         <item>Gmina Łobez</item>
         <item>Gmina Łodygowice</item>
         <item>Gmina Łomazy</item>
         <item>Gmina Łopiennik Górny</item>
+        <item>Gmina Łopuszno</item>
         <item>Gmina Lubań</item>
         <item>Gmina Lubartów</item>
         <item>Gmina Lubasz</item>
@@ -348,30 +403,40 @@
         <item>Gmina Lubiewo</item>
         <item>Gmina Lubin</item>
         <item>Gmina Łubniany</item>
+        <item>Gmina Lubochnia</item>
         <item>Gmina Lubomia</item>
         <item>Gmina Luboń</item>
         <item>Gmina Łuków</item>
+        <item>Gmina Łukowica</item>
+        <item>Gmina Lutowiska</item>
         <item>Gmina Luzino</item>
         <item>Gmina Łużna</item>
         <item>Gmina Łysomice</item>
         <item>Gmina Magnuszew</item>
         <item>Gmina Maków Podhalański</item>
+        <item>Gmina Mała Wieś</item>
         <item>Gmina Malbork</item>
         <item>Gmina Małdyty</item>
+        <item>Gmina Małkinia Górna</item>
         <item>Gmina Marcinowice</item>
         <item>Gmina Margonin</item>
         <item>Gmina Marianowo</item>
+        <item>Gmina Markusy</item>
         <item>Gmina Masłów</item>
+        <item>Gmina Medyka</item>
         <item>Gmina Mełgiew</item>
+        <item>Gmina Michałów</item>
         <item>Gmina Michałowo</item>
         <item>Gmina Miedziana Góra</item>
         <item>Gmina Miedźna</item>
         <item>Gmina Miedźno</item>
         <item>Gmina Międzybórz</item>
         <item>Gmina Międzylesie</item>
+        <item>Gmina Międzyrzec Podlaski</item>
         <item>Gmina Międzyzdroje</item>
         <item>Gmina Miejsce Piastowe</item>
         <item>Gmina Mielec</item>
+        <item>Gmina Milanów</item>
         <item>Gmina Milejów</item>
         <item>Gmina Milicz</item>
         <item>Gmina Miłkowice</item>
@@ -385,28 +450,38 @@
         <item>Gmina Mogilany</item>
         <item>Gmina Mordy</item>
         <item>Gmina Moryń</item>
+        <item>Gmina Mrocza</item>
         <item>Gmina Mrozy</item>
         <item>Gmina Mszana</item>
         <item>Gmina Mszana Dolna</item>
         <item>Gmina Murów</item>
         <item>Gmina Mycielin</item>
+        <item>Gmina Mysłakowice</item>
         <item>Gmina Myślibórz</item>
         <item>Gmina Nadarzyn</item>
+        <item>Gmina Namysłów</item>
+        <item>Gmina Nasielsk</item>
         <item>Gmina Nawojowa</item>
+        <item>Gmina Nędza</item>
         <item>Gmina Nekla</item>
         <item>Gmina Niebylec</item>
         <item>Gmina Niechlów</item>
         <item>Gmina Niedrzwica Duża</item>
+        <item>Gmina Niedźwiada</item>
+        <item>Gmina Niedźwiedź</item>
         <item>Gmina Niegosławice</item>
         <item>Gmina Niwiska</item>
         <item>Gmina Nowa Ruda</item>
         <item>Gmina Nowa Wieś Lęborska</item>
         <item>Gmina Nowe Miasto</item>
         <item>Gmina Nowe Miasto Nad Wartą</item>
+        <item>Gmina Nowogród Bobrzański</item>
         <item>Gmina Nowosolna</item>
         <item>Gmina Nowy Kawęczyn</item>
         <item>Gmina Nowy Staw</item>
         <item>Gmina Nowy Targ</item>
+        <item>Gmina Nowy Tomyśl</item>
+        <item>Gmina Nur</item>
         <item>Gmina Obrazów</item>
         <item>Gmina Ochotnica Dolna</item>
         <item>Gmina Ogrodzieniec</item>
@@ -420,33 +495,45 @@
         <item>Gmina Osiek Jasielski</item>
         <item>Gmina Osiek Mały</item>
         <item>Gmina Osielsko</item>
+        <item>Gmina Ostrów</item>
         <item>Gmina Ostrówek</item>
         <item>Gmina Ostrów Lubelski</item>
         <item>Gmina Ostrów Mazowiecka</item>
         <item>Gmina Ostrów Wielkopolski</item>
         <item>Gmina Otyń</item>
         <item>Gmina Ożarów</item>
+        <item>Gmina Ożarowice</item>
         <item>Gmina Ozimek</item>
         <item>Gmina Ozorków</item>
         <item>Gmina Pabianice</item>
         <item>Gmina Pacanów</item>
+        <item>Gmina Paczków</item>
         <item>Gmina Padew Narodowa</item>
+        <item>Gmina Pajęczno</item>
         <item>Gmina Pakosław</item>
         <item>Gmina Pakosławice</item>
+        <item>Gmina Pałecznica</item>
         <item>Gmina Panki</item>
         <item>Gmina Parchowo</item>
         <item>Gmina Parczew</item>
         <item>Gmina Pawłosiów</item>
         <item>Gmina Pawłowice</item>
+        <item>Gmina Pawłowiczki</item>
+        <item>Gmina Pęcław</item>
         <item>Gmina Pelplin</item>
         <item>Gmina Piaski</item>
         <item>Gmina Piątnica</item>
+        <item>Gmina Piecki</item>
+        <item>Gmina Piekoszów</item>
         <item>Gmina Pilchowice</item>
         <item>Gmina Pionki</item>
+        <item>Gmina Piotrków Trybunalski</item>
         <item>Gmina Pleśna</item>
         <item>Gmina Pleszew</item>
         <item>Gmina Płońsk</item>
+        <item>Gmina Płośnica</item>
         <item>Gmina Poczesna</item>
+        <item>Gmina Podedwórze</item>
         <item>Gmina Podegrodzie</item>
         <item>Gmina Pokój</item>
         <item>Gmina Połajewo</item>
@@ -456,6 +543,7 @@
         <item>Gmina Police</item>
         <item>Gmina Polkowice</item>
         <item>Gmina Pomiechówek</item>
+        <item>Gmina Popielów</item>
         <item>Gmina Popów</item>
         <item>Gmina Poraj</item>
         <item>Gmina Potęgowo</item>
@@ -482,23 +570,27 @@
         <item>Gmina Puszcza Mariańska</item>
         <item>Gmina Pysznica</item>
         <item>Gmina Pyzdry</item>
+        <item>Gmina Rachanie</item>
         <item>Gmina Raciechowice</item>
         <item>Gmina Racławice</item>
         <item>Gmina Radecznica</item>
         <item>Gmina Radków</item>
         <item>Gmina Radłów</item>
         <item>Gmina Radomin</item>
+        <item>Gmina Radomsko</item>
         <item>Gmina Radomyśl Nad Sanem</item>
         <item>Gmina Radoszyce</item>
         <item>Gmina Radwanice</item>
         <item>Gmina Radziłów</item>
         <item>Gmina Rawa Mazowiecka</item>
         <item>Gmina Reńska Wieś</item>
+        <item>Gmina Rossosz</item>
         <item>Gmina Rozprza</item>
         <item>Gmina Ruciane-Nida</item>
         <item>Gmina Ruda-Huta</item>
         <item>Gmina Rudna</item>
         <item>Gmina Rudniki</item>
+        <item>Gmina Rusiec</item>
         <item>Gmina Rychliki</item>
         <item>Gmina Rychtal</item>
         <item>Gmina Ryczywół</item>
@@ -509,27 +601,33 @@
         <item>Gmina Rząśnia</item>
         <item>Gmina Rzeczyca</item>
         <item>Gmina Rzepiennik Strzyżewski</item>
-        <item>Gmina Rzezawa</item>
+        <item>Gmina Rzepin</item>
         <item>Gmina Rzgów</item>
         <item>Gmina Sadki</item>
         <item>Gmina Sadowne</item>
         <item>Gmina Samborzec</item>
+        <item>Gmina Sanok</item>
         <item>Gmina Ścinawa</item>
         <item>Gmina Sędziejowice</item>
         <item>Gmina Sępopol</item>
         <item>Gmina Serokomla</item>
+        <item>Gmina Sianów</item>
         <item>Gmina Sicienko</item>
         <item>Gmina Sieciechów</item>
         <item>Gmina Siedlce</item>
+        <item>Gmina Siemiatycze</item>
         <item>Gmina Siemyśl</item>
         <item>Gmina Siennica</item>
         <item>Gmina Siennica Różana</item>
         <item>Gmina Sienno</item>
         <item>Gmina Siepraw</item>
+        <item>Gmina Sieradz</item>
         <item>Gmina Sierakowice</item>
         <item>Gmina Siewierz</item>
+        <item>Gmina Sitno</item>
         <item>Gmina Skarżysko Kościelne</item>
         <item>Gmina Skępe</item>
+        <item>Gmina Skierniewice</item>
         <item>Gmina Skoczów</item>
         <item>Gmina Skoki</item>
         <item>Gmina Skołyszyn</item>
@@ -539,8 +637,10 @@
         <item>Gmina Słopnice</item>
         <item>Gmina Słupca</item>
         <item>Gmina Słupia</item>
+        <item>Gmina Sobienie-Jeziory</item>
         <item>Gmina Sobótka</item>
         <item>Gmina Sokółka</item>
+        <item>Gmina Sokoły</item>
         <item>Gmina Solina</item>
         <item>Gmina Sośnicowice</item>
         <item>Gmina Sośnie</item>
@@ -558,12 +658,15 @@
         <item>Gmina Stawiszyn</item>
         <item>Gmina Stoczek Łukowski</item>
         <item>Gmina Stopnica</item>
+        <item>Gmina Strawczyn</item>
         <item>Gmina Stryków</item>
         <item>Gmina Stryszów</item>
         <item>Gmina Strzałkowo</item>
         <item>Gmina Strzelce Opolskie</item>
         <item>Gmina Strzelin</item>
+        <item>Gmina Strzelno</item>
         <item>Gmina Strzyżewice</item>
+        <item>Gmina Stupsk</item>
         <item>Gmina Subkowy</item>
         <item>Gmina Suchedniów</item>
         <item>Gmina Suchożebry</item>
@@ -580,14 +683,18 @@
         <item>Gmina Świlcza</item>
         <item>Gmina Szadek</item>
         <item>Gmina Szaflary</item>
+        <item>Gmina Szastarka</item>
         <item>Gmina Szczebrzeszyn</item>
         <item>Gmina Szczekociny</item>
         <item>Gmina Szczerców</item>
         <item>Gmina Szczutowo</item>
         <item>Gmina Szczytna</item>
         <item>Gmina Szczytniki</item>
+        <item>Gmina Szemud</item>
         <item>Gmina Szerzyny</item>
         <item>Gmina Szlichtyngowa</item>
+        <item>Gmina Szydłów</item>
+        <item>Gmina Tarłów</item>
         <item>Gmina Tarnów</item>
         <item>Gmina Tarnowiec</item>
         <item>Gmina Tarnów Opolski</item>
@@ -607,16 +714,19 @@
         <item>Gmina Trzyciąż</item>
         <item>Gmina Tuchów</item>
         <item>Gmina Turośń Kościelna</item>
+        <item>Gmina Tuszów Narodowy</item>
         <item>Gmina Tyczyn</item>
         <item>Gmina Tymbark</item>
         <item>Gmina Tyrawa Wołoska</item>
         <item>Gmina Uchanie</item>
         <item>Gmina Ujazd</item>
+        <item>Gmina Ulan-Majorat</item>
+        <item>Gmina Ulanów</item>
         <item>Gmina Ułęż</item>
         <item>Gmina Urszulin</item>
         <item>Gmina Urzędów</item>
+        <item>Gmina Uścimów</item>
         <item>Gmina Wąchock</item>
-        <item>Gmina Wadowice Górne</item>
         <item>Gmina Wągrowiec</item>
         <item>Gmina Wąpielsk</item>
         <item>Gmina Wasilków</item>
@@ -634,7 +744,9 @@
         <item>Gmina Wieniawa</item>
         <item>Gmina Wieprz</item>
         <item>Gmina Wieruszów</item>
+        <item>Gmina Wierzbno</item>
         <item>Gmina Wierzchosławice</item>
+        <item>Gmina Wietrzychowice</item>
         <item>Gmina Wijewo</item>
         <item>Gmina Wilczyn</item>
         <item>Gmina Wilków</item>
@@ -665,17 +777,25 @@
         <item>Gmina Wyrzysk</item>
         <item>Gmina Zabierzów</item>
         <item>Gmina Żabno</item>
+        <item>Gmina Żagań</item>
+        <item>Gmina Zagórz</item>
         <item>Gmina Zaklików</item>
         <item>Gmina Zakroczym</item>
         <item>Gmina Zakrzówek</item>
         <item>Gmina Zaleszany</item>
         <item>Gmina Zamość</item>
+        <item>Gmina Żarnowiec</item>
+        <item>Gmina Żarów</item>
         <item>Gmina Zarszyn</item>
         <item>Gmina Zator</item>
+        <item>Gmina Zawadzkie</item>
+        <item>Gmina Zawichost</item>
         <item>Gmina Zawonia</item>
         <item>Gmina Zbąszyń</item>
+        <item>Gmina Zbójno</item>
         <item>Gmina Zbrosławice</item>
         <item>Gmina Zduńska Wola</item>
+        <item>Gmina Zduny</item>
         <item>Gmina Zdzieszowice</item>
         <item>Gmina Zebrzydowice</item>
         <item>Gmina Żelazków</item>
@@ -686,6 +806,7 @@
         <item>Gmina Zławieś Wielka</item>
         <item>Gmina Żmudź</item>
         <item>Gmina Żnin</item>
+        <item>Gmina Żółkiewka</item>
         <item>Gmina Żołynia</item>
         <item>Gmina Żukowice</item>
         <item>Gmina Żyrzyn</item>
@@ -701,12 +822,14 @@
         <item>Gostynin</item>
         <item>Grajewo</item>
         <item>Grodzisk Mazowiecki</item>
+        <item>Gronowo Elbląskie</item>
         <item>Grudziądz</item>
         <item>Gryfino</item>
         <item>Gryfów Śląski</item>
         <item>Hel</item>
         <item>Hrubieszów</item>
         <item>Inowrocław</item>
+        <item>Iwanowice</item>
         <item>Izbica Kujawska</item>
         <item>Jabłonowo Pomorskie</item>
         <item>Janowiec Wielkopolski</item>
@@ -725,6 +848,7 @@
         <item>Kalety</item>
         <item>Kalisz</item>
         <item>Kalwaria Zebrzydowska</item>
+        <item>Kamień Krajeński</item>
         <item>Kańczuga</item>
         <item>Karczew</item>
         <item>Kartuzy</item>
@@ -736,6 +860,7 @@
         <item>Kępno</item>
         <item>Kętrzyn</item>
         <item>Kielce</item>
+        <item>Kiełczygłów</item>
         <item>Kłodawa</item>
         <item>Kłodzko</item>
         <item>Knurów</item>
@@ -751,6 +876,7 @@
         <item>Kościerzyna</item>
         <item>Kostrzyn Nad Odrą</item>
         <item>Koszalin</item>
+        <item>Kowal</item>
         <item>Kowalewo Pomorskie</item>
         <item>Kowary</item>
         <item>Kozienice</item>
@@ -766,7 +892,9 @@
         <item>Krzeszowice</item>
         <item>Krzyż Wielkopolski</item>
         <item>Książ Wielkopolski</item>
+        <item>Kudowa-Zdrój</item>
         <item>Kujawsko-Pomorskie</item>
+        <item>Kuźnia Raciborska</item>
         <item>Łabiszyn</item>
         <item>Lądek-Zdrój</item>
         <item>Łapy</item>
@@ -781,6 +909,7 @@
         <item>Leszno</item>
         <item>Lewin Brzeski</item>
         <item>Leżajsk</item>
+        <item>Limanowa</item>
         <item>Lipno</item>
         <item>Lipsko</item>
         <item>Łódź</item>
@@ -796,12 +925,16 @@
         <item>Lubuskie</item>
         <item>Łuków</item>
         <item>Lwówecki</item>
+        <item>Lwówek Śląski</item>
         <item>Malbork</item>
         <item>Małopolskie</item>
+        <item>Marciszów</item>
         <item>Marki</item>
+        <item>Masłowice</item>
         <item>Mazowieckie</item>
         <item>Miastko</item>
         <item>Michałowice</item>
+        <item>Miechów</item>
         <item>Międzyrzec Podlaski</item>
         <item>Miejska Górka</item>
         <item>Mielec</item>
@@ -816,13 +949,18 @@
         <item>Mysłowice</item>
         <item>Myszków</item>
         <item>Nakło Nad Notecią</item>
+        <item>Nasielsk</item>
+        <item>Niemodlin</item>
+        <item>Niepołomice</item>
         <item>Nisko</item>
         <item>Nowa Dęba</item>
         <item>Nowa Sarzyna</item>
         <item>Nowe Miasteczko</item>
         <item>Nowe Skalmierzyce</item>
         <item>Nowogard</item>
+        <item>Nowogród Bobrzański</item>
         <item>Nowogrodziec</item>
+        <item>Nowosolna</item>
         <item>Nowy Dwór Mazowiecki</item>
         <item>Nowy Sącz</item>
         <item>Nowy Targ</item>
@@ -863,6 +1001,7 @@
         <item>Połczyn-Zdrój</item>
         <item>Pomorskie</item>
         <item>Poniec</item>
+        <item>Poręba</item>
         <item>Powiat aleksandrowski</item>
         <item>Powiat augustowski</item>
         <item>Powiat będziński</item>
@@ -877,6 +1016,7 @@
         <item>Powiat braniewski</item>
         <item>Powiat brodnicki</item>
         <item>Powiat brzeski</item>
+        <item>Powiat brzeziński</item>
         <item>Powiat brzozowski</item>
         <item>Powiat buski</item>
         <item>Powiat bydgoski</item>
@@ -897,6 +1037,7 @@
         <item>Powiat elbląski</item>
         <item>Powiat ełcki</item>
         <item>Powiat garwoliński</item>
+        <item>Powiat gdański</item>
         <item>Powiat giżycki</item>
         <item>Powiat gliwicki</item>
         <item>Powiat głogowski</item>
@@ -955,6 +1096,7 @@
         <item>Powiat leski</item>
         <item>Powiat leszczyński</item>
         <item>Powiat leżajski</item>
+        <item>Powiat lidzbarski</item>
         <item>Powiat limanowski</item>
         <item>Powiat lipnowski</item>
         <item>Powiat lipski</item>
@@ -980,6 +1122,7 @@
         <item>Powiat myślenicki</item>
         <item>Powiat myszkowski</item>
         <item>Powiat nakielski</item>
+        <item>Powiat nidzicki</item>
         <item>Powiat niżański</item>
         <item>Powiat nowodworski</item>
         <item>Powiat nowosądecki</item>
@@ -1015,15 +1158,20 @@
         <item>Powiat polkowicki</item>
         <item>Powiat poznański</item>
         <item>Powiat proszowicki</item>
+        <item>Powiat prudnicki</item>
         <item>Powiat pruszkowski</item>
         <item>Powiat przasnyski</item>
         <item>Powiat przemyski</item>
         <item>Powiat przeworski</item>
+        <item>Powiat przysuski</item>
         <item>Powiat pszczyński</item>
+        <item>Powiat pucki</item>
         <item>Powiat puławski</item>
         <item>Powiat pułtuski</item>
+        <item>Powiat pyrzycki</item>
         <item>Powiat raciborski</item>
         <item>Powiat radomski</item>
+        <item>Powiat radomszczański</item>
         <item>Powiat radziejowski</item>
         <item>Powiat radzyński</item>
         <item>Powiat rawicki</item>
@@ -1054,6 +1202,7 @@
         <item>Powiat starachowicki</item>
         <item>Powiat stargardzki</item>
         <item>Powiat starogardzki</item>
+        <item>Powiat staszowski</item>
         <item>Powiat strzelecki</item>
         <item>Powiat strzeliński</item>
         <item>Powiat strzyżowski</item>
@@ -1096,6 +1245,7 @@
         <item>Powiat wschowski</item>
         <item>Powiat wysokomazowiecki</item>
         <item>Powiat wyszkowski</item>
+        <item>Powiat ząbkowicki</item>
         <item>Powiat żagański</item>
         <item>Powiat zambrowski</item>
         <item>Powiat zamojski</item>
@@ -1112,25 +1262,30 @@
         <item>Powiat żyrardowski</item>
         <item>Powiat żywiecki</item>
         <item>Poznań</item>
+        <item>Prostki</item>
         <item>Proszowice</item>
         <item>Prudnik</item>
         <item>Pruszków</item>
+        <item>Przasnysz</item>
         <item>Przemyśl</item>
         <item>Przeworsk</item>
         <item>Przysucha</item>
         <item>Pszczyna</item>
+        <item>Pszów</item>
         <item>Puck</item>
         <item>Puławy</item>
         <item>Pyskowice</item>
         <item>Rabka-Zdrój</item>
         <item>Raciąż</item>
         <item>Racibórz</item>
+        <item>Raciechowice</item>
         <item>Radom</item>
         <item>Radomsko</item>
         <item>Radymno</item>
         <item>Radziejów</item>
         <item>Radzionków</item>
         <item>Radzyń Podlaski</item>
+        <item>Raków</item>
         <item>Rawa Mazowiecka</item>
         <item>Rawicz</item>
         <item>Reda</item>
@@ -1147,6 +1302,7 @@
         <item>Sandomierz</item>
         <item>Sanok</item>
         <item>Sędziszów Małopolski</item>
+        <item>Sejny</item>
         <item>Siedlce</item>
         <item>Siemianowice Śląskie</item>
         <item>Siemiatycze</item>
@@ -1155,7 +1311,7 @@
         <item>Skarżysko-Kamienna</item>
         <item>Skawina</item>
         <item>Skierniewice</item>
-        <item>Skórcz</item>
+        <item>Skoroszyce</item>
         <item>Śląskie</item>
         <item>Sławno</item>
         <item>Słomniki</item>
@@ -1165,16 +1321,21 @@
         <item>Sokołów Podlaski</item>
         <item>Sopot</item>
         <item>Sosnowiec</item>
+        <item>Śrem</item>
         <item>Środa Śląska</item>
         <item>Środa Wielkopolska</item>
         <item>Starachowice</item>
         <item>Starogard Gdański</item>
         <item>Stary Sącz</item>
         <item>Staszów</item>
+        <item>Stronie Śląskie</item>
         <item>Strzegom</item>
+        <item>Strzyżów</item>
+        <item>Suchy Las</item>
         <item>Sulejówek</item>
         <item>Sułkowice</item>
         <item>Sulmierzyce</item>
+        <item>Suwalski</item>
         <item>Swarzędz</item>
         <item>Świdnica</item>
         <item>Świdnik</item>
@@ -1220,9 +1381,11 @@
         <item>Więcbork</item>
         <item>Wieliczka</item>
         <item>Wielkopolskie</item>
+        <item>Wizna</item>
         <item>Władysławowo</item>
         <item>Włocławek</item>
         <item>Włodawa</item>
+        <item>Woźniki</item>
         <item>Wrocław</item>
         <item>Września</item>
         <item>Wschowa</item>
@@ -1240,6 +1403,7 @@
         <item>Żary</item>
         <item>Zawidów</item>
         <item>Zduńska Wola</item>
+        <item>Zduny</item>
         <item>Żelechów</item>
         <item>Zgierz</item>
         <item>Zgorzelec</item>
@@ -1249,7 +1413,6 @@
         <item>Żory</item>
         <item>Zwoleń</item>
         <item>Żyrardów</item>
-        <item>Żywiec</item>
     </string-array>
     <string-array name="symbols_values">
         <item>andrychow</item>
@@ -1269,6 +1432,8 @@
         <item>bielskobiala</item>
         <item>bierawa</item>
         <item>bierutow</item>
+        <item>biskupice</item>
+        <item>blachownia</item>
         <item>blaszki</item>
         <item>blonie</item>
         <item>bochnia</item>
@@ -1308,6 +1473,7 @@
         <item>dabrowatarnowska</item>
         <item>debica</item>
         <item>dobrzenwielki</item>
+        <item>dobrzynnadwisla</item>
         <item>dolnoslaskie</item>
         <item>dusznikizdroj</item>
         <item>dynow</item>
@@ -1328,36 +1494,53 @@
         <item>gminaaleksandrowkujawski</item>
         <item>gminaaleksandrowlodzki</item>
         <item>gminaalwernia</item>
+        <item>gminaandrzejewo</item>
         <item>gminaannopol</item>
+        <item>gminaaugustow</item>
         <item>gminababice</item>
+        <item>gminabadkowo</item>
         <item>gminabaltow</item>
         <item>gminabaranow</item>
+        <item>gminabarciany</item>
         <item>gminabarcin</item>
         <item>gminabaruchowo</item>
         <item>gminabedzino</item>
         <item>gminabelchatow</item>
+        <item>gminabialaczow</item>
         <item>gminabialeblota</item>
+        <item>gminabielskpodlaski</item>
         <item>gminabircza</item>
         <item>gminablazowa</item>
         <item>gminabledow</item>
         <item>gminabobolice</item>
+        <item>gminabobowa</item>
         <item>gminabobowo</item>
         <item>gminabobrowniki</item>
+        <item>gminabodzentyn</item>
+        <item>gminabogoria</item>
+        <item>gminabojanow</item>
         <item>gminabojanowo</item>
         <item>gminabojszowy</item>
         <item>gminaboleslawiec</item>
         <item>gminabolkow</item>
         <item>gminaboronow</item>
+        <item>gminaborow</item>
         <item>gminaborowa</item>
         <item>gminaborzecin</item>
         <item>gminabranice</item>
+        <item>gminabraniewo</item>
         <item>gminabraszewice</item>
         <item>gminabrenna</item>
         <item>gminabrzegdolny</item>
         <item>gminabrzeziny</item>
         <item>gminabrzeznio</item>
+        <item>gminabrzostek</item>
         <item>gminabrzozow</item>
+        <item>gminabrzuze</item>
         <item>gminabrzyska</item>
+        <item>gminabuczek</item>
+        <item>gminabuczkowice</item>
+        <item>gminabudzow</item>
         <item>gminabudzyn</item>
         <item>gminabukowsko</item>
         <item>gminabyczyna</item>
@@ -1366,15 +1549,15 @@
         <item>gminacekowkolonia</item>
         <item>gminacelestynow</item>
         <item>gminacewice</item>
+        <item>gminacharsznica</item>
         <item>gminachelm</item>
         <item>gminachelmiec</item>
         <item>gminachelmno</item>
         <item>gminachmielnik</item>
-        <item>gminachodecz</item>
+        <item>gminachocz</item>
         <item>gminachodel</item>
         <item>gminachojnice</item>
         <item>gminachojnow</item>
-        <item>gminachorkowka</item>
         <item>gminachrzypskowielkie</item>
         <item>gminachybie</item>
         <item>gminaciasna</item>
@@ -1386,12 +1569,12 @@
         <item>gminaczaplinek</item>
         <item>gminaczarna</item>
         <item>gminaczarnkow</item>
-        <item>gminaczarnybor</item>
         <item>gminaczarnydunajec</item>
         <item>gminaczechowicedziedzice</item>
         <item>gminaczernichow</item>
         <item>gminaczerniejewo</item>
         <item>gminaczerwionkaleszczyny</item>
+        <item>gminaczerwonka</item>
         <item>gminaczluchow</item>
         <item>gminaczosnow</item>
         <item>gminadamaslawek</item>
@@ -1399,6 +1582,7 @@
         <item>gminadarlowo</item>
         <item>gminadebewielkie</item>
         <item>gminadebica</item>
+        <item>gminadebno</item>
         <item>gminadlutow</item>
         <item>gminadobczyce</item>
         <item>gminadobra</item>
@@ -1410,6 +1594,7 @@
         <item>gminadominowo</item>
         <item>gminadorohusk</item>
         <item>gminadrzewica</item>
+        <item>gminadubiecko</item>
         <item>gminadukla</item>
         <item>gminadwikozy</item>
         <item>gminadynow</item>
@@ -1433,6 +1618,7 @@
         <item>gminagluszyca</item>
         <item>gminagniew</item>
         <item>gminagniewoszow</item>
+        <item>gminagniezno</item>
         <item>gminagoczalkowicezdroj</item>
         <item>gminagodkowo</item>
         <item>gminagodow</item>
@@ -1451,6 +1637,7 @@
         <item>gminagozd</item>
         <item>gminagrabow</item>
         <item>gminagrabowiec</item>
+        <item>gminagrabownadpilica</item>
         <item>gminagrajewo</item>
         <item>gminagranowo</item>
         <item>gminagrebocice</item>
@@ -1461,6 +1648,7 @@
         <item>gminagrodziec</item>
         <item>gminagrojec</item>
         <item>gminagromadka</item>
+        <item>gminagromnik</item>
         <item>gminagronowoelblaskie</item>
         <item>gminagrudziadz</item>
         <item>gminagruta</item>
@@ -1470,13 +1658,17 @@
         <item>gminahansk</item>
         <item>gminaharasiuki</item>
         <item>gminahazlach</item>
+        <item>gminaherby</item>
         <item>gminahrubieszow</item>
+        <item>gminahuszlew</item>
         <item>gminahyzne</item>
         <item>gminaimielno</item>
         <item>gminainowroclaw</item>
+        <item>gminaistebna</item>
         <item>gminaiwierzyce</item>
         <item>gminaiwoniczzdroj</item>
         <item>gminaizabelin</item>
+        <item>gminaizbica</item>
         <item>gminajadow</item>
         <item>gminajaktorow</item>
         <item>gminajanikowo</item>
@@ -1488,19 +1680,23 @@
         <item>gminajaslo</item>
         <item>gminajastkow</item>
         <item>gminajastrowie</item>
+        <item>gminajastrzab</item>
         <item>gminajedlicze</item>
         <item>gminajedlinsk</item>
         <item>gminajedlnialetnisko</item>
         <item>gminajejkowice</item>
         <item>gminajemielnica</item>
+        <item>gminajemielno</item>
         <item>gminajerzmanowa</item>
         <item>gminajezewo</item>
         <item>gminajeziorawielkie</item>
+        <item>gminajeziorzany</item>
         <item>gminajezowe</item>
         <item>gminajordanow</item>
         <item>gminajozefow</item>
         <item>gminajozefownadwisla</item>
         <item>gminajutrosin</item>
+        <item>gminakakolewnica</item>
         <item>gminakamien</item>
         <item>gminakamienica</item>
         <item>gminakamieniec</item>
@@ -1513,9 +1709,11 @@
         <item>gminakielczyglow</item>
         <item>gminakikol</item>
         <item>gminakiszkowo</item>
+        <item>gminakleczew</item>
         <item>gminaklembow</item>
         <item>gminakleszczewo</item>
         <item>gminakleszczow</item>
+        <item>gminaklimontow</item>
         <item>gminaklobuck</item>
         <item>gminakloczew</item>
         <item>gminaklomnice</item>
@@ -1523,6 +1721,8 @@
         <item>gminaklucze</item>
         <item>gminakluczewsko</item>
         <item>gminakobielewielkie</item>
+        <item>gminakochanowice</item>
+        <item>gminakock</item>
         <item>gminakodrab</item>
         <item>gminakolaczyce</item>
         <item>gminakolbaskowo</item>
@@ -1531,9 +1731,13 @@
         <item>gminakomancza</item>
         <item>gminakomorniki</item>
         <item>gminakomprachcice</item>
+        <item>gminakonarzyny</item>
+        <item>gminakondratowice</item>
+        <item>gminakoniusza</item>
         <item>gminakonopiska</item>
         <item>gminakonskowola</item>
-        <item>gminakorczyna</item>
+        <item>gminakoprzywnica</item>
+        <item>gminakorsze</item>
         <item>gminakorycin</item>
         <item>gminakorzenna</item>
         <item>gminakosakowo</item>
@@ -1542,6 +1746,7 @@
         <item>gminakoscierzyna</item>
         <item>gminakosowlacki</item>
         <item>gminakostrzyn</item>
+        <item>gminakoszyce</item>
         <item>gminakotla</item>
         <item>gminakotun</item>
         <item>gminakozlow</item>
@@ -1553,22 +1758,31 @@
         <item>gminakrokowa</item>
         <item>gminakrosnice</item>
         <item>gminakrupskimlyn</item>
+        <item>gminakruszwica</item>
+        <item>gminakrynki</item>
         <item>gminakrzanowice</item>
         <item>gminakrzemieniewo</item>
         <item>gminakrzymow</item>
+        <item>gminakrzywin</item>
         <item>gminakrzyzanowice</item>
+        <item>gminaksiazwielki</item>
         <item>gminakunice</item>
         <item>gminakunow</item>
         <item>gminakurow</item>
+        <item>gminakurylowka</item>
         <item>gminakwidzyn</item>
         <item>gminakwilcz</item>
+        <item>gminalabowa</item>
         <item>gminalabunie</item>
         <item>gminalambinowice</item>
         <item>gminalanckorona</item>
         <item>gminalapszenizne</item>
+        <item>gminalasin</item>
         <item>gminalaskarzew</item>
         <item>gminalasowicewielkie</item>
         <item>gminalaszczow</item>
+        <item>gminalaszki</item>
+        <item>gminalatowicz</item>
         <item>gminalazy</item>
         <item>gminaleczyca</item>
         <item>gminaleczyce</item>
@@ -1580,16 +1794,20 @@
         <item>gminalesnapodlaska</item>
         <item>gminalesznowola</item>
         <item>gminalezajsk</item>
+        <item>gminalichnowy</item>
         <item>gminalimanowa</item>
+        <item>gminalinia</item>
         <item>gminalipinki</item>
         <item>gminalipnik</item>
         <item>gminalipowa</item>
         <item>gminalisiagora</item>
         <item>gminaliszki</item>
+        <item>gminaliw</item>
         <item>gminalobez</item>
         <item>gminalodygowice</item>
         <item>gminalomazy</item>
         <item>gminalopiennikgorny</item>
+        <item>gminalopuszno</item>
         <item>gminaluban</item>
         <item>gminalubartow</item>
         <item>gminalubasz</item>
@@ -1599,30 +1817,40 @@
         <item>gminalubiewo</item>
         <item>gminalubin</item>
         <item>gminalubniany</item>
+        <item>gminalubochnia</item>
         <item>gminalubomia</item>
         <item>gminalubon</item>
         <item>gminalukow</item>
+        <item>gminalukowica</item>
+        <item>gminalutowiska</item>
         <item>gminaluzino</item>
         <item>gminaluzna</item>
         <item>gminalysomice</item>
         <item>gminamagnuszew</item>
         <item>gminamakowpodhalanski</item>
+        <item>gminamalawies</item>
         <item>gminamalbork</item>
         <item>gminamaldyty</item>
+        <item>gminamalkiniagorna</item>
         <item>gminamarcinowice</item>
         <item>gminamargonin</item>
         <item>gminamarianowo</item>
+        <item>gminamarkusy</item>
         <item>gminamaslow</item>
+        <item>gminamedyka</item>
         <item>gminamelgiew</item>
+        <item>gminamichalow</item>
         <item>gminamichalowo</item>
         <item>gminamiedzianagora</item>
         <item>gminamiedzna</item>
         <item>gminamiedzno</item>
         <item>gminamiedzyborz</item>
         <item>gminamiedzylesie</item>
+        <item>gminamiedzyrzecpodlaski</item>
         <item>gminamiedzyzdroje</item>
         <item>gminamiejscepiastowe</item>
         <item>gminamielec</item>
+        <item>gminamilanow</item>
         <item>gminamilejow</item>
         <item>gminamilicz</item>
         <item>gminamilkowice</item>
@@ -1636,28 +1864,38 @@
         <item>gminamogilany</item>
         <item>gminamordy</item>
         <item>gminamoryn</item>
+        <item>gminamrocza</item>
         <item>gminamrozy</item>
         <item>gminamszana</item>
         <item>gminamszanadolna</item>
         <item>gminamurow</item>
         <item>gminamycielin</item>
+        <item>gminamyslakowice</item>
         <item>gminamysliborz</item>
         <item>gminanadarzyn</item>
+        <item>gminanamyslow</item>
+        <item>gminanasielsk</item>
         <item>gminanawojowa</item>
+        <item>gminanedza</item>
         <item>gminanekla</item>
         <item>gminaniebylec</item>
         <item>gminaniechlow</item>
         <item>gminaniedrzwicaduza</item>
+        <item>gminaniedzwiada</item>
+        <item>gminaniedzwiedz</item>
         <item>gminaniegoslawice</item>
         <item>gminaniwiska</item>
         <item>gminanowaruda</item>
         <item>gminanowawiesleborska</item>
         <item>gminanowemiasto</item>
         <item>gminanowemiastonadwarta</item>
+        <item>gminanowogrodbobrzanski</item>
         <item>gminanowosolna</item>
         <item>gminanowykaweczyn</item>
         <item>gminanowystaw</item>
         <item>gminanowytarg</item>
+        <item>gminanowytomysl</item>
+        <item>gminanur</item>
         <item>gminaobrazow</item>
         <item>gminaochotnicadolna</item>
         <item>gminaogrodzieniec</item>
@@ -1671,33 +1909,45 @@
         <item>gminaosiekjasielski</item>
         <item>gminaosiekmaly</item>
         <item>gminaosielsko</item>
+        <item>gminaostrow</item>
         <item>gminaostrowek</item>
         <item>gminaostrowlubelski</item>
         <item>gminaostrowmazowiecka</item>
         <item>gminaostrowwielkopolski</item>
         <item>gminaotyn</item>
         <item>gminaozarow</item>
+        <item>gminaozarowice</item>
         <item>gminaozimek</item>
         <item>gminaozorkow</item>
         <item>gminapabianice</item>
         <item>gminapacanow</item>
+        <item>gminapaczkow</item>
         <item>gminapadewnarodowa</item>
+        <item>gminapajeczno</item>
         <item>gminapakoslaw</item>
         <item>gminapakoslawice</item>
+        <item>gminapalecznica</item>
         <item>gminapanki</item>
         <item>gminaparchowo</item>
         <item>gminaparczew</item>
         <item>gminapawlosiow</item>
         <item>gminapawlowice</item>
+        <item>gminapawlowiczki</item>
+        <item>gminapeclaw</item>
         <item>gminapelplin</item>
         <item>gminapiaski</item>
         <item>gminapiatnica</item>
+        <item>gminapiecki</item>
+        <item>gminapiekoszow</item>
         <item>gminapilchowice</item>
         <item>gminapionki</item>
+        <item>gminapiotrkowtrybunalski</item>
         <item>gminaplesna</item>
         <item>gminapleszew</item>
         <item>gminaplonsk</item>
+        <item>gminaplosnica</item>
         <item>gminapoczesna</item>
+        <item>gminapodedworze</item>
         <item>gminapodegrodzie</item>
         <item>gminapokoj</item>
         <item>gminapolajewo</item>
@@ -1707,6 +1957,7 @@
         <item>gminapolice</item>
         <item>gminapolkowice</item>
         <item>gminapomiechowek</item>
+        <item>gminapopielow</item>
         <item>gminapopow</item>
         <item>gminaporaj</item>
         <item>gminapotegowo</item>
@@ -1733,23 +1984,27 @@
         <item>gminapuszczamarianska</item>
         <item>gminapysznica</item>
         <item>gminapyzdry</item>
+        <item>gminarachanie</item>
         <item>gminaraciechowice</item>
         <item>gminaraclawice</item>
         <item>gminaradecznica</item>
         <item>gminaradkow</item>
         <item>gminaradlow</item>
         <item>gminaradomin</item>
+        <item>gminaradomsko</item>
         <item>gminaradomyslnadsanem</item>
         <item>gminaradoszyce</item>
         <item>gminaradwanice</item>
         <item>gminaradzilow</item>
         <item>gminarawamazowiecka</item>
         <item>gminarenskawies</item>
+        <item>gminarossosz</item>
         <item>gminarozprza</item>
         <item>gminarucianenida</item>
         <item>gminarudahuta</item>
         <item>gminarudna</item>
         <item>gminarudniki</item>
+        <item>gminarusiec</item>
         <item>gminarychliki</item>
         <item>gminarychtal</item>
         <item>gminaryczywol</item>
@@ -1760,27 +2015,33 @@
         <item>gminarzasnia</item>
         <item>gminarzeczyca</item>
         <item>gminarzepiennikstrzyzewski</item>
-        <item>gminarzezawa</item>
+        <item>gminarzepin</item>
         <item>gminarzgow</item>
         <item>gminasadki</item>
         <item>gminasadowne</item>
         <item>gminasamborzec</item>
+        <item>gminasanok</item>
         <item>gminascinawa</item>
         <item>gminasedziejowice</item>
         <item>gminasepopol</item>
         <item>gminaserokomla</item>
+        <item>gminasianow</item>
         <item>gminasicienko</item>
         <item>gminasieciechow</item>
         <item>gminasiedlce</item>
+        <item>gminasiemiatycze</item>
         <item>gminasiemysl</item>
         <item>gminasiennica</item>
         <item>gminasiennicarozana</item>
         <item>gminasienno</item>
         <item>gminasiepraw</item>
+        <item>gminasieradz</item>
         <item>gminasierakowice</item>
         <item>gminasiewierz</item>
+        <item>gminasitno</item>
         <item>gminaskarzyskokoscielne</item>
         <item>gminaskepe</item>
+        <item>gminaskierniewice</item>
         <item>gminaskoczow</item>
         <item>gminaskoki</item>
         <item>gminaskolyszyn</item>
@@ -1790,8 +2051,10 @@
         <item>gminaslopnice</item>
         <item>gminaslupca</item>
         <item>gminaslupia</item>
+        <item>gminasobieniejeziory</item>
         <item>gminasobotka</item>
         <item>gminasokolka</item>
+        <item>gminasokoly</item>
         <item>gminasolina</item>
         <item>gminasosnicowice</item>
         <item>gminasosnie</item>
@@ -1809,12 +2072,15 @@
         <item>gminastawiszyn</item>
         <item>gminastoczeklukowski</item>
         <item>gminastopnica</item>
+        <item>gminastrawczyn</item>
         <item>gminastrykow</item>
         <item>gminastryszow</item>
         <item>gminastrzalkowo</item>
         <item>gminastrzelceopolskie</item>
         <item>gminastrzelin</item>
+        <item>gminastrzelno</item>
         <item>gminastrzyzewice</item>
+        <item>gminastupsk</item>
         <item>gminasubkowy</item>
         <item>gminasuchedniow</item>
         <item>gminasuchozebry</item>
@@ -1831,14 +2097,18 @@
         <item>gminaswilcza</item>
         <item>gminaszadek</item>
         <item>gminaszaflary</item>
+        <item>gminaszastarka</item>
         <item>gminaszczebrzeszyn</item>
         <item>gminaszczekociny</item>
         <item>gminaszczercow</item>
         <item>gminaszczutowo</item>
         <item>gminaszczytna</item>
         <item>gminaszczytniki</item>
+        <item>gminaszemud</item>
         <item>gminaszerzyny</item>
         <item>gminaszlichtyngowa</item>
+        <item>gminaszydlow</item>
+        <item>gminatarlow</item>
         <item>gminatarnow</item>
         <item>gminatarnowiec</item>
         <item>gminatarnowopolski</item>
@@ -1858,16 +2128,19 @@
         <item>gminatrzyciaz</item>
         <item>gminatuchow</item>
         <item>gminaturosnkoscielna</item>
+        <item>gminatuszownarodowy</item>
         <item>gminatyczyn</item>
         <item>gminatymbark</item>
         <item>gminatyrawawoloska</item>
         <item>gminauchanie</item>
         <item>gminaujazd</item>
+        <item>gminaulanmajorat</item>
+        <item>gminaulanow</item>
         <item>gminaulez</item>
         <item>gminaurszulin</item>
         <item>gminaurzedow</item>
+        <item>gminauscimow</item>
         <item>gminawachock</item>
-        <item>gminawadowicegorne</item>
         <item>gminawagrowiec</item>
         <item>gminawapielsk</item>
         <item>gminawasilkow</item>
@@ -1885,7 +2158,9 @@
         <item>gminawieniawa</item>
         <item>gminawieprz</item>
         <item>gminawieruszow</item>
+        <item>gminawierzbno</item>
         <item>gminawierzchoslawice</item>
+        <item>gminawietrzychowice</item>
         <item>gminawijewo</item>
         <item>gminawilczyn</item>
         <item>gminawilkow</item>
@@ -1916,17 +2191,25 @@
         <item>gminawyrzysk</item>
         <item>gminazabierzow</item>
         <item>gminazabno</item>
+        <item>gminazagan</item>
+        <item>gminazagorz</item>
         <item>gminazaklikow</item>
         <item>gminazakroczym</item>
         <item>gminazakrzowek</item>
         <item>gminazaleszany</item>
         <item>gminazamosc</item>
+        <item>gminazarnowiec</item>
+        <item>gminazarow</item>
         <item>gminazarszyn</item>
         <item>gminazator</item>
+        <item>gminazawadzkie</item>
+        <item>gminazawichost</item>
         <item>gminazawonia</item>
         <item>gminazbaszyn</item>
+        <item>gminazbojno</item>
         <item>gminazbroslawice</item>
         <item>gminazdunskawola</item>
+        <item>gminazduny</item>
         <item>gminazdzieszowice</item>
         <item>gminazebrzydowice</item>
         <item>gminazelazkow</item>
@@ -1937,6 +2220,7 @@
         <item>gminazlawieswielka</item>
         <item>gminazmudz</item>
         <item>gminaznin</item>
+        <item>gminazolkiewka</item>
         <item>gminazolynia</item>
         <item>gminazukowice</item>
         <item>gminazyrzyn</item>
@@ -1952,12 +2236,14 @@
         <item>gostynin</item>
         <item>grajewo</item>
         <item>grodziskmazowiecki</item>
+        <item>gronowoelblaskie</item>
         <item>grudziadz</item>
         <item>gryfino</item>
         <item>gryfowslaski</item>
         <item>hel</item>
         <item>hrubieszow</item>
         <item>inowroclaw</item>
+        <item>iwanowice</item>
         <item>izbicakujawska</item>
         <item>jablonowopomorskie</item>
         <item>janowiecwielkopolski</item>
@@ -1976,6 +2262,7 @@
         <item>kalety</item>
         <item>kalisz</item>
         <item>kalwariazebrzydowska</item>
+        <item>kamienkrajenski</item>
         <item>kanczuga</item>
         <item>karczew</item>
         <item>kartuzy</item>
@@ -1987,6 +2274,7 @@
         <item>kepno</item>
         <item>ketrzyn</item>
         <item>kielce</item>
+        <item>kielczyglow</item>
         <item>klodawa</item>
         <item>klodzko</item>
         <item>knurow</item>
@@ -2002,6 +2290,7 @@
         <item>koscierzyna</item>
         <item>kostrzynnadodra</item>
         <item>koszalin</item>
+        <item>kowal</item>
         <item>kowalewopomorskie</item>
         <item>kowary</item>
         <item>kozienice</item>
@@ -2017,7 +2306,9 @@
         <item>krzeszowice</item>
         <item>krzyzwielkopolski</item>
         <item>ksiazwielkopolski</item>
+        <item>kudowazdroj</item>
         <item>kujawskopomorskie</item>
+        <item>kuzniaraciborska</item>
         <item>labiszyn</item>
         <item>ladekzdroj</item>
         <item>lapy</item>
@@ -2032,6 +2323,7 @@
         <item>leszno</item>
         <item>lewinbrzeski</item>
         <item>lezajsk</item>
+        <item>limanowa</item>
         <item>lipno</item>
         <item>lipsko</item>
         <item>lodz</item>
@@ -2047,12 +2339,16 @@
         <item>lubuskie</item>
         <item>lukow</item>
         <item>lwowecki</item>
+        <item>lwowekslaski</item>
         <item>malbork</item>
         <item>malopolskie</item>
+        <item>marciszow</item>
         <item>marki</item>
+        <item>maslowice</item>
         <item>mazowieckie</item>
         <item>miastko</item>
         <item>michalowice</item>
+        <item>miechow</item>
         <item>miedzyrzecpodlaski</item>
         <item>miejskagorka</item>
         <item>mielec</item>
@@ -2067,13 +2363,18 @@
         <item>myslowice</item>
         <item>myszkow</item>
         <item>naklonadnotecia</item>
+        <item>nasielsk</item>
+        <item>niemodlin</item>
+        <item>niepolomice</item>
         <item>nisko</item>
         <item>nowadeba</item>
         <item>nowasarzyna</item>
         <item>nowemiasteczko</item>
         <item>noweskalmierzyce</item>
         <item>nowogard</item>
+        <item>nowogrodbobrzanski</item>
         <item>nowogrodziec</item>
+        <item>nowosolna</item>
         <item>nowydwormazowiecki</item>
         <item>nowysacz</item>
         <item>nowytarg</item>
@@ -2114,6 +2415,7 @@
         <item>polczynzdroj</item>
         <item>pomorskie</item>
         <item>poniec</item>
+        <item>poreba</item>
         <item>powiataleksandrowski</item>
         <item>powiataugustowski</item>
         <item>powiatbedzinski</item>
@@ -2128,6 +2430,7 @@
         <item>powiatbraniewski</item>
         <item>powiatbrodnicki</item>
         <item>powiatbrzeski</item>
+        <item>powiatbrzezinski</item>
         <item>powiatbrzozowski</item>
         <item>powiatbuski</item>
         <item>powiatbydgoski</item>
@@ -2148,6 +2451,7 @@
         <item>powiatelblaski</item>
         <item>powiatelcki</item>
         <item>powiatgarwolinski</item>
+        <item>powiatgdanski</item>
         <item>powiatgizycki</item>
         <item>powiatgliwicki</item>
         <item>powiatglogowski</item>
@@ -2206,6 +2510,7 @@
         <item>powiatleski</item>
         <item>powiatleszczynski</item>
         <item>powiatlezajski</item>
+        <item>powiatlidzbarski</item>
         <item>powiatlimanowski</item>
         <item>powiatlipnowski</item>
         <item>powiatlipski</item>
@@ -2231,6 +2536,7 @@
         <item>powiatmyslenicki</item>
         <item>powiatmyszkowski</item>
         <item>powiatnakielski</item>
+        <item>powiatnidzicki</item>
         <item>powiatnizanski</item>
         <item>powiatnowodworski</item>
         <item>powiatnowosadecki</item>
@@ -2266,15 +2572,20 @@
         <item>powiatpolkowicki</item>
         <item>powiatpoznanski</item>
         <item>powiatproszowicki</item>
+        <item>powiatprudnicki</item>
         <item>powiatpruszkowski</item>
         <item>powiatprzasnyski</item>
         <item>powiatprzemyski</item>
         <item>powiatprzeworski</item>
+        <item>powiatprzysuski</item>
         <item>powiatpszczynski</item>
+        <item>powiatpucki</item>
         <item>powiatpulawski</item>
         <item>powiatpultuski</item>
+        <item>powiatpyrzycki</item>
         <item>powiatraciborski</item>
         <item>powiatradomski</item>
+        <item>powiatradomszczanski</item>
         <item>powiatradziejowski</item>
         <item>powiatradzynski</item>
         <item>powiatrawicki</item>
@@ -2305,6 +2616,7 @@
         <item>powiatstarachowicki</item>
         <item>powiatstargardzki</item>
         <item>powiatstarogardzki</item>
+        <item>powiatstaszowski</item>
         <item>powiatstrzelecki</item>
         <item>powiatstrzelinski</item>
         <item>powiatstrzyzowski</item>
@@ -2347,6 +2659,7 @@
         <item>powiatwschowski</item>
         <item>powiatwysokomazowiecki</item>
         <item>powiatwyszkowski</item>
+        <item>powiatzabkowicki</item>
         <item>powiatzaganski</item>
         <item>powiatzambrowski</item>
         <item>powiatzamojski</item>
@@ -2363,25 +2676,30 @@
         <item>powiatzyrardowski</item>
         <item>powiatzywiecki</item>
         <item>poznan</item>
+        <item>prostki</item>
         <item>proszowice</item>
         <item>prudnik</item>
         <item>pruszkow</item>
+        <item>przasnysz</item>
         <item>przemysl</item>
         <item>przeworsk</item>
         <item>przysucha</item>
         <item>pszczyna</item>
+        <item>pszow</item>
         <item>puck</item>
         <item>pulawy</item>
         <item>pyskowice</item>
         <item>rabkazdroj</item>
         <item>raciaz</item>
         <item>raciborz</item>
+        <item>raciechowice</item>
         <item>radom</item>
         <item>radomsko</item>
         <item>radymno</item>
         <item>radziejow</item>
         <item>radzionkow</item>
         <item>radzynpodlaski</item>
+        <item>rakow</item>
         <item>rawamazowiecka</item>
         <item>rawicz</item>
         <item>reda</item>
@@ -2398,6 +2716,7 @@
         <item>sandomierz</item>
         <item>sanok</item>
         <item>sedziszowmalopolski</item>
+        <item>sejny</item>
         <item>siedlce</item>
         <item>siemianowiceslaskie</item>
         <item>siemiatycze</item>
@@ -2406,7 +2725,7 @@
         <item>skarzyskokamienna</item>
         <item>skawina</item>
         <item>skierniewice</item>
-        <item>skorcz</item>
+        <item>skoroszyce</item>
         <item>slaskie</item>
         <item>slawno</item>
         <item>slomniki</item>
@@ -2416,16 +2735,21 @@
         <item>sokolowpodlaski</item>
         <item>sopot</item>
         <item>sosnowiec</item>
+        <item>srem</item>
         <item>srodaslaska</item>
         <item>srodawielkopolska</item>
         <item>starachowice</item>
         <item>starogardgdanski</item>
         <item>starysacz</item>
         <item>staszow</item>
+        <item>stronieslaskie</item>
         <item>strzegom</item>
+        <item>strzyzow</item>
+        <item>suchylas</item>
         <item>sulejowek</item>
         <item>sulkowice</item>
         <item>sulmierzyce</item>
+        <item>suwalski</item>
         <item>swarzedz</item>
         <item>swidnica</item>
         <item>swidnik</item>
@@ -2471,9 +2795,11 @@
         <item>wiecbork</item>
         <item>wieliczka</item>
         <item>wielkopolskie</item>
+        <item>wizna</item>
         <item>wladyslawowo</item>
         <item>wloclawek</item>
         <item>wlodawa</item>
+        <item>wozniki</item>
         <item>wroclaw</item>
         <item>wrzesnia</item>
         <item>wschowa</item>
@@ -2491,6 +2817,7 @@
         <item>zary</item>
         <item>zawidow</item>
         <item>zdunskawola</item>
+        <item>zduny</item>
         <item>zelechow</item>
         <item>zgierz</item>
         <item>zgorzelec</item>
@@ -2500,6 +2827,5 @@
         <item>zory</item>
         <item>zwolen</item>
         <item>zyrardow</item>
-        <item>zywiec</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index eef7eab4..49cdd5b7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="bottomNavBackground" format="reference" />
-    <attr name="dividerColor" format="reference" />
+    <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 1b1fc7a0..36dee181 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,24 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#d32f2f</color>
+    <color name="colorPrimaryLight">#e57373</color>
     <color name="colorPrimaryDark">#9a0007</color>
-    <color name="colorPrimaryLight">#ff6659</color>
-    <color name="colorBackgroundBottomNav">#f0f0f0</color>
+    <color name="colorError">#ff5722</color>
+    <color name="colorErrorLight">#e84853</color>
 
-    <color name="grade_text">#ffffff</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>
+
+    <color name="note_positive">#a0c431</color>
+    <color name="note_negative">#d43f3f</color>
 
     <color name="grade_black">#424242</color>
-    <color name="grade_red">#F44336</color>
-    <color name="grade_blue">#2196F3</color>
-    <color name="grade_green">#8BC34A</color>
-    <color name="grade_purple">#7E57C2</color>
+    <color name="grade_red">#d43f3f</color>
+    <color name="grade_blue">#49a6f2</color>
+    <color name="grade_green">#a0c431</color>
+    <color name="grade_purple">#8b6bc2</color>
 
-    <color name="grade_material_six">#03a9f4</color>
+    <color name="grade_material_six">#3dbbf5</color>
     <color name="grade_material_five">#4caf50</color>
-    <color name="grade_material_four">#92c400</color>
-    <color name="grade_material_three">#ffa000</color>
-    <color name="grade_material_two">#ff5722</color>
-    <color name="grade_material_one">#d32f2f</color>
+    <color name="grade_material_four">#a0c431</color>
+    <color name="grade_material_three">#ffb940</color>
+    <color name="grade_material_two">#ff774d</color>
+    <color name="grade_material_one">#d43f3f</color>
     <color name="grade_material_default">#607d8b</color>
 
     <color name="grade_vulcan_six">#91b43c</color>
@@ -29,17 +37,10 @@
     <color name="grade_vulcan_one">#d65757</color>
     <color name="grade_vulcan_default">#3d5f9c</color>
 
-    <color name="bottom_nav_background">#303030</color>
-    <color name="bottom_nav_background_inverse">#ffffff</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>
+    <!--Dark color resource for app widgets-->
 
-    <color name="divider">#cccccc</color>
-    <color name="divider_inverse">#777777</color>
-
-    <color name="spinner_stroke">#61000000</color>
+    <color name="colorWidgetBackground">#121212</color>
+    <color name="colorWidgetTopBar">#272727</color>
+    <color name="colorWidgetNavButton">#383838</color>
 </resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 9646c0b4..00000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#D32F2F</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/library_wulkanowy_api.xml b/app/src/main/res/values/library_wulkanowy_api.xml
deleted file mode 100644
index d16bf86b..00000000
--- a/app/src/main/res/values/library_wulkanowy_api.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="define_WulkanowyApi" translatable="false" />
-
-    <string name="library_WulkanowyApi_author" translatable="false">Wulkanowy</string>
-    <string name="library_WulkanowyApi_authorWebsite" translatable="false">https://github.com/wulkanowy</string>
-
-    <string name="library_WulkanowyApi_libraryName" translatable="false">UONET+ Scraping API</string>
-    <string name="library_WulkanowyApi_libraryDescription" translatable="false">The  UONET+ client using web scraping</string>
-    <string name="library_WulkanowyApi_libraryWebsite" translatable="false">https://github.com/wulkanowy/api</string>
-    <string name="library_WulkanowyApi_libraryVersion" translatable="false">Development</string>
-
-    <string name="library_WulkanowyApi_isOpenSource" translatable="false">true</string>
-    <string name="library_WulkanowyApi_repositoryLink" translatable="false">https://github.com/wulkanowy/api</string>
-
-    <string name="library_WulkanowyApi_licenseId" translatable="false">apache_2_0</string>
-</resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
new file mode 100644
index 00000000..a82b14eb
--- /dev/null
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -0,0 +1,23 @@
+<?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>
+    <bool name="pref_default_grade_statistics_list">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_upcoming_lessons_enable">false</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>
+    <string name="pref_default_timetable_show_whole_class">no</string>
+    <bool name="pref_default_timetable_show_timers">false</bool>
+</resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 730fea59..6cb877ec 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -7,12 +7,19 @@
     <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_grade_statistics_list">grade_statistics_list</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>
+    <string name="pref_key_services_force_sync">services_force_sync</string>
+    <string name="pref_key_notifications_fix_issues">notifications_fix_issues</string>
     <string name="pref_key_notifications_enable">notifications_enable</string>
+    <string name="pref_key_notifications_upcoming_lessons_enable">notifications_upcoming_lessons_enable</string>
     <string name="pref_key_notification_debug">notification_debug</string>
     <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
     <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
     <string name="pref_key_fill_message_content">fill_message_content</string>
+    <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
+    <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
 </resources>
diff --git a/app/src/main/res/values/value_prefernces.xml b/app/src/main/res/values/preferences_values.xml
similarity index 65%
rename from app/src/main/res/values/value_prefernces.xml
rename to app/src/main/res/values/preferences_values.xml
index 97396baa..76427a48 100644
--- a/app/src/main/res/values/value_prefernces.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string-array name="startup_tab_entries" translatable="false">
         <item>@string/grade_title</item>
         <item>@string/attendance_title</item>
@@ -13,17 +13,34 @@
         <item>3</item>
     </string-array>
 
-    <string-array name="app_theme_entries">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Light</item>
         <item>Dark</item>
         <item>Black (AMOLED)</item>
     </string-array>
-    <string-array name="app_theme_values" translatable="false">
+    <string-array name="app_theme_values" translatable="false" tools:ignore="InconsistentArrays">
         <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>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+    <string-array name="app_language_values" translatable="false">
+        <item>system</item>
+        <item>pl</item>
+        <item>en</item>
+        <item>ru</item>
+        <item>uk</item>
+        <item>de</item>
+    </string-array>
+
     <string-array name="services_interval_entries">
         <item>15 minutes</item>
         <item>30 minutes</item>
@@ -44,7 +61,7 @@
     </string-array>
 
     <string-array name="grade_modifier_entries">
-        <item>Default</item>
+        <item>0,00</item>
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
@@ -70,11 +87,22 @@
     </string-array>
 
     <string-array name="grade_average_mode_entries">
-        <item>Average grades from the 2nd semester</item>
+        <item>Average of grades only from the 2nd semester</item>
         <item>Average of grades from the whole year</item>
     </string-array>
     <string-array name="grade_average_mode_values" translatable="false">
         <item>only_one_semester</item>
         <item>all_year</item>
     </string-array>
+
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Don\'t show</item>
+        <item>Show all</item>
+        <item>Show smaller</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_values" translatable="false">
+        <item>no</item>
+        <item>yes</item>
+        <item>small</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd94e5b6..6e08fded 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">Wulkanowy</string>
 
 
@@ -12,6 +14,9 @@
     <string name="settings_title">Settings</string>
     <string name="more_title">More</string>
     <string name="about_title">About</string>
+    <string name="logviewer_title">Log viewer</string>
+    <string name="contributors_title">Contributors</string>
+    <string name="license_title">Licenses</string>
     <string name="message_title">Messages</string>
     <string name="send_message_title">New message</string>
     <string name="note_title">Notes and achievements</string>
@@ -19,22 +24,56 @@
     <string name="account_title">Choose account</string>
 
 
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %d, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
     <string name="login_header_symbol">Enter the symbol</string>
-    <string name="login_nickname_hint">Email or nick</string>
+    <string name="login_nickname_hint">Username</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">Register</string>
+    <string name="login_host_hint">UONET+ Register</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">API key</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
-    <string name="login_invalid_password">This password is too short</string>
-    <string name="login_incorrect_password">Login details are incorrect</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password">Login details are incorrect. Make sure the correct UONET+ register is selected</string>
+    <string name="login_invalid_pin">Invalid PIN</string>
+    <string name="login_invalid_token">Invalid token</string>
+    <string name="login_expired_token">Token expired</string>
+    <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Invalid login</string>
+    <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
-    <string name="login_duplicate_student">The selected student is already logged in</string>
-    <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_duplicate_student">Selected student is already logged in</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Select students to log in to the application</string>
+    <string name="login_advanced">Other options</string>
+    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
+    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
+    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</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_details">Describe details of problem:</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\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nOpis problemu: </string>
+    <string name="login_recover_warning">Make sure the correct UONET+ register is selected!</string>
+    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_title">Recover your account</string>
+    <string name="login_recover">Recover</string>
+    <string name="login_signed_in">Student is already signed in</string>
 
 
     <!--Main-->
@@ -50,10 +89,12 @@
     <string name="grade_switch_semester">Change semester</string>
     <string name="grade_no_items">No grades</string>
     <string name="grade_weight">Weight</string>
+    <string name="grade_weight_value">Weight: %s</string>
     <string name="grade_comment">Comment</string>
     <string name="grade_no_new_items">No new grades</string>
     <string name="grade_number_new_items">Number of new ratings: %1$d</string>
     <string name="grade_average">Average: %1$.2f</string>
+    <string name="grade_points_sum">Points: %s</string>
     <string name="grade_no_average">No average</string>
     <string name="grade_predicted">Predicted: %1$s</string>
     <string name="grade_final">Final: %1$s</string>
@@ -65,8 +106,9 @@
     <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 grades</string>
-    <string name="grade_statistics_semester">Semester grades</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d grade</item>
         <item quantity="other">%d grades</item>
@@ -88,6 +130,14 @@
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
     <string name="timetable_no_items">No lessons this day</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
 
 
     <!--Completed lessons-->
@@ -114,10 +164,16 @@
         <item quantity="one">%1$d absence</item>
         <item quantity="other">%1$d absences</item>
     </plurals>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excused successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
 
 
     <!--Attendance summary-->
     <string name="attendance_summary_final">Attendance</string>
+    <string name="attendance_summary_total">Total</string>
 
 
     <!--Exam-->
@@ -163,6 +219,7 @@
 
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
+    <string name="note_points">Points</string>
     <plurals name="note_number_item">
         <item quantity="one">%d note</item>
         <item quantity="other">%d notes</item>
@@ -179,6 +236,9 @@
 
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
+    <string name="homework_mark_as_done">Mark as done</string>
+    <string name="homework_mark_as_undone">Mark as undone</string>
+    <string name="homework_attachments">Attachments</string>
 
 
     <!--Lucky number-->
@@ -191,7 +251,7 @@
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile devices</string>
     <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Unregister</string>
+    <string name="mobile_devices_unregister">Deregister</string>
     <string name="mobile_device_removed">Device removed</string>
     <string name="mobile_device_qr">QR code</string>
     <string name="mobile_device_token">Token</string>
@@ -199,6 +259,28 @@
     <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>
@@ -207,13 +289,41 @@
 
 
     <!--About-->
-    <string name="about_discord_invite">Discord</string>
+    <string name="about_version">App version</string>
+    <string name="about_contributor">Contributors</string>
+    <string name="about_contributor_summary">List of Wulkanowy developers</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>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
     <string name="about_homepage">Homepage</string>
+    <string name="about_homepage_summary">Visit the website and help develop the application</string>
+    <string name="about_licenses">Licenses</string>
+    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+    <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nTreść zgłoszenia:</string>
+
+
+    <!--Licenses-->
+    <string name="license_dialog_title">License</string>
+
+
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">See more on GitHub</string>
+
+
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
 
 
     <!--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>
@@ -227,10 +337,16 @@
     <string name="all_subject">Subject</string>
     <string name="all_prev">Prev</string>
     <string name="all_next">Next</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search...</string>
 
 
     <!--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>
+    <string name="widget_timetable_theme_system">System Theme</string>
 
 
     <!--Preferences-->
@@ -241,17 +357,34 @@
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson in timetable</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_timetable_show_whole_class">Show whole class lessons</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>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</string>
     <string name="pref_notify_debug_switch">Show debug notifications</string>
 
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
-    <string name="pref_services_suspended">Suspended on holiday</string>
+    <string name="pref_services_suspended">Suspended on holidays</string>
     <string name="pref_services_interval">Updates interval</string>
     <string name="pref_services_wifi">Wi-Fi only</string>
+    <string name="pref_services_force_sync">Sync now</string>
+    <string name="pref_services_message_sync_success">Synced!</string>
+    <string name="pref_services_message_sync_failed">Sync failed</string>
+    <string name="pref_services_sync_in_progress">Sync in progress</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronization</string>
+    <string name="pref_services_dialog_force_sync_summary">
+        Manual sync doesn\'t refresh app views.
+        \nTo see the synced data relaunch the app after syncing.
+    </string>
 
     <string name="pref_other_header">Other</string>
     <string name="pref_other_grade_modifier_plus">Value of the plus</string>
@@ -261,6 +394,12 @@
 
     <!--Notification Channels-->
     <string name="channel_new_entries">New entries in register</string>
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_lucky_number">Lucky number</string>
+    <string name="channel_new_message">New messages</string>
+    <string name="channel_new_notes">New notes</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
     <string name="channel_debug">Debug</string>
 
 
@@ -280,9 +419,11 @@
 
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
-    <string name="error_timeout">Too long waiting time for connection to the register</string>
-    <string name="error_login_failed">Login is failed. Try again or restart the app</string>
-    <string name="error_service_unavailable">The log is not available. Try again later</string>
+    <string name="error_timeout">Connection to the register timed out</string>
+    <string name="error_login_failed">Login failed. Try again or restart the app</string>
+    <string name="error_password_change_required">Password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
     <string name="error_unknown">An unexpected error occurred</string>
     <string name="error_feature_disabled">Feature disabled by your school</string>
+    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 58699c9e..8f30e345 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,51 +1,35 @@
 <resources>
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="actionMenuTextColor">@android:color/primary_text_dark</item>
-        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
-        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
-        <item name="android:textColorTertiary">@android:color/primary_text_light</item>
-        <item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
-        <item name="titleTextColor">@android:color/primary_text_dark</item>
-        <item name="subtitleTextColor">@android:color/primary_text_dark</item>
-        <item name="android:colorBackground">@android:color/white</item>
-        <item name="bottomNavBackground">@color/bottom_nav_background_inverse</item>
-        <item name="dividerColor">@color/divider</item>
-        <item name="chip_detailed_backgroundColor">@color/chip_detailed_backgroundColor</item>
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
 
-        <!-- AboutLibraries specific values -->
-        <item name="about_libraries_window_background">@color/about_libraries_window_background</item>
-        <item name="about_libraries_card">@color/about_libraries_card</item>
-        <item name="about_libraries_title_openSource">@color/about_libraries_title_openSource</item>
-        <item name="about_libraries_title_description">@color/about_libraries_title_openSource</item>
-        <item name="about_libraries_text_openSource">@color/about_libraries_text_openSource</item>
-        <item name="about_libraries_special_button_openSource">@color/about_libraries_special_button_openSource</item>
-        <item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource</item>
-        <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item>
+    <style name="BaseWulkanowyTheme" parent="@style/Theme.MaterialComponents.Light">
+        <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>
+        <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
+    </style>
+
+    <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
     </style>
 
-    <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
+    <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="WulkanowyTheme.ActionBar" parent="WulkanowyTheme">
-        <item name="colorControlNormal">@android:color/white</item>
-    </style>
-
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.AppCompat.Light.Dialog">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
-        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
-    </style>
+    <style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog"/>
 </resources>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 00000000..f0da4709
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,5 @@
+<paths>
+    <files-path
+        name="files"
+        path="." />
+</paths>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index ccacfe9d..c05910f9 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,119 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:title="@string/pref_view_header"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_view_header">
         <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/startup_tab_entries"
-            android:entryValues="@array/startup_tab_value"
-            android:key="@string/pref_key_start_menu"
-            android:summary="%s"
-            android:title="@string/pref_view_list"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_startup"
+            app:entries="@array/startup_tab_entries"
+            app:entryValues="@array/startup_tab_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_start_menu"
+            app:title="@string/pref_view_list"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="light"
-            android:entries="@array/app_theme_entries"
-            android:entryValues="@array/app_theme_values"
-            android:key="@string/pref_key_app_theme"
-            android:summary="%s"
-            android:title="@string/pref_view_app_theme"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_attendance_present"
-            android:title="@string/pref_view_present"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_expand_grade"
-            android:title="@string/pref_view_expand_grade"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_app_theme"
+            app:entries="@array/app_theme_entries"
+            app:entryValues="@array/app_theme_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_app_theme"
+            app:title="@string/pref_view_app_theme"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_attendance_present"
+            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:iconSpaceReserved="false"
+            app:key="@string/pref_key_expand_grade"
+            app:title="@string/pref_view_expand_grade" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_timetable_show_timers"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_timers"
+            app:title="@string/pref_view_timetable_show_timers" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_grade_statistics_list"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_statistics_list"
+            app:title="@string/pref_view_grade_statistics_list" />
         <ListPreference
-            android:defaultValue="vulcan"
-            android:entries="@array/grade_color_scheme_entries"
-            android:entryValues="@array/grade_color_scheme_values"
-            android:key="@string/pref_key_grade_color_scheme"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_color_scheme"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_timetable_show_whole_class"
+            app:entries="@array/timetable_show_whole_class_entries"
+            app:entryValues="@array/timetable_show_whole_class_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_whole_class"
+            app:title="@string/pref_view_timetable_show_whole_class"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_grade_color_scheme"
+            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
-        android:title="@string/pref_services_header"
-        app:iconSpaceReserved="false">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_services_enable"
-            android:title="@string/pref_services_switch"
-            app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_services_header">
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_services_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_enable"
+            app:title="@string/pref_services_switch" />
         <ListPreference
-            android:defaultValue="60"
-            android:dependency="services_enable"
-            android:entries="@array/services_interval_entries"
-            android:entryValues="@array/services_interval_value"
-            android:key="@string/pref_key_services_interval"
-            android:summary="%s"
-            android:title="@string/pref_services_interval"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:dependency="services_enable"
-            android:key="@string/pref_key_services_wifi_only"
-            android:title="@string/pref_services_wifi"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_services_interval"
+            app:dependency="services_enable"
+            app:entries="@array/services_interval_entries"
+            app:entryValues="@array/services_interval_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_interval"
+            app:title="@string/pref_services_interval"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_services_wifi_only"
+            app:dependency="services_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_wifi_only"
+            app:title="@string/pref_services_wifi" />
+        <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_force_sync"
+            app:title="@string/pref_services_force_sync" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_notify_header"
-        app:iconSpaceReserved="false">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:dependency="services_enable"
-            android:key="@string/pref_key_notifications_enable"
-            android:title="@string/pref_notify_switch"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_notification_debug"
-            android:title="@string/pref_notify_debug_switch"
-            app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_notify_header">
+        <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_fix_issues"
+            app:title="@string/pref_notify_fix_sync_issues" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_notifications_enable"
+            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_upcoming_lessons_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_upcoming_lessons_enable"
+            app:title="@string/pref_notify_upcoming_lessons_switch" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_notification_debug"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notification_debug"
+            app:title="@string/pref_notify_debug_switch" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_other_header"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_other_header">
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_plus"
-            android:summary="%s"
-            android:title="@string/pref_other_grade_modifier_plus"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_grade_modifier_plus"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_plus"
+            app:title="@string/pref_other_grade_modifier_plus"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_minus"
-            android:summary="%s"
-            android:title="@string/pref_other_grade_modifier_minus"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_grade_modifier_minus"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_minus"
+            app:title="@string/pref_other_grade_modifier_minus"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="only_one_semester"
-            android:entries="@array/grade_average_mode_entries"
-            android:entryValues="@array/grade_average_mode_values"
-            android:key="@string/pref_key_grade_average_mode"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_average_mode"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_grade_average_force_calc"
-            android:title="@string/pref_view_grade_average_force_calc"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_fill_message_content"
-            android:title="@string/pref_other_fill_message_content"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="@string/pref_default_grade_average_mode"
+            app:entries="@array/grade_average_mode_entries"
+            app:entryValues="@array/grade_average_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_average_mode"
+            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:key="@string/pref_key_grade_average_force_calc"
+            app:title="@string/pref_view_grade_average_force_calc" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_fill_message_content"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_fill_message_content"
+            app:title="@string/pref_other_fill_message_content" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index 4f76ef83..e374577d 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -1,31 +1,46 @@
 package io.github.wulkanowy.utils
 
-import android.content.Context
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
-import io.fabric.sdk.android.Fabric
-import timber.log.Timber
+import android.util.Log
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import fr.bipi.tressence.base.FormatterPriorityTree
+import fr.bipi.tressence.common.StackTraceRecorder
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import java.net.UnknownHostException
 
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    Fabric.with(Fabric.Builder(context)
-        .kits(
-            Crashlytics.Builder()
-                .core(CrashlyticsCore.Builder()
-                    .disabled(!appInfo.isCrashlyticsEnabled)
-                    .build())
-                .build()
-        )
-        .debuggable(appInfo.isDebug)
-        .build())
-}
+class CrashlyticsTree : FormatterPriorityTree(Log.VERBOSE) {
 
-class CrashlyticsTree : Timber.Tree() {
+    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+
+    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
+        if (t is FeatureDisabledException || t is FeatureNotAvailableException || t is UnknownHostException) {
+            return true
+        }
+
+        return super.skipLog(priority, tag, message, t)
+    }
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        Crashlytics.setInt("priority", priority)
-        Crashlytics.setString("tag", tag)
+        if (skipLog(priority, tag, message, t)) return
 
-        if (t == null) Crashlytics.log(message)
-        else Crashlytics.logException(t)
+        crashlytics.log(format(priority, tag, message))
+    }
+}
+
+class CrashlyticsExceptionTree : FormatterPriorityTree(Log.ERROR) {
+
+    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        if (skipLog(priority, tag, message, t)) return
+
+        crashlytics.setCustomKey("priority", priority)
+        crashlytics.setCustomKey("tag", tag.orEmpty())
+        crashlytics.setCustomKey("message", message)
+        if (t != null) {
+            crashlytics.recordException(t)
+        } else {
+            crashlytics.recordException(StackTraceRecorder(format(priority, tag, message)))
+        }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
new file mode 100644
index 00000000..5d003f27
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -0,0 +1,74 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.sdk.Sdk
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+
+fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
+    return Semester(
+        studentId = 1,
+        diaryId = diaryId,
+        semesterId = semesterId,
+        diaryName = "$semesterId",
+        schoolYear = 1970,
+        classId = 0,
+        semesterName = semesterName,
+        unitId = 1,
+        start = start,
+        end = end
+    )
+}
+
+fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
+    return Student(
+        scrapperBaseUrl = "http://fakelog.cf",
+        email = "jan@fakelog.cf",
+        certificateKey = "",
+        classId = 0,
+        className = "",
+        isCurrent = false,
+        isParent = false,
+        loginMode = mode.name,
+        loginType = "STANDARD",
+        mobileBaseUrl = "",
+        password = "",
+        privateKey = "",
+        registrationDate = now(),
+        schoolName = "",
+        schoolShortName = "test",
+        schoolSymbol = "",
+        studentId = 0,
+        studentName = "",
+        symbol = "",
+        userLoginId = 0
+    )
+}
+
+fun getTimetableEntity(
+    isStudentPlan: Boolean = false,
+    canceled: Boolean = false,
+    start: LocalDateTime = now(),
+    end: LocalDateTime = now()
+) = Timetable(
+    studentId = 0,
+    subject = "",
+    number = 0,
+    diaryId = 0,
+    canceled = canceled,
+    changes = false,
+    date = LocalDate.now(),
+    end = end,
+    group = "",
+    info = "",
+    isStudentPlan = isStudentPlan,
+    room = "",
+    roomOld = "",
+    start = start,
+    subjectOld = "",
+    teacher = "",
+    teacherOld = ""
+)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
index 28abbb99..954c191c 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -5,14 +5,14 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error
 import io.reactivex.Observable
 import io.reactivex.Single
 
-class UnitTestInternetObservingStrategy : InternetObservingStrategy {
+class UnitTestInternetObservingStrategy(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
 
     override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
-        return Single.just(true)
+        return Single.just(isInternetConnection)
     }
 
     override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
-        return Observable.just(true)
+        return Observable.just(isInternetConnection)
     }
 
     override fun getDefaultPingHost() = "localhost"
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index 8adfa83b..a5b79cfd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -1,8 +1,10 @@
 package io.github.wulkanowy.data.repositories.attendance
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.attendance.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Attendance
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -12,16 +14,18 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.threeten.bp.LocalDate
-import java.sql.Date
+import org.threeten.bp.LocalDate.of
 
 class AttendanceRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private var student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -29,29 +33,47 @@ class AttendanceRemoteTest {
 
     @Test
     fun getAttendanceTest() {
-        every { mockApi.getAttendance(
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
-        ) } returns Single.just(listOf(
-                getAttendance("2018-09-10"),
-                getAttendance("2018-09-17")
+        every { mockSdk.init(student) } returns mockSdk
+        every {
+            mockSdk.getAttendance(
+                of(2018, 9, 10),
+                of(2018, 9, 15),
+                1
+            )
+        } returns Single.just(listOf(
+            getAttendance(of(2018, 9, 10)),
+            getAttendance(of(2018, 9, 17))
         ))
 
-        every { mockApi.diaryId } returns 1
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val attendance = AttendanceRemote(mockApi).getAttendance(semesterMock,
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)).blockingGet()
+        val attendance = AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, attendance.size)
     }
 
-    private fun getAttendance(dateString: String): Attendance {
-        return Attendance().apply {
-            subject = "Fizyka"
-            name = "Obecność"
-            date = Date.valueOf(dateString)
-        }
+    private fun getAttendance(date: LocalDate): Attendance {
+        return Attendance(
+            subject = "Fizyka",
+            name = "Obecność",
+            date = date,
+            timeId = 0,
+            number = 0,
+            deleted = false,
+            excusable = false,
+            excused = false,
+            exemption = false,
+            lateness = false,
+            presence = false,
+            categoryId = 1,
+            absence = false,
+            excuseStatus = null
+        )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
index bb9f5294..10307fee 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -1,8 +1,10 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.timetable.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.CompletedLesson
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -12,16 +14,18 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.threeten.bp.LocalDate
-import java.sql.Date
+import org.threeten.bp.LocalDate.of
 
 class CompletedLessonsRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -29,28 +33,41 @@ class CompletedLessonsRemoteTest {
 
     @Test
     fun getCompletedLessonsTest() {
+        every { mockSdk.init(student) } returns mockSdk
         every {
-            mockApi.getCompletedLessons(
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
+            mockSdk.getCompletedLessons(
+                of(2018, 9, 10),
+                of(2018, 9, 15)
             )
         } returns Single.just(listOf(
-            getCompletedLesson("2018-09-10"),
-            getCompletedLesson("2018-09-17")
+            getCompletedLesson(of(2018, 9, 10)),
+            getCompletedLesson(of(2018, 9, 17))
         ))
 
-        every { mockApi.diaryId } returns 1
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val completed = CompletedLessonsRemote(mockApi).getCompletedLessons(semesterMock,
-            LocalDate.of(2018, 9, 10),
-            LocalDate.of(2018, 9, 15)
+        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
         ).blockingGet()
         Assert.assertEquals(2, completed.size)
     }
 
-    private fun getCompletedLesson(dateString: String): CompletedLesson {
-        return CompletedLesson().apply { date = Date.valueOf(dateString) }
+    private fun getCompletedLesson(date: LocalDate): CompletedLesson {
+        return CompletedLesson(
+            date = date,
+            subject = "",
+            absence = "",
+            resources = "",
+            substitution = "",
+            teacherSymbol = "",
+            teacher = "",
+            topic = "",
+            number = 1
+        )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index 0c83bed0..aecef472 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -1,8 +1,10 @@
 package io.github.wulkanowy.data.repositories.exam
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.exams.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Exam
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -12,52 +14,61 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.threeten.bp.LocalDate
-import java.sql.Date
+import org.threeten.bp.LocalDate.of
 
 class ExamRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
-    fun initApi() {
+    fun setUp() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getExamsTest() {
-        every { mockApi.getExams(
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
-        ) } returns Single.just(listOf(
-                getExam("2018-09-10"),
-                getExam("2018-09-17")
+        every { mockSdk.init(student) } returns mockSdk
+        every { mockSdk.switchDiary(1, 2019) } returns mockSdk
+
+        every {
+            mockSdk.getExams(
+                of(2018, 9, 10),
+                of(2018, 9, 15),
+                1
+            )
+        } returns Single.just(listOf(
+            getExam(of(2018, 9, 10)),
+            getExam(of(2018, 9, 17))
         ))
 
-        every { mockApi.diaryId } returns 1
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
 
-        val exams = ExamRemote(mockApi).getExams(semesterMock,
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
+        val exams = ExamRemote(mockSdk).getExams(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
         ).blockingGet()
         assertEquals(2, exams.size)
     }
 
-    private fun getExam(dateString: String): Exam {
-        return Exam().apply {
-            subject = ""
-            group = ""
-            type = ""
-            description = ""
-            teacher = ""
-            teacherSymbol = ""
-            date = Date.valueOf(dateString)
-            entryDate = Date.valueOf(dateString)
-        }
+    private fun getExam(date: LocalDate): Exam {
+        return Exam(
+            subject = "",
+            group = "",
+            type = "",
+            description = "",
+            teacher = "",
+            teacherSymbol = "",
+            date = date,
+            entryDate = date
+        )
     }
 }
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 37d3f2ad..77c87025 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,52 +1,86 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.grades.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.GradePointsStatistics
+import io.github.wulkanowy.sdk.pojo.GradeStatistics
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import io.reactivex.Single
-import org.junit.Assert
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
 class GradeStatisticsRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
+        every { mockSdk.init(student) } returns mockSdk
     }
 
     @Test
     fun getGradeStatisticsTest() {
-        every { mockApi.getGradesStatistics(1, any()) } returns Single.just(listOf(
+        every { mockSdk.getGradesPartialStatistics(1) } returns Single.just(listOf(
             getGradeStatistics("Fizyka"),
             getGradeStatistics("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
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = GradeStatisticsRemote(mockApi).getGradeStatistics(semesterMock, false).blockingGet()
-        Assert.assertEquals(2, stats.size)
+        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false).blockingGet()
+        assertEquals(2, stats.size)
+    }
+
+    @Test
+    fun getGradePointsStatisticsTest() {
+        every { mockSdk.getGradesPointsStatistics(1) } returns Single.just(listOf(
+            getGradePointsStatistics("Fizyka"),
+            getGradePointsStatistics("Matematyka")
+        ))
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
+
+        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock).blockingGet()
+        assertEquals(2, stats.size)
     }
 
     private fun getGradeStatistics(subjectName: String): GradeStatistics {
-        return GradeStatistics().apply {
-            subject = subjectName
-            gradeValue = 5
-            amount = 10
-        }
+        return GradeStatistics(
+            subject = subjectName,
+            gradeValue = 5,
+            amount = 10,
+            grade = "",
+            semesterId = 1
+        )
+    }
+
+    private fun getGradePointsStatistics(subjectName: String): GradePointsStatistics {
+        return GradePointsStatistics(
+            semesterId = 1,
+            subject = subjectName,
+            student = 0.80,
+            others = 0.40
+        )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
index 67e6c2ef..cbdf34fa 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -1,11 +1,10 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRemote
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
 import io.mockk.every
-import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import io.reactivex.Maybe
 import org.junit.Assert.assertEquals
@@ -16,30 +15,28 @@ import org.threeten.bp.LocalDate
 class LuckyNumberRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
-    @MockK
-    private lateinit var semesterMock: Semester
+    private val student = getStudentEntity(Sdk.Mode.SCRAPPER)
 
     @Before
-    fun initApi() {
+    fun setUp() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getLuckyNumberTest() {
-        every { mockApi.getLuckyNumber() } returns Maybe.just(14)
+        every { mockSdk.init(student) } returns mockSdk
+        every { mockSdk.getLuckyNumber("test") } returns Maybe.just(14)
 
-        every { mockApi.diaryId } returns 1
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.diaryId } returns 1
+        every { mockSdk.diaryId } returns 1
 
-        val luckyNumber = LuckyNumberRemote(mockApi)
-            .getLuckyNumber(semesterMock)
+        val luckyNumber = LuckyNumberRemote(mockSdk)
+            .getLuckyNumber(student)
             .blockingGet()
 
         assertEquals(14, luckyNumber.luckyNumber)
         assertEquals(LocalDate.now(), luckyNumber.date)
-        assertEquals(semesterMock.studentId, luckyNumber.studentId)
+        assertEquals(student.studentId, luckyNumber.studentId)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
new file mode 100644
index 00000000..b7963d43
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -0,0 +1,114 @@
+package io.github.wulkanowy.data.repositories.message
+
+import androidx.room.EmptyResultSetException
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.reactivex.Single
+import io.reactivex.observers.TestObserver
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
+import java.net.UnknownHostException
+
+class MessageRepositoryTest {
+
+    @Mock
+    lateinit var local: MessageLocal
+
+    @Mock
+    lateinit var remote: MessageRemote
+
+    @Mock
+    lateinit var student: Student
+
+    private val testObservingStrategy = UnitTestInternetObservingStrategy()
+
+    private lateinit var repo: MessageRepository
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+
+        repo = MessageRepository(InternetObservingSettings.builder()
+            .strategy(testObservingStrategy)
+            .build(), local, remote)
+    }
+
+    @Test
+    fun `throw error when message is not in the db`() {
+        val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(EmptyResultSetException::class.java)
+    }
+
+    @Test
+    fun `get message when content already in db`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage).blockingGet()
+
+        assertEquals("Test", message.message.content)
+    }
+
+    @Test
+    fun `get message when content in db is empty`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val testMessageWithContent = testMessage.copy(content = "Test")
+
+        val mWa = MessageWithAttachment(testMessage, emptyList())
+        val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
+
+        `when`(local.getMessageWithAttachment(student, testMessage))
+            .thenReturn(Single.just(mWa))
+            .thenReturn(Single.just(mWaWithContent))
+        `when`(remote.getMessagesContentDetails(student, testMessageWithContent)).thenReturn(Single.just("Test" to emptyList()))
+
+        val message = repo.getMessage(student, testMessage).blockingGet()
+
+        assertEquals("Test", message.message.content)
+        verify(local).updateMessages(listOf(testMessageWithContent))
+    }
+
+    @Test
+    fun `get message when content in db is empty and there is no internet connection`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
+    }
+
+    @Test
+    fun `get message when content in db is empty, unread and there is no internet connection`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
index 9c1bb975..c586572f 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.getStudentEntity
 import io.reactivex.Maybe
 import io.reactivex.Single
 import org.junit.Before
@@ -25,6 +26,8 @@ class MobileDeviceRepositoryTest {
     @Mock
     private lateinit var mobileDeviceLocal: MobileDeviceLocal
 
+    private val student = getStudentEntity()
+
     private lateinit var mobileDeviceRepository: MobileDeviceRepository
 
     private val settings = InternetObservingSettings.builder()
@@ -45,9 +48,9 @@ class MobileDeviceRepositoryTest {
         )
 
         doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
-        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(semester)
+        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(student, semester)
 
-        mobileDeviceRepository.getDevices(semester).blockingGet()
+        mobileDeviceRepository.getDevices(student, semester).blockingGet()
 
         verify(mobileDeviceLocal).deleteDevices(emptyList())
         verify(mobileDeviceLocal).saveDevices(devices)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
index 7856b937..c00a771c 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -1,19 +1,21 @@
 package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.createSemesterEntity
 import io.reactivex.Maybe
 import io.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
-import org.mockito.Mockito.doNothing
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
 
 class SemesterRepositoryTest {
 
@@ -23,9 +25,6 @@ class SemesterRepositoryTest {
     @Mock
     private lateinit var semesterLocal: SemesterLocal
 
-    @Mock
-    private lateinit var apiHelper: ApiHelper
-
     @Mock
     private lateinit var student: Student
 
@@ -38,17 +37,17 @@ class SemesterRepositoryTest {
     @Before
     fun initTest() {
         MockitoAnnotations.initMocks(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings, apiHelper)
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings)
+        doReturn("SCRAPPER").`when`(student).loginMode
     }
 
     @Test
-    fun singleCurrentSemesterTest() {
+    fun getSemesters_noSemesters() {
         val semesters = listOf(
-            createSemesterEntity(false),
-            createSemesterEntity(true)
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        doNothing().`when`(apiHelper).initApi(student)
         doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
         doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
@@ -58,17 +57,140 @@ class SemesterRepositoryTest {
         verify(semesterLocal).saveSemesters(semesters)
     }
 
-    @Test(expected = IllegalArgumentException::class)
-    fun twoCurrentSemesterTest() {
-        val semesters = listOf(
-            createSemesterEntity(true),
-            createSemesterEntity(true)
+    @Test
+    fun getSemesters_invalidDiary_api() {
+        doReturn("API").`when`(student).loginMode
+        val badSemesters = listOf(
+            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(0, 2, now().minusMonths(3), now())
+        )
+
+        doReturn(Maybe.just(badSemesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+        assertEquals(0, items[0].diaryId)
+    }
+
+    @Test
+    fun getSemesters_invalidDiary_scrapper() {
+        doReturn("SCRAPPER").`when`(student).loginMode
+        val badSemesters = listOf(
+            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(0, 2, now().minusMonths(3), now())
+        )
+
+        val goodSemesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        doReturn(Maybe.just(badSemesters), Maybe.just(badSemesters), Maybe.just(goodSemesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(goodSemesters)).`when`(semesterRemote).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+        assertNotEquals(0, items[0].diaryId)
+    }
+
+    @Test
+    fun getSemesters_noCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_oneCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_noSemesters_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        doNothing().`when`(apiHelper).initApi(student)
         doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
         doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        semesterRepository.getSemesters(student).blockingGet()
+        semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
+    }
+
+    @Test
+    fun getSemesters_noCurrent_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun getCurrentSemester_doubleCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 1, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        semesterRepository.getCurrentSemester(student).blockingGet()
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun getCurrentSemester_emptyList() {
+        doReturn(Maybe.just(emptyList<Semester>())).`when`(semesterLocal).getSemesters(student)
+
+        semesterRepository.getCurrentSemester(student).blockingGet()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
deleted file mode 100644
index f628710f..00000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-import io.github.wulkanowy.data.db.entities.Semester
-import org.threeten.bp.LocalDate.now
-
-fun createSemesterEntity(current: Boolean): Semester {
-    return Semester(
-        studentId = 0,
-        diaryId = 0,
-        semesterId = 0,
-        diaryName = "",
-        schoolYear = 1970,
-        classId = 0,
-        isCurrent = current,
-        semesterName = 0,
-        unitId = 0,
-        start = now(),
-        end = now()
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index 4d7b23eb..b6b195c9 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -1,19 +1,20 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.register.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Student
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
+import org.mockito.Mockito.anyString
 import org.mockito.Mockito.doReturn
 import org.mockito.MockitoAnnotations
 
 class StudentRemoteTest {
 
     @Mock
-    private lateinit var mockApi: Api
+    private lateinit var mockSdk: Sdk
 
     @Before
     fun initApi() {
@@ -22,11 +23,32 @@ class StudentRemoteTest {
 
     @Test
     fun testRemoteAll() {
-        doReturn(Single.just(listOf(Student("", "", 1, "test", "", "", "", 1, Api.LoginType.AUTO))))
-            .`when`(mockApi).getStudents()
+        doReturn(Single.just(listOf(getStudent("test")))).`when`(mockSdk).getStudentsFromScrapper(anyString(), anyString(), anyString(), anyString())
 
-        val students = StudentRemote(mockApi).getStudents("", "", "").blockingGet()
+        val students = StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "").blockingGet()
         assertEquals(1, students.size)
         assertEquals("test", students.first().studentName)
     }
+
+    private fun getStudent(name: String): Student {
+        return Student(
+            email = "",
+            symbol = "",
+            studentId = 0,
+            userLoginId = 0,
+            studentName = name,
+            schoolSymbol = "",
+            schoolShortName = "",
+            schoolName = "",
+            className = "",
+            classId = 0,
+            certificateKey = "",
+            privateKey = "",
+            loginMode = Sdk.Mode.SCRAPPER,
+            mobileBaseUrl = "",
+            loginType = Sdk.ScrapperLoginType.STANDARD,
+            scrapperBaseUrl = "",
+            isParent = false
+        )
+    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index 4bb4091f..d2b4a667 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.timetable.Timetable
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.timetable.TimetableRemote
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Timetable
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -13,16 +13,19 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.threeten.bp.LocalDate
-import java.sql.Date
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime.now
 
 class TimetableRemoteTest {
 
     @SpyK
-    private var mockApi = Api()
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -30,26 +33,46 @@ class TimetableRemoteTest {
 
     @Test
     fun getTimetableTest() {
-        every { mockApi.getTimetable(
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
-        ) } returns Single.just(listOf(
-                getTimetable("2018-09-10"),
-                getTimetable("2018-09-17")
+        every {
+            mockSdk.getTimetable(
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        } returns Single.just(listOf(
+            getTimetable(of(2018, 9, 10)),
+            getTimetable(of(2018, 9, 17))
         ))
 
-        every { mockApi.diaryId } returns 1
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val timetable = TimetableRemote(mockApi).getTimetable(semesterMock,
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 15)
+        val timetable = TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
         ).blockingGet()
         assertEquals(2, timetable.size)
     }
 
-    private fun getTimetable(dateString: String): Timetable {
-        return Timetable(date = Date.valueOf(dateString))
+    private fun getTimetable(date: LocalDate): Timetable {
+        return Timetable(
+            date = date,
+            number = 0,
+            teacherOld = "",
+            subjectOld = "",
+            roomOld = "",
+            subject = "",
+            teacher = "",
+            group = "",
+            canceled = false,
+            changes = false,
+            info = "",
+            room = "",
+            end = now(),
+            start = now(),
+            studentPlan = true
+        )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index 3197bb79..fcc30593 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -2,19 +2,21 @@ package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.createSemesterEntity
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.sdk.Sdk
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
-import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.`when`
 import org.mockito.MockitoAnnotations
 import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDateTime
 
 class GradeAverageProviderTest {
@@ -23,137 +25,217 @@ class GradeAverageProviderTest {
     lateinit var preferencesRepository: PreferencesRepository
 
     @Mock
-    lateinit var gradeRepository: GradeRepository
+    lateinit var semesterRepository: SemesterRepository
 
     @Mock
-    lateinit var gradeSummaryRepository: GradeSummaryRepository
+    lateinit var gradeRepository: GradeRepository
 
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student("", "", "", "", "", 101, "", "", "", "", 1, true, LocalDateTime.now())
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
-        Semester(101, 10, "", 1, 21, 1, false, now(), now(), 1, 1),
-        Semester(101, 11, "", 1, 22, 1, false, now(), now(), 1, 1),
-        Semester(101, 11, "", 1, 23, 2, true, now(), now(), 1, 1)
+        createSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
+        createSemesterEntity(11, 22, of(2019, 9, 1), of(2020, 1, 31)),
+        createSemesterEntity(11, 23, of(2020, 2, 1), now(), semesterName = 2)
     )
 
     private val firstGrades = listOf(
-        getGrade(22, "Matematyka", 4),
-        getGrade(22, "Matematyka", 3),
-        getGrade(22, "Fizyka", 6),
-        getGrade(22, "Fizyka", 1)
+        // avg: 3.5
+        getGrade(22, "Matematyka", 4.0),
+        getGrade(22, "Matematyka", 3.0),
+
+        // avg: 3.5
+        getGrade(22, "Fizyka", 6.0),
+        getGrade(22, "Fizyka", 1.0)
     )
 
-    private val secondGrade = listOf(
-        getGrade(23, "Matematyka", 2),
-        getGrade(23, "Matematyka", 3),
-        getGrade(23, "Fizyka", 4),
-        getGrade(23, "Fizyka", 2)
+    private val firstSummaries = listOf(
+        getSummary(semesterId = 22, subject = "Matematyka", average = 3.9),
+        getSummary(semesterId = 22, subject = "Fizyka", average = 3.1)
+    )
+
+    private val secondGrades = listOf(
+        // avg: 2.5
+        getGrade(23, "Matematyka", 2.0),
+        getGrade(23, "Matematyka", 3.0),
+
+        // avg: 3.0
+        getGrade(23, "Fizyka", 4.0),
+        getGrade(23, "Fizyka", 2.0)
+    )
+
+    private val secondSummaries = listOf(
+        getSummary(semesterId = 23, subject = "Matematyka", average = 2.9),
+        getSummary(semesterId = 23, subject = "Fizyka", average = 3.4)
+    )
+
+    private val secondGradeWithModifier = listOf(
+        // avg: 3.375
+        getGrade(24, "Język polski", 3.0, -0.50),
+        getGrade(24, "Język polski", 4.0, 0.25)
+    )
+
+    private val secondSummariesWithModifier = listOf(
+        getSummary(24, "Język polski", 3.49)
     )
 
     @Before
-    fun initTest() {
+    fun setUp() {
         MockitoAnnotations.initMocks(this)
-        gradeAverageProvider = GradeAverageProvider(preferencesRepository, gradeRepository, gradeSummaryRepository)
 
-        doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
-        doReturn(.33).`when`(preferencesRepository).gradePlusModifier
-        doReturn(false).`when`(preferencesRepository).gradeAverageForceCalc
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
 
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
-        doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
+        gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
     }
 
     @Test
     fun onlyOneSemesterTest() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        assertEquals(2, averages.size)
-        assertEquals(2.5, averages["Matematyka"])
-        assertEquals(3.0, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0)
+    }
+
+    @Test
+    fun onlyOneSemester_gradesWithModifiers_default() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0)
+    }
+
+    @Test
+    fun onlyOneSemester_gradesWithModifiers_api() {
+        val student = student.copy(loginMode = Sdk.Mode.API.name)
+
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0)
+    }
+
+    @Test
+    fun onlyOneSemester_gradesWithModifiers_scrapper() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0)
+    }
+
+    @Test
+    fun onlyOneSemester_gradesWithModifiers_hybrid() {
+        val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
+
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("only_one_semester")
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
+
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0)
     }
 
     @Test
     fun allYearFirstSemesterTest() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[1], true)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[1].semesterId, true)
-            .blockingGet()
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId).blockingGet()
 
-        assertEquals(2, averages.size)
-        assertEquals(3.5, averages["Matematyka"])
-        assertEquals(3.5, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test
     fun allYearSecondSemesterTest() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        assertEquals(2, averages.size)
-        assertEquals(3.0, averages["Matematyka"])
-        assertEquals(3.25, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test(expected = IllegalArgumentException::class)
     fun incorrectAverageModeTest() {
-        doReturn("test_mode").`when`(preferencesRepository).gradeAverageMode
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("test_mode")
 
-        gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true).blockingGet()
+        gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).blockingGet()
     }
 
     @Test
-    fun onlyOneSemester_averageFromSummary() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(listOf(
-            getSummary(22, "Matematyka", 3.1),
-            getSummary(22, "Fizyka", 3.26)
-        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+    fun allYearSemester_averageFromSummary() {
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
+            getSummary(22, "Matematyka", 3.0),
+            getSummary(22, "Fizyka", 3.5)
+        )))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 3.5),
+            getSummary(22, "Fizyka", 4.0)
+        )))
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        assertEquals(2, averages.size)
-        assertEquals(3.1, averages["Matematyka"])
-        assertEquals(3.26, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
     @Test
     fun onlyOneSemester_averageFromSummary_forceCalc() {
-        doReturn(true).`when`(preferencesRepository).gradeAverageForceCalc
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(listOf(
-            getSummary(22, "Matematyka", 3.1),
-            getSummary(22, "Fizyka", 3.26)
-        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn("all_year")
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 1.1),
+            getSummary(22, "Fizyka", 7.26)
+        )))
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
-        assertEquals(2, averages.size)
-        assertEquals(3.0, averages["Matematyka"])
-        assertEquals(3.25, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
     }
 
-    private fun getGrade(semesterId: Int, subject: String, value: Int): Grade {
+    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0): Grade {
         return Grade(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
             value = value,
-            modifier = .0,
+            modifier = modifier,
             weightValue = 1.0,
             teacher = "",
             date = now(),
@@ -166,12 +248,12 @@ class GradeAverageProviderTest {
         )
     }
 
-    private fun getSummary(semesterId: Int, subject: String, value: Double): GradeSummary {
+    private fun getSummary(semesterId: Int, subject: String, average: Double): GradeSummary {
         return GradeSummary(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
-            average = value,
+            average = average,
             pointsSum = "",
             proposedPoints = "",
             finalPoints = "",
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 75b7327a..4ef5904f 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).initAdapter()
+        verify(loginView).initView()
         verify(loginView).showActionBar(false)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 453adfba..9d226dac 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -4,7 +4,6 @@ import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.reactivex.Single
 import org.junit.Before
@@ -34,16 +33,13 @@ class LoginFormPresenterTest {
     @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
-    @Mock
-    lateinit var appInfo: AppInfo
-
     private lateinit var presenter: LoginFormPresenter
 
     @Before
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
         clearInvocations(repository, loginFormView)
-        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics, appInfo)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics)
         presenter.onAttachView(loginFormView)
     }
 
@@ -54,49 +50,49 @@ class LoginFormPresenterTest {
 
     @Test
     fun emptyNicknameLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("")
+        `when`(loginFormView.formUsernameValue).thenReturn("")
         `when`(loginFormView.formPassValue).thenReturn("test123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(loginFormView).setErrorNameRequired()
+        verify(loginFormView).setErrorUsernameRequired()
         verify(loginFormView, never()).setErrorPassRequired(false)
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNameRequired()
+        verify(loginFormView, never()).setErrorUsernameRequired()
         verify(loginFormView).setErrorPassRequired(true)
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNameRequired()
+        verify(loginFormView, never()).setErrorUsernameRequired()
         verify(loginFormView, never()).setErrorPassRequired(true)
         verify(loginFormView).setErrorPassInvalid(true)
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "")
-        doReturn(Single.just(listOf(studentTest)))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
+        doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
-        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
@@ -109,10 +105,11 @@ class LoginFormPresenterTest {
     @Test
     fun loginEmptyTest() {
         doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
@@ -125,10 +122,11 @@ class LoginFormPresenterTest {
     @Test
     fun loginEmptyTwiceTest() {
         doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
         presenter.onSignInClick()
 
@@ -142,11 +140,11 @@ class LoginFormPresenterTest {
     @Test
     fun loginErrorTest() {
         val testException = RuntimeException("test")
-        doReturn(Single.error<List<Student>>(testException))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
+        doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
         `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
         verify(loginFormView).hideSoftKeyboard()
@@ -157,4 +155,3 @@ class LoginFormPresenterTest {
         verify(errorHandler).dispatch(testException)
     }
 }
-
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index 16bcdebe..121391de 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -32,7 +32,7 @@ class LoginStudentSelectPresenterTest {
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "") }
+    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false) }
 
     private val testException by lazy { RuntimeException("Problem") }
 
@@ -53,7 +53,7 @@ class LoginStudentSelectPresenterTest {
     fun onSelectedStudentTest() {
         doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
         doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
-        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        presenter.onItemSelected(testStudent, false)
         presenter.onSignIn()
         verify(loginStudentSelectView).showContent(false)
         verify(loginStudentSelectView).showProgress(true)
@@ -64,7 +64,7 @@ class LoginStudentSelectPresenterTest {
     fun onSelectedStudentErrorTest() {
         doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
         doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
-        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        presenter.onItemSelected(testStudent, false)
         presenter.onSignIn()
         verify(loginStudentSelectView).showContent(false)
         verify(loginStudentSelectView).showProgress(true)
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
deleted file mode 100644
index 943fb190..00000000
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.send
-
-import io.github.wulkanowy.data.db.entities.Recipient
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class TestRecipientChip {
-
-    @Test
-    fun testRecipientChipInfo() {
-        assertEquals("Uczeń", getRecipientChip("Kowalski Jan - Uczeń").info)
-        assertEquals("(JK) - pracownik [Fake123456]", getRecipientChip("Kowalski Jan (JK) - pracownik [Fake123456]").info)
-        assertEquals("[KK] - pracownik (Fake123456)", getRecipientChip("Kowalska Karolina [KK] - pracownik (Fake123456)").info)
-        assertEquals("(BK) - Nauczyciel [Fake123456]", getRecipientChip("Kowal-Mazur Barbara (BK) - Nauczyciel [Fake123456]").info)
-    }
-
-    private fun getRecipientChip(realName: String): RecipientChip {
-        return RecipientChip(Recipient(0, "", "", realName, 0, 0, 0, ""))
-    }
-}
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 31618fd4..ece7acf2 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.utils
 
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import org.junit.Assert.assertEquals
@@ -22,11 +23,11 @@ class GradeExtensionTest {
     @Test
     fun calcWeightedAverage() {
         assertEquals(3.47, listOf(
-            createGrade(5, 6.0, 0.33),
-            createGrade(5, 5.0, -0.33),
-            createGrade(4, 1.0, 0.0),
-            createGrade(1, 9.0, 0.5),
-            createGrade(0, .0, 0.0)
+            createGrade(5.0, 6.0, 0.33),
+            createGrade(5.0, 5.0, -0.33),
+            createGrade(4.0, 1.0, 0.0),
+            createGrade(1.0, 9.0, 0.5),
+            createGrade(0.0, .0, 0.0)
         ).calcAverage(), 0.005)
     }
 
@@ -41,24 +42,32 @@ class GradeExtensionTest {
     }
 
     @Test
-    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)
+    fun getBackgroundColor() {
+        assertEquals(R.color.grade_material_five, createGrade(5.0).getBackgroundColor("material"))
+        assertEquals(R.color.grade_material_five, createGrade(5.5).getBackgroundColor("material"))
+        assertEquals(R.color.grade_material_five, createGrade(5.9).getBackgroundColor("material"))
+        assertEquals(R.color.grade_vulcan_five, createGrade(5.9).getBackgroundColor("whatever"))
+    }
+
+    @Test
+    fun changeModifier_zero() {
+        assertEquals(.0, createGrade(5.0, .0, .5).changeModifier(.0, .0).modifier, .0)
+        assertEquals(.0, createGrade(5.0, .0, -.5).changeModifier(.0, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_plus() {
-        assertEquals(.33, createGrade(5, .0, .25).changeModifier(.33, .50).modifier, .0)
-        assertEquals(.25, createGrade(5, .0, .33).changeModifier(.25, .0).modifier, .0)
+        assertEquals(.33, createGrade(5.0, .0, .25).changeModifier(.33, .50).modifier, .0)
+        assertEquals(.25, createGrade(5.0, .0, .33).changeModifier(.25, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_minus() {
-        assertEquals(-.33, createGrade(5, .0, -.25).changeModifier(.25, .33).modifier, .0)
-        assertEquals(-.25, createGrade(5, .0, -.33).changeModifier(.0, .25).modifier, .0)
+        assertEquals(-.33, createGrade(5.0, .0, -.25).changeModifier(.25, .33).modifier, .0)
+        assertEquals(-.25, createGrade(5.0, .0, -.33).changeModifier(.0, .25).modifier, .0)
     }
 
-    private fun createGrade(value: Int, weightValue: Double = .0, modifier: Double = 0.25): Grade {
+    private fun createGrade(value: Double, weightValue: Double = .0, modifier: Double = 0.25): Grade {
         return Grade(
             semesterId = 1,
             studentId = 1,
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 442356dc..024b4727 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -4,7 +4,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.Month.JANUARY
 import java.util.Locale
@@ -13,13 +13,13 @@ class TimeExtensionTest {
 
     @Test
     fun toLocalDateTest() {
-        assertEquals(LocalDate.of(1970, 1, 1), "1970-01-01".toLocalDate("yyyy-MM-dd"))
+        assertEquals(of(1970, 1, 1), "1970-01-01".toLocalDate("yyyy-MM-dd"))
     }
 
     @Test
     fun toFormattedStringLocalDateTest() {
-        assertEquals("01.10.2018", LocalDate.of(2018, 10, 1).toFormattedString())
-        assertEquals("2018-10.01", LocalDate.of(2018, 10, 1).toFormattedString("yyyy-MM.dd"))
+        assertEquals("01.10.2018", of(2018, 10, 1).toFormattedString())
+        assertEquals("2018-10.01", of(2018, 10, 1).toFormattedString("yyyy-MM.dd"))
     }
 
     @Test
@@ -30,20 +30,20 @@ class TimeExtensionTest {
 
     @Test
     fun mondayTest() {
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 2).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 5).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 6).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 7).monday)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 8).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 2).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 5).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 6).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 7).monday)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 8).monday)
     }
 
     @Test
     fun fridayTest() {
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 2).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 5).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 6).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 7).friday)
-        assertEquals(LocalDate.of(2018, 10, 12), LocalDate.of(2018, 10, 8).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 2).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 5).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).friday)
+        assertEquals(of(2018, 10, 12), of(2018, 10, 8).friday)
     }
 
     @Test
@@ -57,106 +57,118 @@ class TimeExtensionTest {
     @Test
     fun weekDayNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
-        assertEquals("poniedziałek", LocalDate.of(2018, 10, 1).weekDayName)
+        assertEquals("poniedziałek", of(2018, 10, 1).weekDayName)
         Locale.setDefault(Locale.forLanguageTag("US"))
-        assertEquals("Monday", LocalDate.of(2018, 10, 1).weekDayName)
+        assertEquals("Monday", of(2018, 10, 1).weekDayName)
     }
 
     @Test
     fun nextSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 1).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 3), LocalDate.of(2018, 10, 2).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 4), LocalDate.of(2018, 10, 3).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 4).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 5).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 6).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 7).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 9), LocalDate.of(2018, 10, 8).nextSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 1).nextSchoolDay)
+        assertEquals(of(2018, 10, 3), of(2018, 10, 2).nextSchoolDay)
+        assertEquals(of(2018, 10, 4), of(2018, 10, 3).nextSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 4).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 5).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 6).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 7).nextSchoolDay)
+        assertEquals(of(2018, 10, 9), of(2018, 10, 8).nextSchoolDay)
     }
 
     @Test
     fun previousSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 10, 9), LocalDate.of(2018, 10, 10).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 9).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 8).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 7).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 6).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 4), LocalDate.of(2018, 10, 5).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 3), LocalDate.of(2018, 10, 4).previousSchoolDay)
+        assertEquals(of(2018, 10, 9), of(2018, 10, 10).previousSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 9).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 8).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).previousSchoolDay)
+        assertEquals(of(2018, 10, 4), of(2018, 10, 5).previousSchoolDay)
+        assertEquals(of(2018, 10, 3), of(2018, 10, 4).previousSchoolDay)
     }
 
     @Test
     fun nextOrSameSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 28).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 9, 29).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 9, 30).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 1).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 2).nextOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 28).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 9, 29).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 9, 30).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 1).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 2).nextOrSameSchoolDay)
     }
 
     @Test
     fun previousOrSameSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 28).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 29).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 30).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 1).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 2).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 28).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 29).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 30).previousOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 1).previousOrSameSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 2).previousOrSameSchoolDay)
     }
 
     @Test
     fun isHolidays_schoolEndTest() {
-        assertFalse(LocalDate.of(2017, 6, 23).isHolidays)
-        assertFalse(LocalDate.of(2018, 6, 22).isHolidays)
-        assertFalse(LocalDate.of(2019, 6, 21).isHolidays)
-        assertFalse(LocalDate.of(2020, 6, 26).isHolidays)
-        assertFalse(LocalDate.of(2021, 6, 25).isHolidays)
-        assertFalse(LocalDate.of(2022, 6, 24).isHolidays)
-        assertFalse(LocalDate.of(2023, 6, 23).isHolidays)
-        assertFalse(LocalDate.of(2024, 6, 21).isHolidays)
-        assertFalse(LocalDate.of(2025, 6, 27).isHolidays)
+        assertFalse(of(2017, 6, 23).isHolidays)
+        assertFalse(of(2018, 6, 22).isHolidays)
+        assertFalse(of(2019, 6, 21).isHolidays)
+        assertFalse(of(2020, 6, 26).isHolidays)
+        assertFalse(of(2021, 6, 25).isHolidays)
+        assertFalse(of(2022, 6, 24).isHolidays)
+        assertFalse(of(2023, 6, 23).isHolidays)
+        assertFalse(of(2024, 6, 21).isHolidays)
+        assertFalse(of(2025, 6, 27).isHolidays)
     }
 
     @Test
     fun isHolidays_holidaysStartTest() {
-        assertTrue(LocalDate.of(2017, 6, 24).isHolidays)
-        assertTrue(LocalDate.of(2018, 6, 23).isHolidays)
-        assertTrue(LocalDate.of(2019, 6, 22).isHolidays)
-        assertTrue(LocalDate.of(2020, 6, 27).isHolidays)
-        assertTrue(LocalDate.of(2021, 6, 26).isHolidays)
-        assertTrue(LocalDate.of(2022, 6, 25).isHolidays)
-        assertTrue(LocalDate.of(2023, 6, 24).isHolidays)
-        assertTrue(LocalDate.of(2024, 6, 22).isHolidays)
-        assertTrue(LocalDate.of(2025, 6, 28).isHolidays)
+        assertTrue(of(2017, 6, 24).isHolidays)
+        assertTrue(of(2018, 6, 23).isHolidays)
+        assertTrue(of(2019, 6, 22).isHolidays)
+        assertTrue(of(2020, 6, 27).isHolidays)
+        assertTrue(of(2021, 6, 26).isHolidays)
+        assertTrue(of(2022, 6, 25).isHolidays)
+        assertTrue(of(2023, 6, 24).isHolidays)
+        assertTrue(of(2024, 6, 22).isHolidays)
+        assertTrue(of(2025, 6, 28).isHolidays)
     }
 
     @Test
     fun isHolidays_holidaysEndTest() {
-        assertTrue(LocalDate.of(2017, 9, 1).isHolidays) // friday
-        assertTrue(LocalDate.of(2017, 9, 2).isHolidays) // saturday
-        assertTrue(LocalDate.of(2017, 9, 3).isHolidays) // sunday
-        assertTrue(LocalDate.of(2018, 9, 1).isHolidays) // saturday
-        assertTrue(LocalDate.of(2018, 9, 2).isHolidays) // sunday
-        assertTrue(LocalDate.of(2019, 9, 1).isHolidays) // sunday
-        assertTrue(LocalDate.of(2020, 8, 31).isHolidays) // monday
-        assertTrue(LocalDate.of(2021, 8, 31).isHolidays) // tuesday
-        assertTrue(LocalDate.of(2022, 8, 31).isHolidays) // wednesday
-        assertTrue(LocalDate.of(2023, 9, 1).isHolidays) // friday
-        assertTrue(LocalDate.of(2023, 9, 2).isHolidays) // saturday
-        assertTrue(LocalDate.of(2023, 9, 3).isHolidays) // sunday
-        assertTrue(LocalDate.of(2024, 9, 1).isHolidays) // sunday
-        assertTrue(LocalDate.of(2025, 8, 31).isHolidays) // sunday
+        assertTrue(of(2017, 9, 1).isHolidays) // friday
+        assertTrue(of(2017, 9, 2).isHolidays) // saturday
+        assertTrue(of(2017, 9, 3).isHolidays) // sunday
+        assertTrue(of(2018, 9, 1).isHolidays) // saturday
+        assertTrue(of(2018, 9, 2).isHolidays) // sunday
+        assertTrue(of(2019, 9, 1).isHolidays) // sunday
+        assertTrue(of(2020, 8, 31).isHolidays) // monday
+        assertTrue(of(2021, 8, 31).isHolidays) // tuesday
+        assertTrue(of(2022, 8, 31).isHolidays) // wednesday
+        assertTrue(of(2023, 9, 1).isHolidays) // friday
+        assertTrue(of(2023, 9, 2).isHolidays) // saturday
+        assertTrue(of(2023, 9, 3).isHolidays) // sunday
+        assertTrue(of(2024, 9, 1).isHolidays) // sunday
+        assertTrue(of(2025, 8, 31).isHolidays) // sunday
     }
 
     @Test
     fun isHolidays_schoolStartTest() {
-        assertFalse(LocalDate.of(2017, 9, 4).isHolidays) // monday
-        assertFalse(LocalDate.of(2018, 9, 3).isHolidays) // monday
-        assertFalse(LocalDate.of(2019, 9, 2).isHolidays) // monday
-        assertFalse(LocalDate.of(2020, 9, 1).isHolidays) // tuesday
-        assertFalse(LocalDate.of(2021, 9, 1).isHolidays) // wednesday
-        assertFalse(LocalDate.of(2022, 9, 1).isHolidays) // thursday
-        assertFalse(LocalDate.of(2023, 9, 4).isHolidays) // monday
-        assertFalse(LocalDate.of(2024, 9, 2).isHolidays) // monday
-        assertFalse(LocalDate.of(2025, 9, 1).isHolidays) // monday
+        assertFalse(of(2017, 9, 4).isHolidays) // monday
+        assertFalse(of(2018, 9, 3).isHolidays) // monday
+        assertFalse(of(2019, 9, 2).isHolidays) // monday
+        assertFalse(of(2020, 9, 1).isHolidays) // tuesday
+        assertFalse(of(2021, 9, 1).isHolidays) // wednesday
+        assertFalse(of(2022, 9, 1).isHolidays) // thursday
+        assertFalse(of(2023, 9, 4).isHolidays) // monday
+        assertFalse(of(2024, 9, 2).isHolidays) // monday
+        assertFalse(of(2025, 9, 1).isHolidays) // monday
+    }
+
+    @Test
+    fun getCorrectedDate_holidays() {
+        assertEquals(of(2019, 6, 21), of(2019, 8, 9).getLastSchoolDayIfHoliday(2018))
+        assertEquals(of(2018, 6, 22), of(2019, 8, 9).getLastSchoolDayIfHoliday(2017))
+    }
+
+    @Test
+    fun getCorrectedDate_schoolYear() {
+        assertEquals(of(2019, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2018))
+        assertEquals(of(2018, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2017))
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
new file mode 100644
index 00000000..33a79850
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.getTimetableEntity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.threeten.bp.LocalDateTime.now
+
+class TimetableExtensionTest {
+
+    @Test
+    fun isShowTimeUntil() {
+        assertFalse(getTimetableEntity().isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = false).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = true).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(5)).isShowTimeUntil(now().plusMinutes(5)))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(61)).isShowTimeUntil(now().minusMinutes(5)))
+
+        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(now().minusMinutes(5)))
+        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(null))
+
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
+    }
+
+    @Test
+    fun getLeft() {
+        assertEquals(null, getTimetableEntity(canceled = true).left)
+        assertEquals(null, getTimetableEntity(start = now().plusMinutes(5), end = now().plusMinutes(50)).left)
+        assertEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = false).left)
+        assertNotEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = true).left)
+    }
+
+    @Test
+    fun isJustFinished() {
+        assertFalse(getTimetableEntity(end = now().minusSeconds(16)).isJustFinished)
+        assertTrue(getTimetableEntity(end = now().minusSeconds(14)).isJustFinished)
+        assertTrue(getTimetableEntity(end = now().minusSeconds(1)).isJustFinished)
+        assertFalse(getTimetableEntity(end = now().plusSeconds(1)).isJustFinished)
+    }
+}
diff --git a/app/upload-key-encrypted.jks b/app/upload-key-encrypted.jks
deleted file mode 100644
index 6ad925d8..00000000
Binary files a/app/upload-key-encrypted.jks and /dev/null differ
diff --git a/build.gradle b/build.gradle
index ac8a0926..2b92bc7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.72'
+    ext.about_libraries = '8.1.2'
     repositories {
         mavenCentral()
         google()
         jcenter()
         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.4.1'
-        classpath 'com.google.gms:google-services:4.2.0'
-        classpath "io.fabric.tools:gradle:1.29.0"
-        classpath "com.github.triplet.gradle:play-publisher:2.2.1"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
-        classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0"
+        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.0'
+        classpath "com.github.triplet.gradle:play-publisher:2.7.5"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
+        classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }
 
@@ -35,8 +36,6 @@ 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/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000..2399a56b
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,14 @@
+files:
+  - source: /app/src/main/res/values/*.xml
+    ignore:
+      - /app/src/main/res/values/styles.xml
+      - /app/src/main/res/values/api_hosts.xml
+      - /app/src/main/res/values/api_symbols.xml
+      - /app/src/main/res/values/attrs.xml
+      - /app/src/main/res/values/colors.xml
+      - /app/src/main/res/values/dimens.xml
+      - /app/src/main/res/values/preferences_keys.xml
+      - /app/src/main/res/values/preferences_defaults.xml
+    translation: /app/src/main/res/values-%android_code%/%original_file_name%
+    translate_attributes: 0
+    content_segmentation: 0
diff --git a/gradle.properties b/gradle.properties
index 24e69b6a..5741ecfc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,7 @@
 # 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
 
@@ -11,10 +9,10 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
+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
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372aef..f3d88b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 791ac7a4..6623300b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Apr 18 00:26:43 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f789..2fe81a7d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,42 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -60,6 +40,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -134,27 +154,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282a..9109989e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,103 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega