diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce2922ba..2cb2e147 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -162,7 +162,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
 
 workflows:
   version: 2
diff --git a/.editorconfig b/.editorconfig
index 35fbd466..7c537735 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,7 @@
 [*]
 charset=utf-8
 end_of_line=lf
-insert_final_newline=true
+insert_final_newline=Advanced
 indent_style=space
 indent_size=4
 
diff --git a/.gitea/FUNDING.yml b/.gitea/FUNDING.yml
new file mode 100644
index 00000000..cdce0759
--- /dev/null
+++ b/.gitea/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: wulkanowy
+custom: https://www.paypal.com/paypalme/wulkanowy
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.gitea/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .gitea/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.gitea/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .gitea/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/dependabot.yml b/.gitea/dependabot.yml
similarity index 100%
rename from .github/dependabot.yml
rename to .gitea/dependabot.yml
diff --git a/.gitea/release.yml b/.gitea/release.yml
new file mode 100644
index 00000000..8557fcea
--- /dev/null
+++ b/.gitea/release.yml
@@ -0,0 +1,18 @@
+changelog:
+  exclude:
+    labels:
+      - "release ignore"
+  categories:
+    - title: breaking changes
+      labels:
+        - major
+    - title: new features
+      labels:
+        - minor
+        - fr:approved
+    - title: translation updates
+      labels:
+        - translation
+    - title: features
+      labels:
+        - "*"
diff --git a/.gitea/workflows/build_android.yml b/.gitea/workflows/build_android.yml
new file mode 100644
index 00000000..f9d83d38
--- /dev/null
+++ b/.gitea/workflows/build_android.yml
@@ -0,0 +1,85 @@
+name: Generate APK
+
+env:
+    main_project_module: app
+
+on:
+    pull_request:
+        types:
+            - closed
+
+jobs:
+    build:
+
+        runs-on: ubuntu-latest
+
+        env:
+            RUNNER_TOOL_CACHE: /toolcache
+
+        steps:
+            -   name: Checkout the repository
+                uses: actions/checkout@v3
+
+            -   name: Set current date as env variable
+                run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+            -   name: Set repository name as env variable
+                run: echo "repository_name=$(echo '${{ gitea.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+            -   name: Set up JDK
+                uses: actions/setup-java@v3
+                with:
+                    distribution: 'zulu' # See 'Supported distributions' for available options
+                    java-version: '17'
+                    cache: 'gradle'
+
+            -   name: Set up Go environment
+                uses: actions/setup-go@v3
+                with:
+                    go-version: '1.22'
+
+            -   name: Get hash of Gradle files
+                uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+                id: get-hash
+                with: 
+                    patterns: |-
+                        **/*.gradle*
+
+            -   name: Cache Gradle
+                uses: actions/cache@v3
+                with:
+                    path: |
+                        ~/.gradle/caches
+                        ~/.gradle/wrapper
+                    key: gradle-${{ runner.os }}-${{ steps.get-hash.outputs.hash }}
+
+            -   name: Get app version
+                id: get_version
+                run: echo "VERSION_NAME=$(grep -m1 "versionName" app/build.gradle | awk '{print $2}' | tr -d \''"\')" >> $GITHUB_ENV
+
+            -   name: Change wrapper permissions
+                run: chmod +x ./gradlew
+
+            -   name: Setup Android SDK
+                uses: android-actions/setup-android@v3
+
+            -   name: Build debug APK
+                run: ./gradlew assembleDebug
+
+            -   name: Upload artifacts
+                uses: actions/upload-artifact@v3 # not v4 because of GHES
+                with:
+                    name: wulkanowy_mod_debug_builds
+                    path: |
+                        app/build/outputs/**/*-debug.apk
+
+            -   name: Create release
+                uses: akkuman/gitea-release-action@v1
+                env:
+                    NODE_OPTIONS: '--experimental-fetch'
+                with:
+                    files: |
+                        app/build/outputs/**/*-debug.apk                        
+
+                    name: Release ${{ env.VERSION_NAME }} (${{ env.date_today }})
+                    tag_name: v${{ env.VERSION_NAME }}
\ No newline at end of file
diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
deleted file mode 100644
index e8237a38..00000000
--- a/.github/workflows/deploy-store.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: Deploy release
-
-on:
-  release:
-    types: [ created ]
-
-jobs:
-
-  deploy-google-play:
-    name: Google Play
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: google-play
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Upload apk to google play
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
-          ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }}
-          SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }}
-          DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }}
-          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
-
-  deploy-app-gallery:
-    name: AppGallery
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-gallery
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Prepare credentials
-        env:
-          AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }}
-        run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json
-      - name: Build and publish HMS version
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
deleted file mode 100644
index c4f55e6a..00000000
--- a/.github/workflows/deploy-test.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-name: Deploy DEV
-
-on:
-  push:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-  pull_request_target:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-
-  workflow_dispatch:
-
-jobs:
-
-  deploy-appcenter:
-    name: App Center
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-center
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Prepare build configuration
-        run: |
-          sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
-          sed -i -e '/versionNameSuffix/d' app/build.gradle
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assembleFdroidDebug --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
-          path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-      - name: Deploy to app center
-        uses: wzieba/AppCenter-Github-Action@v1
-        with:
-          appName: wulkanowy/wulkanowy
-          token: ${{ secrets.APP_CENTER_TOKEN }}
-          group: Testers
-          file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-          notifyTesters: true
-          debug: true
-
-  deploy-app-distribution:
-    name: App Distribution
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-distribution
-    if: github.event_name != 'pull_request_target'
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-          BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
-          path: app/build/outputs/apk/play/debug/app-play-debug.apk
-      - name: Deploy to app distribution
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{ secrets.FIREBASE_APP_ID }}
-          token: ${{ secrets.FIREBASE_TOKEN }}
-          groups: discord
-          file: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 6d50c45d..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-      - 'hotfix/**'
-    tags: [ '*' ]
-  pull_request:
-
-jobs:
-
-  tests-fdroid:
-      name: F-Droid
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v3
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v3
-          with:
-            distribution: 'zulu'
-            java-version: 17
-        - uses: actions/cache@v3
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Unit tests
-          run: |
-            ./gradlew testFdroidDebugUnitTest --stacktrace
-            ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v3
-          with:
-              flags: unit
-
-  tests-play:
-      name: Play
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v3
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v3
-          with:
-            distribution: 'zulu'
-            java-version: 17
-        - uses: actions/cache@v3
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Unit tests
-          run: |
-            ./gradlew testPlayDebugUnitTest --stacktrace
-            ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v3
-          with:
-              flags: unit
-
-  tests-hms:
-      name: HMS
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v3
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v3
-          with:
-            distribution: 'zulu'
-            java-version: 17
-        - uses: actions/cache@v3
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Unit tests
-          run: |
-            ./gradlew testHmsDebugUnitTest --stacktrace
-            ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v3
-          with:
-              flags: unit
diff --git a/.gitignore b/.gitignore
index 980085e3..12c6f241 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,10 @@ captures/
 .idea/discord.xml
 .idea/migrations.xml
 .idea/androidTestResultsUserPreferences.xml
+.idea/copilot
+.idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
+.idea/kotlinc.xml
 
 # Keystore files
 *.jks
@@ -113,12 +117,14 @@ Thumbs.db
 *.ear
 
 ### AndroidStudio Patch ###
-
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
 
+### Services config files
+agconnect-services.json
+agconnect-credentials.json
+google-services.json
+!app/google-services.json
 
-app/src/release/agconnect-services.json
-app/src/release/agconnect-credentials.json
-.idea/deploymentTargetDropDown.xml
-.idea/kotlinc.xml
+
+.idea/appInsightsSettings.xml
diff --git a/.travis.yml b/.travis.yml
index 04db3a61..e0b0be97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ script:
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-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 -PenableFirebase --stacktrace;
+      ./gradlew publishPlayRelease --stacktrace;
     fi
 
 after_success:
diff --git a/README.cs.md b/README.cs.md
index 8171b27d..2d3d2a77 100644
--- a/README.cs.md
+++ b/README.cs.md
@@ -1,73 +1,33 @@
 Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkce:
+* skrýt známky
+* Skrýt jednotlivé záznamy o docházce.
+* Skrýt komentáře.
+* falešná docházka %
 
-Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
+Chcete-li se dostat na skrytý panel:
+1. Přejděte na kartu „Další“.
+2. Přejděte na panel „Nastavení“.
+3. Přejděte na panel „O aplikaci“.
+4. Klikněte 5x na logo aplikace
+5. Přejděte na domovskou obrazovku
+6. Přejděte do nastavení
+7. Zadejte „tajná nastavení“
+ 
+# Instalace
 
-## Funkce
+|  Název souboru   |    Přizpůsobeno   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* přihlášení pomocí emailu a hesla
-* funkce z webové stránky deníku:
-    * známky
-    * statistiky známek
-    * frekvence
-    * procento frekvence
-    * zkoušky
-    * plán lekce
-    * dokončené lekce
-    * zprávy
-    * domácí úkoly
-    * poznámky
-    * šťastné číslo
-    * další lekce
-    * školní setkání
-    * informace o žáku a škole
-* výpočet průměru nezávisle na preferencích školy
-* upozornění, např. o nových známkách
-* podpora více účtů s možností přejmenování žáků
-* tmavý a černý (AMOLED) motiv
-* offline režim
-* volitelné reklamy na podporu projektu
+Stáhněte si vybranou verzi z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Doporučujeme stáhnout nejnovější dostupnou verzi.
 
-## Stáhnout
+# O projektu Wulkanowy
 
-Aktuální verzi si můžete stáhnout z Google Play, F-Droid nebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/cs-CZ/badges/images/generic/cs_badge_web_generic.png"
-    alt="Nyní na 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="Stáhnout s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/baTGiDP.png"
-    alt="Objevuj v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-Můžete si také stáhnout [vývojovou verzi](https://wulkanowy.github.io/#download), která zahrnuje nové funkce připravované pro příští vydání
-
-## Postaveno s pomocí
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráce
-
-Přispějte do projektu vytvořením PR nebo odesláním issue na GitHub.
-
-Pro zájemce o překlad aplikace do různých jazyků poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licence
-
-Tento projekt je licencován pod licencí Apache License 2.0 - podrobnosti v souboru [LICENSE](LICENSE)
+Chcete si přečíst více o projektu Wulkanowy? [Klikněte sem](https://github.com/wulkanowy/wulkanowy)
\ No newline at end of file
diff --git a/README.de.md b/README.de.md
index 972f66ba..da16a997 100644
--- a/README.de.md
+++ b/README.de.md
@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funktionen:
+* Noten ausblenden
+* Individuelle Anwesenheitslisten ausblenden.
+* Kommentare ausblenden.
+* Anwesenheit fälschen %
 
-Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
+So gelangen Sie zum ausgeblendeten Bereich:
+1. Gehen Sie zur Registerkarte „Mehr“.
+2. Gehen Sie zum Bereich „Einstellungen“.
+3. Gehen Sie zum Bereich „Über die Anwendung“.
+4. Klicken Sie fünfmal auf das Anwendungslogo
+5. Gehen Sie zum Startbildschirm
+6. Gehen Sie zu den Einstellungen
+7. Geben Sie „Geheime Einstellungen“ ein
+ 
+# Installation
 
-## Merkmale
+|    Dateiname     |    Angepasst an   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* Einloggen mit E-Mail und Passwort
-* Funktionen von der Registerwebsite:
-    * Noten
-    * Notenstatistik
-    * Anwesenheit
-    * Prozentsatz der Anwesenheit
-    * Prüfungen
-    * Stundenplan
-    * abgeschlossene Unterrichtsstunden
-    * Nachrichten
-    * Hausaufgaben
-    * Anmerkungen
-    * Glückszahl
-    * Zusätzliche Lektionen
-    * Schulkonferenzen
-    * Schüler- und Schulinformationen
-* Berechnung des Durchschnitts unabhängig von den Präferenzen der Schule
-* Benachrichtigungen, z. B. über eine neue Note
-* Unterstützung für mehrere Konten mit der Möglichkeit, den Namen des Schülers zu ändern
-* dunkles und schwarzes (AMOLED) Thema
-* Offline-Modus
-* optionale Werbungen, die es uns ermöglichen das Projekt zu unterstützen
+Laden Sie die ausgewählte Version von [hier](https://git.sador.me/sadorowo/wulkanowy-mod/releases) herunter.
+Wir empfehlen, die neueste verfügbare Version herunterzuladen.
 
-## Herunterladen
+# Über das Wulkanowy-Projekt
 
-Die aktuelle Version können Sie von der Google Play, F-Droid oder Huawei AppGallery store herunterladen
-
-[<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/)
-[<img src="appgallery_badge.png"
-    alt="Explore it on AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-    
-Sie können auch eine [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) die beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
-
-## Gebaut mit
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
-
-## Beitragen
-
-Bitte tragen Sie zum Projekt bei, indem Sie entweder eine PR erstellen oder ein Issue auf GitHub einreichen.
-
-Für Personen, die daran interessiert sind, die Anwendung in verschiedene Sprachen zu übersetzen, bieten wir Crowdin
-https://crowdin.com/project/wulkanowy2
-
-## Lizenz
-
-Dieses Projekt ist unter der Apache License 2.0 lizenziert - siehe die [LIZENZ](LICENSE) Datei für Details
+Möchten Sie mehr über das Wulkanowy-Projekt lesen? [Hier klicken](https://github.com/wulkanowy/wulkanowy)
\ No newline at end of file
diff --git a/README.en.md b/README.en.md
index 6e4da463..9365c9b4 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Functions:
+* hide grades
+* hide individual attendance entries
+* hide comments
+* fake attendance %.
 
-Unofficial android VULCAN UONET+ register client for both students and their parents
+To get to the hidden panel:
+1. Go to the "More" tab
+2. Go to the "Settings" panel
+3. Go to the "About application" panel
+4. Click on the application logo 5 times
+5. Go to the home screen
+6. Go to settings
+7. Enter "secret settings"
+ 
+# Installation
 
-## Features
+|    File name     |    Adapted to     |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* logging in using the email and password
-* functions from the register website:
-    * grades
-    * grade statistics
-    * attendance
-    * percentage of attendance
-    * exams
-    * timetable
-    * completed lessons
-    * messages
-    * homework
-    * notes
-    * lucky number
-    * additional lessons
-    * school conferences
-    * student and school information
-* calculation of the average independently of school's preferences
-* notifications, e.g. about a new grade
-* support for multiple accounts with the ability to rename students 
-* dark and black (AMOLED) theme
-* offline mode
-* optional ads which allow to support the project
+Download application from [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+We recommend downloading the latest available version.
 
-## Download
+# About the Wulkanowy project
 
-You can download the current version from the Google Play, F-Droid or Huawei AppGallery 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/)
-[<img src="appgallery_badge.png"
-    alt="Explore it on AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-    
-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)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [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.
-
-For people interested in translating the application into different languages, we provide Crowdin
-https://crowdin.com/project/wulkanowy2
-
-## License
-
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
+Want to read more about the Wulkanowy project? [Click here](https://github.com/wulkanowy/wulkanowy)
\ No newline at end of file
diff --git a/README.md b/README.md
index f3d2e29a..7a265ff1 100644
--- a/README.md
+++ b/README.md
@@ -1,74 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkcje:
+* ukryj oceny
+* ukryj poszczególne wpisy frekwencji
+* ukryj uwagi
+* sfałszuj % frekwencji
 
-Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
+Aby dostać się do ukrytego panelu:
+1. Przejdź do karty "Więcej"
+2. Przejdź do panelu "Ustawienia"
+3. Przejdź do panelu "O aplikacji"
+4. Kliknij 5 razy w logo aplikacji
+5. Przejdź na ekran główny
+6. Wejdź w ustawienia
+7. Wejdź w "sekretne ustawienia"
+ 
+# Instalacja
 
-## Funkcje
+|   Nazwa pliku    | Przystosowana do  |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Sklep Play    |
 
-* logowanie za pomocą e-maila i hasła
-* funkcje ze strony internetowej dziennika:
-    * oceny
-    * statystyki ocen
-    * frekwencja
-    * procent frekwencji
-    * sprawdziany
-    * plan lekcji
-    * lekcje zrealizowane
-    * wiadomości
-    * zadania domowe
-    * uwagi
-    * szczęśliwy numerek
-    * dodatkowe lekcje
-    * zebrania w szkole
-    * informacje o uczniu i szkole
-* obliczanie średniej niezależnie od preferencji szkoły
-* powiadomienia np. o nowej ocenie
-* obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
-* ciemny i czarny (AMOLED) motyw
-* tryb offline
-* opcjonalne reklamy umożliwiające wsparcie projektu
+Pobierz wybraną wersję z [wydań](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Zalecamy pobranie najnowszej dostępnej wersji.
 
-## Pobierz
+# O projekcie Wulkanowy
 
-Aktualną wersję możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
-
-[<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/)
-[<img src="appgallery_badge.png"
-    alt="Odkrywaj w AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-
-Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
-
-
-## Zbudowana za pomocą
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [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.
-
-Dla osób zainteresowanych tłumaczeniem aplikacji na różne języki udostępniamy Crowdina
-https://crowdin.com/project/wulkanowy2
-
-## Licencja
-
-Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
+Chcesz poczytać więcej o projekcie Wulkanowy? [Kliknij tutaj](https://github.com/wulkanowy/wulkanowy)
\ No newline at end of file
diff --git a/README.sk.md b/README.sk.md
index ff0c6e3c..570ac6d6 100644
--- a/README.sk.md
+++ b/README.sk.md
@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkcie:
+* skryť známky
+* Skryť individuálne záznamy o dochádzke.
+* Skryť komentáre.
+* falošná dochádzka %
 
-Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
+Ak chcete prejsť na skrytý panel:
+1. Prejdite na kartu „Viac“.
+2. Prejdite na panel „Nastavenia“.
+3. Prejdite na panel „O aplikácii“.
+4. Kliknite 5-krát na logo aplikácie
+5. Prejdite na domovskú obrazovku
+6. Prejdite do nastavení
+7. Zadajte „tajné nastavenia“
+ 
+# Inštalácia
 
-## Funkcie
+|   Názov súboru   |    Prispôsobené   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* prihlásenie pomocou emailu a hesla
-* funkcie z webovej stránky denníka:
-    * známky
-    * štatistiky známok
-    * frekvencia
-    * percento frekvencie
-    * skúšky
-    * plán lekcie
-    * dokončené lekcie
-    * správy
-    * domáce úlohy
-    * poznámky
-    * šťastné číslo
-    * ďalšie lekcie
-    * školské stretnutie
-    * informácie o žiakovi a škole
-* výpočet priemeru nezávisle od preferencií školy
-* upozornenia, napr. o nových známkach
-* podpora viacerých účtov s možnosťou premenovania žiakov
-* tmavý a čierny (AMOLED) motív
-* offline režim
-* voliteľné reklamy na podporu projektu
+Stiahnite si vybranú verziu z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Odporúčame stiahnuť najnovšiu dostupnú verziu.
 
-## Stiahnuť
+# O projekte Wulkanowy
 
-Aktuálnu verziu si môžete stiahnuť z Google Play, F-Droid alebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/sk/badges/images/generic/sk_badge_web_generic.png"
-    alt="Nyní na 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="Stiahnuť s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/sX8UyAw.png"
-    alt="Objavíte v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-Môžete si tiež stiahnuť [vývojovú verziu](https://wulkanowy.github.io/#download), ktorá zahrňuje nové funkcie pripravované pre budúce vydanie
-
-## Postavené s pomocou
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráca
-
-Prispejte do projektu vytvorením PR alebo odoslaním issue na GitHub.
-
-Pre záujemcov o preklad aplikácie do rôznych jazykov poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licencia
-
-Tento projekt je licencovaný pod licenciou Apache License 2.0 - podrobnosti v súbore [LICENSE](LICENSE)
+Chcete si prečítať viac o projekte Wulkanowy? [Kliknite sem](https://github.com/wulkanowy/wulkanowy)
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 26c2547e..9e444b2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,15 +27,12 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 148
-        versionName "2.4.2"
+        versionCode 168
+        versionName "2.6.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
-        manifestPlaceholders = [
-            firebase_enabled: project.hasProperty("enableFirebase"),
-            admob_project_id: ""
-        ]
+        manifestPlaceholders = [admob_project_id: ""]
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
         buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
@@ -65,8 +62,8 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // signingConfig signingConfigs.release
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -76,7 +73,6 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -187,31 +183,33 @@ huaweiPublish {
 
 ext {
     work_manager = "2.9.0"
-    android_hilt = "1.1.0"
+    android_hilt = "1.2.0"
     room = "2.6.1"
     chucker = "4.0.0"
-    mockk = "1.13.9"
+    mockk = "1.13.10"
     coroutines = "1.8.0"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.4.1'
+    implementation 'io.github.wulkanowy:sdk:2.6.7'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.8.2"
+    implementation "androidx.activity:activity-ktx:1.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.6.2"
+    implementation "androidx.fragment:fragment-ktx:1.7.0"
     implementation "androidx.annotation:annotation:1.7.1"
+    implementation "androidx.javascriptengine:javascriptengine:1.0.0-beta01"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -237,7 +235,7 @@ dependencies {
     implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
@@ -246,13 +244,13 @@ dependencies {
     implementation 'com.github.Faierbel:slf4j-timber:2.0'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation 'io.coil-kt:coil:2.5.0'
+    implementation 'io.coil-kt:coil:2.6.0'
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
-    implementation 'org.apache.commons:commons-text:1.11.0'
+    implementation 'org.apache.commons:commons-text:1.12.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.7.2')
+    playImplementation platform('com.google.firebase:firebase-bom:33.0.0')
     playImplementation 'com.google.firebase:firebase-analytics'
     playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
@@ -278,7 +276,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.11.1'
+    testImplementation 'org.robolectric:robolectric:4.12.1'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"
diff --git a/app/src/debug/google-services.json b/app/google-services.json
similarity index 56%
rename from app/src/debug/google-services.json
rename to app/google-services.json
index e9303986..2f71b854 100644
--- a/app/src/debug/google-services.json
+++ b/app/google-services.json
@@ -36,6 +36,37 @@
           "status": 2
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1091101852179:android:b558a25f65d088b1",
+        "android_client_info": {
+          "package_name": "io.github.wulkanowy"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": ""
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
     }
   ],
   "configuration_version": "1"
diff --git a/app/play-publish-lint.sh b/app/play-publish-lint.sh
index d3354b1a..5f0391de 100755
--- a/app/play-publish-lint.sh
+++ b/app/play-publish-lint.sh
@@ -1,7 +1,8 @@
 #!/bin/bash -
 
 content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
-if [[ "${#content}" -gt 500 ]]; then
+content2=echo "$content" | dos2unix
+if [[ "${#content2}" -gt 500 ]]; then
     echo >&2 "Release notes content has reached the limit of 500 characters"
     exit 1
 fi
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/60.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/60.json
new file mode 100644
index 00000000..20eacad1
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/60.json
@@ -0,0 +1,2527 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 60,
+    "identityHash": "3672d3f4d5e6b874e5a22d2bb458dc65",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `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, `user_name` TEXT 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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "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": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "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}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "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": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_ok_visible` INTEGER NOT NULL DEFAULT 0, `is_x_visible` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isOkVisible",
+            "columnName": "is_ok_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isXVisible",
+            "columnName": "is_x_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MutedMessageSenders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`author` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesDescriptive",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `description` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "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, '3672d3f4d5e6b874e5a22d2bb458dc65')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/61.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/61.json
new file mode 100644
index 00000000..e36dcc8a
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/61.json
@@ -0,0 +1,2533 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 61,
+    "identityHash": "41fbd2ff00aba10b2ef0a079e6037c87",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `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, `user_name` TEXT 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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "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": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "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}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "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": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `author` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_ok_visible` INTEGER NOT NULL DEFAULT 0, `is_x_visible` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isOkVisible",
+            "columnName": "is_ok_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isXVisible",
+            "columnName": "is_x_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MutedMessageSenders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`author` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesDescriptive",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `description` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "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, '41fbd2ff00aba10b2ef0a079e6037c87')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/62.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/62.json
new file mode 100644
index 00000000..ab63c679
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/62.json
@@ -0,0 +1,2547 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 62,
+    "identityHash": "ee2464d218b254ca868667c0fc756c0b",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `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, `user_name` TEXT 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, `is_authorized` INTEGER NOT NULL DEFAULT 0, `is_edu_one` INTEGER NOT NULL DEFAULT 0, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "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": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "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
+          },
+          {
+            "fieldPath": "isAuthorized",
+            "columnName": "is_authorized",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isEduOne",
+            "columnName": "is_edu_one",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "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}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "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": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `author` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_ok_visible` INTEGER NOT NULL DEFAULT 0, `is_x_visible` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isOkVisible",
+            "columnName": "is_ok_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isXVisible",
+            "columnName": "is_x_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MutedMessageSenders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`author` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesDescriptive",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `description` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "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, 'ee2464d218b254ca868667c0fc756c0b')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/63.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/63.json
new file mode 100644
index 00000000..9c774bb4
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/63.json
@@ -0,0 +1,2547 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 63,
+    "identityHash": "8c04a56e74b1c4f55302f28ede94cac0",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `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, `user_name` TEXT 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, `is_authorized` INTEGER NOT NULL DEFAULT 0, `is_edu_one` INTEGER DEFAULT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "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": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "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
+          },
+          {
+            "fieldPath": "isAuthorized",
+            "columnName": "is_authorized",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isEduOne",
+            "columnName": "is_edu_one",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "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}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "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": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `author` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_ok_visible` INTEGER NOT NULL DEFAULT 0, `is_x_visible` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isOkVisible",
+            "columnName": "is_ok_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isXVisible",
+            "columnName": "is_x_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MutedMessageSenders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`author` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesDescriptive",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `description` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "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, '8c04a56e74b1c4f55302f28ede94cac0')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/64.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/64.json
new file mode 100644
index 00000000..178a5eab
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/64.json
@@ -0,0 +1,2559 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 64,
+    "identityHash": "dd5446e82ad8d0a65c545a5dbbaeb81c",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `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, `user_name` TEXT 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, `is_authorized` INTEGER NOT NULL DEFAULT 0, `is_edu_one` INTEGER DEFAULT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "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": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "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
+          },
+          {
+            "fieldPath": "isAuthorized",
+            "columnName": "is_authorized",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isEduOne",
+            "columnName": "is_edu_one",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "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}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `points_sum_all_year` TEXT, `average` REAL NOT NULL, `average_all_year` REAL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "pointsSumAllYear",
+            "columnName": "points_sum_all_year",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "averageAllYear",
+            "columnName": "average_all_year",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "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": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "user_login_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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "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": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `author` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_ok_visible` INTEGER NOT NULL DEFAULT 0, `is_x_visible` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isOkVisible",
+            "columnName": "is_ok_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isXVisible",
+            "columnName": "is_x_visible",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MutedMessageSenders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`author` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesDescriptive",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `description` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "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, 'dd5446e82ad8d0a65c545a5dbbaeb81c')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/debug/agconnect-services.json b/app/src/debug/agconnect-services.json
deleted file mode 100644
index 52426f54..00000000
--- a/app/src/debug/agconnect-services.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "agcgw": {
-    "backurl": "connect-dre.hispace.hicloud.com",
-    "url": "connect-dre.dbankcloud.cn",
-    "websocketbackurl": "connect-ws-dre.hispace.dbankcloud.com",
-    "websocketurl": "connect-ws-dre.hispace.dbankcloud.cn"
-  },
-  "agcgw_all": {
-    "CN": "connect-drcn.dbankcloud.cn",
-    "CN_back": "connect-drcn.hispace.hicloud.com",
-    "DE": "connect-dre.dbankcloud.cn",
-    "DE_back": "connect-dre.hispace.hicloud.com",
-    "RU": "connect-drru.hispace.dbankcloud.ru",
-    "RU_back": "connect-drru.hispace.dbankcloud.cn",
-    "SG": "connect-dra.dbankcloud.cn",
-    "SG_back": "connect-dra.hispace.hicloud.com"
-  },
-  "websocketgw_all": {
-    "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
-    "CN_back": "connect-ws-drcn.hispace.dbankcloud.com",
-    "DE": "connect-ws-dre.hispace.dbankcloud.cn",
-    "DE_back": "connect-ws-dre.hispace.dbankcloud.com",
-    "RU": "connect-ws-drru.hispace.dbankcloud.ru",
-    "RU_back": "connect-ws-drru.hispace.dbankcloud.cn",
-    "SG": "connect-ws-dra.hispace.dbankcloud.cn",
-    "SG_back": "connect-ws-dra.hispace.dbankcloud.com"
-  },
-  "client": {
-    "cp_id": "890048000024105546",
-    "product_id": "736430079244736562",
-    "client_id": "514530959291319360",
-    "client_secret": "C42522DBF17D3D4BBE9D9C1783A54484B7E6844B388B7A67502D36A633A4186B",
-    "project_id": "736430079244736562",
-    "app_id": "106552551",
-    "api_key": "CgB6e3x9BUNiq+r8ebCHNojjjYsMT4pJSjjNDOkm9owtBb6rVI6LjnASoZBRxbjjhObcrV5gANo99fI/eKZDTbWS",
-    "package_name": "io.github.wulkanowy.dev"
-  },
-  "oauth_client": {
-    "client_id": "106552551",
-    "client_type": 1
-  },
-  "app_info": {
-    "app_id": "106552551",
-    "package_name": "io.github.wulkanowy.dev"
-  },
-  "service": {
-    "analytics": {
-      "collector_url": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-      "collector_url_ru": "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
-      "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
-      "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-      "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
-      "resource_id": "p1",
-      "channel_id": ""
-    },
-		"search":{
-			"url":"https://search-dre.cloud.huawei.com"
-		},
-		"cloudstorage": {
-      "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
-      "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
-      "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
-      "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
-      "storage_url_de": "https://ops-dre.agcstorage.link",
-      "storage_url": "https://agc-storage-drcn.platform.dbankcloud.cn",
-      "storage_url_sg": "https://ops-dra.agcstorage.link",
-      "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
-      "storage_url_cn": "https://agc-storage-drcn.platform.dbankcloud.cn"
-    },
-    "ml": {
-      "mlservice_url": "ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-    }
-  },
-  "region": "DE",
-  "configuration_version": "3.0",
-  "appInfos": [
-    {
-      "package_name": "io.github.wulkanowy.dev",
-      "client": {
-        "app_id": "106552551"
-      },
-      "app_info": {
-        "package_name": "io.github.wulkanowy.dev",
-        "app_id": "106552551"
-      },
-      "oauth_client": {
-        "client_type": 1,
-        "client_id": "106552551"
-      }
-    }
-  ]
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f43dfdd2..a4257893 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly">
 
+    <uses-sdk tools:overrideLibrary="androidx.javascriptengine" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -42,16 +44,16 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
-        android:resizeableActivity="true"
         tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="LockedOrientationActivity">
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -155,33 +157,9 @@
                 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"
-            tools:ignore="MissingClass" />
-
         <meta-data
             android:name="install_channel"
             android:value="${install_channel}" />
-        <meta-data
-            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="${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_all" />
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
index a7629c22..97ac9356 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@@ -54,5 +54,9 @@
   {
     "displayName": "Antoni Paduch",
     "githubUsername": "janAte1"
+  },
+  {
+    "displayName": "Kamil Wąsik",
+    "githubUsername": "JestemKamil"
   }
 ]
diff --git a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
index 7c9cf9a3..a21d56cc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@@ -13,22 +13,18 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import io.github.wulkanowy.data.api.AdminMessageService
-import io.github.wulkanowy.data.api.SchoolsService
+import io.github.wulkanowy.data.api.services.SchoolsService
+import io.github.wulkanowy.data.api.services.WulkanowyService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.RemoteConfigHelper
-import io.github.wulkanowy.utils.WebkitCookieManagerProxy
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.create
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
@@ -36,20 +32,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal class DataModule {
 
-    @Singleton
-    @Provides
-    fun provideSdk(chuckerInterceptor: ChuckerInterceptor, remoteConfig: RemoteConfigHelper) =
-        Sdk().apply {
-            androidVersion = android.os.Build.VERSION.RELEASE
-            buildTag = android.os.Build.MODEL
-            userAgentTemplate = remoteConfig.userAgentTemplate
-            setSimpleHttpLogger { Timber.d(it) }
-            setAdditionalCookieManager(WebkitCookieManagerProxy())
-
-            // for debug only
-            addInterceptor(chuckerInterceptor, network = true)
-        }
-
     @Singleton
     @Provides
     fun provideChuckerCollector(
@@ -89,7 +71,7 @@ internal class DataModule {
         okHttpClient: OkHttpClient,
         json: Json,
         appInfo: AppInfo
-    ): AdminMessageService = Retrofit.Builder()
+    ): WulkanowyService = Retrofit.Builder()
         .baseUrl(appInfo.messagesBaseUrl)
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
@@ -254,6 +236,10 @@ internal class DataModule {
     @Provides
     fun provideAdminMessageDao(database: AppDatabase) = database.adminMessagesDao
 
+    @Singleton
+    @Provides
+    fun provideMutesDao(database: AppDatabase) = database.mutedMessageSendersDao
+
     @Singleton
     @Provides
     fun provideGradeDescriptiveDao(database: AppDatabase) = database.gradeDescriptiveDao
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
index 108b0d58..712a946f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
@@ -1,11 +1,17 @@
 package io.github.wulkanowy.data
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
@@ -14,16 +20,39 @@ import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
-sealed class Resource<T> {
-
-    open class Loading<T> : Resource<T>()
+sealed interface Resource<out T> {
+    /**
+     * The initial value of a resource flow. Indicates no data that is currently available to be shown,
+     * however with the expectation that the state will transition to another one soon.
+     */
+    open class Loading<T> : Resource<T>
 
+    /**
+     * A semi-loading state with some data available to be displayed (usually cached data loaded from
+     * the database). Still not the target state and it's expected to transition into another one soon.
+     */
     data class Intermediate<T>(val data: T) : Loading<T>()
 
-    data class Success<T>(val data: T) : Resource<T>()
+    /**
+     * The happy-path target state. Data can either be:
+     * - loaded from the database - while it may seem like this case is already handled by the
+     *   Intermediate state, the difference here is semantic. Cached data is returned as Intermediate
+     *   when there's a API request in progress (or soon expected to be), however when there is no
+     *   intention of immediately querying the API, the cached data is returned as a Success.
+     * - fetched from the API.
+     */
+    data class Success<T>(val data: T) : Resource<T>
 
-    data class Error<T>(val error: Throwable) : Resource<T>()
+    /**
+     * Something bad happened and we were unable to get the requested data. This can be caused by
+     * a database error, a network error, or really just any other error. Upon receiving this state
+     * the UI can either: display a full screen error, or, when it has received any data previously,
+     * display a snack bar informing of the problem.
+     */
+    data class Error<T>(val error: Throwable) : Resource<T>
 }
 
 val <T> Resource<T>.dataOrNull: T?
@@ -64,6 +93,22 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
     is Resource.Error -> Resource.Error(this.error)
 }
 
+/**
+ * Injects another flow into this flow's resource data.
+ */
+inline fun <T1, T2, R> Flow<Resource<T1>>.combineWithResourceData(
+    flow: Flow<T2>,
+    crossinline block: suspend (T1, T2) -> R
+): Flow<Resource<R>> =
+    combine(flow) { resource, inject ->
+        when (resource) {
+            is Resource.Success -> Resource.Success(block(resource.data, inject))
+            is Resource.Intermediate -> Resource.Intermediate(block(resource.data, inject))
+            is Resource.Loading -> Resource.Loading()
+            is Resource.Error -> Resource.Error(resource.error)
+        }
+    }
+
 fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
     val description = when (it) {
         is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
@@ -74,8 +119,29 @@ fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = fa
     Timber.i("$name: $description")
 }
 
-fun <T, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
-    it.mapData(block)
+inline fun <T, U> Flow<Resource<T>>.mapResourceData(crossinline block: suspend (T) -> U) = map {
+    when (it) {
+        is Resource.Success -> Resource.Success(block(it.data))
+        is Resource.Intermediate -> Resource.Intermediate(block(it.data))
+        is Resource.Loading -> Resource.Loading()
+        is Resource.Error -> Resource.Error(it.error)
+    }
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+fun <T, U> Flow<Resource<T>>.flatMapResourceData(
+    inheritIntermediate: Boolean = true, block: suspend (T) -> Flow<Resource<U>>
+) = flatMapLatest {
+    when (it) {
+        is Resource.Success -> block(it.data)
+        is Resource.Intermediate -> block(it.data).map { newRes ->
+            if (inheritIntermediate && newRes is Resource.Success) Resource.Intermediate(newRes.data)
+            else newRes
+        }
+
+        is Resource.Loading -> flowOf(Resource.Loading())
+        is Resource.Error -> flowOf(Resource.Error(it.error))
+    }
 }
 
 fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
@@ -105,13 +171,13 @@ fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceError(block: (Throwable) -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceError(block: suspend (Throwable) -> Unit) = onEach {
     if (it is Resource.Error) {
         block(it.error)
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: suspend () -> Unit) = onEach {
     if (it !is Resource.Loading) {
         block()
     }
@@ -121,70 +187,99 @@ suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loa
 
 suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
 
-inline fun <ResultType, RequestType> networkBoundResource(
-    mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline isResultEmpty: (ResultType) -> Boolean,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline filterResult: (ResultType) -> ResultType = { it }
-) = flow {
-    emit(Resource.Loading())
+// Can cause excessive amounts of `Resource.Intermediate` to be emitted. Unless that is desired,
+// use `debounceIntermediates` to alleviate this behavior.
+inline fun <reified T> combineResourceFlows(flows: Iterable<Flow<Resource<T>>>): Flow<Resource<List<T>>> =
+    combine(flows) { items ->
+        var isIntermediate = false
+        val data = mutableListOf<T>()
+        for (item in items) {
+            when (item) {
+                is Resource.Success -> data.add(item.data)
+                is Resource.Intermediate -> {
+                    isIntermediate = true
+                    data.add(item.data)
+                }
 
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        val filteredResult = filterResult(data)
-
-        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
-            emit(Resource.Intermediate(filteredResult))
+                is Resource.Loading -> return@combine Resource.Loading()
+                is Resource.Error -> continue
+            }
         }
-
-        try {
-            val newData = fetch(data)
-            mutex.withLock { saveFetchResult(query().first(), newData) }
-            query().map { Resource.Success(filterResult(it)) }
-        } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+        if (data.isEmpty()) {
+            // All items have to be errors for this to happen, so just return the first one.
+            // mapData is functionally useless and exists only to satisfy the type checker
+            items.first().mapData { listOf(it) }
+        } else if (isIntermediate) {
+            Resource.Intermediate(data)
+        } else {
+            Resource.Success(data)
+        }
+    }
+
+@OptIn(FlowPreview::class)
+fun <T> Flow<Resource<T>>.debounceIntermediates(timeout: Duration = 5.seconds) = flow {
+    var wasIntermediate = false
+
+    emitAll(this@debounceIntermediates.debounce {
+        if (it is Resource.Intermediate) {
+            if (!wasIntermediate) {
+                wasIntermediate = true
+                Duration.ZERO
+            } else {
+                timeout
+            }
+        } else {
+            wasIntermediate = false
+            Duration.ZERO
         }
-    } else {
-        query().map { Resource.Success(filterResult(it)) }
     })
 }
 
+
+inline fun <OutputType, ApiType> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    crossinline isResultEmpty: (OutputType) -> Boolean,
+    crossinline query: () -> Flow<OutputType>,
+    crossinline fetch: suspend () -> ApiType,
+    crossinline saveFetchResult: suspend (old: OutputType, new: ApiType) -> Unit,
+    crossinline shouldFetch: (OutputType) -> Boolean = { true },
+    crossinline filterResult: (OutputType) -> OutputType = { it }
+) = networkBoundResource(
+    mutex = mutex,
+    isResultEmpty = isResultEmpty,
+    query = query,
+    fetch = fetch,
+    saveFetchResult = saveFetchResult,
+    shouldFetch = shouldFetch,
+    mapResult = filterResult
+)
+
 @JvmName("networkBoundResourceWithMap")
-inline fun <ResultType, RequestType, T> networkBoundResource(
+inline fun <DatabaseType, ApiType, OutputType> networkBoundResource(
     mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline isResultEmpty: (T) -> Boolean,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline mapResult: (ResultType) -> T,
+    crossinline isResultEmpty: (OutputType) -> Boolean,
+    crossinline query: () -> Flow<DatabaseType>,
+    crossinline fetch: suspend () -> ApiType,
+    crossinline saveFetchResult: suspend (old: DatabaseType, new: ApiType) -> Unit,
+    crossinline shouldFetch: (DatabaseType) -> Boolean = { true },
+    crossinline mapResult: (DatabaseType) -> OutputType,
 ) = flow {
     emit(Resource.Loading())
 
     val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        val mappedResult = mapResult(data)
+    if (shouldFetch(data)) {
+        emit(Resource.Intermediate(data))
 
-        if (showSavedOnLoading && !isResultEmpty(mappedResult)) {
-            emit(Resource.Intermediate(mappedResult))
-        }
         try {
-            val newData = fetch(data)
+            val newData = fetch()
             mutex.withLock { saveFetchResult(query().first(), newData) }
-            query().map { Resource.Success(mapResult(it)) }
         } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+            emit(Resource.Error(throwable))
+            return@flow
         }
-    } else {
-        query().map { Resource.Success(mapResult(it)) }
-    })
+    }
+
+    emitAll(query().map { Resource.Success(it) })
 }
+    .mapResourceData { mapResult(it) }
+    .filterNot { it is Resource.Intermediate && isResultEmpty(it.data) }
diff --git a/app/src/main/java/io/github/wulkanowy/data/WulkanowySdkFactory.kt b/app/src/main/java/io/github/wulkanowy/data/WulkanowySdkFactory.kt
new file mode 100644
index 00000000..2931db35
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/WulkanowySdkFactory.kt
@@ -0,0 +1,171 @@
+package io.github.wulkanowy.data
+
+import android.content.Context
+import android.os.Build
+import androidx.javascriptengine.JavaScriptSandbox
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.google.common.util.concurrent.ListenableFuture
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.db.dao.StudentDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsEduOne
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.scrapper.EvaluateHandler
+import io.github.wulkanowy.utils.RemoteConfigHelper
+import io.github.wulkanowy.utils.WebkitCookieManagerProxy
+import kotlinx.coroutines.guava.await
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WulkanowySdkFactory @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val chuckerInterceptor: ChuckerInterceptor,
+    private val remoteConfig: RemoteConfigHelper,
+    private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
+    private val studentDb: StudentDao,
+    private val wulkanowyRepository: WulkanowyRepository,
+) {
+
+    private val eduOneMutex = Mutex()
+    private val migrationFailedStudentIds = mutableSetOf<Long>()
+    private val sandbox: ListenableFuture<JavaScriptSandbox>? =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && JavaScriptSandbox.isSupported())
+            JavaScriptSandbox.createConnectedInstanceAsync(context)
+        else null
+
+    private val sdk = Sdk().apply {
+        androidVersion = Build.VERSION.RELEASE
+        buildTag = Build.MODEL
+        userAgentTemplate = remoteConfig.userAgentTemplate
+        setSimpleHttpLogger { Timber.d(it) }
+        setAdditionalCookieManager(webkitCookieManagerProxy)
+
+        // for debug only
+        addInterceptor(chuckerInterceptor, network = true)
+    }
+
+    fun createBase() = sdk
+
+    suspend fun create(): Sdk {
+        val mapping = wulkanowyRepository.getMapping()
+
+        return createBase().apply {
+            if (mapping != null) {
+                endpointsMapping = mapping.endpoints
+                vTokenMapping = mapping.vTokens
+                vTokenSchemeMapping = mapping.vTokenScheme
+                vParamsEvaluation = createIsolate()
+            }
+        }
+    }
+
+    private suspend fun createIsolate(): suspend () -> EvaluateHandler {
+        return {
+            val isolate = sandbox?.await()?.createIsolate()
+            object : EvaluateHandler {
+                override suspend fun evaluate(code: String): String? {
+                    return isolate?.evaluateJavaScriptAsync(code)?.await()
+                }
+
+                override fun close() {
+                    isolate?.close()
+                }
+            }
+        }
+    }
+
+    suspend fun create(student: Student, semester: Semester? = null): Sdk {
+        val overrideIsEduOne = checkEduOneAndMigrateIfNecessary(student)
+        return buildSdk(student, semester, overrideIsEduOne)
+    }
+
+    private suspend fun buildSdk(
+        student: Student,
+        semester: Semester?,
+        isStudentEduOne: Boolean
+    ): Sdk {
+        return create().apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+            emptyCookieJarInterceptor = true
+            isEduOne = isStudentEduOne
+
+            if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
+                mobileBaseUrl = student.mobileBaseUrl
+            } else {
+                scrapperBaseUrl = student.scrapperBaseUrl
+                domainSuffix = student.scrapperDomainSuffix
+                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+            }
+
+            mode = Sdk.Mode.valueOf(student.loginMode)
+            mobileBaseUrl = student.mobileBaseUrl
+            keyId = student.certificateKey
+            privatePem = student.privateKey
+
+            if (semester != null) {
+                diaryId = semester.diaryId
+                kindergartenDiaryId = semester.kindergartenDiaryId
+                schoolYear = semester.schoolYear
+                unitId = semester.unitId
+            }
+        }
+    }
+
+    private suspend fun checkEduOneAndMigrateIfNecessary(student: Student): Boolean {
+        if (student.isEduOne != null) return student.isEduOne
+
+        if (student.id in migrationFailedStudentIds) {
+            Timber.i("Migration eduOne: skipping because of previous failure")
+            return false
+        }
+
+        eduOneMutex.withLock {
+            if (student.id in migrationFailedStudentIds) {
+                Timber.i("Migration eduOne: skipping because of previous failure")
+                return false
+            }
+
+            val studentFromDatabase = studentDb.loadById(student.id)
+            if (studentFromDatabase?.isEduOne != null) {
+                Timber.i("Migration eduOne: already done")
+                return studentFromDatabase.isEduOne
+            }
+
+            Timber.i("Migration eduOne: flag missing. Running migration...")
+            val initializedSdk = buildSdk(
+                student = student,
+                semester = null,
+                isStudentEduOne = false, // doesn't matter
+            )
+            val newCurrentStudent = runCatching { initializedSdk.getCurrentStudent() }
+                .onFailure { Timber.e(it, "Migration eduOne: can't get current student") }
+                .getOrNull()
+
+            if (newCurrentStudent == null) {
+                Timber.i("Migration eduOne: failed, so skipping")
+                migrationFailedStudentIds.add(student.id)
+                return false
+            }
+
+            Timber.i("Migration eduOne: success. New isEduOne flag: ${newCurrentStudent.isEduOne}")
+
+            val studentIsEduOne = StudentIsEduOne(
+                id = student.id,
+                isEduOne = newCurrentStudent.isEduOne
+            )
+            studentDb.update(studentIsEduOne)
+            return newCurrentStudent.isEduOne
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/api/models/Mapping.kt b/app/src/main/java/io/github/wulkanowy/data/api/models/Mapping.kt
new file mode 100644
index 00000000..c4667a47
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/api/models/Mapping.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.api.models
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Mapping(
+
+    @SerialName("endpoints")
+    val endpoints: Map<String, Map<String, Map<String, String>>>,
+
+    @SerialName("vTokens")
+    val vTokens: Map<String, Map<String, Map<String, String>>>,
+
+    @SerialName("vTokenScheme")
+    val vTokenScheme: Map<String, Map<String, String>> = emptyMap(),
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt b/app/src/main/java/io/github/wulkanowy/data/api/services/SchoolsService.kt
similarity index 87%
rename from app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt
rename to app/src/main/java/io/github/wulkanowy/data/api/services/SchoolsService.kt
index a7da9b63..07fbeb89 100644
--- a/app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/api/services/SchoolsService.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.api
+package io.github.wulkanowy.data.api.services
 
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent
diff --git a/app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt b/app/src/main/java/io/github/wulkanowy/data/api/services/WulkanowyService.kt
similarity index 51%
rename from app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt
rename to app/src/main/java/io/github/wulkanowy/data/api/services/WulkanowyService.kt
index 23f5af24..161e93d6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/api/services/WulkanowyService.kt
@@ -1,12 +1,16 @@
-package io.github.wulkanowy.data.api
+package io.github.wulkanowy.data.api.services
 
+import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import retrofit2.http.GET
 import javax.inject.Singleton
 
 @Singleton
-interface AdminMessageService {
+interface WulkanowyService {
 
     @GET("/v1.json")
     suspend fun getAdminMessages(): List<AdminMessage>
-}
\ No newline at end of file
+
+    @GET("/mapping2.json")
+    suspend fun getMapping(): Mapping
+}
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 8e5841fe..f23c79de 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
@@ -25,6 +25,7 @@ import io.github.wulkanowy.data.db.dao.MailboxDao
 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.MutedMessageSendersDao
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.dao.NotificationDao
 import io.github.wulkanowy.data.db.dao.RecipientDao
@@ -56,6 +57,7 @@ import io.github.wulkanowy.data.db.entities.Mailbox
 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.MutedMessageSender
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Notification
 import io.github.wulkanowy.data.db.entities.Recipient
@@ -118,6 +120,7 @@ import io.github.wulkanowy.data.db.migrations.Migration55
 import io.github.wulkanowy.data.db.migrations.Migration57
 import io.github.wulkanowy.data.db.migrations.Migration58
 import io.github.wulkanowy.data.db.migrations.Migration6
+import io.github.wulkanowy.data.db.migrations.Migration63
 import io.github.wulkanowy.data.db.migrations.Migration7
 import io.github.wulkanowy.data.db.migrations.Migration8
 import io.github.wulkanowy.data.db.migrations.Migration9
@@ -157,6 +160,7 @@ import javax.inject.Singleton
         SchoolAnnouncement::class,
         Notification::class,
         AdminMessage::class,
+        MutedMessageSender::class,
         GradeDescriptive::class,
     ],
     autoMigrations = [
@@ -169,6 +173,11 @@ import javax.inject.Singleton
         AutoMigration(from = 56, to = 57, spec = Migration57::class),
         AutoMigration(from = 57, to = 58, spec = Migration58::class),
         AutoMigration(from = 58, to = 59),
+        AutoMigration(from = 59, to = 60),
+        AutoMigration(from = 60, to = 61),
+        AutoMigration(from = 61, to = 62),
+        AutoMigration(from = 62, to = 63, spec = Migration63::class),
+        AutoMigration(from = 63, to = 64),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -177,7 +186,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 59
+        const val VERSION_SCHEMA = 64
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -303,5 +312,7 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val adminMessagesDao: AdminMessageDao
 
+    abstract val mutedMessageSendersDao: MutedMessageSendersDao
+
     abstract val gradeDescriptiveDao: GradeDescriptiveDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
index 2b4cb597..6c8d7e47 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
@@ -2,24 +2,14 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-abstract class AdminMessageDao : BaseDao<AdminMessage> {
+interface AdminMessageDao : BaseDao<AdminMessage> {
 
     @Query("SELECT * FROM AdminMessages")
-    abstract fun loadAll(): Flow<List<AdminMessage>>
-
-    @Transaction
-    open suspend fun removeOldAndSaveNew(
-        oldMessages: List<AdminMessage>,
-        newMessages: List<AdminMessage>
-    ) {
-        deleteAll(oldMessages)
-        insertAll(newMessages)
-    }
+    fun loadAll(): Flow<List<AdminMessage>>
 }
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 c6c255a1..7d20c9a7 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import kotlinx.coroutines.flow.Flow
 import java.time.LocalDate
 import javax.inject.Singleton
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
index 056a5cbd..937e9824 100644
--- 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
+import androidx.room.Transaction
 import androidx.room.Update
 
 interface BaseDao<T> {
@@ -15,4 +16,10 @@ interface BaseDao<T> {
 
     @Delete
     suspend fun deleteAll(items: List<T>)
+
+    @Transaction
+    suspend fun removeOldAndSaveNew(oldItems: List<T>, newItems: List<T>) {
+        deleteAll(oldItems)
+        insertAll(newItems)
+    }
 }
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 12e70bde..ff332618 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
@@ -12,4 +12,8 @@ interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
+
+    @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId " +
+        "AND entry NOT IN(:censoredEntries)")
+    fun loadAllCensored(semesterId: Int, studentId: Int, censoredEntries: Array<String>): Flow<List<Grade>>
 }
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 1709f763..11e6da1e 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
@@ -5,15 +5,23 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
-
     @Transaction
     @Query("SELECT * FROM Messages WHERE message_global_key = :messageGlobalKey")
     fun loadMessageWithAttachment(messageGlobalKey: String): Flow<MessageWithAttachment?>
 
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
+    fun loadMessagesWithMutedAuthor(mailboxKey: String, folder: Int): Flow<List<MessageWithMutedAuthor>>
+
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadMessagesWithMutedAuthor(folder: Int, email: String): Flow<List<MessageWithMutedAuthor>>
+
     @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
     fun loadAll(mailboxKey: String, folder: Int): Flow<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 96382cc1..5ddb4dd0 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
@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
+    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :studentId ORDER BY date DESC")
+    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MutedMessageSendersDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MutedMessageSendersDao.kt
new file mode 100644
index 00000000..0a866401
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MutedMessageSendersDao.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.MutedMessageSender
+
+@Dao
+interface MutedMessageSendersDao : BaseDao<MutedMessageSender> {
+
+    @Query("SELECT COUNT(*) FROM MutedMessageSenders WHERE author = :author")
+    suspend fun checkMute(author: String): Boolean
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun insertMute(mute: MutedMessageSender): Long
+
+    @Query("DELETE FROM MutedMessageSenders WHERE author = :author")
+    suspend fun deleteMute(author: String)
+}
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 e89a4135..98de5ba3 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
@@ -9,7 +9,6 @@ import javax.inject.Singleton
 @Singleton
 @Dao
 interface NoteDao : BaseDao<Note> {
-
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Flow<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
index c32e4aba..64d49bce 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
@@ -10,6 +10,6 @@ import javax.inject.Singleton
 @Singleton
 interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
 
-    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(userLoginId: Int): Flow<List<SchoolAnnouncement>>
+    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :studentId ORDER BY date DESC")
+    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
 }
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 4d171907..bf9a34d0 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
@@ -14,6 +14,6 @@ interface SemesterDao : BaseDao<Semester> {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertSemesters(items: List<Semester>): List<Long>
 
-    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
+    @Query("SELECT * FROM Semesters WHERE (student_id = :studentId AND class_id = :classId) OR (student_id = :studentId AND class_id = 0)")
     suspend fun loadAll(studentId: Int, classId: Int): 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 d9326ff6..5302b320 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
@@ -9,6 +9,8 @@ import androidx.room.Transaction
 import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsAuthorized
+import io.github.wulkanowy.data.db.entities.StudentIsEduOne
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import javax.inject.Singleton
@@ -23,6 +25,12 @@ abstract class StudentDao {
     @Delete
     abstract suspend fun delete(student: Student)
 
+    @Update(entity = Student::class)
+    abstract suspend fun update(studentIsAuthorized: StudentIsAuthorized)
+
+    @Update(entity = Student::class)
+    abstract suspend fun update(studentIsEduOne: StudentIsEduOne)
+
     @Update(entity = Student::class)
     abstract suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 
@@ -39,11 +47,11 @@ abstract class StudentDao {
     abstract suspend fun loadAll(): List<Student>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id")
+    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0)")
     abstract suspend fun loadStudentsWithSemesters(): Map<Student, List<Semester>>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id WHERE Students.id = :id")
+    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0) WHERE Students.id = :id")
     abstract suspend fun loadStudentWithSemestersById(id: Long): Map<Student, List<Semester>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
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 b4b7379f..40d97ea9 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
@@ -15,5 +15,5 @@ interface TimetableDao : BaseDao<Timetable> {
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
+    suspend fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
index 0c8f1a5d..a8604c5c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
@@ -4,6 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.serializers.SafeMessageTypeEnumListSerializer
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -34,6 +36,8 @@ data class AdminMessage(
 
     val priority: String,
 
+    @SerialName("messageTypes")
+    @Serializable(with = SafeMessageTypeEnumListSerializer::class)
     @ColumnInfo(name = "types", defaultValue = "[]")
     val types: List<MessageType> = emptyList(),
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index a42832ce..f8a357a3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -33,7 +33,13 @@ data class GradeSummary(
     @ColumnInfo(name = "points_sum")
     val pointsSum: String,
 
-    val average: Double
+    @ColumnInfo(name = "points_sum_all_year")
+    val pointsSumAllYear: String?,
+
+    val average: Double,
+
+    @ColumnInfo(name = "average_all_year")
+    val averageAllYear: Double? = null,
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
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
index cd468215..fc890e76 100644
--- 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
@@ -2,11 +2,15 @@ package io.github.wulkanowy.data.db.entities
 
 import androidx.room.Embedded
 import androidx.room.Relation
+import java.io.Serializable
 
 data class MessageWithAttachment(
     @Embedded
     val message: Message,
 
     @Relation(parentColumn = "message_global_key", entityColumn = "message_global_key")
-    val attachments: List<MessageAttachment>
-)
+    val attachments: List<MessageAttachment>,
+
+    @Relation(parentColumn = "correspondents", entityColumn = "author")
+    val mutedMessageSender: MutedMessageSender?,
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithMutedAuthor.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithMutedAuthor.kt
new file mode 100644
index 00000000..e3cd1ca7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithMutedAuthor.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class MessageWithMutedAuthor(
+    @Embedded
+    val message: Message,
+
+    @Relation(parentColumn = "correspondents", entityColumn = "author")
+    val mutedMessageSender: MutedMessageSender?,
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 89b04ccc..44e90064 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -9,8 +9,8 @@ import java.time.Instant
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
 
-    @ColumnInfo(name = "user_login_id")
-    val userLoginId: Int,
+    @ColumnInfo(name = "user_login_id") // todo: change column name
+    val studentId: Int,
 
     @ColumnInfo(name = "device_id")
     val deviceId: Int,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MutedMessageSender.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MutedMessageSender.kt
new file mode 100644
index 00000000..f1770e64
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MutedMessageSender.kt
@@ -0,0 +1,15 @@
+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 = "MutedMessageSenders")
+data class MutedMessageSender(
+    @ColumnInfo(name = "author")
+    val author: String,
+) : Serializable {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
index 25e27ef1..814a3c8d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
@@ -9,14 +9,16 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "user_login_id")
-    val userLoginId: Int,
+    @ColumnInfo(name = "user_login_id") // todo: change column name
+    val studentId: Int,
 
     val date: LocalDate,
 
     val subject: String,
 
-    val content: String
+    val content: String,
+
+    val author: String? = null,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
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 e1116733..0300506a 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
@@ -49,6 +49,7 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
+    @Deprecated("not available in VULCAN anymore")
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
@@ -78,6 +79,13 @@ data class Student(
 
     @ColumnInfo(name = "registration_date")
     val registrationDate: Instant,
+
+    @ColumnInfo(name = "is_authorized", defaultValue = "0")
+    val isAuthorized: Boolean,
+
+    @ColumnInfo(name = "is_edu_one", defaultValue = "NULL")
+    val isEduOne: Boolean?,
+
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
@@ -88,3 +96,22 @@ data class Student(
     @ColumnInfo(name = "avatar_color")
     var avatarColor = 0L
 }
+
+@Entity
+data class StudentIsAuthorized(
+
+    @PrimaryKey
+    var id: Long,
+
+    @ColumnInfo(name = "is_authorized", defaultValue = "NULL")
+    val isAuthorized: Boolean?,
+) : Serializable
+
+@Entity
+data class StudentIsEduOne(
+    @PrimaryKey
+    var id: Long,
+
+    @ColumnInfo(name = "is_edu_one", defaultValue = "NULL")
+    val isEduOne: Boolean?,
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration63.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration63.kt
new file mode 100644
index 00000000..f88d31fc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration63.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.AutoMigrationSpec
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration63 : AutoMigrationSpec {
+
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        db.execSQL("UPDATE Students SET is_edu_one = NULL WHERE is_edu_one = 0")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt b/app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt
index 438f0732..acff9d2e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt
@@ -7,6 +7,6 @@ enum class AppTheme(val value: String) {
     BLACK("black");
 
     companion object {
-        fun getByValue(value: String) = values().find { it.value == value } ?: LIGHT
+        fun getByValue(value: String) = entries.find { it.value == value } ?: LIGHT
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/AttendanceCalculatorSortingMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/AttendanceCalculatorSortingMode.kt
new file mode 100644
index 00000000..77dd5fc4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/AttendanceCalculatorSortingMode.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.enums
+
+enum class AttendanceCalculatorSortingMode(private val value: String) {
+    ALPHABETIC("alphabetic"),
+    ATTENDANCE("attendance_percentage"),
+    LESSON_BALANCE("lesson_balance");
+
+    companion object {
+        fun getByValue(value: String) =
+            AttendanceCalculatorSortingMode.values()
+                .find { it.value == value } ?: ALPHABETIC
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt b/app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt
index 24b095d0..48b81670 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt
@@ -8,6 +8,6 @@ enum class GradeColorTheme(val value: String) : Serializable {
     GRADE_COLOR("grade_color");
 
     companion object {
-        fun getByValue(value: String) = values().find { it.value == value } ?: VULCAN
+        fun getByValue(value: String) = entries.find { it.value == value } ?: VULCAN
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt
index 96e4a174..f99fe7a8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt
@@ -6,6 +6,6 @@ enum class GradeExpandMode(val value: String) {
     ALWAYS_EXPANDED("always");
 
     companion object {
-        fun getByValue(value: String) = values().find { it.value == value } ?: ONE
+        fun getByValue(value: String) = entries.find { it.value == value } ?: ONE
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
index a7aa4cc2..e2872728 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
@@ -6,6 +6,6 @@ enum class GradeSortingMode(val value: String) {
     AVERAGE("average");
 
     companion object {
-        fun getByValue(value: String) = values().find { it.value == value } ?: ALPHABETIC
+        fun getByValue(value: String) = entries.find { it.value == value } ?: ALPHABETIC
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt b/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
index 899ba908..7cb4202a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
@@ -3,5 +3,10 @@ package io.github.wulkanowy.data.enums
 enum class MessageFolder(val id: Int = 1) {
     RECEIVED(1),
     SENT(2),
-    TRASHED(3)
+    TRASHED(3),
+    ;
+
+    companion object {
+        fun byId(id: Int) = entries.first { it.id == id }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt b/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
index 531684e4..ecd8d916 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
@@ -4,6 +4,8 @@ enum class MessageType {
     GENERAL_MESSAGE,
     DASHBOARD_MESSAGE,
     LOGIN_MESSAGE,
+    LOGIN_STUDENT_SELECT_MESSAGE,
+    LOGIN_SYMBOL_MESSAGE,
     PASS_RESET_MESSAGE,
     ERROR_OVERRIDE,
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/ShowAdditionalLessonsMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/ShowAdditionalLessonsMode.kt
new file mode 100644
index 00000000..3e7cdef5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/ShowAdditionalLessonsMode.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.enums
+
+enum class ShowAdditionalLessonsMode(val value: String) {
+    NONE("none"),
+    INLINE("inline"),
+    BELOW("below");
+
+    companion object {
+        fun getByValue(value: String) = entries.find { it.value == value } ?: INLINE
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt
index 9e294ad7..b2eeec38 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt
@@ -6,6 +6,6 @@ enum class TimetableMode(val value: String) {
     SMALL_OTHER_GROUP("small");
 
     companion object {
-        fun getByValue(value: String) = values().find { it.value == value } ?: ONLY_CURRENT_GROUP
+        fun getByValue(value: String) = entries.find { it.value == value } ?: ONLY_CURRENT_GROUP
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
index 16f1bbac..1a84a6a5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
@@ -3,12 +3,26 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformation
+import io.github.wulkanowy.sdk.pojo.LastAnnouncement as SdkLastAnnouncement
 
+@JvmName("mapDirectorInformationToEntities")
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        userLoginId = student.userLoginId,
+        studentId = student.studentId,
         date = it.date,
         subject = it.subject,
         content = it.content,
+        author = null,
+    )
+}
+
+@JvmName("mapLastAnnouncementsToEntities")
+fun List<SdkLastAnnouncement>.mapToEntities(student: Student) = map {
+    SchoolAnnouncement(
+        studentId = student.studentId,
+        date = it.date,
+        subject = it.subject,
+        content = it.content,
+        author = it.author,
     )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
index 66e92217..57322a7a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
@@ -37,9 +37,11 @@ fun List<SdkGradeSummary>.mapToEntities(semester: Semester) = map {
         predictedGrade = it.predicted,
         finalGrade = it.final,
         pointsSum = it.pointsSum,
+        pointsSumAllYear = it.pointsSumAllYear,
         proposedPoints = it.proposedPoints,
         finalPoints = it.finalPoints,
-        average = it.average
+        average = it.average,
+        averageAllYear = it.averageAllYear,
     )
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
index 1f4178fa..3818f01a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
@@ -8,7 +8,7 @@ import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 
 fun List<SdkDevice>.mapToEntities(student: Student) = map {
     MobileDevice(
-        userLoginId = student.userLoginId,
+        studentId = student.studentId,
         date = it.createDate.toInstant(),
         deviceId = it.id,
         name = it.name
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
index 72c4861c..7e6a8166 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
@@ -34,17 +34,19 @@ fun SdkRegisterUser.mapToPojo(password: String?) = RegisterUser(
                     error = it.error,
                     students = it.subjects
                         .filterIsInstance<SdkRegisterStudent>()
-                        .map { registerSubject ->
+                        .map { registerStudent ->
                             RegisterStudent(
-                                studentId = registerSubject.studentId,
-                                studentName = registerSubject.studentName,
-                                studentSecondName = registerSubject.studentSecondName,
-                                studentSurname = registerSubject.studentSurname,
-                                className = registerSubject.className,
-                                classId = registerSubject.classId,
-                                isParent = registerSubject.isParent,
-                                semesters = registerSubject.semesters
-                                    .mapToEntities(registerSubject.studentId),
+                                studentId = registerStudent.studentId,
+                                studentName = registerStudent.studentName,
+                                studentSecondName = registerStudent.studentSecondName,
+                                studentSurname = registerStudent.studentSurname,
+                                className = registerStudent.className,
+                                classId = registerStudent.classId,
+                                isParent = registerStudent.isParent,
+                                isAuthorized = registerStudent.isAuthorized,
+                                isEduOne = registerStudent.isEduOne,
+                                semesters = registerStudent.semesters
+                                    .mapToEntities(registerStudent.studentId),
                             )
                         },
                 )
@@ -84,6 +86,8 @@ fun RegisterStudent.mapToStudentWithSemesters(
         password = user.password.orEmpty(),
         isCurrent = false,
         registrationDate = Instant.now(),
+        isAuthorized = this.isAuthorized,
+        isEduOne = this.isEduOne,
     ).apply {
         avatarColor = colors.random()
     },
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/AttendanceData.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/AttendanceData.kt
new file mode 100644
index 00000000..5810363c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/AttendanceData.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.pojos
+
+data class AttendanceData(
+    val subjectName: String,
+    val lessonBalance: Int,
+    val presences: Int,
+    val absences: Int,
+) {
+    val total: Int
+        get() = presences + absences
+
+    val presencePercentage: Double
+        get() = if (total == 0) 0.0 else (presences.toDouble() / total) * 100
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
index 98bf1402..dec6ebec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
@@ -45,4 +45,6 @@ data class RegisterStudent(
     val classId: Int,
     val isParent: Boolean,
     val semesters: List<Semester>,
+    val isAuthorized: Boolean,
+    val isEduOne: Boolean
 ) : java.io.Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt
deleted file mode 100644
index b831ee75..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.api.AdminMessageService
-import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.networkBoundResource
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AdminMessageRepository @Inject constructor(
-    private val adminMessageService: AdminMessageService,
-    private val adminMessageDao: AdminMessageDao,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getAdminMessages(): Flow<Resource<List<AdminMessage>>> =
-        networkBoundResource(
-            mutex = saveFetchResultMutex,
-            isResultEmpty = { false },
-            query = { adminMessageDao.loadAll() },
-            fetch = { adminMessageService.getAdminMessages() },
-            shouldFetch = { true },
-            saveFetchResult = { oldItems, newItems ->
-                adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
-            },
-            showSavedOnLoading = false,
-        )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
index 6d782047..ebe6f5db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -7,19 +8,17 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.withContext
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
@@ -30,14 +29,73 @@ import javax.inject.Singleton
 class AttendanceRepository @Inject constructor(
     private val attendanceDb: AttendanceDao,
     private val timetableDb: TimetableDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
+    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
     private val cacheKey = "attendance"
 
+    private fun filterAttendance(
+        hiddenAttendanceTiles: List<DashboardItem.HiddenAttendanceTile>,
+        attendanceItem: Attendance
+    ): Boolean {
+        return when {
+            attendanceItem.absence && attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.EXCUSED_ABSENCE
+            ) -> false
+
+            attendanceItem.absence && !attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.UNEXCUSED_ABSENCE
+            ) -> false
+
+            attendanceItem.lateness && attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.EXCUSED_LATENESS
+            ) -> false
+
+            attendanceItem.lateness && !attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.UNEXCUSED_LATENESS
+            ) -> false
+
+            attendanceItem.exemption && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.EXEMPTION) -> false
+            attendanceItem.deleted && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.DELETED) -> false
+            attendanceItem.presence && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.PRESENT) -> false
+
+            else -> !hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.UNKNOWN)
+        }
+    }
+
+    private fun filterAttendance(
+        hiddenAttendanceTiles: List<DashboardItem.HiddenAttendanceTile>,
+        attendanceItem: SdkAttendance
+    ): Boolean {
+        return when {
+            attendanceItem.absence && attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.EXCUSED_ABSENCE
+            ) -> false
+
+            attendanceItem.absence && !attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.UNEXCUSED_ABSENCE
+            ) -> false
+
+            attendanceItem.lateness && attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.EXCUSED_LATENESS
+            ) -> false
+
+            attendanceItem.lateness && !attendanceItem.excused && hiddenAttendanceTiles.contains(
+                DashboardItem.HiddenAttendanceTile.UNEXCUSED_LATENESS
+            ) -> false
+
+            attendanceItem.exemption && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.EXEMPTION) -> false
+            attendanceItem.deleted && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.DELETED) -> false
+            attendanceItem.presence && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.PRESENT) -> false
+
+            else -> !hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.UNKNOWN)
+        }
+    }
+
     fun getAttendance(
         student: Student,
         semester: Semester,
@@ -55,26 +113,34 @@ class AttendanceRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
+            val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
+
+            attendanceDb
+                .loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
+                .map {
+                    it.filter { item -> filterAttendance(hiddenAttendanceItems, item) }
+                }
         },
         fetch = {
-            val lessons = withContext(Dispatchers.IO) {
-                timetableDb.load(
-                    semester.diaryId, semester.studentId, start.monday, end.sunday
-                )
-            }
-            sdk.init(student)
-                .switchSemester(semester)
+            val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
+
+            val lessons = timetableDb.load(
+                semester.diaryId, semester.studentId, start.monday, end.sunday
+            )
+
+            wulkanowySdkFactory.create(student, semester)
                 .getAttendance(start.monday, end.sunday)
+                .filter { item -> filterAttendance(hiddenAttendanceItems, item) }
                 .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
             val attendanceToAdd = (new uniqueSubtract old).map { newAttendance ->
                 newAttendance.apply { if (notify) isNotified = false }
             }
-            attendanceDb.insertAll(attendanceToAdd)
-
+            attendanceDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = attendanceToAdd,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
@@ -85,7 +151,13 @@ class AttendanceRepository @Inject constructor(
         start: LocalDate,
         end: LocalDate
     ): Flow<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, start, end)
+        val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
+
+        return attendanceDb
+            .loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
+            .map {
+                it.filter { item -> filterAttendance(hiddenAttendanceItems, item) }
+            }
     }
 
     suspend fun updateTimetable(timetable: List<Attendance>) {
@@ -93,8 +165,10 @@ class AttendanceRepository @Inject constructor(
     }
 
     suspend fun excuseForAbsence(
-        student: Student, semester: Semester,
-        absenceList: List<Attendance>, reason: String? = null
+        student: Student,
+        semester: Semester,
+        absenceList: List<Attendance>,
+        reason: String? = null
     ) {
         val items = absenceList.map { attendance ->
             Absent(
@@ -102,8 +176,7 @@ class AttendanceRepository @Inject constructor(
                 timeId = attendance.timeId
             )
         }
-        sdk.init(student)
-            .switchSemester(semester)
+        wulkanowySdkFactory.create(student, semester)
             .excuseForAbsence(items, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
index 6bdcf9d7..78c98169 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import androidx.room.withTransaction
+import io.github.wulkanowy.data.WulkanowySdkFactory
+import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -18,8 +18,9 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceSummaryRepository @Inject constructor(
     private val attendanceDb: AttendanceSummaryDao,
-    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
+    private val appDatabase: AppDatabase,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -40,14 +41,15 @@ class AttendanceSummaryRepository @Inject constructor(
         },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getAttendanceSummary(subjectId)
                 .mapToEntities(semester, subjectId)
         },
         saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
-            attendanceDb.insertAll(new uniqueSubtract old)
+            appDatabase.withTransaction {
+                attendanceDb.deleteAll(old uniqueSubtract new)
+                attendanceDb.insertAll(new uniqueSubtract old)
+            }
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
index 1579ae62..45a36f55 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
@@ -1,12 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -15,7 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class CompletedLessonsRepository @Inject constructor(
     private val completedLessonsDb: CompletedLessonsDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -47,14 +51,15 @@ class CompletedLessonsRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getCompletedLessons(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            completedLessonsDb.deleteAll(old uniqueSubtract new)
-            completedLessonsDb.insertAll(new uniqueSubtract old)
+            completedLessonsDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
index 7eb37f0b..58ce0091 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
@@ -1,16 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.ConferenceDao
 import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -21,7 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class ConferenceRepository @Inject constructor(
     private val conferenceDb: ConferenceDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -46,19 +44,18 @@ class ConferenceRepository @Inject constructor(
             conferenceDb.loadAll(semester.diaryId, student.studentId, startDate)
         },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getConferences()
                 .mapToEntities(semester)
                 .filter { it.date >= startDate }
         },
         saveFetchResult = { old, new ->
-            val conferencesToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
-
-            conferenceDb.deleteAll(old uniqueSubtract new)
-            conferenceDb.insertAll(conferencesToSave)
+            conferenceDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
index 96026a55..89dbcd5c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
@@ -1,18 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.ExamDao
 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.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.endExamsDay
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.startExamsDay
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -23,7 +21,7 @@ import javax.inject.Singleton
 @Singleton
 class ExamRepository @Inject constructor(
     private val examDb: ExamDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -56,18 +54,17 @@ class ExamRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            val examsToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
-
-            examDb.deleteAll(old uniqueSubtract new)
-            examDb.insertAll(examsToSave)
+            examDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
index 1e2ea935..7a502787 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.dao.GradeDescriptiveDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
@@ -10,17 +11,15 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.toLocalDate
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
+import timber.log.Timber
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -30,12 +29,20 @@ class GradeRepository @Inject constructor(
     private val gradeDb: GradeDao,
     private val gradeSummaryDb: GradeSummaryDao,
     private val gradeDescriptiveDb: GradeDescriptiveDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
+    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
+    private fun loadGrades(semesterId: Int, studentId: Int): Flow<List<Grade>> {
+        val hiddenGrades = preferencesRepository.hiddenGrades
+
+        Timber.i("Load grades for semester $semesterId student $studentId")
+        return gradeDb.loadAllCensored(semesterId, studentId, hiddenGrades.toTypedArray())
+    }
+
     fun getGrades(
         student: Student,
         semester: Semester,
@@ -63,12 +70,15 @@ class GradeRepository @Inject constructor(
             }
         },
         fetch = {
-            val (details, summary, descriptive) = sdk.init(student)
-                .switchSemester(semester)
+            val hiddenGrades = preferencesRepository.hiddenGrades
+
+            val (details, summary, descriptive) = wulkanowySdkFactory.create(student, semester)
                 .getGrades(semester.semesterId)
 
+            val censoredDetails = details.filterNot { it.entry in hiddenGrades }
+
             Triple(
-                details.mapToEntities(semester),
+                censoredDetails.mapToEntities(semester),
                 summary.mapToEntities(semester),
                 descriptive.mapToEntities(semester)
             )
@@ -87,10 +97,12 @@ class GradeRepository @Inject constructor(
         new: List<GradeDescriptive>,
         notify: Boolean
     ) {
-        gradeDescriptiveDb.deleteAll(old uniqueSubtract new)
-        gradeDescriptiveDb.insertAll((new uniqueSubtract old).onEach {
-            if (notify) it.isNotified = false
-        })
+        gradeDescriptiveDb.removeOldAndSaveNew(
+            oldItems = old uniqueSubtract new,
+            newItems = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            },
+        )
     }
 
     private suspend fun refreshGradeDetails(
@@ -101,13 +113,16 @@ class GradeRepository @Inject constructor(
     ) {
         val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date
             ?: student.registrationDate.toLocalDate()
-        gradeDb.deleteAll(oldGrades uniqueSubtract newDetails)
-        gradeDb.insertAll((newDetails uniqueSubtract oldGrades).onEach {
-            if (it.date >= notifyBreakDate) it.apply {
-                isRead = false
-                if (notify) isNotified = false
-            }
-        })
+
+        gradeDb.removeOldAndSaveNew(
+            oldItems = oldGrades uniqueSubtract newDetails,
+            newItems = (newDetails uniqueSubtract oldGrades).onEach {
+                if (it.date >= notifyBreakDate) it.apply {
+                    isRead = false
+                    if (notify) isNotified = false
+                }
+            },
+        )
     }
 
     private suspend fun refreshGradeSummaries(
@@ -115,41 +130,53 @@ class GradeRepository @Inject constructor(
         newSummary: List<GradeSummary>,
         notify: Boolean
     ) {
-        gradeSummaryDb.deleteAll(oldSummaries uniqueSubtract newSummary)
-        gradeSummaryDb.insertAll((newSummary uniqueSubtract oldSummaries).onEach { summary ->
-            val oldSummary = oldSummaries.find { old -> old.subject == summary.subject }
-            summary.isPredictedGradeNotified = when {
-                summary.predictedGrade.isEmpty() -> true
-                notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
-                else -> true
-            }
-            summary.isFinalGradeNotified = when {
-                summary.finalGrade.isEmpty() -> true
-                notify && oldSummary?.finalGrade != summary.finalGrade -> false
-                else -> true
-            }
+        gradeSummaryDb.removeOldAndSaveNew(
+            oldItems = oldSummaries uniqueSubtract newSummary,
+            newItems = (newSummary uniqueSubtract oldSummaries).onEach { summary ->
+                getGradeSummaryWithUpdatedNotificationState(
+                    summary = summary,
+                    oldSummary = oldSummaries.find { it.subject == summary.subject },
+                    notify = notify,
+                )
+            },
+        )
+    }
 
-            summary.predictedGradeLastChange = when {
-                oldSummary == null -> Instant.now()
-                summary.predictedGrade != oldSummary.predictedGrade -> Instant.now()
-                else -> oldSummary.predictedGradeLastChange
-            }
-            summary.finalGradeLastChange = when {
-                oldSummary == null -> Instant.now()
-                summary.finalGrade != oldSummary.finalGrade -> Instant.now()
-                else -> oldSummary.finalGradeLastChange
-            }
-        })
+    private fun getGradeSummaryWithUpdatedNotificationState(
+        summary: GradeSummary,
+        oldSummary: GradeSummary?,
+        notify: Boolean,
+    ) {
+        summary.isPredictedGradeNotified = when {
+            summary.predictedGrade.isEmpty() -> true
+            notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
+            else -> true
+        }
+        summary.isFinalGradeNotified = when {
+            summary.finalGrade.isEmpty() -> true
+            notify && oldSummary?.finalGrade != summary.finalGrade -> false
+            else -> true
+        }
+        summary.predictedGradeLastChange = when {
+            oldSummary == null -> Instant.now()
+            summary.predictedGrade != oldSummary.predictedGrade -> Instant.now()
+            else -> oldSummary.predictedGradeLastChange
+        }
+        summary.finalGradeLastChange = when {
+            oldSummary == null -> Instant.now()
+            summary.finalGrade != oldSummary.finalGrade -> Instant.now()
+            else -> oldSummary.finalGradeLastChange
+        }
     }
 
     fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
+        return loadGrades(semester.semesterId, semester.studentId).map {
             it.filter { grade -> !grade.isRead }
         }
     }
 
     fun getGradesFromDatabase(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId)
+        return loadGrades(semester.semesterId, semester.studentId)
     }
 
     fun getGradesPredictedFromDatabase(semester: Semester): Flow<List<GradeSummary>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
index 23d7b858..f120d34f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
@@ -12,14 +13,11 @@ import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
 import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -28,7 +26,7 @@ class GradeStatisticsRepository @Inject constructor(
     private val gradePartialStatisticsDb: GradePartialStatisticsDao,
     private val gradePointsStatisticsDb: GradePointsStatisticsDao,
     private val gradeSemesterStatisticsDb: GradeSemesterStatisticsDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -56,14 +54,15 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getGradesPartialStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradePartialStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradePartialStatisticsDb.insertAll(new uniqueSubtract old)
+            gradePartialStatisticsDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(partialCacheKey, semester))
         },
         mapResult = { items ->
@@ -80,6 +79,7 @@ class GradeStatisticsRepository @Inject constructor(
                     )
                     listOf(summaryItem) + items
                 }
+
                 else -> items.filter { it.subject == subjectName }
             }.mapPartialToStatisticItems()
         }
@@ -101,14 +101,15 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getGradesSemesterStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradeSemesterStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradeSemesterStatisticsDb.insertAll(new uniqueSubtract old)
+            gradeSemesterStatisticsDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(semesterCacheKey, semester))
         },
         mapResult = { items ->
@@ -138,6 +139,7 @@ class GradeStatisticsRepository @Inject constructor(
                     }
                     listOf(summaryItem) + itemsWithAverage
                 }
+
                 else -> itemsWithAverage.filter { it.subject == subjectName }
             }.mapSemesterToStatisticItems()
         }
@@ -157,14 +159,15 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getGradesPointsStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradePointsStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradePointsStatisticsDb.insertAll(new uniqueSubtract old)
+            gradePointsStatisticsDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(pointsCacheKey, semester))
         },
         mapResult = { items ->
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
index 010cf845..7893ef63 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
@@ -1,18 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 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.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -22,7 +20,7 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRepository @Inject constructor(
     private val homeworkDb: HomeworkDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -55,20 +53,19 @@ class HomeworkRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            val homeWorkToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
             val filteredOld = old.filterNot { it.isAddedByUser }
 
-            homeworkDb.deleteAll(filteredOld uniqueSubtract new)
-            homeworkDb.insertAll(homeWorkToSave)
-
+            homeworkDb.removeOldAndSaveNew(
+                oldItems = filteredOld uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
index 4ff4517d..dfafe6c8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.utils.AppWidgetUpdater
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
@@ -18,7 +19,8 @@ import javax.inject.Singleton
 @Singleton
 class LuckyNumberRepository @Inject constructor(
     private val luckyNumberDb: LuckyNumberDao,
-    private val sdk: Sdk
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val appWidgetUpdater: AppWidgetUpdater,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -27,23 +29,28 @@ class LuckyNumberRepository @Inject constructor(
         student: Student,
         forceRefresh: Boolean,
         notify: Boolean = false,
+        isFromAppWidget: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it == null },
         shouldFetch = { it == null || forceRefresh },
         query = { luckyNumberDb.load(student.studentId, now()) },
         fetch = {
-            sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student)
+            wulkanowySdkFactory.create(student)
+                .getLuckyNumber(student.schoolShortName)
+                ?.mapToEntity(student)
         },
         saveFetchResult = { oldLuckyNumber, newLuckyNumber ->
             newLuckyNumber ?: return@networkBoundResource
 
             if (newLuckyNumber != oldLuckyNumber) {
-                val updatedLuckNumberList =
-                    listOf(newLuckyNumber.apply { if (notify) isNotified = false })
-
-                oldLuckyNumber?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
-                luckyNumberDb.insertAll(updatedLuckNumberList)
+                luckyNumberDb.removeOldAndSaveNew(
+                    oldItems = listOfNotNull(oldLuckyNumber),
+                    newItems = listOf(newLuckyNumber.apply { if (notify) isNotified = false }),
+                )
+                if (!isFromAppWidget) {
+                    appWidgetUpdater.updateAllAppWidgetsByProvider(LuckyNumberWidgetProvider::class)
+                }
             }
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index c8fccb23..f91dc63e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -4,17 +4,22 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.dao.MutedMessageSendersDao
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
+import io.github.wulkanowy.data.db.entities.MutedMessageSender
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.enums.MessageFolder.SENT
 import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -22,16 +27,14 @@ import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -42,8 +45,9 @@ import javax.inject.Singleton
 @Singleton
 class MessageRepository @Inject constructor(
     private val messagesDb: MessagesDao,
+    private val mutedMessageSendersDao: MutedMessageSendersDao,
     private val messageAttachmentDao: MessageAttachmentDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     @ApplicationContext private val context: Context,
     private val refreshHelper: AutoRefreshHelper,
     private val sharedPrefProvider: SharedPrefProvider,
@@ -51,7 +55,6 @@ class MessageRepository @Inject constructor(
     private val mailboxDao: MailboxDao,
     private val getMailboxByStudentUseCase: GetMailboxByStudentUseCase,
 ) {
-
     private val saveFetchResultMutex = Mutex()
 
     private val messagesCacheKey = "message"
@@ -63,7 +66,7 @@ class MessageRepository @Inject constructor(
         folder: MessageFolder,
         forceRefresh: Boolean,
         notify: Boolean = false,
-    ): Flow<Resource<List<Message>>> = networkBoundResource(
+    ): Flow<Resource<List<MessageWithMutedAuthor>>> = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it.isEmpty() },
         shouldFetch = {
@@ -74,21 +77,30 @@ class MessageRepository @Inject constructor(
         },
         query = {
             if (mailbox == null) {
-                messagesDb.loadAll(folder.id, student.email)
-            } else messagesDb.loadAll(mailbox.globalKey, folder.id)
+                messagesDb.loadMessagesWithMutedAuthor(folder.id, student.email)
+            } else messagesDb.loadMessagesWithMutedAuthor(mailbox.globalKey, folder.id)
         },
         fetch = {
-            sdk.init(student).getMessages(
-                folder = Folder.valueOf(folder.name),
-                mailboxKey = mailbox?.globalKey,
-            ).mapToEntities(student, mailbox, mailboxDao.loadAll(student.email))
+            wulkanowySdkFactory.create(student)
+                .getMessages(
+                    folder = Folder.valueOf(folder.name),
+                    mailboxKey = mailbox?.globalKey,
+                )
+                .mapToEntities(
+                    student = student,
+                    mailbox = mailbox,
+                    allMailboxes = mailboxDao.loadAll(student.email)
+                )
         },
-        saveFetchResult = { old, new ->
-            messagesDb.deleteAll(old uniqueSubtract new)
-            messagesDb.insertAll((new uniqueSubtract old).onEach {
-                it.isNotified = !notify
-            })
-
+        saveFetchResult = { oldWithAuthors, new ->
+            val old = oldWithAuthors.map { it.message }
+            messagesDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    val muted = isMuted(it.correspondents)
+                    it.isNotified = !notify || muted
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(
                 getRefreshKey(messagesCacheKey, mailbox, folder)
             )
@@ -106,14 +118,13 @@ class MessageRepository @Inject constructor(
             Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
             (it.message.unread && markAsRead) || it.message.content.isBlank()
         },
-        query = {
-            messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
-        },
+        query = { messagesDb.loadMessageWithAttachment(message.messageGlobalKey) },
         fetch = {
-            sdk.init(student).getMessageDetails(
-                messageKey = it!!.message.messageGlobalKey,
-                markAsRead = message.unread && markAsRead,
-            )
+            wulkanowySdkFactory.create(student)
+                .getMessageDetails(
+                    messageKey = message.messageGlobalKey,
+                    markAsRead = message.unread && markAsRead,
+                )
         },
         saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }
@@ -152,22 +163,36 @@ class MessageRepository @Inject constructor(
         subject: String,
         content: String,
         recipients: List<Recipient>,
-        mailboxId: String,
+        mailbox: Mailbox,
     ) {
-        sdk.init(student).sendMessage(
-            subject = subject,
-            content = content,
-            recipients = recipients.mapFromEntities(),
-            mailboxId = mailboxId,
-        )
+        wulkanowySdkFactory.create(student)
+            .sendMessage(
+                subject = subject,
+                content = content,
+                recipients = recipients.mapFromEntities(),
+                mailboxId = mailbox.globalKey,
+            )
+        refreshFolders(student, mailbox, listOf(SENT))
     }
 
-    suspend fun deleteMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
+    suspend fun restoreMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
+        wulkanowySdkFactory.create(student)
+            .restoreMessages(messages = messages.map { it.messageGlobalKey })
+
+        refreshFolders(student, mailbox)
+    }
+
+    suspend fun deleteMessage(student: Student, message: Message) {
+        deleteMessages(student, listOf(message))
+    }
+
+    suspend fun deleteMessages(student: Student, messages: List<Message>) {
         val firstMessage = messages.first()
-        sdk.init(student).deleteMessages(
-            messages = messages.map { it.messageGlobalKey },
-            removeForever = firstMessage.folderId == TRASHED.id,
-        )
+        wulkanowySdkFactory.create(student)
+            .deleteMessages(
+                messages = messages.map { it.messageGlobalKey },
+                removeForever = firstMessage.folderId == TRASHED.id,
+            )
 
         if (firstMessage.folderId != TRASHED.id) {
             val deletedMessages = messages.map {
@@ -181,18 +206,24 @@ class MessageRepository @Inject constructor(
             }
 
             messagesDb.updateAll(deletedMessages)
-        } else messagesDb.deleteAll(messages)
-
-        getMessages(
-            student = student,
-            mailbox = mailbox,
-            folder = TRASHED,
-            forceRefresh = true,
-        ).first()
+        } else {
+            messagesDb.deleteAll(messages)
+        }
     }
 
-    suspend fun deleteMessage(student: Student, mailbox: Mailbox?, message: Message) {
-        deleteMessages(student, mailbox, listOf(message))
+    private suspend fun refreshFolders(
+        student: Student,
+        mailbox: Mailbox?,
+        folders: List<MessageFolder> = MessageFolder.entries
+    ) {
+        folders.forEach {
+            getMessages(
+                student = student,
+                mailbox = mailbox,
+                folder = it,
+                forceRefresh = true,
+            ).toFirstResult()
+        }
     }
 
     suspend fun getMailboxes(student: Student, forceRefresh: Boolean) = networkBoundResource(
@@ -206,7 +237,9 @@ class MessageRepository @Inject constructor(
         },
         query = { mailboxDao.loadAll(student.email, student.symbol, student.schoolSymbol) },
         fetch = {
-            sdk.init(student).getMailboxes().mapToEntities(student)
+            wulkanowySdkFactory.create(student)
+                .getMailboxes()
+                .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
             mailboxDao.deleteAll(old uniqueSubtract new)
@@ -236,4 +269,18 @@ class MessageRepository @Inject constructor(
             context.getString(R.string.pref_key_message_draft),
             value?.let { json.encodeToString(it) }
         )
+
+    private suspend fun isMuted(author: String): Boolean {
+        return mutedMessageSendersDao.checkMute(author)
+    }
+
+    suspend fun muteMessage(author: String) {
+        if (isMuted(author)) return
+        mutedMessageSendersDao.insertMute(MutedMessageSender(author))
+    }
+
+    suspend fun unmuteMessage(author: String) {
+        if (!isMuted(author)) return
+        mutedMessageSendersDao.deleteMute(author)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
index 412f9e7f..1303d0e7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
@@ -8,11 +9,8 @@ import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -21,7 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class MobileDeviceRepository @Inject constructor(
     private val mobileDb: MobileDeviceDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -40,32 +38,30 @@ class MobileDeviceRepository @Inject constructor(
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { mobileDb.loadAll(student.userLoginId) },
+        query = { mobileDb.loadAll(student.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getRegisteredDevices()
                 .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
-            mobileDb.deleteAll(old uniqueSubtract new)
-            mobileDb.insertAll(new uniqueSubtract old)
-
+            mobileDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
         }
     )
 
     suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        sdk.init(student)
-            .switchSemester(semester)
+        wulkanowySdkFactory.create(student, semester)
             .unregisterDevice(device.deviceId)
 
         mobileDb.deleteAll(listOf(device))
     }
 
     suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return sdk.init(student)
-            .switchSemester(semester)
+        return wulkanowySdkFactory.create(student, semester)
             .getToken()
             .mapToMobileDeviceToken()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
index eeb1d53e..6be0928e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
@@ -1,13 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -16,8 +19,9 @@ import javax.inject.Singleton
 @Singleton
 class NoteRepository @Inject constructor(
     private val noteDb: NoteDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
+    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -36,24 +40,29 @@ class NoteRepository @Inject constructor(
             val isExpired = refreshHelper.shouldBeRefreshed(
                 getRefreshKey(cacheKey, semester)
             )
+
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            val showNotes = preferencesRepository.showNotes
+
+            wulkanowySdkFactory.create(student, semester)
                 .getNotes()
+                .filter { showNotes }
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            noteDb.deleteAll(old uniqueSubtract new)
-            noteDb.insertAll((new uniqueSubtract old).onEach {
+            val notesToAdd = (new uniqueSubtract old).onEach {
                 if (it.date >= student.registrationDate.toLocalDate()) it.apply {
                     isRead = false
                     if (notify) isNotified = false
                 }
-            })
-
+            }
+            noteDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = notesToAdd,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 64e60a60..0cc883a0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -7,12 +7,16 @@ import androidx.core.content.edit
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import com.fredporciuncula.flow.preferences.Preference
 import com.fredporciuncula.flow.preferences.Serializer
+import com.fredporciuncula.flow.preferences.map
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.enums.AppTheme
+import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
 import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.data.enums.GradeExpandMode
 import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode
 import io.github.wulkanowy.data.enums.TimetableGapsMode
 import io.github.wulkanowy.data.enums.TimetableMode
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
@@ -22,6 +26,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import timber.log.Timber
 import java.time.Instant
 import java.util.UUID
 import javax.inject.Inject
@@ -34,6 +39,7 @@ class PreferencesRepository @Inject constructor(
     private val flowSharedPref: FlowSharedPreferences,
     private val json: Json,
 ) {
+    private val NO_ATTENDANCE_VALUE = -1.0
 
     val isShowPresent: Boolean
         get() = getBoolean(
@@ -41,6 +47,27 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_attendance_present
         )
 
+    val targetAttendanceFlow: Flow<Int>
+        get() = flowSharedPref.getInt(
+            context.getString(R.string.pref_key_attendance_target),
+            context.resources.getInteger(R.integer.pref_default_attendance_target)
+        ).asFlow()
+
+    val attendanceCalculatorSortingModeFlow: Flow<AttendanceCalculatorSortingMode>
+        get() = flowSharedPref.getString(
+            context.getString(R.string.pref_key_attendance_calculator_sorting_mode),
+            context.resources.getString(R.string.pref_default_attendance_calculator_sorting_mode)
+        ).asFlow().map(AttendanceCalculatorSortingMode::getByValue)
+
+    /**
+     * Subjects are empty when they don't have any attendances (total = 0, attendances = 0, absences = 0).
+     */
+    val attendanceCalculatorShowEmptySubjects: Flow<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_attendance_calculator_show_empty_subjects),
+            context.resources.getBoolean(R.bool.pref_default_attendance_calculator_show_empty_subjects)
+        ).asFlow()
+
     private val gradeAverageModePref: Preference<GradeAverageMode>
         get() = getObjectFlow(
             R.string.pref_key_grade_average_mode,
@@ -191,6 +218,12 @@ class PreferencesRepository @Inject constructor(
             )
         )
 
+    val showAdditionalLessonsInPlan: ShowAdditionalLessonsMode
+        get() = getString(
+            R.string.pref_key_timetable_show_additional_lessons,
+            R.string.pref_default_timetable_show_additional_lessons
+        ).let { ShowAdditionalLessonsMode.getByValue(it) }
+
     val gradeSortingMode: GradeSortingMode
         get() = GradeSortingMode.getByValue(
             getString(
@@ -272,6 +305,60 @@ class PreferencesRepository @Inject constructor(
             selectedDashboardTilesPreference.set(filteredValue)
         }
 
+    var attendancePercentage: Double?
+        get() = attendancePercentagePreference.get().takeIf { it != NO_ATTENDANCE_VALUE }
+        set(value) = attendancePercentagePreference.set(value ?: NO_ATTENDANCE_VALUE)
+
+    var hiddenAttendanceItems: List<DashboardItem.HiddenAttendanceTile>
+        get() = hiddenAttendanceItemsPreference.get().toList()
+        set(value) = hiddenAttendanceItemsPreference.set(value.toSet())
+
+    var hiddenGrades: List<String>
+        get() = hiddenGradesPreference.get().toList()
+        set(value) = hiddenGradesPreference.set(value.toSet())
+
+    var showNotes: Boolean
+        get() = showNotesPreference.get()
+        set(value) = showNotesPreference.set(value)
+
+    var developerMode: Boolean
+        get() = developerModePreference.get()
+        set(value) = developerModePreference.set(value)
+
+    private val developerModePreference: Preference<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_developer_mode),
+            context.resources.getBoolean(R.bool.pref_default_developer_mode)
+        )
+
+    private val hiddenGradesPreference: Preference<Set<String>>
+        get() {
+            val defaultSet = context.resources.getStringArray(R.array.pref_default_hidden_grades).toSet()
+            val prefKey = "hidden_grades"
+
+            return flowSharedPref.getStringSet(prefKey, defaultSet)
+        }
+
+    private val showNotesPreference: Preference<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_show_notes),
+            context.resources.getBoolean(R.bool.pref_default_show_notes)
+        )
+
+    private val hiddenAttendanceItemsPreference: Preference<Set<DashboardItem.HiddenAttendanceTile>>
+        get() {
+            val defaultSet =
+                context.resources.getStringArray(R.array.pref_default_hidden_attendance_items).toSet()
+            val prefKey = "attendance_items"
+
+            return flowSharedPref
+                .getStringSet(prefKey, defaultSet)
+                .map(
+                    mapper = { it -> it.map { DashboardItem.HiddenAttendanceTile.valueOf(it) }.toSet() },
+                    reverse = { it -> it.map { it.name }.toSet() }
+                )
+        }
+
     private val selectedDashboardTilesPreference: Preference<Set<String>>
         get() {
             val defaultSet =
@@ -281,6 +368,19 @@ class PreferencesRepository @Inject constructor(
             return flowSharedPref.getStringSet(prefKey, defaultSet)
         }
 
+    private val attendancePercentagePreference: Preference<Double>
+        get() {
+            val prefKey = context.getString(R.string.pref_key_attendance_percentage)
+            val defaultValue = context.resources.getString(R.string.pref_default_attendance_percentage)
+
+            return flowSharedPref
+                .getString(prefKey, defaultValue)
+                .map(
+                    mapper = { it.toDoubleOrNull() ?: NO_ATTENDANCE_VALUE },
+                    reverse = { it.toString() }
+                )
+        }
+
     var dismissedAdminMessageIds: List<Int>
         get() = sharedPref.getStringSet(PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS, emptySet())
             .orEmpty()
@@ -346,6 +446,15 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
         private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
 
+    var mapping: Mapping?
+        get() {
+            val value = sharedPref.getString("mapping", null)
+            return value?.let { json.decodeFromString(it) }
+        }
+        set(value) = sharedPref.edit(commit = true) {
+            putString("mapping", value?.let { json.encodeToString(it) })
+        }
+
     init {
         if (installationId.isEmpty()) {
             installationId = UUID.randomUUID().toString()
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
index 79984ce6..8233d932 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
@@ -1,12 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -14,19 +17,22 @@ import javax.inject.Singleton
 @Singleton
 class RecipientRepository @Inject constructor(
     private val recipientDb: RecipientDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
     private val cacheKey = "recipient"
 
     suspend fun refreshRecipients(student: Student, mailbox: Mailbox, type: MailboxType) {
-        val new = sdk.init(student).getRecipients(mailbox.globalKey)
+        val new = wulkanowySdkFactory.create(student)
+            .getRecipients(mailbox.globalKey)
             .mapToEntities(mailbox.globalKey)
         val old = recipientDb.loadAll(type, mailbox.globalKey)
 
-        recipientDb.deleteAll(old uniqueSubtract new)
-        recipientDb.insertAll(new uniqueSubtract old)
+        recipientDb.removeOldAndSaveNew(
+            oldItems = old uniqueSubtract new,
+            newItems = new uniqueSubtract old,
+        )
 
         refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
     }
@@ -54,7 +60,7 @@ class RecipientRepository @Inject constructor(
     ): List<Recipient> {
         mailbox ?: return emptyList()
 
-        return sdk.init(student)
+        return wulkanowySdkFactory.create(student)
             .getMessageReplayDetails(message.messageGlobalKey)
             .sender
             .let(::listOf)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
index 5940f477..b554bda0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
@@ -1,17 +1,23 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class RecoverRepository @Inject constructor(private val sdk: Sdk) {
+class RecoverRepository @Inject constructor(
+    private val wulkanowySdkFactory: WulkanowySdkFactory
+) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
-        return sdk.getPasswordResetCaptchaCode(host, symbol)
-    }
+    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> =
+        wulkanowySdkFactory.create()
+            .getPasswordResetCaptchaCode(host, symbol)
 
     suspend fun sendRecoverRequest(
-        url: String, symbol: String, email: String, reCaptchaResponse: String
-    ): String = sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
+        url: String,
+        symbol: String,
+        email: String,
+        reCaptchaResponse: String
+    ): String = wulkanowySdkFactory.create()
+        .sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
index 4c42d092..78d95699 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
@@ -1,14 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -18,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class SchoolAnnouncementRepository @Inject constructor(
     private val schoolAnnouncementDb: SchoolAnnouncementDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -38,26 +37,27 @@ class SchoolAnnouncementRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            schoolAnnouncementDb.loadAll(student.userLoginId)
+            schoolAnnouncementDb.loadAll(student.studentId)
         },
         fetch = {
-            sdk.init(student)
-                .getDirectorInformation()
-                .mapToEntities(student)
+            val sdk = wulkanowySdkFactory.create(student)
+            val lastAnnouncements = sdk.getLastAnnouncements().mapToEntities(student)
+            val directorInformation = sdk.getDirectorInformation().mapToEntities(student)
+            lastAnnouncements + directorInformation
         },
         saveFetchResult = { old, new ->
-            val schoolAnnouncementsToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
-
-            schoolAnnouncementDb.deleteAll(old uniqueSubtract new)
-            schoolAnnouncementDb.insertAll(schoolAnnouncementsToSave)
+            schoolAnnouncementDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
         }
     )
 
     fun getSchoolAnnouncementFromDatabase(student: Student): Flow<List<SchoolAnnouncement>> {
-        return schoolAnnouncementDb.loadAll(student.userLoginId)
+        return schoolAnnouncementDb.loadAll(student.studentId)
     }
 
     suspend fun updateSchoolAnnouncement(schoolAnnouncement: List<SchoolAnnouncement>) =
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
index f757ef04..c48abb6f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
@@ -1,15 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,7 +15,7 @@ import javax.inject.Singleton
 @Singleton
 class SchoolRepository @Inject constructor(
     private val schoolDb: SchoolDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -40,17 +38,16 @@ class SchoolRepository @Inject constructor(
         },
         query = { schoolDb.load(semester.studentId, semester.classId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getSchool()
                 .mapToEntity(semester)
         },
         saveFetchResult = { old, new ->
             if (old != null && new != old) {
-                with(schoolDb) {
-                    deleteAll(listOf(old))
-                    insertAll(listOf(new))
-                }
+                schoolDb.removeOldAndSaveNew(
+                    oldItems = listOf(old),
+                    newItems = listOf(new)
+                )
             } else if (old == null) {
                 schoolDb.insertAll(listOf(new))
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
index 216a8c11..25da241a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
@@ -1,17 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.api.SchoolsService
+import io.github.wulkanowy.data.WulkanowySdkFactory
+import io.github.wulkanowy.data.api.services.SchoolsService
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.utils.IntegrityHelper
 import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import java.util.UUID
@@ -23,7 +21,7 @@ import kotlin.time.Duration.Companion.seconds
 class SchoolsRepository @Inject constructor(
     private val integrityHelper: IntegrityHelper,
     private val schoolsService: SchoolsService,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
 ) {
 
     suspend fun logSchoolLogin(loginData: LoginData, students: List<StudentWithSemesters>) {
@@ -40,10 +38,9 @@ class SchoolsRepository @Inject constructor(
     private suspend fun logLogin(loginData: LoginData, student: Student, semester: Semester) {
         val requestId = UUID.randomUUID().toString()
         val token = integrityHelper.getIntegrityToken(requestId) ?: return
+        val updatedStudent = student.copy(password = loginData.password)
 
-        val schoolInfo = sdk
-            .init(student.copy(password = loginData.password))
-            .switchSemester(semester)
+        val schoolInfo = wulkanowySdkFactory.create(updatedStudent, semester)
             .getSchool()
 
         schoolsService.logLoginEvent(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
index dd44df70..92d44650 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
@@ -1,11 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.isCurrent
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -14,8 +18,8 @@ import javax.inject.Singleton
 @Singleton
 class SemesterRepository @Inject constructor(
     private val semesterDb: SemesterDao,
-    private val sdk: Sdk,
-    private val dispatchers: DispatchersProvider
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val dispatchers: DispatchersProvider,
 ) {
 
     suspend fun getSemesters(
@@ -45,6 +49,7 @@ class SemesterRepository @Inject constructor(
                     0 == it.diaryId && 0 == it.kindergartenDiaryId
                 } == true
             }
+
             else -> false
         }
 
@@ -55,12 +60,20 @@ class SemesterRepository @Inject constructor(
     }
 
     private suspend fun refreshSemesters(student: Student) {
-        val new = sdk.init(student).getSemesters().mapToEntities(student.studentId)
-        if (new.isEmpty()) return Timber.i("Empty semester list!")
+        val new = wulkanowySdkFactory.create(student)
+            .getSemesters()
+            .mapToEntities(student.studentId)
+
+        if (new.isEmpty()) {
+            Timber.i("Empty semester list from SDK!")
+            return
+        }
 
         val old = semesterDb.loadAll(student.studentId, student.classId)
-        semesterDb.deleteAll(old.uniqueSubtract(new))
-        semesterDb.insertSemesters(new.uniqueSubtract(old))
+        semesterDb.removeOldAndSaveNew(
+            oldItems = old uniqueSubtract new,
+            newItems = new uniqueSubtract old,
+        )
     }
 
     suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) =
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
index d6cd25c8..db4c0aeb 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
@@ -1,13 +1,11 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.StudentInfoDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -15,7 +13,7 @@ import javax.inject.Singleton
 @Singleton
 class StudentInfoRepository @Inject constructor(
     private val studentInfoDao: StudentInfoDao,
-    private val sdk: Sdk
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -30,16 +28,16 @@ class StudentInfoRepository @Inject constructor(
         shouldFetch = { it == null || forceRefresh },
         query = { studentInfoDao.loadStudentInfo(student.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
-                .getStudentInfo().mapToEntity(semester)
+            wulkanowySdkFactory.create(student, semester)
+                .getStudentInfo()
+                .mapToEntity(semester)
         },
         saveFetchResult = { old, new ->
             if (old != null && new != old) {
-                with(studentInfoDao) {
-                    deleteAll(listOf(old))
-                    insertAll(listOf(new))
-                }
+                studentInfoDao.removeOldAndSaveNew(
+                    oldItems = listOf(old),
+                    newItems = listOf(new),
+                )
             } else if (old == null) {
                 studentInfoDao.insertAll(listOf(new))
             }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index e063840c..575ca89f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -1,23 +1,25 @@
 package io.github.wulkanowy.data.repositories
 
 import androidx.room.withTransaction
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsAuthorized
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
+import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToPojo
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.security.Scrambler
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -26,7 +28,7 @@ class StudentRepository @Inject constructor(
     private val dispatchers: DispatchersProvider,
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val appDatabase: AppDatabase,
     private val scrambler: Scrambler,
 ) {
@@ -37,9 +39,10 @@ class StudentRepository @Inject constructor(
         pin: String,
         symbol: String,
         token: String
-    ): RegisterUser = sdk
+    ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsFromHebe(token, pin, symbol, "")
         .mapToPojo(null)
+        .also { it.logErrors() }
 
     suspend fun getUserSubjectsFromScrapper(
         email: String,
@@ -47,18 +50,20 @@ class StudentRepository @Inject constructor(
         scrapperBaseUrl: String,
         domainSuffix: String,
         symbol: String
-    ): RegisterUser = sdk
+    ): RegisterUser = wulkanowySdkFactory.create()
         .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, domainSuffix, symbol)
         .mapToPojo(password)
+        .also { it.logErrors() }
 
     suspend fun getStudentsHybrid(
         email: String,
         password: String,
         scrapperBaseUrl: String,
         symbol: String
-    ): RegisterUser = sdk
+    ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
         .mapToPojo(password)
+        .also { it.logErrors() }
 
     suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
         return studentDb.loadStudentsWithSemesters().map { (student, semesters) ->
@@ -100,6 +105,46 @@ class StudentRepository @Inject constructor(
         return student
     }
 
+    suspend fun updateCurrentStudentAuthStatus() {
+        Timber.i("Check isAuthorized: started")
+        val student = getCurrentStudent()
+        if (student.isAuthorized) {
+            Timber.i("Check isAuthorized: already authorized")
+            return
+        }
+
+        val initializedSdk = wulkanowySdkFactory.create(student)
+        val newCurrentStudent = runCatching { initializedSdk.getCurrentStudent() }
+            .onFailure { Timber.e(it, "Check isAuthorized: error occurred") }
+            .getOrNull()
+
+        if (newCurrentStudent == null) {
+            Timber.d("Check isAuthorized: current user is null")
+            return
+        }
+
+        val currentStudentSemesters = semesterDb.loadAll(student.studentId, student.classId)
+        if (currentStudentSemesters.isEmpty()) {
+            Timber.d("Check isAuthorized: apply empty semesters workaround")
+            semesterDb.insertSemesters(
+                items = newCurrentStudent.semesters.mapToEntities(student.studentId),
+            )
+        }
+
+        if (!newCurrentStudent.isAuthorized) {
+            Timber.i("Check isAuthorized: authorization required")
+            throw NoAuthorizationException()
+        }
+
+        val studentIsAuthorized = StudentIsAuthorized(
+            id = student.id,
+            isAuthorized = true
+        )
+
+        Timber.i("Check isAuthorized: already authorized, update local status")
+        studentDb.update(studentIsAuthorized)
+    }
+
     suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
         val student = studentDb.loadCurrent() ?: throw NoCurrentStudentException()
 
@@ -149,20 +194,24 @@ class StudentRepository @Inject constructor(
         .distinctBy { it.student.studentName }.size == 1
 
     suspend fun authorizePermission(student: Student, semester: Semester, pesel: String) =
-        sdk.init(student)
-            .switchSemester(semester)
+        wulkanowySdkFactory.create(student, semester)
             .authorizePermission(pesel)
 
-    suspend fun refreshStudentName(student: Student, semester: Semester) {
-        val newCurrentApiStudent = sdk.init(student)
-            .switchSemester(semester)
-            .getCurrentStudent() ?: return
+    suspend fun refreshStudentAfterAuthorize(student: Student, semester: Semester) {
+        val wulkanowySdk = wulkanowySdkFactory.create(student, semester)
+            val newCurrentApiStudent = runCatching { wulkanowySdk.getCurrentStudent() }
+            .onFailure { Timber.e(it, "Can't find student with id ${student.studentId}") }
+            .getOrNull() ?: return
 
         val studentName = StudentName(
             studentName = "${newCurrentApiStudent.studentName} ${newCurrentApiStudent.studentSurname}"
         ).apply { id = student.id }
 
         studentDb.update(studentName)
+        semesterDb.removeOldAndSaveNew(
+            oldItems = semesterDb.loadAll(student.studentId, semester.classId),
+            newItems = newCurrentApiStudent.semesters.mapToEntities(newCurrentApiStudent.studentId)
+        )
     }
 
     suspend fun deleteStudentsAssociatedWithAccount(student: Student) {
@@ -175,4 +224,18 @@ class StudentRepository @Inject constructor(
             appDatabase.clearAllTables()
         }
     }
+
+    private fun RegisterUser.logErrors() {
+        val symbolsErrors = symbols.filter { it.error != null }
+            .map { it.error }
+        val unitsErrors = symbols.flatMap { it.schools }
+            .filter { it.error != null }
+            .map { it.error }
+
+        (symbolsErrors + unitsErrors).forEach { error ->
+            Timber.e(error, "Error occurred while fetching students")
+        }
+    }
 }
+
+class NoAuthorizationException : Exception()
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
index 98cb181a..573c7c14 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
@@ -1,15 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -18,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class SubjectRepository @Inject constructor(
     private val subjectDao: SubjectDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -39,15 +37,15 @@ class SubjectRepository @Inject constructor(
         },
         query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getSubjects()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            subjectDao.deleteAll(old uniqueSubtract new)
-            subjectDao.insertAll(new uniqueSubtract old)
-
+            subjectDao.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
index 42698f92..a5a6e3f9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
@@ -1,15 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -18,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class TeacherRepository @Inject constructor(
     private val teacherDb: TeacherDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -39,15 +37,15 @@ class TeacherRepository @Inject constructor(
         },
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {
-            sdk.init(student)
-                .switchSemester(semester)
+            wulkanowySdkFactory.create(student, semester)
                 .getTeachers()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            teacherDb.deleteAll(old uniqueSubtract new)
-            teacherDb.insertAll(new uniqueSubtract old)
-
+            teacherDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
index 9305d3b3..60c562e1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
@@ -1,15 +1,25 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
-import io.github.wulkanowy.data.db.entities.*
+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.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.TimetableFull
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
+import io.github.wulkanowy.utils.AppWidgetUpdater
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.sync.Mutex
@@ -18,14 +28,16 @@ import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
+
 @Singleton
 class TimetableRepository @Inject constructor(
     private val timetableDb: TimetableDao,
     private val timetableAdditionalDb: TimetableAdditionalDao,
     private val timetableHeaderDb: TimetableHeaderDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val schedulerHelper: TimetableNotificationSchedulerHelper,
     private val refreshHelper: AutoRefreshHelper,
+    private val appWidgetUpdater: AppWidgetUpdater,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -44,7 +56,8 @@ class TimetableRepository @Inject constructor(
         forceRefresh: Boolean,
         refreshAdditional: Boolean = false,
         notify: Boolean = false,
-        timetableType: TimetableType = TimetableType.NORMAL
+        timetableType: TimetableType = TimetableType.NORMAL,
+        isFromAppWidget: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = {
@@ -64,8 +77,7 @@ class TimetableRepository @Inject constructor(
         },
         query = { getFullTimetableFromDatabase(student, semester, start, end) },
         fetch = {
-            val timetableFull = sdk.init(student)
-                .switchSemester(semester)
+            val timetableFull = wulkanowySdkFactory.create(student, semester)
                 .getTimetable(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)
@@ -76,6 +88,9 @@ class TimetableRepository @Inject constructor(
             refreshDayHeaders(timetableOld.headers, timetableNew.headers)
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+            if (!isFromAppWidget) {
+                appWidgetUpdater.updateAllAppWidgetsByProvider(TimetableWidgetProvider::class)
+            }
         },
         filterResult = { (timetable, additional, headers) ->
             TimetableFull(
@@ -121,12 +136,12 @@ class TimetableRepository @Inject constructor(
         }
     }
 
-    fun getTimetableFromDatabase(
+    suspend fun getTimetableFromDatabase(
         semester: Semester,
-        from: LocalDate,
+        start: LocalDate,
         end: LocalDate
-    ): Flow<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, from, end)
+    ): List<Timetable> {
+        return timetableDb.load(semester.diaryId, semester.studentId, start, end)
     }
 
     suspend fun updateTimetable(timetable: List<Timetable>) {
@@ -144,8 +159,10 @@ class TimetableRepository @Inject constructor(
             new.apply { if (notify) isNotified = false }
         }
 
-        timetableDb.deleteAll(lessonsToRemove)
-        timetableDb.insertAll(lessonsToAdd)
+        timetableDb.removeOldAndSaveNew(
+            oldItems = lessonsToRemove,
+            newItems = lessonsToAdd,
+        )
 
         schedulerHelper.cancelScheduled(lessonsToRemove, student)
         schedulerHelper.scheduleNotifications(lessonsToAdd, student)
@@ -156,13 +173,17 @@ class TimetableRepository @Inject constructor(
         new: List<TimetableAdditional>
     ) {
         val oldFiltered = old.filter { !it.isAddedByUser }
-        timetableAdditionalDb.deleteAll(oldFiltered uniqueSubtract new)
-        timetableAdditionalDb.insertAll(new uniqueSubtract old)
+        timetableAdditionalDb.removeOldAndSaveNew(
+            oldItems = oldFiltered uniqueSubtract new,
+            newItems = new uniqueSubtract old,
+        )
     }
 
     private suspend fun refreshDayHeaders(old: List<TimetableHeader>, new: List<TimetableHeader>) {
-        timetableHeaderDb.deleteAll(old uniqueSubtract new)
-        timetableHeaderDb.insertAll(new uniqueSubtract old)
+        timetableHeaderDb.removeOldAndSaveNew(
+            oldItems = old uniqueSubtract new,
+            newItems = new uniqueSubtract old,
+        )
     }
 
     fun getLastRefreshTimestamp(semester: Semester, start: LocalDate, end: LocalDate): Instant {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/WulkanowyRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/WulkanowyRepository.kt
new file mode 100644
index 00000000..5b563b35
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/WulkanowyRepository.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.api.models.Mapping
+import io.github.wulkanowy.data.api.services.WulkanowyService
+import io.github.wulkanowy.data.db.dao.AdminMessageDao
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.data.networkBoundResource
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.sync.Mutex
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WulkanowyRepository @Inject constructor(
+    private val wulkanowyService: WulkanowyService,
+    private val adminMessageDao: AdminMessageDao,
+    private val preferencesRepository: PreferencesRepository,
+) {
+
+    private val saveFetchResultMutex = Mutex()
+
+    fun getAdminMessages(): Flow<Resource<List<AdminMessage>>> =
+        networkBoundResource(
+            mutex = saveFetchResultMutex,
+            isResultEmpty = { false },
+            query = { adminMessageDao.loadAll() },
+            fetch = { wulkanowyService.getAdminMessages() },
+            shouldFetch = { true },
+            saveFetchResult = { oldItems, newItems ->
+                adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
+            },
+        )
+            .filterNot { it is Resource.Intermediate }
+
+    suspend fun getMapping(): Mapping? {
+        var savedMapping = preferencesRepository.mapping
+
+        if (savedMapping == null) {
+            fetchMapping()
+            savedMapping = preferencesRepository.mapping
+        }
+
+        return savedMapping
+    }
+
+    suspend fun fetchMapping() {
+        runCatching { wulkanowyService.getMapping() }
+            .onFailure { Timber.e(it) }
+            .onSuccess { preferencesRepository.mapping = it }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/serializers/SafeMessageTypeEnumListSerializer.kt b/app/src/main/java/io/github/wulkanowy/data/serializers/SafeMessageTypeEnumListSerializer.kt
new file mode 100644
index 00000000..a95eab80
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/serializers/SafeMessageTypeEnumListSerializer.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.serializers
+
+import io.github.wulkanowy.data.enums.MessageType
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@OptIn(ExperimentalSerializationApi::class)
+object SafeMessageTypeEnumListSerializer : KSerializer<List<MessageType>> {
+
+    private val serializer = ListSerializer(String.serializer())
+
+    override val descriptor = serializer.descriptor
+
+    override fun serialize(encoder: Encoder, value: List<MessageType>) {
+        encoder.encodeNotNullMark()
+        serializer.serialize(encoder, value.map { it.name })
+    }
+
+    override fun deserialize(decoder: Decoder): List<MessageType> =
+        serializer.deserialize(decoder).mapNotNull { enumName ->
+            MessageType.entries.find { it.name == enumName }
+        }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
index b55bf899..8b0d67b5 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
@@ -5,14 +5,14 @@ import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.data.mapResourceData
-import io.github.wulkanowy.data.repositories.AdminMessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.utils.AppInfo
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetAppropriateAdminMessageUseCase @Inject constructor(
-    private val adminMessageRepository: AdminMessageRepository,
+    private val wulkanowyRepository: WulkanowyRepository,
     private val preferencesRepository: PreferencesRepository,
     private val appInfo: AppInfo
 ) {
@@ -22,7 +22,7 @@ class GetAppropriateAdminMessageUseCase @Inject constructor(
     }
 
     operator fun invoke(scrapperBaseUrl: String, type: MessageType): Flow<Resource<AdminMessage?>> {
-        return adminMessageRepository.getAdminMessages().mapResourceData { adminMessages ->
+        return wulkanowyRepository.getAdminMessages().mapResourceData { adminMessages ->
             adminMessages
                 .asSequence()
                 .filter { it.isNotDismissed() }
diff --git a/app/src/main/java/io/github/wulkanowy/domain/attendance/GetAttendanceCalculatorDataUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/attendance/GetAttendanceCalculatorDataUseCase.kt
new file mode 100644
index 00000000..294abd1b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/domain/attendance/GetAttendanceCalculatorDataUseCase.kt
@@ -0,0 +1,106 @@
+package io.github.wulkanowy.domain.attendance
+
+import io.github.wulkanowy.data.*
+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.data.db.entities.Subject
+import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
+import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode.*
+import io.github.wulkanowy.data.pojos.AttendanceData
+import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SubjectRepository
+import io.github.wulkanowy.utils.allAbsences
+import io.github.wulkanowy.utils.allPresences
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+import kotlin.math.ceil
+import kotlin.math.floor
+
+class GetAttendanceCalculatorDataUseCase @Inject constructor(
+    private val subjectRepository: SubjectRepository,
+    private val attendanceSummaryRepository: AttendanceSummaryRepository,
+    private val preferencesRepository: PreferencesRepository,
+) {
+
+    operator fun invoke(
+        student: Student,
+        semester: Semester,
+        forceRefresh: Boolean,
+    ): Flow<Resource<List<AttendanceData>>> =
+        subjectRepository.getSubjects(student, semester, forceRefresh)
+            .mapResourceData { subjects -> subjects.sortedBy(Subject::name) }
+            .combineWithResourceData(preferencesRepository.targetAttendanceFlow, ::Pair)
+            .flatMapResourceData { (subjects, targetFreq) ->
+                combineResourceFlows(subjects.map { subject ->
+                    attendanceSummaryRepository.getAttendanceSummary(
+                        student = student,
+                        semester = semester,
+                        subjectId = subject.realId,
+                        forceRefresh = forceRefresh
+                    ).mapResourceData { summaries ->
+                        summaries.toAttendanceData(subject.name, targetFreq)
+                    }
+                })
+                    // Every individual combined flow causes separate network requests to update data.
+                    // When there is N child flows, they can cause up to N-1 items to be emitted. Since all
+                    // requests are usually completed in less than 5s, there is no need to emit multiple
+                    // intermediates that will be visible for barely any time.
+                    .debounceIntermediates()
+            }
+            .combineWithResourceData(preferencesRepository.attendanceCalculatorShowEmptySubjects) { attendanceDataList, showEmptySubjects ->
+                attendanceDataList.filter { it.total != 0 || showEmptySubjects }
+            }
+            .combineWithResourceData(preferencesRepository.attendanceCalculatorSortingModeFlow, List<AttendanceData>::sortedBy)
+}
+
+private fun List<AttendanceSummary>.toAttendanceData(subjectName: String, targetFreq: Int): AttendanceData {
+    val presences = sumOf { it.allPresences }
+    val absences = sumOf { it.allAbsences }
+    return AttendanceData(
+        subjectName = subjectName,
+        lessonBalance = calcLessonBalance(
+            targetFreq.toDouble() / 100, presences, absences
+        ),
+        presences = presences,
+        absences = absences,
+    )
+}
+
+private fun calcLessonBalance(targetFreq: Double, presences: Int, absences: Int): Int {
+    val total = presences + absences
+    // The `+ 1` is to avoid false positives in close cases. Eg.:
+    // target frequency 99%, 1 presence. Without the `+ 1` this would be reported shown as
+    // a positive balance of +1, however that is not actually true as skipping one class
+    // would make it so that the balance would actually be negative (-98). The `+ 1`
+    // fixes this and makes sure that in situations like these, it's not reporting incorrect
+    // balances
+    return when {
+        presences / (total + 1f) >= targetFreq -> calcMissingAbsences(
+            targetFreq, absences, presences
+        )
+        presences / (total + 0f) < targetFreq -> -calcMissingPresences(
+            targetFreq, absences, presences
+        )
+        else -> 0
+    }
+}
+
+private fun calcMissingPresences(targetFreq: Double, absences: Int, presences: Int) =
+    calcMinRequiredPresencesFor(targetFreq, absences) - presences
+
+private fun calcMinRequiredPresencesFor(targetFreq: Double, absences: Int) =
+    ceil((targetFreq / (1 - targetFreq)) * absences).toInt()
+
+private fun calcMissingAbsences(targetFreq: Double, absences: Int, presences: Int) =
+    calcMinRequiredAbsencesFor(targetFreq, presences) - absences
+
+private fun calcMinRequiredAbsencesFor(targetFreq: Double, presences: Int) =
+    floor((presences * (1 - targetFreq)) / targetFreq).toInt()
+
+private fun List<AttendanceData>.sortedBy(mode: AttendanceCalculatorSortingMode) = when (mode) {
+    ALPHABETIC -> sortedBy(AttendanceData::subjectName)
+    ATTENDANCE -> sortedByDescending(AttendanceData::presencePercentage)
+    LESSON_BALANCE -> sortedBy(AttendanceData::lessonBalance)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
index 669514aa..8f25eba1 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
@@ -59,7 +59,7 @@ class GetMailboxByStudentUseCase @Inject constructor(
     private fun String.getUnauthorizedVersion(): String {
         return normalizeStudentName().split(" ")
             .joinToString(" ") {
-                it.first() + "*".repeat(it.length - 1)
+                it.firstOrNull()?.toString().orEmpty() + "*".repeat((it.length - 1).coerceAtLeast(0))
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/domain/timetable/IsStudentHasLessonsOnWeekendUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/timetable/IsStudentHasLessonsOnWeekendUseCase.kt
index efe928e2..ffd00574 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/timetable/IsStudentHasLessonsOnWeekendUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/timetable/IsStudentHasLessonsOnWeekendUseCase.kt
@@ -1,10 +1,7 @@
 package io.github.wulkanowy.domain.timetable
 
-import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
 import java.time.LocalDate
@@ -16,18 +13,14 @@ class IsStudentHasLessonsOnWeekendUseCase @Inject constructor(
 ) {
 
     suspend operator fun invoke(
-        student: Student,
         semester: Semester,
         currentDate: LocalDate = LocalDate.now(),
     ): Boolean {
-        val lessons = timetableRepository.getTimetable(
-            student = student,
+        val lessons = timetableRepository.getTimetableFromDatabase(
             semester = semester,
             start = currentDate.monday,
             end = currentDate.sunday,
-            forceRefresh = false,
-            timetableType = TimetableRepository.TimetableType.NORMAL
-        ).toFirstResult().dataOrNull?.lessons.orEmpty()
+        )
         return isWeekendHasLessonsUseCase(lessons)
     }
 }
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 5dddd9a7..bcbc23ef 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
@@ -17,6 +17,7 @@ import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureUnavailableException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.DispatchersProvider
@@ -48,6 +49,7 @@ class SyncWorker @AssistedInject constructor(
             val semester = semesterRepository.getCurrentSemester(student, true)
             student to semester
         } catch (e: Throwable) {
+            Timber.e(e)
             return@withContext getResultFromErrors(listOf(e))
         }
 
@@ -59,7 +61,7 @@ class SyncWorker @AssistedInject constructor(
                 null
             } catch (e: Throwable) {
                 Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred")
-                if (e is FeatureDisabledException || e is FeatureNotAvailableException) {
+                if (e is FeatureDisabledException || e is FeatureNotAvailableException || e is FeatureUnavailableException) {
                     null
                 } else {
                     Timber.e(e)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
index 7f90bbdd..232ba672 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
@@ -19,16 +19,18 @@ class NewGradeNotification @Inject constructor(
 ) {
 
     suspend fun notifyDetails(items: List<Grade>, student: Student) {
-        val notificationDataList = items.map {
-            NotificationData(
-                title = context.getPlural(R.plurals.grade_new_items, 1),
-                content = buildString {
-                    append("${it.subject}: ${it.entry}")
-                    if (it.comment.isNotBlank()) append(" (${it.comment})")
-                },
-                destination = Destination.Grade,
-            )
-        }
+        val notificationDataList = items
+            .filter { !it.isNotified }
+            .map {
+                NotificationData(
+                    title = context.getPlural(R.plurals.grade_new_items, 1),
+                    content = buildString {
+                        append("${it.subject}: ${it.entry}")
+                        if (it.comment.isNotBlank()) append(" (${it.comment})")
+                    },
+                    destination = Destination.Grade,
+                )
+            }
 
         val groupNotificationData = GroupNotificationData(
             notificationDataList = notificationDataList,
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 ac9a8eb4..2d10d925 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
@@ -6,7 +6,6 @@ import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.ChangeTimetableNotification
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
@@ -31,10 +30,9 @@ class TimetableWork @Inject constructor(
 
         timetableRepository.getTimetableFromDatabase(
             semester = semester,
-            from = startDate,
+            start = startDate,
             end = endDate,
         )
-            .first()
             .filterNot { it.isNotified }
             .let {
                 if (it.isNotEmpty()) changeTimetableNotification.notify(it, student)
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 29996db7..922c3536 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,6 +1,7 @@
 package io.github.wulkanowy.ui.base
 
 import android.app.ActivityManager
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -17,6 +18,8 @@ import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.openInternetBrowser
+import timber.log.Timber
+import java.time.Instant
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
@@ -36,16 +39,26 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     abstract var presenter: T
 
+    private var lastDialogOpenTime = mutableMapOf<String, Instant>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         inject()
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
+        applyCustomTaskDescription()
+    }
 
-        @Suppress("DEPRECATION")
-        setTaskDescription(
-            ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
-        )
+    @Suppress("DEPRECATION")
+    private fun applyCustomTaskDescription() {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) return
+        try {
+            val newColor = getThemeAttrColor(R.attr.colorSurface)
+            val taskDescription = ActivityManager.TaskDescription(null, null, newColor)
+            setTaskDescription(taskDescription)
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
@@ -70,6 +83,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     }
 
     override fun showExpiredCredentialsDialog() {
+        if (!shouldShowDialog(DIALOG_ERROR_BAD_CREDENTIALS)) return
+
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_expired_credentials_title)
             .setMessage(R.string.main_expired_credentials_description)
@@ -83,6 +98,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     }
 
     override fun showDecryptionFailedDialog() {
+        if (!shouldShowDialog(DIALOG_ERROR_DECRYPTION_FAILED)) return
+
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_session_expired)
             .setMessage(R.string.main_session_relogin)
@@ -119,4 +136,21 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     protected open fun inject() {
         throw UnsupportedOperationException()
     }
+
+    private fun shouldShowDialog(name: String): Boolean {
+        val lastOpenTime = lastDialogOpenTime[name]
+        val now = Instant.now()
+
+        if (lastOpenTime != null && now.isBefore(lastOpenTime.plusSeconds(1))) {
+            Timber.i("Dialog $name was shown less than a second ago. Skip")
+            return false
+        }
+        lastDialogOpenTime[name] = Instant.now()
+        return true
+    }
+
+    companion object {
+        private const val DIALOG_ERROR_BAD_CREDENTIALS = "dialog_error_bad_credentials"
+        private const val DIALOG_ERROR_DECRYPTION_FAILED = "dialog_error_decryption_failed"
+    }
 }
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 e17c0c9e..00a2ab22 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
@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.base
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.sdk.scrapper.exception.AuthorizationRequiredException
+import io.github.wulkanowy.data.repositories.NoAuthorizationException
 import io.github.wulkanowy.sdk.scrapper.exception.CloudflareVerificationException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
@@ -34,17 +34,21 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
     }
 
     protected open fun proceed(error: Throwable) {
-        showErrorMessage(context.resources.getErrorString(error), error)
+        showDefaultMessage(error)
         when (error) {
             is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl)
             is ScramblerException -> onDecryptionFailed()
             is BadCredentialsException -> onExpiredCredentials()
             is NoCurrentStudentException -> onNoCurrentStudent()
-            is AuthorizationRequiredException -> onAuthorizationRequired()
+            is NoAuthorizationException -> onAuthorizationRequired()
             is CloudflareVerificationException -> onCaptchaVerificationRequired(error.originalUrl)
         }
     }
 
+    fun showDefaultMessage(error: Throwable) {
+        showErrorMessage(context.resources.getErrorString(error), error)
+    }
+
     open fun clear() {
         showErrorMessage = { _, _ -> }
         onExpiredCredentials = {}
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
index 35dec3b4..cd2dc210 100644
--- 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
@@ -3,14 +3,19 @@ package io.github.wulkanowy.ui.modules.about
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemAboutBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
 import javax.inject.Inject
 
-class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class AboutAdapter @Inject constructor(
+    private val preferencesRepository: PreferencesRepository
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
+    private var developerModeClicks = 0
     private enum class ViewType(val id: Int) {
         ITEM_HEADER(1),
         ITEM_ELEMENT(2)
@@ -46,6 +51,19 @@ class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.Vie
 
     private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
         with(binding.aboutScrollableHeaderIcon) {
+            setOnClickListener {
+                if (++developerModeClicks == 5 && !preferencesRepository.developerMode) {
+                    preferencesRepository.developerMode = true
+                    developerModeClicks = 0
+
+                    Toast.makeText(
+                        context,
+                        "done!",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            }
+
             setImageDrawable(ResourcesCompat.getDrawableForDensity(
                 context.resources, context.applicationInfo.icon, 640, null)
             )
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
index 4e9baac3..f5689ec8 100644
--- 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance
 
+import android.content.res.ColorStateList
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
@@ -33,17 +34,17 @@ class AttendanceAdapter @Inject constructor() :
     )
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val context = holder.binding.root.context
         val item = items[position]
 
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject.ifBlank {
-                root.context.getString(R.string.all_no_data)
-            }
+            attendanceItemSubject.text = item.subject
+                .ifBlank { context.getString(R.string.all_no_data) }
             attendanceItemDescription.setText(item.descriptionRes)
 
             attendanceItemDescription.setTextColor(
-                root.context.getThemeAttrColor(
+                context.getThemeAttrColor(
                     when {
                         item.absence && !item.excused -> R.attr.colorAttendanceAbsence
                         item.lateness && !item.excused -> R.attr.colorAttendanceLateness
@@ -61,13 +62,15 @@ class AttendanceAdapter @Inject constructor() :
             attendanceItemAlert.isVisible =
                 item.let { (it.absence && !it.excused) || (it.lateness && !it.excused) }
 
-            attendanceItemAlert.setColorFilter(root.context.getThemeAttrColor(
-                when{
-                    item.absence && !item.excused -> R.attr.colorAttendanceAbsence
-                    item.lateness && !item.excused -> R.attr.colorAttendanceLateness
-                    else -> android.R.attr.colorPrimary
-                }
-            ))
+            attendanceItemAlert.imageTintList = ColorStateList.valueOf(
+                context.getThemeAttrColor(
+                    when {
+                        item.absence && !item.excused -> R.attr.colorAttendanceAbsence
+                        item.lateness && !item.excused -> R.attr.colorAttendanceLateness
+                        else -> android.R.attr.colorPrimary
+                    }
+                )
+            )
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
             attendanceItemExcuseCheckbox.visibility = View.GONE
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 6e842b4d..07649e43 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
@@ -14,6 +14,7 @@ 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.modules.attendance.calculator.AttendanceCalculatorFragment
 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
@@ -134,6 +135,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
+        else if (item.itemId == R.id.attendanceMenuCalculator) presenter.onCalculatorSwitchSelected()
         else false
     }
 
@@ -253,6 +255,10 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
 
+    override fun openCalculatorView() {
+        (activity as? MainActivity)?.pushView(AttendanceCalculatorFragment.newInstance())
+    }
+
     override fun startActionMode() {
         actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
     }
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 f66479da..586a41ad 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,21 +1,37 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.Resource
 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.data.db.entities.Timetable
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.mapResourceData
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceIntermediate
+import io.github.wulkanowy.data.onResourceLoading
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.AttendanceRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.*
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.capitalise
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isExcusableOrNotExcused
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousOrSameSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.time.DayOfWeek
@@ -199,6 +215,11 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
+    fun onCalculatorSwitchSelected(): Boolean {
+        view?.openCalculatorView()
+        return true
+    }
+
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
 
@@ -210,7 +231,7 @@ class AttendancePresenter @Inject constructor(
 
             val semester = semesterRepository.getCurrentSemester(student)
 
-            checkInitialAndCurrentDate(student, semester)
+            checkInitialAndCurrentDate(semester)
             attendanceRepository.getAttendance(
                 student = student,
                 semester = semester,
@@ -266,15 +287,13 @@ class AttendancePresenter @Inject constructor(
             .launch()
     }
 
-    private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
+    private suspend fun checkInitialAndCurrentDate(semester: Semester) {
         if (initialDate == null) {
-            val lessons = attendanceRepository.getAttendance(
-                student = student,
+            val lessons = attendanceRepository.getAttendanceFromDatabase(
                 semester = semester,
                 start = now().monday,
                 end = now().sunday,
-                forceRefresh = false,
-            ).toFirstResult().dataOrNull.orEmpty()
+            ).firstOrNull().orEmpty()
             isWeekendHasLessons = isWeekendHasLessons(lessons)
             initialDate = getInitialDate(semester)
         }
@@ -316,6 +335,7 @@ class AttendancePresenter @Inject constructor(
                     showContent(false)
                     showExcuseButton(false)
                 }
+
                 is Resource.Success -> {
                     Timber.i("Excusing for absence result: Success")
                     analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
@@ -328,6 +348,7 @@ class AttendancePresenter @Inject constructor(
                     }
                     loadData(forceRefresh = true)
                 }
+
                 is Resource.Error -> {
                     Timber.i("Excusing for absence result: An exception occurred")
                     errorHandler.dispatch(it.error)
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 2629c217..f51ce7c7 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
@@ -56,6 +56,8 @@ interface AttendanceView : BaseView {
 
     fun openSummaryView()
 
+    fun openCalculatorView()
+
     fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String)
 
     fun startActionMode()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorAdapter.kt
new file mode 100644
index 00000000..4b908bba
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorAdapter.kt
@@ -0,0 +1,67 @@
+package io.github.wulkanowy.ui.modules.attendance.calculator
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.AttendanceData
+import io.github.wulkanowy.databinding.ItemAttendanceCalculatorHeaderBinding
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.roundToInt
+
+class AttendanceCalculatorAdapter @Inject constructor() :
+    RecyclerView.Adapter<AttendanceCalculatorAdapter.ViewHolder>() {
+
+    var items = emptyList<AttendanceData>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        ItemAttendanceCalculatorHeaderBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        )
+    )
+
+    override fun onBindViewHolder(parent: ViewHolder, position: Int) {
+        val context = parent.binding.root.context
+        val item = items[position]
+
+        with(parent.binding) {
+            attendanceCalculatorPercentage.text = "${item.presencePercentage.roundToInt()}"
+
+            attendanceCalculatorSummaryBalance.text = when {
+                item.lessonBalance > 0 -> {
+                    context.getString(
+                        R.string.attendance_calculator_summary_balance_positive,
+                        item.lessonBalance
+                    )
+                }
+
+                item.lessonBalance < 0 -> {
+                    context.getString(
+                        R.string.attendance_calculator_summary_balance_negative,
+                        abs(item.lessonBalance)
+                    )
+                }
+
+                else -> context.getString(R.string.attendance_calculator_summary_balance_neutral)
+            }
+            attendanceCalculatorWarning.isVisible = item.lessonBalance < 0
+            attendanceCalculatorTitle.text = item.subjectName
+            attendanceCalculatorSummaryValues.text = if (item.total == 0) {
+                context.getString(R.string.attendance_calculator_summary_values_empty)
+            } else {
+                context.getString(
+                    R.string.attendance_calculator_summary_values,
+                    item.presences,
+                    item.total
+                )
+            }
+        }
+    }
+
+    class ViewHolder(val binding: ItemAttendanceCalculatorHeaderBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorFragment.kt
new file mode 100644
index 00000000..63d1d8be
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorFragment.kt
@@ -0,0 +1,133 @@
+package io.github.wulkanowy.ui.modules.attendance.calculator
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.AttendanceData
+import io.github.wulkanowy.databinding.FragmentAttendanceCalculatorBinding
+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.settings.appearance.AppearanceFragment
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AttendanceCalculatorFragment :
+    BaseFragment<FragmentAttendanceCalculatorBinding>(R.layout.fragment_attendance_calculator),
+    AttendanceCalculatorView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: AttendanceCalculatorPresenter
+
+    @Inject
+    lateinit var attendanceCalculatorAdapter: AttendanceCalculatorAdapter
+
+    override val titleStringId get() = R.string.attendance_title
+
+    companion object {
+        fun newInstance() = AttendanceCalculatorFragment()
+    }
+
+    override val isViewEmpty get() = attendanceCalculatorAdapter.items.isEmpty()
+
+    @Suppress("DEPRECATION")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAttendanceCalculatorBinding.bind(view)
+        messageContainer = binding.attendanceCalculatorRecycler
+        presenter.onAttachView(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_attendance_calculator, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.attendance_calculator_menu_settings) presenter.onSettingsSelected()
+        else false
+    }
+
+    override fun openSettingsView() {
+        (activity as? MainActivity)?.pushView(AppearanceFragment.withFocusedPreference(getString(R.string.pref_key_attendance_target)))
+    }
+
+    override fun initView() {
+        with(binding.attendanceCalculatorRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = attendanceCalculatorAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+
+        with(binding) {
+            attendanceCalculatorSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            attendanceCalculatorSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+            attendanceCalculatorSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(
+                    R.attr.colorSwipeRefresh
+                )
+            )
+            attendanceCalculatorErrorRetry.setOnClickListener { presenter.onRetry() }
+            attendanceCalculatorErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
+    }
+
+    override fun updateData(data: List<AttendanceData>) {
+        with(attendanceCalculatorAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun clearView() {
+        with(attendanceCalculatorAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun showEmpty(show: Boolean) {
+        binding.attendanceCalculatorEmpty.isVisible = show
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.attendanceCalculatorError.isVisible = show
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.attendanceCalculatorErrorMessage.text = message
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.attendanceCalculatorProgress.isVisible = show
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        binding.attendanceCalculatorSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.attendanceCalculatorRecycler.isVisible = show
+    }
+
+    override fun showRefresh(show: Boolean) {
+        binding.attendanceCalculatorSwipe.isRefreshing = show
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorPresenter.kt
new file mode 100644
index 00000000..29cb2197
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorPresenter.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.attendance.calculator
+
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceIntermediate
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.domain.attendance.GetAttendanceCalculatorDataUseCase
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
+import javax.inject.Inject
+
+class AttendanceCalculatorPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val getAttendanceCalculatorData: GetAttendanceCalculatorDataUseCase,
+) : BasePresenter<AttendanceCalculatorView>(errorHandler, studentRepository) {
+
+    private lateinit var lastError: Throwable
+
+    override fun onAttachView(view: AttendanceCalculatorView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("Attendance calculator view was initialized")
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the attendance calculator")
+        loadData(forceRefresh = true)
+    }
+
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData()
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    private fun loadData(forceRefresh: Boolean = false) {
+        flatResourceFlow {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            getAttendanceCalculatorData(student, semester, forceRefresh)
+        }
+            .logResourceStatus("load attendance calculator")
+            .onResourceData {
+                view?.run {
+                    showProgress(false)
+                    showErrorView(false)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    updateData(it)
+                }
+            }
+            .onResourceIntermediate { view?.showRefresh(true) }
+            .onResourceNotLoading {
+                view?.run {
+                    enableSwipe(true)
+                    showRefresh(false)
+                    showProgress(false)
+                }
+            }
+            .onResourceError(errorHandler::dispatch)
+            .launch()
+    }
+
+    private fun showErrorViewOnError(message: String, error: Throwable) {
+        view?.run {
+            if (isViewEmpty) {
+                lastError = error
+                setErrorDetails(message)
+                showErrorView(true)
+                showEmpty(false)
+            } else showError(message, error)
+        }
+    }
+
+    fun onSettingsSelected(): Boolean {
+        view?.openSettingsView()
+        return true
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorView.kt
new file mode 100644
index 00000000..21afe532
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorView.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.modules.attendance.calculator
+
+import io.github.wulkanowy.data.pojos.AttendanceData
+import io.github.wulkanowy.ui.base.BaseView
+
+interface AttendanceCalculatorView : BaseView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun showRefresh(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showEmpty(show: Boolean)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun updateData(data: List<AttendanceData>)
+
+    fun clearView()
+
+    fun openSettingsView()
+}
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
index a2b6abfb..4e9f68c9 100644
--- 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
@@ -5,6 +5,7 @@ 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.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
 import io.github.wulkanowy.utils.calculatePercentage
@@ -13,9 +14,13 @@ import java.time.Month
 import java.util.Locale
 import javax.inject.Inject
 
-class AttendanceSummaryAdapter @Inject constructor() :
+class AttendanceSummaryAdapter @Inject constructor(
+    private val preferencesRepository: PreferencesRepository
+) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
+    private val attendancePercentage = preferencesRepository.attendancePercentage
+
     private enum class ViewType(val id: Int) {
         HEADER(1),
         ITEM(2)
@@ -48,7 +53,10 @@ class AttendanceSummaryAdapter @Inject constructor() :
     }
 
     private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
-        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
+        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(
+            attendancePercentage ?:
+            items.calculatePercentage()
+        )
     }
 
     private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
@@ -60,8 +68,8 @@ class AttendanceSummaryAdapter @Inject constructor() :
                 else -> item.month.getFormattedName()
             }
             attendanceSummaryPercentage.text = when (position) {
-                -1 -> formatPercentage(items.calculatePercentage())
-                else -> formatPercentage(item.calculatePercentage())
+                -1 -> formatPercentage(attendancePercentage ?: item.calculatePercentage())
+                else -> formatPercentage(attendancePercentage ?: item.calculatePercentage())
             }
 
             attendanceSummaryPresent.text = item.presence.toString()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
index fa29df47..0f7c4234 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
@@ -78,4 +78,9 @@ class AuthDialog : BaseDialogFragment<DialogAuthBinding>(), AuthView {
     override fun showDescriptionWithName(name: String) {
         binding.authDescription.text = getString(R.string.auth_description, name).parseAsHtml()
     }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
index 8f579712..0be086b6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 class AuthPresenter @Inject constructor(
@@ -26,8 +27,12 @@ class AuthPresenter @Inject constructor(
 
     private fun loadName() {
         presenterScope.launch {
-            runCatching { studentRepository.getCurrentStudent(false) }
-                .onSuccess { view?.showDescriptionWithName(it.studentName) }
+            runCatching {
+                studentRepository.getCurrentStudent(false)
+                    .studentName
+                    .replace(" ", "\u00A0")
+            }
+                .onSuccess { view?.showDescriptionWithName(it) }
                 .onFailure { errorHandler.dispatch(it) }
         }
     }
@@ -57,13 +62,19 @@ class AuthPresenter @Inject constructor(
                 val semester = semesterRepository.getCurrentSemester(student)
 
                 val isSuccess = studentRepository.authorizePermission(student, semester, pesel)
+                Timber.d("Auth succeed: $isSuccess")
                 if (isSuccess) {
-                    studentRepository.refreshStudentName(student, semester)
+                    studentRepository.refreshStudentAfterAuthorize(student, semester)
                 }
                 isSuccess
             }
-                .onFailure { errorHandler.dispatch(it) }
+                .onFailure {
+                    errorHandler.dispatch(it)
+                    view?.showProgress(false)
+                    view?.showContent(true)
+                }
                 .onSuccess {
+                    Timber.d("Auth fully succeed: $it")
                     if (it) {
                         view?.showSuccess(true)
                         view?.showContent(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt
index ed8293a9..922b652b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt
@@ -10,9 +10,10 @@ import android.webkit.WebViewClient
 import androidx.core.os.bundleOf
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.databinding.DialogCaptchaBinding
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.utils.WebkitCookieManagerProxy
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -20,7 +21,10 @@ import javax.inject.Inject
 class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
 
     @Inject
-    lateinit var sdk: Sdk
+    lateinit var wulkanowySdkFactory: WulkanowySdkFactory
+
+    @Inject
+    lateinit var webkitCookieManagerProxy: WebkitCookieManagerProxy
 
     private var webView: WebView? = null
 
@@ -55,7 +59,7 @@ class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
             webView = this
             with(settings) {
                 javaScriptEnabled = true
-                userAgentString = sdk.userAgent
+                userAgentString = wulkanowySdkFactory.createBase().userAgent
             }
 
             webViewClient = object : WebViewClient() {
@@ -80,6 +84,7 @@ class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
     }
 
     override fun onDestroy() {
+        webkitCookieManagerProxy.webkitCookieManager?.flush()
         webView?.destroy()
         super.onDestroy()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
index d019dea6..506f6124 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
@@ -147,6 +147,17 @@ sealed class DashboardItem(val type: Type) {
         EXAMS,
         CONFERENCES,
     }
+
+    enum class HiddenAttendanceTile {
+        UNEXCUSED_ABSENCE,
+        EXEMPTION,
+        EXCUSED_LATENESS,
+        UNEXCUSED_LATENESS,
+        PRESENT,
+        DELETED,
+        EXCUSED_ABSENCE,
+        UNKNOWN,
+    }
 }
 
 fun DashboardItem.Tile.toDashboardItemType() = when (this) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index 1e6f1c19..9ba71937 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -284,6 +284,8 @@ class DashboardPresenter @Inject constructor(
 
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
+            val attendancePercentage = preferencesRepository.attendancePercentage
+
             val selectedTiles = selectedDashboardTiles
             val flowSuccess = flowOf(Resource.Success(null))
 
@@ -304,6 +306,7 @@ class DashboardPresenter @Inject constructor(
                     forceRefresh = forceRefresh
                 )
             }
+                .mapResourceData { it.map { messageWithAuthor -> messageWithAuthor.message } }
                 .onResourceError { errorHandler.dispatch(it) }
                 .takeIf { DashboardItem.Tile.MESSAGES in selectedTiles } ?: flowSuccess
 
@@ -335,7 +338,7 @@ class DashboardPresenter @Inject constructor(
                             } else null
                         },
                         attendancePercentage = DashboardItem.HorizontalGroup.Cell(
-                            data = attendanceResource.dataOrNull?.calculatePercentage(),
+                            data = attendancePercentage ?: attendanceResource.dataOrNull?.calculatePercentage(),
                             error = attendanceResource.errorOrNull != null,
                             isLoading = attendanceResource is Resource.Loading,
                         ),
@@ -438,7 +441,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadLessons(student: Student, forceRefresh: Boolean) {
         flatResourceFlow {
             val semester = semesterRepository.getCurrentSemester(student)
-            val date = when (isStudentHasLessonsOnWeekendUseCase(student, semester)) {
+            val date = when (isStudentHasLessonsOnWeekendUseCase(semester)) {
                 true -> LocalDate.now()
                 else -> LocalDate.now().nextOrSameSchoolDay
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt
index c452204b..e92d1afb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt
@@ -26,5 +26,7 @@ private fun generateSummary(subject: String, predicted: String, final: String) =
     proposedPoints = "",
     finalPoints = "",
     pointsSum = "",
-    average = .0
+    average = .0,
+    pointsSumAllYear = null,
+    averageAllYear = null,
 )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
index e2dc5cd8..9b21f08e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
@@ -19,6 +19,6 @@ val debugSchoolAnnouncementItems = listOf(
 private fun generateAnnouncement(subject: String, content: String) = SchoolAnnouncement(
     subject = subject,
     content = content,
-    userLoginId = 0,
+    studentId = 0,
     date = LocalDate.now()
 )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
index 1960c3df..3158bd0b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
@@ -6,6 +6,6 @@ enum class GradeAverageMode(val value: String) {
     BOTH_SEMESTERS("both_semesters");
 
     companion object {
-        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ONE_SEMESTER
+        fun getByValue(value: String) = entries.firstOrNull { it.value == value } ?: ONE_SEMESTER
     }
 }
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 e8a5fa25..7f14c01f 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
@@ -159,7 +159,7 @@ class GradeAverageProvider @Inject constructor(
             ?.updateModifiers(student, config).orEmpty()
 
         (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage(
-            config.isOptionalArithmeticAverage
+            isOptionalArithmeticAverage = config.isOptionalArithmeticAverage,
         )
     } else {
         secondSemesterSubject.average
@@ -173,13 +173,21 @@ class GradeAverageProvider @Inject constructor(
         config: AverageCalcParams,
     ): Double {
         return if (!isAnyVulcanAverage || config.forceAverageCalc) {
-            val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
+            val isSecondSemesterHasWeightGrade = secondSemesterSubject.grades
+                .any { it.weightValue > .0 }
+            val isSecondSemesterHasArithmeticGrade = secondSemesterSubject.grades
+                .all { it.weightValue == .0 } && config.isOptionalArithmeticAverage
+            val isSecondSemesterHaveAverage =
+                isSecondSemesterHasWeightGrade || isSecondSemesterHasArithmeticGrade
+
+            val divider = if (isSecondSemesterHaveAverage) 2 else 1
             val secondSemesterAverage = secondSemesterSubject.grades
                 .updateModifiers(student, config)
-                .calcAverage(config.isOptionalArithmeticAverage)
+                .calcAverage(isOptionalArithmeticAverage = config.isOptionalArithmeticAverage)
             val firstSemesterAverage = firstSemesterSubject?.grades
                 ?.updateModifiers(student, config)
-                ?.calcAverage(config.isOptionalArithmeticAverage) ?: secondSemesterAverage
+                ?.calcAverage(isOptionalArithmeticAverage = config.isOptionalArithmeticAverage)
+                ?: secondSemesterAverage
 
             (secondSemesterAverage + firstSemesterAverage) / divider
         } else {
@@ -225,7 +233,7 @@ class GradeAverageProvider @Inject constructor(
                             subject = summary.subject,
                             average = if (!isAnyAverage || params.forceAverageCalc) {
                                 grades.updateModifiers(student, params)
-                                    .calcAverage(params.isOptionalArithmeticAverage)
+                                    .calcAverage(isOptionalArithmeticAverage = params.isOptionalArithmeticAverage)
                             } else summary.average,
                             points = summary.pointsSum,
                             summary = summary,
@@ -258,7 +266,9 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                average = .0
+                pointsSumAllYear = null,
+                average = .0,
+                averageAllYear = null,
             )
         }
 
@@ -286,8 +296,15 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                average = if (calcAverage) details.updateModifiers(student, params)
-                    .calcAverage(params.isOptionalArithmeticAverage) else .0
+                pointsSumAllYear = null,
+                average = when {
+                    calcAverage -> details
+                        .updateModifiers(student, params)
+                        .calcAverage(isOptionalArithmeticAverage = params.isOptionalArithmeticAverage)
+
+                    else -> .0
+                },
+                averageAllYear = null,
             )
         }
     }
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 7ce07eb6..cc61dc25 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
@@ -7,7 +7,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
@@ -31,14 +30,6 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     @Inject
     lateinit var presenter: GradePresenter
 
-    private val pagerAdapter by lazy {
-        BaseFragmentPagerAdapter(
-            fragmentManager = childFragmentManager,
-            pagesCount = 3,
-            lifecycle = lifecycle,
-        )
-    }
-
     private var semesterSwitchMenu: MenuItem? = null
 
     companion object {
@@ -52,6 +43,8 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override val currentPageIndex get() = binding.gradeViewPager.currentItem
 
+    private var pagerAdapter: BaseFragmentPagerAdapter? = null
+
     @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -71,13 +64,26 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun initView() {
+        with(binding) {
+            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
+    }
+
+    override fun initTabs(pageCount: Int) {
+        pagerAdapter = BaseFragmentPagerAdapter(
+            lifecycle = lifecycle,
+            pagesCount = pageCount,
+            fragmentManager = childFragmentManager
+        )
+
         with(binding.gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(pagerAdapter) {
+        with(pagerAdapter!!) {
             containerId = binding.gradeViewPager.id
             titleFactory = {
                 when (it) {
@@ -99,11 +105,6 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
         }
 
         binding.gradeTabLayout.elevation = requireContext().dpToPx(4f)
-
-        with(binding) {
-            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -169,19 +170,20 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
-        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)
+        (pagerAdapter?.getFragmentInstance(index) as? GradeView.GradeChildView)
             ?.onParentLoadData(semesterId, forceRefresh)
     }
 
     override fun notifyChildParentReselected(index: Int) {
-        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentReselected()
+        (pagerAdapter?.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentReselected()
     }
 
     override fun notifyChildSemesterChange(index: Int) {
-        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentChangeSemester()
+        (pagerAdapter?.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentChangeSemester()
     }
 
     override fun onDestroyView() {
+        pagerAdapter = null
         presenter.onDetachView()
         super.onDestroyView()
     }
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 0ae6521c..8a70b3c1 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
@@ -22,11 +22,8 @@ class GradePresenter @Inject constructor(
 ) : BasePresenter<GradeView>(errorHandler, studentRepository) {
 
     private var selectedIndex = 0
-
     private var schoolYear = 0
-
-    private var semesters = emptyList<Semester>()
-
+    private var availableSemesters = emptyList<Semester>()
     private val loadedSemesterId = mutableMapOf<Int, Int>()
 
     private lateinit var lastError: Throwable
@@ -40,7 +37,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onCreateMenu() {
-        if (semesters.isEmpty()) view?.showSemesterSwitch(false)
+        if (availableSemesters.isEmpty()) view?.showSemesterSwitch(false)
     }
 
     fun onViewReselected() {
@@ -49,8 +46,8 @@ class GradePresenter @Inject constructor(
     }
 
     fun onSemesterSwitch(): Boolean {
-        if (semesters.isNotEmpty()) {
-            view?.showSemesterDialog(selectedIndex - 1, semesters.take(2))
+        if (availableSemesters.isNotEmpty()) {
+            view?.showSemesterDialog(selectedIndex - 1, availableSemesters.take(2))
         }
         return true
     }
@@ -83,7 +80,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onPageSelected(index: Int) {
-        if (semesters.isNotEmpty()) loadChild(index)
+        if (availableSemesters.isNotEmpty()) loadChild(index)
     }
 
     fun onRetry() {
@@ -101,16 +98,24 @@ class GradePresenter @Inject constructor(
     private fun loadData() {
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
-            semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
+            val semesters = semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
+
+            student to semesters
         }
             .logResourceStatus("load grade data")
-            .onResourceData {
-                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)
+            .onResourceData { (student, semesters) ->
+                val currentSemester = semesters.getCurrentOrLast()
+                selectedIndex =
+                    if (selectedIndex == 0) currentSemester.semesterName else selectedIndex
+                schoolYear = currentSemester.schoolYear
+                availableSemesters = semesters.filter { semester ->
+                    semester.diaryId == currentSemester.diaryId
+                }
+
                 view?.run {
+                    initTabs(if (student.isEduOne == true) 2 else 3)
+                    setCurrentSemesterName(currentSemester.semesterName, schoolYear)
+
                     Timber.i("Loading grade data: Attempt load index $currentPageIndex")
                     loadChild(currentPageIndex)
                     showErrorView(false)
@@ -131,10 +136,10 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
-        Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
+        Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${availableSemesters.joinToString { it.semesterName.toString() }}")
 
         val newSelectedSemesterId = try {
-            semesters.first { it.semesterName == selectedIndex }.semesterId
+            availableSemesters.first { it.semesterName == selectedIndex }.semesterId
         } catch (e: NoSuchElementException) {
             Timber.e(e, "Selected semester no exists")
             return
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 104f8505..fc06c480 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
@@ -9,6 +9,8 @@ interface GradeView : BaseView {
 
     fun initView()
 
+    fun initTabs(pageCount: Int)
+
     fun showContent(show: Boolean)
 
     fun showProgress(show: 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
index 15b5db03..bcbd2df2 100644
--- 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
@@ -96,9 +96,11 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             ViewType.HEADER.id -> HeaderViewHolder(
                 HeaderGradeDetailsBinding.inflate(inflater, parent, false)
             )
+
             ViewType.ITEM.id -> ItemViewHolder(
                 ItemGradeDetailsBinding.inflate(inflater, parent, false)
             )
+
             else -> throw IllegalStateException()
         }
     }
@@ -110,6 +112,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
                 header = items[position].value as GradeDetailsHeader,
                 position = position
             )
+
             is ItemViewHolder -> bindItemViewHolder(
                 holder = holder,
                 grade = items[position].value as Grade
@@ -133,6 +136,10 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
                 maxLines = if (expandedPositions[headerPosition]) 2 else 1
             }
             gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
+            with(gradeHeaderAverageAllYear) {
+                isVisible = header.averageAllYear != null && header.averageAllYear != .0
+                text = formatAverageAllYear(header.averageAllYear, root.context.resources)
+            }
             gradeHeaderPointsSum.text =
                 context.getString(R.string.grade_points_sum, header.pointsSum)
             gradeHeaderPointsSum.isVisible = !header.pointsSum.isNullOrEmpty()
@@ -233,6 +240,13 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             resources.getString(R.string.grade_average, average)
         }
 
+    private fun formatAverageAllYear(average: Double?, resources: Resources) =
+        if (average == null || average == .0) {
+            resources.getString(R.string.grade_no_average)
+        } else {
+            resources.getString(R.string.grade_average_year, average)
+        }
+
     private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
         RecyclerView.ViewHolder(binding.root)
 
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 479aff80..1224efaf 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
@@ -13,6 +13,7 @@ data class GradeDetailsItem(
 data class GradeDetailsHeader(
     val subject: String,
     val average: Double?,
+    val averageAllYear: Double?,
     val pointsSum: String?,
     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 d9621f51..ec5d34c5 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
@@ -226,8 +226,9 @@ class GradeDetailsPresenter @Inject constructor(
                         GradeDetailsHeader(
                             subject = gradeSubject.subject,
                             average = gradeSubject.average,
+                            averageAllYear = gradeSubject.summary.averageAllYear,
                             pointsSum = gradeSubject.points,
-                            grades = subItems
+                            grades = subItems,
                         ).apply {
                             newGrades = gradeSubject.grades.filter { grade -> !grade.isRead }.size
                         }, ViewType.HEADER
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
index 95cf97be..1cc74ef0 100644
--- 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.grade.summary
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
@@ -65,37 +66,55 @@ class GradeSummaryAdapter @Inject constructor(
         val gradeSummaries = items
             .filter { it.gradeDescriptive == null }
             .map { it.gradeSummary }
+        val isSecondSemester = items.any { item ->
+            item.gradeSummary.let { it.averageAllYear != null && it.averageAllYear != .0 }
+        }
 
         val context = binding.root.context
         val finalItemsCount = gradeSummaries.count { isGradeValid(it.finalGrade) }
-        val calculatedItemsCount = gradeSummaries.count { value -> value.average != 0.0 }
+        val calculatedSemesterItemsCount = gradeSummaries.count { value -> value.average != 0.0 }
+        val calculatedAnnualItemsCount =
+            gradeSummaries.count { value -> value.averageAllYear != 0.0 }
         val allItemsCount = gradeSummaries.count { !it.subject.equals("zachowanie", true) }
         val finalAverage = gradeSummaries.calcFinalAverage(
-            preferencesRepository.gradePlusModifier,
-            preferencesRepository.gradeMinusModifier
+            plusModifier = preferencesRepository.gradePlusModifier,
+            minusModifier = preferencesRepository.gradeMinusModifier,
         )
-        val calculatedAverage = gradeSummaries.filter { value -> value.average != 0.0 }
+        val calculatedSemesterAverage = gradeSummaries.filter { value -> value.average != 0.0 }
             .map { values -> values.average }
             .reversed() // fix average precision
             .average()
             .let { if (it.isNaN()) 0.0 else it }
+        val calculatedAnnualAverage = gradeSummaries.filter { value -> value.averageAllYear != 0.0 }
+            .mapNotNull { values -> values.averageAllYear }
+            .reversed() // fix average precision
+            .average()
+            .let { if (it.isNaN()) 0.0 else it }
 
         with(binding) {
+            gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedSemesterAverage)
+            gradeSummaryScrollableHeaderCalculatedAnnual.text =
+                formatAverage(calculatedAnnualAverage)
             gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage)
-            gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedAverage)
-            gradeSummaryScrollableHeaderFinalSubjectCount.text =
-                context.getString(
-                    R.string.grade_summary_from_subjects,
-                    finalItemsCount,
-                    allItemsCount
-                )
-            gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString(
+            gradeSummaryScrollableHeaderFinalSubjectCount.text = context.getString(
                 R.string.grade_summary_from_subjects,
-                calculatedItemsCount,
+                finalItemsCount,
                 allItemsCount
             )
+            gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString(
+                R.string.grade_summary_from_subjects,
+                calculatedSemesterItemsCount,
+                allItemsCount
+            )
+            gradeSummaryScrollableHeaderCalculatedSubjectCountAnnual.text = context.getString(
+                R.string.grade_summary_from_subjects,
+                calculatedAnnualItemsCount,
+                allItemsCount
+            )
+            gradeSummaryScrollableHeaderCalculatedAnnualContainer.isVisible = isSecondSemester
 
             gradeSummaryCalculatedAverageHelp.setOnClickListener { onCalculatedHelpClickListener() }
+            gradeSummaryCalculatedAverageHelpAnnual.setOnClickListener { onCalculatedHelpClickListener() }
             gradeSummaryFinalAverageHelp.setOnClickListener { onFinalHelpClickListener() }
         }
     }
@@ -107,7 +126,12 @@ class GradeSummaryAdapter @Inject constructor(
         with(binding) {
             gradeSummaryItemTitle.text = gradeSummary.subject
             gradeSummaryItemPoints.text = gradeSummary.pointsSum
+
             gradeSummaryItemAverage.text = formatAverage(gradeSummary.average, "")
+            gradeSummaryItemAverageAllYear.text = gradeSummary.averageAllYear?.let {
+                formatAverage(it, "")
+            }
+
             gradeSummaryItemPredicted.text =
                 "${gradeSummary.predictedGrade} ${gradeSummary.proposedPoints}".trim()
             gradeSummaryItemFinal.text =
@@ -116,6 +140,12 @@ class GradeSummaryAdapter @Inject constructor(
                 root.context.getString(R.string.all_no_data)
             }
 
+            gradeSummaryItemAverageContainer.isVisible = gradeSummary.average != .0
+            gradeSummaryItemAverageDivider.isVisible = gradeSummaryItemAverageContainer.isVisible
+            gradeSummaryItemAverageAllYearContainer.isGone =
+                gradeSummary.averageAllYear == null || gradeSummary.averageAllYear == .0
+            gradeSummaryItemAverageAllYearDivider.isGone =
+                gradeSummaryItemAverageAllYearContainer.isGone
             gradeSummaryItemFinalDivider.isVisible = gradeDescriptive == null
             gradeSummaryItemPredictedDivider.isVisible = gradeDescriptive == null
             gradeSummaryItemPointsDivider.isVisible = gradeDescriptive == null
@@ -123,6 +153,7 @@ class GradeSummaryAdapter @Inject constructor(
             gradeSummaryItemFinalContainer.isVisible = gradeDescriptive == null
             gradeSummaryItemDescriptiveContainer.isVisible = gradeDescriptive != null
             gradeSummaryItemPointsContainer.isVisible = gradeSummary.pointsSum.isNotBlank()
+            gradeSummaryItemPointsDivider.isVisible = gradeSummaryItemPointsContainer.isVisible
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
index c51370ea..400d9f46 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
@@ -98,7 +98,9 @@ class HomeworkAddDialog : BaseDialogFragment<DialogHomeworkAddBinding>(), Homewo
             rangeEnd = LocalDate.now().lastSchoolDayInSchoolYear,
             onDateSelected = {
                 date = it
-                binding.homeworkDialogDate.editText?.setText(date!!.toFormattedString())
+                if (isAdded) {
+                    binding.homeworkDialogDate.editText?.setText(date!!.toFormattedString())
+                }
             }
         )
     }
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 88f29578..e528c514 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
@@ -118,5 +118,6 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     override fun onResume() {
         super.onResume()
         inAppUpdateHelper.onResume()
+        presenter.updateSdkMappings()
     }
 }
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 9031cb8a..aff0515f 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
@@ -1,12 +1,15 @@
 package io.github.wulkanowy.ui.modules.login
 
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(
+    private val wulkanowyRepository: WulkanowyRepository,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
 ) : BasePresenter<LoginView>(errorHandler, studentRepository) {
@@ -16,4 +19,11 @@ class LoginPresenter @Inject constructor(
         view.initView()
         Timber.i("Login view was initialized")
     }
+
+    fun updateSdkMappings() {
+        presenterScope.launch {
+            runCatching { wulkanowyRepository.fetchMapping() }
+                .onFailure { Timber.e(it) }
+        }
+    }
 }
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 69e1d027..39bc3f02 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
@@ -14,6 +14,7 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
+import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -204,6 +205,9 @@ class LoginFormPresenter @Inject constructor(
             }
             .onResourceError {
                 loginErrorHandler.dispatch(it)
+                if (it is InvalidSymbolException) {
+                    loginErrorHandler.showDefaultMessage(it)
+                }
                 lastError = it
                 view?.showContact(true)
                 analytics.logEvent(
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
index e6d13182..ef8cf4ee 100644
--- 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
@@ -19,19 +19,23 @@ class LoginStudentSelectAdapter @Inject constructor() :
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        return when (LoginStudentSelectItemType.values()[viewType]) {
+        return when (LoginStudentSelectItemType.entries[viewType]) {
             LoginStudentSelectItemType.EMPTY_SYMBOLS_HEADER -> EmptySymbolsHeaderViewHolder(
                 ItemLoginStudentSelectEmptySymbolHeaderBinding.inflate(inflater, parent, false),
             )
+
             LoginStudentSelectItemType.SYMBOL_HEADER -> SymbolsHeaderViewHolder(
                 ItemLoginStudentSelectHeaderSymbolBinding.inflate(inflater, parent, false)
             )
+
             LoginStudentSelectItemType.SCHOOL_HEADER -> SchoolHeaderViewHolder(
                 ItemLoginStudentSelectHeaderSchoolBinding.inflate(inflater, parent, false)
             )
+
             LoginStudentSelectItemType.STUDENT -> StudentViewHolder(
                 ItemLoginStudentSelectStudentBinding.inflate(inflater, parent, false)
             )
+
             LoginStudentSelectItemType.HELP -> HelpViewHolder(
                 ItemLoginStudentSelectHelpBinding.inflate(inflater, parent, false)
             )
@@ -98,9 +102,11 @@ class LoginStudentSelectAdapter @Inject constructor() :
             with(binding) {
                 loginStudentSelectHeaderSchoolName.text = buildString {
                     append(item.unit.schoolName.trim())
-                    append(" (")
-                    append(item.unit.schoolShortName)
-                    append(")")
+                    if (item.unit.schoolShortName.isNotBlank()) {
+                        append(" (")
+                        append(item.unit.schoolShortName)
+                        append(")")
+                    }
                 }
                 loginStudentSelectHeaderSchoolDetails.isVisible = item.unit.students.isEmpty()
                 loginStudentSelectHeaderSchoolError.text = item.unit.error?.message
@@ -170,9 +176,11 @@ class LoginStudentSelectAdapter @Inject constructor() :
             oldItem is LoginStudentSelectItem.SymbolHeader && newItem is LoginStudentSelectItem.SymbolHeader -> {
                 oldItem.symbol == newItem.symbol
             }
+
             oldItem is LoginStudentSelectItem.Student && newItem is LoginStudentSelectItem.Student -> {
                 oldItem.student == newItem.student
             }
+
             else -> oldItem == newItem
         }
 
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 0fe36aa9..4eb60265 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
@@ -6,10 +6,12 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
@@ -111,6 +113,19 @@ class LoginStudentSelectFragment :
         LoginSupportDialog.newInstance(supportInfo).show(childFragmentManager, "support_dialog")
     }
 
+    override fun showAdminMessage(adminMessage: AdminMessage?) {
+        AdminMessageViewHolder(
+            binding = binding.loginStudentSelectAdminMessage,
+            onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
+            onAdminMessageClickListener = presenter::onAdminMessageSelected,
+        ).bind(adminMessage)
+        binding.loginStudentSelectAdminMessage.root.isVisible = adminMessage != null
+    }
+
+    override fun openInternetBrowser(url: String) {
+        requireContext().openInternetBrowser(url)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
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 34441418..39070cf0 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
@@ -2,16 +2,24 @@ package io.github.wulkanowy.ui.modules.login.studentselect
 
 import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.flatResourceFlow
 import io.github.wulkanowy.data.logResourceStatus
 import io.github.wulkanowy.data.mappers.mapToStudentWithSemesters
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.pojos.RegisterStudent
 import io.github.wulkanowy.data.pojos.RegisterSymbol
 import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SchoolsRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
+import io.github.wulkanowy.sdk.scrapper.exception.StudentGraduateException
 import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -32,6 +40,8 @@ class LoginStudentSelectPresenter @Inject constructor(
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
     private val appInfo: AppInfo,
+    private val preferencesRepository: PreferencesRepository,
+    private val getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase
 ) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
 
     private var lastError: Throwable? = null
@@ -64,6 +74,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         this.loginData = loginData
         this.registerUser = registerUser
         loadData()
+        loadAdminMessage()
     }
 
     private fun loadData() {
@@ -87,7 +98,20 @@ class LoginStudentSelectPresenter @Inject constructor(
                     refreshItems()
                 }
             }
-        }.launch()
+        }.launch("load_data")
+    }
+
+    private fun loadAdminMessage() {
+        flatResourceFlow {
+            getAppropriateAdminMessageUseCase(
+                scrapperBaseUrl = registerUser.scrapperBaseUrl.orEmpty(),
+                type = MessageType.LOGIN_STUDENT_SELECT_MESSAGE,
+            )
+        }
+            .logResourceStatus("load login admin message")
+            .onResourceData { view?.showAdminMessage(it) }
+            .onResourceError { view?.showAdminMessage(null) }
+            .launch("load_admin_message")
     }
 
     private fun getStudentsWithCurrentlyActiveSemesters(): List<LoginStudentSelectItem.Student> {
@@ -108,8 +132,8 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     private fun createItems(): List<LoginStudentSelectItem> = buildList {
-        val notEmptySymbols = registerUser.symbols.filter { it.schools.isNotEmpty() }
-        val emptySymbols = registerUser.symbols.filter { it.schools.isEmpty() }
+        val notEmptySymbols = registerUser.symbols.filter { it.shouldShowOnTop() }
+        val emptySymbols = registerUser.symbols.filter { !it.shouldShowOnTop() }
 
         if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.userEnteredSymbol }) {
             add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.userEnteredSymbol }))
@@ -127,6 +151,10 @@ class LoginStudentSelectPresenter @Inject constructor(
         add(helpItem)
     }
 
+    private fun RegisterSymbol.shouldShowOnTop(): Boolean {
+        return schools.isNotEmpty() || error is StudentGraduateException
+    }
+
     private fun createNotEmptySymbolItems(
         notEmptySymbols: List<RegisterSymbol>,
         students: List<StudentWithSemesters>,
@@ -336,4 +364,14 @@ class LoginStudentSelectPresenter @Inject constructor(
             )
         }
     }
+
+    fun onAdminMessageSelected(url: String?) {
+        url?.let { view?.openInternetBrowser(it) }
+    }
+
+    fun onAdminMessageDismissed(adminMessage: AdminMessage) {
+        preferencesRepository.dismissedAdminMessageIds += adminMessage.id
+
+        view?.showAdminMessage(null)
+    }
 }
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 b69700f1..4d0ef9e9 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,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
@@ -25,4 +26,8 @@ interface LoginStudentSelectView : BaseView {
     fun openDiscordInvite()
 
     fun openEmail(supportInfo: LoginSupportInfo)
+
+    fun showAdminMessage(adminMessage: AdminMessage?)
+
+    fun openInternetBrowser(url: 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 23ebffe9..a813e7c0 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
@@ -9,13 +9,16 @@ import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
@@ -179,4 +182,17 @@ class LoginSymbolFragment :
     override fun openSupportDialog(supportInfo: LoginSupportInfo) {
         LoginSupportDialog.newInstance(supportInfo).show(childFragmentManager, "support_dialog")
     }
+
+    override fun showAdminMessage(adminMessage: AdminMessage?) {
+        AdminMessageViewHolder(
+            binding = binding.loginSymbolAdminMessage,
+            onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
+            onAdminMessageClickListener = presenter::onAdminMessageSelected,
+        ).bind(adminMessage)
+        binding.loginSymbolAdminMessage.root.isVisible = adminMessage != null
+    }
+
+    override fun openInternetBrowser(url: String) {
+        requireContext().openInternetBrowser(url)
+    }
 }
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 5c31f14d..8de2994a 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
@@ -2,10 +2,18 @@ package io.github.wulkanowy.ui.modules.login.symbol
 
 import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceNotLoading
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.sdk.scrapper.getNormalizedSymbol
 import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -21,7 +29,9 @@ import javax.inject.Inject
 class LoginSymbolPresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
-    private val analytics: AnalyticsHelper
+    private val analytics: AnalyticsHelper,
+    private val preferencesRepository: PreferencesRepository,
+    private val getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase,
 ) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository) {
 
     private var lastError: Throwable? = null
@@ -43,6 +53,21 @@ class LoginSymbolPresenter @Inject constructor(
             clearAndFocusSymbol()
             showSoftKeyboard()
         }
+
+        loadAdminMessage()
+    }
+
+    private fun loadAdminMessage() {
+        flatResourceFlow {
+            getAppropriateAdminMessageUseCase(
+                scrapperBaseUrl = loginData.baseUrl,
+                type = MessageType.LOGIN_SYMBOL_MESSAGE,
+            )
+        }
+            .logResourceStatus("load login admin message")
+            .onResourceData { view?.showAdminMessage(it) }
+            .onResourceError { view?.showAdminMessage(null) }
+            .launch("load_admin_message")
     }
 
     fun onSymbolTextChanged() {
@@ -166,4 +191,14 @@ class LoginSymbolPresenter @Inject constructor(
             )
         )
     }
+
+    fun onAdminMessageSelected(url: String?) {
+        url?.let { view?.openInternetBrowser(it) }
+    }
+
+    fun onAdminMessageDismissed(adminMessage: AdminMessage) {
+        preferencesRepository.dismissedAdminMessageIds += adminMessage.id
+
+        view?.showAdminMessage(null)
+    }
 }
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 ace12f78..2fc91024 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
@@ -44,4 +45,8 @@ interface LoginSymbolView : BaseView {
     fun openFaqPage()
 
     fun openSupportDialog(supportInfo: LoginSupportInfo)
+
+    fun showAdminMessage(adminMessage: AdminMessage?)
+
+    fun openInternetBrowser(url: String)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
index 0c1b89c8..9c718af4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
@@ -33,4 +33,4 @@ class LuckyNumberHistoryAdapter @Inject constructor() :
     }
 
     class ItemViewHolder(val binding: ItemLuckyNumberHistoryBinding) : RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
+}
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 1ab079a3..e6de1781 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
@@ -145,7 +145,11 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
             }
 
             if (currentStudent != null) {
-                luckyNumberRepository.getLuckyNumber(currentStudent, forceRefresh = false)
+                luckyNumberRepository.getLuckyNumber(
+                    student = currentStudent,
+                    forceRefresh = false,
+                    isFromAppWidget = true
+                )
                     .toFirstResult()
                     .dataOrThrow
             } else null
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 62c16257..e64aa9b0 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
@@ -138,6 +138,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     override fun onResume() {
         super.onResume()
         inAppUpdateHelper.onResume()
+        presenter.updateSdkMappings()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
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 5469fcad..6a072718 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
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -29,6 +30,7 @@ class MainPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
+    private val wulkanowyRepository: WulkanowyRepository,
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
     private val json: Json,
@@ -73,6 +75,7 @@ class MainPresenter @Inject constructor(
         syncManager.startPeriodicSyncWorker()
 
         checkAppSupport()
+        updateCurrentStudentAuthStatus()
 
         analytics.logEvent("app_open", "destination" to initDestination.toString())
         Timber.i("Main view was initialized with $initDestination")
@@ -191,4 +194,18 @@ class MainPresenter @Inject constructor(
 
         view?.showStudentAvatar(currentStudent)
     }
+
+    private fun updateCurrentStudentAuthStatus() {
+        presenterScope.launch {
+            runCatching { studentRepository.updateCurrentStudentAuthStatus() }
+                .onFailure { errorHandler.dispatch(it) }
+        }
+    }
+
+    fun updateSdkMappings() {
+        presenterScope.launch {
+            runCatching { wulkanowyRepository.fetchMapping() }
+                .onFailure { Timber.e(it) }
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
index 8bd84f2b..11d3c6c1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
@@ -47,7 +47,6 @@ class MailboxChooserDialog : BaseDialogFragment<DialogMailboxChooserBinding>(),
     }
 
 
-    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(
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
index d3c6b95c..b83f7e23 100644
--- 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
@@ -50,12 +50,15 @@ class MessagePreviewAdapter @Inject constructor() :
             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()
         }
     }
@@ -66,6 +69,7 @@ class MessagePreviewAdapter @Inject constructor() :
                 holder,
                 requireNotNull(messageWithAttachment).message
             )
+
             is AttachmentViewHolder -> bindAttachment(
                 holder,
                 requireNotNull(messageWithAttachment).attachments[position - 2]
@@ -82,9 +86,11 @@ class MessagePreviewAdapter @Inject constructor() :
             recipientCount > 1 -> {
                 context.getString(R.string.message_read_by, message.readBy, recipientCount)
             }
+
             message.readBy == 1 || (isReceived && !message.unread) -> {
                 context.getString(R.string.message_read, context.getString(R.string.all_yes))
             }
+
             else -> context.getString(R.string.message_read, context.getString(R.string.all_no))
         }
 
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 3ed685cd..8e7c7276 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
@@ -44,18 +44,33 @@ class MessagePreviewFragment :
 
     private var menuForwardButton: MenuItem? = null
 
+    private var menuRestoreButton: MenuItem? = null
+
     private var menuDeleteButton: MenuItem? = null
 
+    private var menuDeleteForeverButton: MenuItem? = null
+
     private var menuShareButton: MenuItem? = null
 
     private var menuPrintButton: MenuItem? = null
 
+    private var menuMuteButton: MenuItem? = null
+
     override val titleStringId: Int
         get() = R.string.message_title
 
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
+    override val muteMessageSuccessString: String
+        get() = getString(R.string.message_mute_success)
+
+    override val unmuteMessageSuccessString: String
+        get() = getString(R.string.message_unmute_success)
+
+    override val restoreMessageSuccessString: String
+        get() = getString(R.string.message_restore_success)
+
     override val messageNoSubjectString: String
         get() = getString(R.string.message_no_subject)
 
@@ -67,10 +82,10 @@ class MessagePreviewFragment :
         get() = getString(R.string.message_not_exists)
 
     companion object {
-        const val MESSAGE_ID_KEY = "message_id"
+        private const val MESSAGE_ARG_KEY = "message"
 
         fun newInstance(message: Message) = MessagePreviewFragment().apply {
-            arguments = bundleOf(MESSAGE_ID_KEY to message)
+            arguments = bundleOf(MESSAGE_ARG_KEY to message)
         }
     }
 
@@ -86,7 +101,7 @@ class MessagePreviewFragment :
         messageContainer = binding.messagePreviewContainer
         presenter.onAttachView(
             view = this,
-            message = (savedInstanceState ?: arguments)?.serializable(MESSAGE_ID_KEY),
+            message = requireArguments().serializable(MESSAGE_ARG_KEY),
         )
     }
 
@@ -103,9 +118,12 @@ class MessagePreviewFragment :
         inflater.inflate(R.menu.action_menu_message_preview, menu)
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
         menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
+        menuRestoreButton = menu.findItem(R.id.messagePreviewMenuRestore)
         menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
+        menuDeleteForeverButton = menu.findItem(R.id.messagePreviewMenuDeleteForever)
         menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
         menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
+        menuMuteButton = menu.findItem(R.id.messagePreviewMenuMute)
         presenter.onCreateOptionsMenu()
 
         menu.findItem(R.id.mainMenuAccount).isVisible = false
@@ -115,9 +133,12 @@ class MessagePreviewFragment :
         return when (item.itemId) {
             R.id.messagePreviewMenuReply -> presenter.onReply()
             R.id.messagePreviewMenuForward -> presenter.onForward()
+            R.id.messagePreviewMenuRestore -> presenter.onMessageRestore()
             R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
+            R.id.messagePreviewMenuDeleteForever -> presenter.onMessageDelete()
             R.id.messagePreviewMenuShare -> presenter.onShare()
             R.id.messagePreviewMenuPrint -> presenter.onPrint()
+            R.id.messagePreviewMenuMute -> presenter.onMute()
             else -> false
         }
     }
@@ -129,6 +150,11 @@ class MessagePreviewFragment :
         }
     }
 
+    override fun updateMuteToggleButton(isMuted: Boolean) {
+        menuMuteButton?.setTitle(if (isMuted) R.string.message_unmute else R.string.message_mute)
+
+    }
+
     override fun showProgress(show: Boolean) {
         binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
@@ -137,20 +163,15 @@ class MessagePreviewFragment :
         binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showOptions(show: Boolean, isReplayable: Boolean) {
-        menuReplyButton?.isVisible = isReplayable
+    override fun showOptions(show: Boolean, isReplayable: Boolean, isRestorable: Boolean) {
+        menuReplyButton?.isVisible = show && isReplayable
         menuForwardButton?.isVisible = show
-        menuDeleteButton?.isVisible = show
+        menuRestoreButton?.isVisible = show && isRestorable
+        menuDeleteButton?.isVisible = show && !isRestorable
+        menuDeleteForeverButton?.isVisible = show && isRestorable
         menuShareButton?.isVisible = show
         menuPrintButton?.isVisible = show
-    }
-
-    override fun setDeletedOptionsLabels() {
-        menuDeleteButton?.setTitle(R.string.message_delete_forever)
-    }
-
-    override fun setNotDeletedOptionsLabels() {
-        menuDeleteButton?.setTitle(R.string.message_move_to_trash)
+        menuMuteButton?.isVisible = show && isReplayable
     }
 
     override fun showErrorView(show: Boolean) {
@@ -212,11 +233,6 @@ class MessagePreviewFragment :
         (activity as MainActivity).popView()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
-        super.onSaveInstanceState(outState)
-    }
-
     override fun onDestroyView() {
         presenter.onDetachView()
         super.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 cd7b7284..3b3b2b42 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
@@ -3,10 +3,15 @@ package io.github.wulkanowy.ui.modules.message.preview
 import android.annotation.SuppressLint
 import androidx.core.text.parseAsHtml
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.*
 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.enums.MessageFolder
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
@@ -14,9 +19,11 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.time.Duration.Companion.seconds
 
 class MessagePreviewPresenter @Inject constructor(
     errorHandler: ErrorHandler,
@@ -26,20 +33,17 @@ class MessagePreviewPresenter @Inject constructor(
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
-    var message: Message? = null
-
-    var attachments: List<MessageAttachment>? = null
+    private var messageWithAttachments: MessageWithAttachment? = null
 
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
 
-    fun onAttachView(view: MessagePreviewView, message: Message?) {
+    fun onAttachView(view: MessagePreviewView, message: Message) {
         super.onAttachView(view)
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        this.message = message
-        loadData(requireNotNull(message))
+        loadData(message)
     }
 
     private fun onMessageLoadRetry(message: Message) {
@@ -66,25 +70,24 @@ class MessagePreviewPresenter @Inject constructor(
             .logResourceStatus("message ${messageToLoad.messageId} preview")
             .onResourceData {
                 if (it != null) {
-                    message = it.message
-                    attachments = it.attachments
+                    messageWithAttachments = it
                     view?.apply {
                         setMessageWithAttachment(it)
                         showContent(true)
                         initOptions()
-
+                        updateMuteToggleButton(isMuted = it.mutedMessageSender != null)
                         if (preferencesRepository.isIncognitoMode && it.message.unread) {
                             showMessage(R.string.message_incognito_description)
                         }
                     }
                 } else {
+                    delay(1.seconds)
                     view?.run {
                         showMessage(messageNotExists)
                         popView()
                     }
                 }
-            }
-            .onResourceSuccess {
+            }.onResourceSuccess {
                 if (it != null) {
                     analytics.logEvent(
                         "load_item",
@@ -92,31 +95,28 @@ class MessagePreviewPresenter @Inject constructor(
                         "length" to it.message.content.length
                     )
                 }
-            }
-            .onResourceNotLoading { view?.showProgress(false) }
-            .onResourceError {
+            }.onResourceNotLoading { view?.showProgress(false) }.onResourceError {
                 retryCallback = { onMessageLoadRetry(messageToLoad) }
                 errorHandler.dispatch(it)
-            }
-            .launch()
+            }.launch()
     }
 
     fun onReply(): Boolean {
-        return if (message != null) {
-            view?.openMessageReply(message)
+        return if (messageWithAttachments?.message != null) {
+            view?.openMessageReply(messageWithAttachments?.message)
             true
         } else false
     }
 
     fun onForward(): Boolean {
-        return if (message != null) {
-            view?.openMessageForward(message)
+        return if (messageWithAttachments?.message != null) {
+            view?.openMessageForward(messageWithAttachments?.message)
             true
         } else false
     }
 
     fun onShare(): Boolean {
-        val message = message ?: return false
+        val message = messageWithAttachments?.message ?: return false
         val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
         val text = buildString {
@@ -129,13 +129,15 @@ class MessagePreviewPresenter @Inject constructor(
 
             appendLine(message.content.parseAsHtml())
 
-            if (!attachments.isNullOrEmpty()) {
+            if (!messageWithAttachments?.attachments.isNullOrEmpty()) {
                 appendLine()
                 appendLine("Załączniki:")
 
-                append(attachments.orEmpty().joinToString(separator = "\n") { attachment ->
-                    "${attachment.filename}: ${attachment.url}"
-                })
+                append(
+                    messageWithAttachments?.attachments.orEmpty()
+                        .joinToString(separator = "\n") { attachment ->
+                            "${attachment.filename}: ${attachment.url}"
+                        })
             }
         }
 
@@ -148,7 +150,7 @@ class MessagePreviewPresenter @Inject constructor(
 
     @SuppressLint("NewApi")
     fun onPrint(): Boolean {
-        val message = message ?: return false
+        val message = messageWithAttachments?.message ?: return false
         val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
         val dateString = message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
@@ -159,8 +161,7 @@ class MessagePreviewPresenter @Inject constructor(
             append("<div><h4>Od</h4>${message.sender}</div>")
             append("<div><h4>DO</h4>${message.recipients}</div>")
         }
-        val messageContent = "<p>${message.content}</p>"
-            .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
+        val messageContent = "<p>${message.content}</p>".replace(Regex("[\\n\\r]{2,}"), "</p><p>")
             .replace(Regex("[\\n\\r]"), "<br>")
 
         val jobName = buildString {
@@ -171,9 +172,7 @@ class MessagePreviewPresenter @Inject constructor(
         }
 
         view?.apply {
-            val html = printHTML
-                .replace("%SUBJECT%", subject)
-                .replace("%CONTENT%", messageContent)
+            val html = printHTML.replace("%SUBJECT%", subject).replace("%CONTENT%", messageContent)
                 .replace("%INFO%", infoContent)
             printDocument(html, jobName)
         }
@@ -181,34 +180,69 @@ class MessagePreviewPresenter @Inject constructor(
         return true
     }
 
-    private fun deleteMessage() {
-        message ?: return
+    private fun restoreMessage() {
+        val message = messageWithAttachments?.message ?: return
 
         view?.run {
             showContent(false)
             showProgress(true)
-            showOptions(show = false, isReplayable = false)
+            showOptions(
+                show = false,
+                isReplayable = false,
+                isRestorable = false,
+            )
             showErrorView(false)
         }
-
-        Timber.i("Delete message ${message?.messageGlobalKey}")
-
+        Timber.i("Restore message ${message.messageGlobalKey}")
         presenterScope.launch {
             runCatching {
                 val student = studentRepository.getCurrentStudent(decryptPass = true)
                 val mailbox = messageRepository.getMailboxByStudent(student)
-                messageRepository.deleteMessage(student, mailbox, message!!)
+                messageRepository.restoreMessages(student, mailbox, listOfNotNull(message))
             }
                 .onFailure {
-                    retryCallback = { onMessageDelete() }
+                    retryCallback = { onMessageRestore() }
                     errorHandler.dispatch(it)
                 }
                 .onSuccess {
                     view?.run {
-                        showMessage(deleteMessageSuccessString)
+                        showMessage(restoreMessageSuccessString)
                         popView()
                     }
                 }
+            view?.showProgress(false)
+        }
+    }
+
+    private fun deleteMessage() {
+        messageWithAttachments?.message ?: return
+
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            showOptions(
+                show = false,
+                isReplayable = false,
+                isRestorable = false,
+            )
+            showErrorView(false)
+        }
+
+        Timber.i("Delete message ${messageWithAttachments?.message?.messageGlobalKey}")
+
+        presenterScope.launch {
+            runCatching {
+                val student = studentRepository.getCurrentStudent(decryptPass = true)
+                messageRepository.deleteMessage(student, messageWithAttachments?.message!!)
+            }.onFailure {
+                retryCallback = { onMessageDelete() }
+                errorHandler.dispatch(it)
+            }.onSuccess {
+                view?.run {
+                    showMessage(deleteMessageSuccessString)
+                    popView()
+                }
+            }
 
             view?.showProgress(false)
         }
@@ -224,6 +258,11 @@ class MessagePreviewPresenter @Inject constructor(
         }
     }
 
+    fun onMessageRestore(): Boolean {
+        restoreMessage()
+        return true
+    }
+
     fun onMessageDelete(): Boolean {
         deleteMessage()
         return true
@@ -232,20 +271,39 @@ class MessagePreviewPresenter @Inject constructor(
     private fun initOptions() {
         view?.apply {
             showOptions(
-                show = message != null,
-                isReplayable = message?.folderId != MessageFolder.SENT.id,
+                show = messageWithAttachments?.message != null,
+                isReplayable = messageWithAttachments?.message?.folderId == MessageFolder.RECEIVED.id,
+                isRestorable = messageWithAttachments?.message?.folderId == MessageFolder.TRASHED.id,
             )
-            message?.let {
-                when (it.folderId == MessageFolder.TRASHED.id) {
-                    true -> setDeletedOptionsLabels()
-                    false -> setNotDeletedOptionsLabels()
-                }
-            }
-
         }
     }
 
     fun onCreateOptionsMenu() {
         initOptions()
     }
+
+    fun onMute(): Boolean {
+        val message = messageWithAttachments?.message ?: return false
+        val isMuted = messageWithAttachments?.mutedMessageSender != null
+
+        presenterScope.launch {
+            runCatching {
+                when (isMuted) {
+                    true -> {
+                        messageRepository.unmuteMessage(message.correspondents)
+                        view?.run { showMessage(unmuteMessageSuccessString) }
+                    }
+
+                    false -> {
+                        messageRepository.muteMessage(message.correspondents)
+                        view?.run { showMessage(muteMessageSuccessString) }
+                    }
+                }
+            }.onFailure {
+                errorHandler.dispatch(it)
+            }
+        }
+        view?.updateMuteToggleButton(isMuted)
+        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 7f5f140b..ee0b6ce0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -9,6 +9,12 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
+    val muteMessageSuccessString: String
+
+    val unmuteMessageSuccessString: String
+
+    val restoreMessageSuccessString: String
+
     val messageNoSubjectString: String
 
     val printHTML: String
@@ -19,6 +25,8 @@ interface MessagePreviewView : BaseView {
 
     fun setMessageWithAttachment(item: MessageWithAttachment)
 
+    fun updateMuteToggleButton(isMuted: Boolean)
+
     fun showProgress(show: Boolean)
 
     fun showContent(show: Boolean)
@@ -29,11 +37,7 @@ interface MessagePreviewView : BaseView {
 
     fun setErrorRetryCallback(callback: () -> Unit)
 
-    fun showOptions(show: Boolean, isReplayable: Boolean)
-
-    fun setDeletedOptionsLabels()
-
-    fun setNotDeletedOptionsLabels()
+    fun showOptions(show: Boolean, isReplayable: Boolean, isRestorable: Boolean)
 
     fun openMessageReply(message: Message?)
 
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 e776e994..6155baea 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
@@ -203,7 +203,7 @@ class SendMessagePresenter @Inject constructor(
                 subject = subject,
                 content = content,
                 recipients = recipients,
-                mailboxId = mailbox.globalKey,
+                mailbox = mailbox,
             )
         }.logResourceStatus("sending message").onEach {
             when (it) {
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
index 9792c708..fadc77e6 100644
--- 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
@@ -18,8 +18,7 @@ import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
 
-class MessageTabAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class MessageTabAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     lateinit var onItemClickListener: (MessageTabDataItem.MessageItem, position: Int) -> Unit
 
@@ -52,10 +51,11 @@ class MessageTabAdapter @Inject constructor() :
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
 
-        return when (MessageItemViewType.values()[viewType]) {
+        return when (MessageItemViewType.entries[viewType]) {
             MessageItemViewType.FILTERS -> HeaderViewHolder(
                 ItemMessageChipsBinding.inflate(inflater, parent, false)
             )
+
             MessageItemViewType.MESSAGE -> ItemViewHolder(
                 ItemMessageBinding.inflate(inflater, parent, false)
             )
@@ -137,7 +137,12 @@ class MessageTabAdapter @Inject constructor() :
                 ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(currentTextColor))
                 isVisible = message.hasAttachments
             }
-            messageItemUnreadIndicator.isVisible = message.unread
+            messageItemUnreadIndicator.isVisible = message.unread || item.isMuted
+
+            when (item.isMuted) {
+                true -> messageItemUnreadIndicator.setImageResource(R.drawable.ic_notifications_off)
+                else -> messageItemUnreadIndicator.setImageResource(R.drawable.ic_circle_notification)
+            }
 
             root.setOnClickListener {
                 holder.bindingAdapterPosition.let {
@@ -165,8 +170,7 @@ class MessageTabAdapter @Inject constructor() :
         RecyclerView.ViewHolder(binding.root)
 
     private class MessageTabDiffUtil(
-        private val old: List<MessageTabDataItem>,
-        private val new: List<MessageTabDataItem>
+        private val old: List<MessageTabDataItem>, private val new: List<MessageTabDataItem>
     ) : DiffUtil.Callback() {
 
         override fun getOldListSize(): Int = old.size
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
index c0bd4170..ef640e04 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
@@ -6,6 +6,7 @@ sealed class MessageTabDataItem(val viewType: MessageItemViewType) {
 
     data class MessageItem(
         val message: Message,
+        val isMuted: Boolean,
         val isSelected: Boolean,
         val isActionMode: Boolean
     ) : MessageTabDataItem(MessageItemViewType.MESSAGE)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 4364e868..12f9d323 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
@@ -5,7 +5,9 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.View.*
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
 import android.widget.CompoundButton
 import androidx.annotation.StringRes
 import androidx.appcompat.view.ActionMode
@@ -64,10 +66,12 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
 
         override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-            if (presenter.folder == MessageFolder.TRASHED) {
-                val menuItem = menu.findItem(R.id.messageTabContextMenuDelete)
-                menuItem.setTitle(R.string.message_delete_forever)
-            }
+            val isTrashFolder = presenter.folder == MessageFolder.TRASHED
+
+            menu.findItem(R.id.messageTabContextMenuDelete).setVisible(!isTrashFolder)
+            menu.findItem(R.id.messageTabContextMenuDeleteForever).setVisible(isTrashFolder)
+            menu.findItem(R.id.messageTabContextMenuRestore).setVisible(isTrashFolder)
+
             return presenter.onPrepareActionMode()
         }
 
@@ -79,6 +83,8 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         override fun onActionItemClicked(mode: ActionMode, menu: MenuItem): Boolean {
             when (menu.itemId) {
                 R.id.messageTabContextMenuDelete -> presenter.onActionModeSelectDelete()
+                R.id.messageTabContextMenuRestore -> presenter.onActionModeSelectRestore()
+                R.id.messageTabContextMenuDeleteForever -> presenter.onActionModeSelectDelete()
                 R.id.messageTabContextMenuSelectAll -> presenter.onActionModeSelectCheckAll()
             }
             return true
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 90f93b14..cda0b32b 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
@@ -4,6 +4,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
@@ -39,7 +40,7 @@ class MessageTabPresenter @Inject constructor(
     private var mailboxes: List<Mailbox> = emptyList()
     private var selectedMailbox: Mailbox? = null
 
-    private var messages = emptyList<Message>()
+    private var messages = emptyList<MessageWithMutedAuthor>()
 
     private val searchChannel = Channel<String>()
 
@@ -120,8 +121,27 @@ class MessageTabPresenter @Inject constructor(
         return true
     }
 
+    fun onActionModeSelectRestore() {
+        Timber.i("Restore ${messagesToDelete.size} messages")
+        val messageList = messagesToDelete.toList()
+
+        presenterScope.launch {
+            view?.run {
+                showProgress(true)
+                showContent(false)
+                showActionMode(false)
+            }
+            runCatching {
+                val student = studentRepository.getCurrentStudent(true)
+                messageRepository.restoreMessages(student, selectedMailbox, messageList)
+            }
+                .onFailure(errorHandler::dispatch)
+                .onSuccess { view?.showMessage(R.string.message_messages_restored) }
+        }
+    }
+
     fun onActionModeSelectDelete() {
-        Timber.i("Delete ${messagesToDelete.size} messages)")
+        Timber.i("Delete ${messagesToDelete.size} messages")
         val messageList = messagesToDelete.toList()
 
         presenterScope.launch {
@@ -133,7 +153,7 @@ class MessageTabPresenter @Inject constructor(
 
             runCatching {
                 val student = studentRepository.getCurrentStudent(true)
-                messageRepository.deleteMessages(student, selectedMailbox, messageList)
+                messageRepository.deleteMessages(student, messageList)
             }
                 .onFailure(errorHandler::dispatch)
                 .onSuccess { view?.showMessage(R.string.message_messages_deleted) }
@@ -141,7 +161,7 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onActionModeSelectCheckAll() {
-        val messagesToSelect = getFilteredData()
+        val messagesToSelect = getFilteredData().map { it.message }
         val isAllSelected = messagesToDelete.containsAll(messagesToSelect)
 
         if (isAllSelected) {
@@ -188,7 +208,7 @@ class MessageTabPresenter @Inject constructor(
                 view?.showActionMode(false)
             }
 
-            val filteredData = getFilteredData()
+            val filteredData = getFilteredData().map { it.message }
 
             view?.run {
                 updateActionModeTitle(messagesToDelete.size)
@@ -320,25 +340,31 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
-    private fun getFilteredData(): List<Message> {
+    private fun getFilteredData(): List<MessageWithMutedAuthor> {
         if (lastSearchQuery.trim().isEmpty()) {
-            val sortedMessages = messages.sortedByDescending { it.date }
+            val sortedMessages = messages.sortedByDescending { it.message.date }
             return when {
-                (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
-                (onlyUnread == true) -> sortedMessages.filter { it.unread == onlyUnread }
-                onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
+                (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter {
+                    it.message.unread == onlyUnread && it.message.hasAttachments == onlyWithAttachments
+                }
+
+                (onlyUnread == true) -> sortedMessages.filter { it.message.unread == onlyUnread }
+                onlyWithAttachments -> sortedMessages.filter { it.message.hasAttachments == onlyWithAttachments }
                 else -> sortedMessages
             }
         } else {
             val sortedMessages = messages
-                .map { it to calculateMatchRatio(it, lastSearchQuery) }
-                .sortedWith(compareBy<Pair<Message, Int>> { -it.second }.thenByDescending { it.first.date })
+                .map { it to calculateMatchRatio(it.message, lastSearchQuery) }
+                .sortedWith(compareBy<Pair<MessageWithMutedAuthor, Int>> { -it.second }.thenByDescending { it.first.message.date })
                 .filter { it.second > 6000 }
                 .map { it.first }
             return when {
-                (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
-                (onlyUnread == true) -> sortedMessages.filter { it.unread == onlyUnread }
-                onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
+                (onlyUnread == true) && onlyWithAttachments -> sortedMessages.filter {
+                    it.message.unread == onlyUnread && it.message.hasAttachments == onlyWithAttachments
+                }
+
+                (onlyUnread == true) -> sortedMessages.filter { it.message.unread == onlyUnread }
+                onlyWithAttachments -> sortedMessages.filter { it.message.hasAttachments == onlyWithAttachments }
                 else -> sortedMessages
             }
         }
@@ -367,8 +393,9 @@ class MessageTabPresenter @Inject constructor(
 
             addAll(data.map { message ->
                 MessageTabDataItem.MessageItem(
-                    message = message,
-                    isSelected = messagesToDelete.any { it.messageGlobalKey == message.messageGlobalKey },
+                    message = message.message,
+                    isMuted = message.mutedMessageSender != null,
+                    isSelected = messagesToDelete.any { it.messageGlobalKey == message.message.messageGlobalKey },
                     isActionMode = isActionMode
                 )
             })
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
index 697eab33..23eaba7c 100644
--- 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
@@ -12,6 +12,8 @@ class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemV
 
     var onClickListener: (moreItem: MoreItem) -> Unit = {}
 
+    var onLongClickListener: (moreItem: MoreItem) -> Unit = {}
+
     override fun getItemCount() = items.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
@@ -27,6 +29,10 @@ class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemV
             moreItemImage.setImageResource(item.icon)
 
             root.setOnClickListener { onClickListener(item) }
+            root.setOnLongClickListener {
+                onLongClickListener(item)
+                true
+            }
         }
     }
 
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 40831806..27023d13 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
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.Destination
@@ -23,6 +24,9 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     @Inject
     lateinit var moreAdapter: MoreAdapter
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     companion object {
         fun newInstance() = MoreFragment()
     }
@@ -73,4 +77,9 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         presenter.onDetachView()
         super.onDestroyView()
     }
+
+    override fun restartApp() {
+        startActivity(MainActivity.getStartIntent(requireContext()))
+        requireActivity().finishAffinity()
+    }
 }
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 fbca97ed..05b426d6 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
@@ -12,4 +12,6 @@ interface MoreView : BaseView {
     fun popView(depth: Int)
 
     fun openView(destination: Destination)
+
+    fun restartApp()
 }
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 62ad347f..59a13fbb 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.note
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.NoteRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -17,6 +18,7 @@ class NotePresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val noteRepository: NoteRepository,
     private val semesterRepository: SemesterRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<NoteView>(errorHandler, studentRepository) {
 
@@ -48,6 +50,19 @@ class NotePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
+        if (!preferencesRepository.showNotes) {
+            view?.run {
+                enableSwipe(false)
+                showEmpty(false)
+                showContent(false)
+                showErrorView(false)
+                showProgress(false)
+                showEmpty(true)
+            }
+
+            return
+        }
+
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
index 46999599..731488a9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.schoolannouncement
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.ItemSchoolAnnouncementBinding
@@ -29,6 +30,10 @@ class SchoolAnnouncementAdapter @Inject constructor() :
             schoolAnnouncementItemDate.text = item.date.toFormattedString()
             schoolAnnouncementItemType.text = item.subject
             schoolAnnouncementItemContent.text = item.content.parseUonetHtml()
+            with(schoolAnnouncementItemAuthor) {
+                text = item.author
+                isVisible = !item.author.isNullOrBlank()
+            }
 
             root.setOnClickListener { onItemClickListener(item) }
         }
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 f8d1323c..f4503fad 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
@@ -1,13 +1,22 @@
 package io.github.wulkanowy.ui.modules.settings
 
+import android.content.SharedPreferences
 import android.os.Bundle
+import android.view.View
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceScreen
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.modules.main.MainView
 import timber.log.Timber
+import javax.inject.Inject
 
-class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView, SettingsView {
+@AndroidEntryPoint
+class SettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener,
+    MainView.TitledView, SettingsView {
 
     companion object {
 
@@ -16,11 +25,26 @@ class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView, Settin
 
     override val titleStringId get() = R.string.settings_title
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
+
+        val prefScreen: PreferenceScreen? = findPreference("settings_preferences")
+        val prefDeveloper: Preference? = findPreference("mod_settings")
+
+        if (!preferencesRepository.developerMode && prefScreen != null && prefDeveloper != null) {
+            prefScreen.removePreference(prefDeveloper)
+        }
+
         Timber.i("Settings view was initialized")
     }
 
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
+    }
+
     override fun showError(text: String, error: Throwable) {}
 
     override fun showMessage(text: String) {}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
index 3d0c8052..62544f83 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
@@ -3,7 +3,9 @@ package io.github.wulkanowy.ui.modules.settings.appearance
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
+import androidx.core.os.bundleOf
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SeekBarPreference
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -29,13 +31,31 @@ class AppearanceFragment : PreferenceFragmentCompat(),
 
     override val titleStringId get() = R.string.pref_settings_appearance_title
 
+    companion object {
+        fun withFocusedPreference(key: String) = AppearanceFragment().apply {
+            arguments = bundleOf(FOCUSED_KEY to key)
+        }
+
+        private const val FOCUSED_KEY = "focusedKey"
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(this)
+        arguments?.getString(FOCUSED_KEY)?.let { scrollToPreference(it) }
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.scheme_preferences_appearance, rootKey)
+        val attendanceTargetPref =
+            findPreference<SeekBarPreference>(requireContext().getString(R.string.pref_key_attendance_target))!!
+        attendanceTargetPref.setOnPreferenceChangeListener { _, newValueObj ->
+            val newValue = (((newValueObj as Int).toDouble() + 2.5) / 5).toInt() * 5
+            attendanceTargetPref.value =
+                newValue.coerceIn(attendanceTargetPref.min, attendanceTargetPref.max)
+
+            false
+        }
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsFragment.kt
new file mode 100644
index 00000000..e45a5443
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsFragment.kt
@@ -0,0 +1,147 @@
+package io.github.wulkanowy.ui.modules.settings.mod_settings
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.EditTextPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.AppInfo
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ModSettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener,
+    MainView.TitledView, ModSettingsView {
+
+    @Inject
+    lateinit var presenter: ModSettingsPresenter
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
+    override val titleStringId get() = R.string.pref_mod_settings_title
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.scheme_preferences_mod_settings, rootKey)
+
+        val attendancePercentagePreference: EditTextPreference? = findPreference("attendance_percentage")
+        attendancePercentagePreference?.setOnBindEditTextListener { editText ->
+            editText.inputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL
+            editText.filters = arrayOf(
+                android.text.InputFilter { source, _, _, dest, _, _ ->
+                    if (source == "." && dest.isEmpty()) {
+                        return@InputFilter "0."
+                    }
+
+                    val input = dest.toString() + source.toString()
+                    if (input == "100.00") {
+                        return@InputFilter null
+                    }
+
+                    val inputVal = input.toFloatOrNull()
+                    if (inputVal != null && inputVal >= 0 && inputVal <= 100) {
+                        null
+                    } else {
+                        ""
+                    }
+                }
+            )
+        }
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        presenter.onSharedPreferenceChanged(key)
+    }
+
+    override fun showError(text: String, error: Throwable) {
+        (activity as? BaseActivity<*, *>)?.showError(text, error)
+    }
+
+    override fun showMessage(text: String) {
+        (activity as? BaseActivity<*, *>)?.showMessage(text)
+    }
+
+    override fun showExpiredCredentialsDialog() {
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
+    }
+
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+    }
+
+    override fun showErrorDetailsDialog(error: Throwable) {
+        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+    }
+
+    override fun showAuthDialog() {
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun showAttendanceSettings(items: List<DashboardItem.HiddenAttendanceTile>) {
+        val entries = requireContext().resources.getStringArray(R.array.mod_settings_attendance_entries)
+        val values = requireContext().resources.getStringArray(R.array.mod_settings_attendance_values)
+        val selectedItemsState = values.map { value -> items.any { it.name == value } }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.attendance_title)
+            .setMultiChoiceItems(entries, selectedItemsState.toBooleanArray()) { _, _, _ -> }
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                val selectedState = (dialog as AlertDialog).listView.checkedItemPositions
+                val selectedValues = values
+                    .filterIndexed { index, _ -> selectedState[index] }
+                    .map { DashboardItem.HiddenAttendanceTile.valueOf(it) }
+
+                Timber.i("Selected attendance to hide: $selectedValues")
+                presenter.onAttendanceSettingsSelected(selectedValues)
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    override fun restartApp() {
+        startActivity(MainActivity.getStartIntent(requireContext()))
+        requireActivity().finishAffinity()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsPresenter.kt
new file mode 100644
index 00000000..10bbefbc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsPresenter.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.ui.modules.settings.mod_settings
+
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import io.github.wulkanowy.utils.AnalyticsHelper
+import timber.log.Timber
+import javax.inject.Inject
+
+class ModSettingsPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val analytics: AnalyticsHelper,
+    private val preferencesRepository: PreferencesRepository
+) : BasePresenter<ModSettingsView>(errorHandler, studentRepository) {
+
+    override fun onAttachView(view: ModSettingsView) {
+        super.onAttachView(view)
+
+        Timber.i("Mod settings view was initialized")
+    }
+
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
+        Timber.i("Change mod settings $key")
+        analytics.logEvent("setting_changed", "name" to key)
+    }
+
+    fun onHiddenGradesSelected(selectedItems: List<String>) {
+        preferencesRepository.hiddenGrades = selectedItems
+        view?.restartApp()
+    }
+
+    fun onAttendanceSettingsSelected(selectedValues: List<DashboardItem.HiddenAttendanceTile>) {
+        preferencesRepository.hiddenAttendanceItems = selectedValues
+        view?.restartApp()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsView.kt
new file mode 100644
index 00000000..0133d2a4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/mod_settings/ModSettingsView.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.ui.modules.settings.mod_settings
+
+import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+
+interface ModSettingsView : BaseView {
+    fun restartApp()
+    fun showAttendanceSettings(items: List<DashboardItem.HiddenAttendanceTile>)
+}
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
index a957ef79..5cb6c401 100644
--- 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
@@ -7,27 +7,28 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
 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.ItemTimetableEmptyBinding
+import io.github.wulkanowy.databinding.ItemTimetableMainAdditionalBinding
 import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
+import io.github.wulkanowy.utils.SyncListAdapter
 import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
 
 class TimetableAdapter @Inject constructor() :
-    ListAdapter<TimetableItem, RecyclerView.ViewHolder>(differ) {
+    SyncListAdapter<TimetableItem, RecyclerView.ViewHolder>(Differ) {
 
     override fun getItemViewType(position: Int): Int = getItem(position).type.ordinal
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
 
-        return when (TimetableItemType.values()[viewType]) {
+        return when (TimetableItemType.entries[viewType]) {
             TimetableItemType.SMALL -> SmallViewHolder(
                 ItemTimetableSmallBinding.inflate(inflater, parent, false)
             )
@@ -39,6 +40,10 @@ class TimetableAdapter @Inject constructor() :
             TimetableItemType.EMPTY -> EmptyViewHolder(
                 ItemTimetableEmptyBinding.inflate(inflater, parent, false)
             )
+
+            TimetableItemType.ADDITIONAL -> AdditionalViewHolder(
+                ItemTimetableMainAdditionalBinding.inflate(inflater, parent, false)
+            )
         }
     }
 
@@ -61,16 +66,30 @@ class TimetableAdapter @Inject constructor() :
                 binding = holder.binding,
                 item = getItem(position) as TimetableItem.Small,
             )
-
             is NormalViewHolder -> bindNormalView(
                 binding = holder.binding,
                 item = getItem(position) as TimetableItem.Normal,
             )
-
             is EmptyViewHolder -> bindEmptyView(
                 binding = holder.binding,
                 item = getItem(position) as TimetableItem.Empty,
             )
+
+            is AdditionalViewHolder -> bindAdditionalView(
+                binding = holder.binding,
+                item = getItem(position) as TimetableItem.Additional,
+            )
+        }
+    }
+
+    private fun bindAdditionalView(
+        binding: ItemTimetableMainAdditionalBinding,
+        item: TimetableItem.Additional
+    ) {
+        with(binding) {
+            timetableItemSubject.text = item.additional.subject
+            timetableItemTimeStart.text = item.additional.start.toFormattedString("HH:mm")
+            timetableItemTimeFinish.text = item.additional.end.toFormattedString("HH:mm")
         }
     }
 
@@ -79,6 +98,7 @@ class TimetableAdapter @Inject constructor() :
 
         with(binding) {
             timetableSmallItemNumber.text = lesson.number.toString()
+            timetableSmallItemNumber.isVisible = item.isLessonNumberVisible
             timetableSmallItemSubject.text = lesson.subject
             timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
             timetableSmallItemRoom.text = lesson.room
@@ -97,6 +117,7 @@ class TimetableAdapter @Inject constructor() :
 
         with(binding) {
             timetableItemNumber.text = lesson.number.toString()
+            timetableItemNumber.isVisible = item.isLessonNumberVisible
             timetableItemSubject.text = lesson.subject
             timetableItemGroup.text = lesson.group
             timetableItemRoom.text = lesson.room
@@ -305,31 +326,32 @@ class TimetableAdapter @Inject constructor() :
     private class EmptyViewHolder(val binding: ItemTimetableEmptyBinding) :
         RecyclerView.ViewHolder(binding.root)
 
-    companion object {
-        private val differ = object : DiffUtil.ItemCallback<TimetableItem>() {
-            override fun areItemsTheSame(oldItem: TimetableItem, newItem: TimetableItem): Boolean =
-                when {
-                    oldItem is TimetableItem.Small && newItem is TimetableItem.Small -> {
-                        oldItem.lesson.start == newItem.lesson.start
-                    }
+    private class AdditionalViewHolder(val binding: ItemTimetableMainAdditionalBinding) :
+        RecyclerView.ViewHolder(binding.root)
 
-                    oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal -> {
-                        oldItem.lesson.start == newItem.lesson.start
-                    }
-
-                    else -> oldItem == newItem
+    private object Differ : DiffUtil.ItemCallback<TimetableItem>() {
+        override fun areItemsTheSame(oldItem: TimetableItem, newItem: TimetableItem): Boolean =
+            when {
+                oldItem is TimetableItem.Small && newItem is TimetableItem.Small -> {
+                    oldItem.lesson.start == newItem.lesson.start
                 }
 
-            override fun areContentsTheSame(oldItem: TimetableItem, newItem: TimetableItem) =
-                oldItem == newItem
+                oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal -> {
+                    oldItem.lesson.start == newItem.lesson.start
+                }
 
-            override fun getChangePayload(oldItem: TimetableItem, newItem: TimetableItem): Any? {
-                return if (oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal) {
-                    if (oldItem.lesson == newItem.lesson && oldItem.showGroupsInPlan == newItem.showGroupsInPlan && oldItem.timeLeft != newItem.timeLeft) {
-                        "time_left"
-                    } else super.getChangePayload(oldItem, newItem)
-                } else super.getChangePayload(oldItem, newItem)
+                else -> oldItem == newItem
             }
+
+        override fun areContentsTheSame(oldItem: TimetableItem, newItem: TimetableItem) =
+            oldItem == newItem
+
+        override fun getChangePayload(oldItem: TimetableItem, newItem: TimetableItem): Any? {
+            return if (oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal) {
+                if (oldItem.lesson == newItem.lesson && oldItem.showGroupsInPlan == newItem.showGroupsInPlan && oldItem.timeLeft != newItem.timeLeft) {
+                    "time_left"
+                } else super.getChangePayload(oldItem, newItem)
+            } else super.getChangePayload(oldItem, newItem)
         }
     }
 }
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 0e645911..b73e7c26 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
@@ -21,7 +21,11 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.additional.AdditionalLessonsFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
+import io.github.wulkanowy.utils.openMaterialDatePicker
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -104,8 +108,11 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         }
     }
 
-    override fun updateData(data: List<TimetableItem>) {
-        timetableAdapter.submitList(data)
+    override fun updateData(data: List<TimetableItem>, isDayChanged: Boolean) {
+        when {
+            isDayChanged -> timetableAdapter.recreate(data)
+            else -> timetableAdapter.submitList(data)
+        }
     }
 
     override fun clearData() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
index 105ece38..93290ba2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -1,18 +1,21 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
 import java.time.Duration
 
 sealed class TimetableItem(val type: TimetableItemType) {
 
     data class Small(
         val lesson: Timetable,
+        val isLessonNumberVisible: Boolean,
         val onClick: (Timetable) -> Unit,
     ) : TimetableItem(TimetableItemType.SMALL)
 
     data class Normal(
         val lesson: Timetable,
         val showGroupsInPlan: Boolean,
+        val isLessonNumberVisible: Boolean,
         val timeLeft: TimeLeft?,
         val onClick: (Timetable) -> Unit,
     ) : TimetableItem(TimetableItemType.NORMAL)
@@ -21,6 +24,10 @@ sealed class TimetableItem(val type: TimetableItemType) {
         val numFrom: Int,
         val numTo: Int
     ) : TimetableItem(TimetableItemType.EMPTY)
+
+    data class Additional(
+        val additional: TimetableAdditional,
+    ) : TimetableItem(TimetableItemType.ADDITIONAL)
 }
 
 data class TimeLeft(
@@ -32,5 +39,6 @@ data class TimeLeft(
 enum class TimetableItemType {
     SMALL,
     NORMAL,
-    EMPTY
+    EMPTY,
+    ADDITIONAL,
 }
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 7e8c876e..c00bdc3e 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
@@ -3,8 +3,10 @@ package io.github.wulkanowy.ui.modules.timetable
 import android.os.Handler
 import android.os.Looper
 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.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode.BELOW
+import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode.NONE
 import io.github.wulkanowy.data.enums.TimetableGapsMode.BETWEEN_AND_BEFORE_LESSONS
 import io.github.wulkanowy.data.enums.TimetableGapsMode.NO_GAPS
 import io.github.wulkanowy.data.enums.TimetableMode
@@ -15,6 +17,7 @@ import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceIntermediate
 import io.github.wulkanowy.data.onResourceNotLoading
 import io.github.wulkanowy.data.onResourceSuccess
+import io.github.wulkanowy.data.pojos.TimetableFull
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
@@ -58,6 +61,7 @@ class TimetablePresenter @Inject constructor(
 
     private var initialDate: LocalDate? = null
     private var isWeekendHasLessons: Boolean = false
+    private var isEduOne: Boolean = false
 
     var currentDate: LocalDate? = null
         private set
@@ -81,7 +85,7 @@ class TimetablePresenter @Inject constructor(
         } else currentDate?.previousSchoolDay
 
         reloadView(date ?: return)
-        loadData()
+        loadData(isDayChanged = true)
     }
 
     fun onNextDay() {
@@ -90,7 +94,7 @@ class TimetablePresenter @Inject constructor(
         } else currentDate?.nextSchoolDay
 
         reloadView(date ?: return)
-        loadData()
+        loadData(isDayChanged = true)
     }
 
     fun onPickDate() {
@@ -104,7 +108,7 @@ class TimetablePresenter @Inject constructor(
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the timetable")
-        loadData(true)
+        loadData(forceRefresh = true)
     }
 
     fun onRetry() {
@@ -112,7 +116,7 @@ class TimetablePresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(forceRefresh = true)
     }
 
     fun onDetailsClick() {
@@ -145,12 +149,13 @@ class TimetablePresenter @Inject constructor(
         return true
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
+    private fun loadData(forceRefresh: Boolean = false, isDayChanged: Boolean = false) {
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
 
-            checkInitialAndCurrentDate(student, semester)
+            isEduOne = student.isEduOne == true
+            checkInitialAndCurrentDate(semester)
             timetableRepository.getTimetable(
                 student = student,
                 semester = semester,
@@ -168,9 +173,9 @@ class TimetablePresenter @Inject constructor(
                     enableSwipe(true)
                     showProgress(false)
                     showErrorView(false)
-                    showContent(it.lessons.isNotEmpty())
-                    showEmpty(it.lessons.isEmpty())
-                    updateData(it.lessons)
+                    updateData(it, isDayChanged)
+                    showContent(it.lessons.isNotEmpty() || it.additional.isNotEmpty())
+                    showEmpty(it.lessons.isEmpty() && it.additional.isEmpty())
                     setDayHeaderMessage(it.headers.find { header -> header.date == currentDate }?.content)
                     reloadNavigation()
                 }
@@ -194,9 +199,9 @@ class TimetablePresenter @Inject constructor(
             .launch()
     }
 
-    private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
+    private suspend fun checkInitialAndCurrentDate(semester: Semester) {
         if (initialDate == null) {
-            isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(student, semester)
+            isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(semester)
             initialDate = getInitialDate(semester)
         }
 
@@ -215,66 +220,97 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    private fun updateData(lessons: List<Timetable>) {
+    private fun updateData(lessons: TimetableFull, isDayChanged: Boolean) {
         tickTimer?.cancel()
 
-        if (currentDate != now()) {
-            view?.updateData(createItems(lessons))
-        } else {
-            tickTimer = timer(period = 2_000) {
+        view?.updateData(createItems(lessons), isDayChanged)
+        if (currentDate == now()) {
+            tickTimer = timer(period = 2_000, initialDelay = 2_000) {
                 Handler(Looper.getMainLooper()).post {
-                    view?.updateData(createItems(lessons))
+                    view?.updateData(createItems(lessons), isDayChanged)
                 }
             }
         }
     }
 
-    private fun createItems(items: List<Timetable>): List<TimetableItem> {
-        val filteredItems = items
-            .filter {
-                if (prefRepository.showWholeClassPlan == TimetableMode.ONLY_CURRENT_GROUP) {
-                    it.isStudentPlan
-                } else true
-            }.sortedWith(
-                compareBy({ item -> item.number }, { item -> !item.isStudentPlan })
-            )
+    private sealed class Item(
+        val isStudentPlan: Boolean,
+        val start: Instant,
+        val number: Int?,
+    ) {
+        class Lesson(val lesson: Timetable) :
+            Item(lesson.isStudentPlan, lesson.start, lesson.number)
+
+        class Additional(val additional: TimetableAdditional) : Item(true, additional.start, null)
+    }
+
+    private fun createItems(fullTimetable: TimetableFull): List<TimetableItem> {
+        val showAdditionalLessonsInPlan = prefRepository.showAdditionalLessonsInPlan
+        val allItems =
+            fullTimetable.lessons.map(Item::Lesson) + fullTimetable.additional.map(Item::Additional)
+                .takeIf { showAdditionalLessonsInPlan != NONE }.orEmpty()
+
+        val filteredItems = allItems.filter {
+            if (prefRepository.showWholeClassPlan == TimetableMode.ONLY_CURRENT_GROUP) {
+                it.isStudentPlan
+            } else true
+        }.sortedWith(
+            (compareBy<Item> { it is Item.Additional }
+                .takeIf { showAdditionalLessonsInPlan == BELOW } ?: EmptyComparator())
+                .thenBy { it.start }
+                .thenBy { !it.isStudentPlan }
+        )
 
         var prevNum = when (prefRepository.showTimetableGaps) {
             BETWEEN_AND_BEFORE_LESSONS -> 0
             else -> null
         }
+        var prevIsAdditional = false
         return buildList {
             filteredItems.forEachIndexed { i, it ->
-                if (prefRepository.showTimetableGaps != NO_GAPS && prevNum != null && it.number > prevNum!! + 1) {
-                    val emptyLesson = TimetableItem.Empty(
-                        numFrom = prevNum!! + 1,
-                        numTo = it.number - 1
-                    )
-                    add(emptyLesson)
+                if (prefRepository.showTimetableGaps != NO_GAPS) {
+                    if (prevNum != null && it.number != null && it.number > prevNum!! + 1) {
+                        if (!prevIsAdditional) {
+                            // Additional lessons do count as a lesson so don't add empty lessons
+                            // when there is an additional lesson present
+                            val emptyLesson = TimetableItem.Empty(
+                                numFrom = prevNum!! + 1, numTo = it.number - 1
+                            )
+                            add(emptyLesson)
+                        }
+                    }
+                    prevNum = it.number
+                    prevIsAdditional = it is Item.Additional
                 }
 
-                if (it.isStudentPlan) {
-                    val normalLesson = TimetableItem.Normal(
-                        lesson = it,
-                        showGroupsInPlan = prefRepository.showGroupsInPlan,
-                        timeLeft = filteredItems.getTimeLeftForLesson(it, i),
-                        onClick = ::onTimetableItemSelected
-                    )
-                    add(normalLesson)
-                } else {
-                    val smallLesson = TimetableItem.Small(
-                        lesson = it,
-                        onClick = ::onTimetableItemSelected
-                    )
-                    add(smallLesson)
+                if (it is Item.Lesson) {
+                    if (it.isStudentPlan) {
+                        val normalLesson = TimetableItem.Normal(
+                            lesson = it.lesson,
+                            showGroupsInPlan = prefRepository.showGroupsInPlan,
+                            timeLeft = filteredItems.getTimeLeftForLesson(it.lesson, i),
+                            onClick = ::onTimetableItemSelected,
+                            isLessonNumberVisible = !isEduOne
+                        )
+                        add(normalLesson)
+                    } else {
+                        val smallLesson = TimetableItem.Small(
+                            lesson = it.lesson,
+                            onClick = ::onTimetableItemSelected,
+                            isLessonNumberVisible = !isEduOne
+                        )
+                        add(smallLesson)
+                    }
+                } else if (it is Item.Additional) {
+                    // If the user disabled showing additional lessons, they would've been filtered
+                    // out already, so there's no need to check it again.
+                    add(TimetableItem.Additional(it.additional))
                 }
-
-                prevNum = it.number
             }
         }
     }
 
-    private fun List<Timetable>.getTimeLeftForLesson(lesson: Timetable, index: Int): TimeLeft {
+    private fun List<Item>.getTimeLeftForLesson(lesson: Timetable, index: Int): TimeLeft {
         val isShowTimeUntil = lesson.isShowTimeUntil(getPreviousLesson(index))
         return TimeLeft(
             until = lesson.until.plusMinutes(1).takeIf { isShowTimeUntil },
@@ -283,11 +319,20 @@ class TimetablePresenter @Inject constructor(
         )
     }
 
-    private fun List<Timetable>.getPreviousLesson(position: Int): Instant? {
-        return filter { it.isStudentPlan }
-            .getOrNull(position - 1 - filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)
+    private fun List<Item>.getPreviousLesson(position: Int): Instant? {
+        val lessonAdditionalOffset = filterIndexed { i, item ->
+            i < position && item is Item.Additional
+        }.size
+        val lessonStudentPlanOffset = filterIndexed { i, item ->
+            i < position && !item.isStudentPlan
+        }.size
+        val lessonIndex = position - 1 - lessonAdditionalOffset - lessonStudentPlanOffset
+
+        return filterIsInstance<Item.Lesson>()
+            .filter { it.isStudentPlan }
+            .getOrNull(lessonIndex)
             ?.let {
-                if (!it.canceled && it.isStudentPlan) it.end
+                if (!it.lesson.canceled && it.isStudentPlan) it.lesson.end
                 else null
             }
     }
@@ -340,3 +385,7 @@ class TimetablePresenter @Inject constructor(
         super.onDetachView()
     }
 }
+
+private class EmptyComparator<T> : Comparator<T> {
+    override fun compare(o1: T, o2: T) = 0
+}
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 40190d51..f4d5b762 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
@@ -12,7 +12,7 @@ interface TimetableView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<TimetableItem>)
+    fun updateData(data: List<TimetableItem>, isDayChanged: Boolean)
 
     fun updateNavigationDay(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
index faa833c2..bf6be56f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
@@ -13,7 +13,11 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.additional.add.AdditionalLessonAddDialog
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
+import io.github.wulkanowy.utils.openMaterialDatePicker
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -132,8 +136,12 @@ class AdditionalLessonsFragment :
         binding.additionalLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
-    override fun showAddAdditionalLessonDialog() {
-        (activity as? MainActivity)?.showDialogFragment(AdditionalLessonAddDialog.newInstance())
+    override fun showAddAdditionalLessonDialog(currentDate: LocalDate) {
+        (activity as? MainActivity)?.showDialogFragment(
+            AdditionalLessonAddDialog.newInstance(
+                currentDate
+            )
+        )
     }
 
     override fun showDatePickerDialog(selectedDate: LocalDate) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
index d0a01b38..16ec9746 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
@@ -1,14 +1,27 @@
 package io.github.wulkanowy.ui.modules.timetable.additional
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.domain.timetable.IsStudentHasLessonsOnWeekendUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.capitalise
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
@@ -22,11 +35,14 @@ class AdditionalLessonsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     private val semesterRepository: SemesterRepository,
     private val timetableRepository: TimetableRepository,
+    private val isStudentHasLessonsOnWeekendUseCase: IsStudentHasLessonsOnWeekendUseCase,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<AdditionalLessonsView>(errorHandler, studentRepository) {
 
     private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
 
+    private var isWeekendHasLessons: Boolean = false
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -43,12 +59,18 @@ class AdditionalLessonsPresenter @Inject constructor(
     }
 
     fun onPreviousDay() {
-        loadData(currentDate.previousSchoolDay)
+        val date = if (isWeekendHasLessons) {
+            currentDate.minusDays(1)
+        } else currentDate.previousSchoolDay
+        loadData(date)
         reloadView()
     }
 
     fun onNextDay() {
-        loadData(currentDate.nextSchoolDay)
+        val date = if (isWeekendHasLessons) {
+            currentDate.plusDays(1)
+        } else currentDate.nextSchoolDay
+        loadData(date)
         reloadView()
     }
 
@@ -57,7 +79,7 @@ class AdditionalLessonsPresenter @Inject constructor(
     }
 
     fun onAdditionalLessonAddButtonClicked() {
-        view?.showAddAdditionalLessonDialog()
+        view?.showAddAdditionalLessonDialog(currentDate)
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
@@ -131,6 +153,8 @@ class AdditionalLessonsPresenter @Inject constructor(
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
+
+            isWeekendHasLessons = isStudentHasLessonsOnWeekendUseCase(semester, currentDate)
             timetableRepository.getTimetable(
                 student = student,
                 semester = semester,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
index 76d37b75..291c1217 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
@@ -36,7 +36,7 @@ interface AdditionalLessonsView : BaseView {
 
     fun showDatePickerDialog(selectedDate: LocalDate)
 
-    fun showAddAdditionalLessonDialog()
+    fun showAddAdditionalLessonDialog(currentDate: LocalDate)
 
     fun showSuccessMessage()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
index 13471997..9470c910 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.timetable.additional.add
 import android.app.Dialog
 import android.os.Bundle
 import android.view.View
+import androidx.core.os.bundleOf
 import androidx.core.widget.doOnTextChanged
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.timepicker.MaterialTimePicker
@@ -26,10 +27,12 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
     lateinit var presenter: AdditionalLessonAddPresenter
 
     companion object {
-        fun newInstance() = AdditionalLessonAddDialog()
+        const val ARGUMENT_KEY = "additional_lesson_default_date"
+        fun newInstance(defaultDate: LocalDate) = AdditionalLessonAddDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to defaultDate.toEpochDay())
+        }
     }
 
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return MaterialAlertDialogBuilder(requireContext(), theme)
             .setView(
@@ -40,10 +43,13 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        arguments?.getLong(ARGUMENT_KEY)?.let(LocalDate::ofEpochDay)?.let {
+            presenter.onDateSelected(it)
+        }
         presenter.onAttachView(this)
     }
 
-    override fun initView() {
+    override fun initView(selectedDate: LocalDate) {
         with(binding) {
             additionalLessonDialogStartEdit.doOnTextChanged { _, _, _, _ ->
                 additionalLessonDialogStart.isErrorEnabled = false
@@ -53,6 +59,7 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
                 additionalLessonDialogEnd.isErrorEnabled = false
                 additionalLessonDialogEnd.error = null
             }
+            additionalLessonDialogDateEdit.setText(selectedDate.toFormattedString())
             additionalLessonDialogDateEdit.doOnTextChanged { _, _, _, _ ->
                 additionalLessonDialogDate.isErrorEnabled = false
                 additionalLessonDialogDate.error = null
@@ -61,7 +68,6 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
                 additionalLessonDialogContent.isErrorEnabled = false
                 additionalLessonDialogContent.error = null
             }
-
             additionalLessonDialogAdd.setOnClickListener {
                 presenter.onAddAdditionalClicked(
                     start = additionalLessonDialogStartEdit.text?.toString(),
@@ -155,7 +161,9 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
             .build()
 
         timePicker.addOnPositiveButtonClickListener {
-            onTimeSelected(LocalTime.of(timePicker.hour, timePicker.minute))
+            if (isAdded) {
+                onTimeSelected(LocalTime.of(timePicker.hour, timePicker.minute))
+            }
         }
 
         if (!parentFragmentManager.isStateSaved) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
index c207165d..db59a2ab 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddPresenter.kt
@@ -10,9 +10,12 @@ import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
 import io.github.wulkanowy.utils.toLocalDate
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.time.*
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
 import java.time.temporal.ChronoUnit
-import java.util.*
+import java.util.UUID
 import javax.inject.Inject
 
 class AdditionalLessonAddPresenter @Inject constructor(
@@ -30,7 +33,7 @@ class AdditionalLessonAddPresenter @Inject constructor(
 
     override fun onAttachView(view: AdditionalLessonAddView) {
         super.onAttachView(view)
-        view.initView()
+        view.initView(selectedDate)
         Timber.i("AdditionalLesson details view was initialized")
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
index 0df53815..8d9678e7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddView.kt
@@ -6,7 +6,7 @@ import java.time.LocalTime
 
 interface AdditionalLessonAddView : BaseView {
 
-    fun initView()
+    fun initView(selectedDate: LocalDate)
 
     fun closeDialog()
 
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 4cfc0322..e60d5488 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
@@ -46,11 +46,8 @@ class TimetableWidgetFactory(
 ) : RemoteViewsService.RemoteViewsFactory {
 
     private var items = emptyList<TimetableWidgetItem>()
-
     private var timetableCanceledColor: Int? = null
-
     private var textColor: Int? = null
-
     private var timetableChangeColor: Int? = null
 
     override fun getLoadingView() = null
@@ -81,7 +78,7 @@ class TimetableWidgetFactory(
                 val lessons = getLessons(student, semester, date)
                 val lastSync = timetableRepository.getLastRefreshTimestamp(semester, date, date)
 
-                createItems(lessons, lastSync)
+                createItems(lessons, lastSync, !(student.isEduOne ?: false))
             }
                 .onFailure {
                     items = listOf(TimetableWidgetItem.Error(it))
@@ -104,14 +101,22 @@ class TimetableWidgetFactory(
     private suspend fun getLessons(
         student: Student, semester: Semester, date: LocalDate
     ): List<Timetable> {
-        val timetable = timetableRepository.getTimetable(student, semester, date, date, false)
+        val timetable = timetableRepository.getTimetable(
+            student = student,
+            semester = semester,
+            start = date,
+            end = date,
+            forceRefresh = false,
+            isFromAppWidget = true
+        )
         val lessons = timetable.toFirstResult().dataOrThrow.lessons
-        return lessons.sortedBy { it.number }
+        return lessons.sortedBy { it.start }
     }
 
     private fun createItems(
         lessons: List<Timetable>,
         lastSync: Instant?,
+        isEduOne: Boolean
     ): List<TimetableWidgetItem> {
         var prevNum = when (prefRepository.showTimetableGaps) {
             BETWEEN_AND_BEFORE_LESSONS -> 0
@@ -127,7 +132,7 @@ class TimetableWidgetFactory(
                     )
                     add(emptyItem)
                 }
-                add(TimetableWidgetItem.Normal(it))
+                add(TimetableWidgetItem.Normal(it, isEduOne))
                 prevNum = it.number
             }
             add(TimetableWidgetItem.Synchronized(lastSync ?: Instant.MIN))
@@ -155,9 +160,11 @@ class TimetableWidgetFactory(
 
         val lessonStartTime = lesson.start.toFormattedString(TIME_FORMAT_STYLE)
         val lessonEndTime = lesson.end.toFormattedString(TIME_FORMAT_STYLE)
+        val lessonNumberVisibility = if (item.isLessonNumberVisible) VISIBLE else GONE
 
         val remoteViews = RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
             setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
+            setViewVisibility(R.id.timetableWidgetItemNumber, lessonNumberVisibility)
             setTextViewText(R.id.timetableWidgetItemTimeStart, lessonStartTime)
             setTextViewText(R.id.timetableWidgetItemTimeFinish, lessonEndTime)
             setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
index fb02f891..d4c2cfc0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
@@ -7,6 +7,7 @@ sealed class TimetableWidgetItem(val type: TimetableWidgetItemType) {
 
     data class Normal(
         val lesson: Timetable,
+        val isLessonNumberVisible: Boolean,
     ) : TimetableWidgetItem(TimetableWidgetItemType.NORMAL)
 
     data class Empty(
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppWidgetUpdater.kt b/app/src/main/java/io/github/wulkanowy/utils/AppWidgetUpdater.kt
new file mode 100644
index 00000000..1b54f40c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppWidgetUpdater.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.utils
+
+import android.appwidget.AppWidgetManager
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import timber.log.Timber
+import javax.inject.Inject
+import kotlin.reflect.KClass
+
+class AppWidgetUpdater @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val appWidgetManager: AppWidgetManager
+) {
+
+    fun updateAllAppWidgetsByProvider(providerClass: KClass<out BroadcastReceiver>) {
+        try {
+            val ids = appWidgetManager.getAppWidgetIds(ComponentName(context, providerClass.java))
+            if (ids.isEmpty()) return
+
+            val intent = Intent(context, providerClass.java)
+                .apply {
+                    action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
+                }
+
+            context.sendBroadcast(intent)
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to update all widgets for provider $providerClass")
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
index 397c9595..3cac0b48 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -10,19 +10,19 @@ import io.github.wulkanowy.sdk.scrapper.attendance.AttendanceCategory
  * (https://www.vulcan.edu.pl/vulcang_files/user/AABW/AABW-PDF/uonetplus/uonetplus_Frekwencja-liczby-obecnych-nieobecnych.pdf)
  */
 
-private inline val AttendanceSummary.allPresences: Double
-    get() = presence.toDouble() + absenceForSchoolReasons + lateness + latenessExcused
+inline val AttendanceSummary.allPresences: Int
+    get() = presence + absenceForSchoolReasons + lateness + latenessExcused
 
-private inline val AttendanceSummary.allAbsences: Double
-    get() = absence.toDouble() + absenceExcused
+inline val AttendanceSummary.allAbsences: Int
+    get() = absence + absenceExcused
 
 inline val Attendance.isExcusableOrNotExcused: Boolean
     get() = (excusable || ((absence || lateness) && !excused)) && excuseStatus == null
 
-fun AttendanceSummary.calculatePercentage() = calculatePercentage(allPresences, allAbsences)
+fun AttendanceSummary.calculatePercentage() = calculatePercentage(allPresences.toDouble(), allAbsences.toDouble())
 
 fun List<AttendanceSummary>.calculatePercentage(): Double {
-    return calculatePercentage(sumOf { it.allPresences }, sumOf { it.allAbsences })
+    return calculatePercentage(sumOf { it.allPresences.toDouble() }, sumOf { it.allAbsences.toDouble() })
 }
 
 private fun calculatePercentage(presence: Double, absence: Double): Double {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
index d3c9f800..b1742b4f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
@@ -4,30 +4,31 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.core.os.BundleCompat
 import java.io.Serializable
 
+// Even though API was introduced in 33, we use 34 as 33 is bugged in some scenarios.
+
 inline fun <reified T : Serializable> Bundle.serializable(key: String): T = when {
-    Build.VERSION.SDK_INT >= 33 -> getSerializable(key, T::class.java)!!
+    Build.VERSION.SDK_INT >= 34 -> getSerializable(key, T::class.java)!!
     else -> @Suppress("DEPRECATION") getSerializable(key) as T
 }
 
 inline fun <reified T : Serializable> Bundle.nullableSerializable(key: String): T? = when {
-    Build.VERSION.SDK_INT >= 33 -> getSerializable(key, T::class.java)
+    Build.VERSION.SDK_INT >= 34 -> getSerializable(key, T::class.java)
     else -> @Suppress("DEPRECATION") getSerializable(key) as T?
 }
 
 @Suppress("UNCHECKED_CAST")
-inline fun <reified T : Parcelable> Bundle.parcelableArray(key: String): Array<T>? = when {
-    Build.VERSION.SDK_INT >= 33 -> getParcelableArray(key, T::class.java)
-    else -> @Suppress("DEPRECATION") getParcelableArray(key) as Array<T>?
-}
+inline fun <reified T : Parcelable> Bundle.parcelableArray(key: String): Array<T>? =
+    BundleCompat.getParcelableArray(this, key, T::class.java) as Array<T>?
 
 inline fun <reified T : Serializable> Intent.serializable(key: String): T = when {
-    Build.VERSION.SDK_INT >= 33 -> getSerializableExtra(key, T::class.java)!!
+    Build.VERSION.SDK_INT >= 34 -> getSerializableExtra(key, T::class.java)!!
     else -> @Suppress("DEPRECATION") getSerializableExtra(key) as T
 }
 
 inline fun <reified T : Serializable> Intent.nullableSerializable(key: String): T? = when {
-    Build.VERSION.SDK_INT >= 33 -> getSerializableExtra(key, T::class.java)
+    Build.VERSION.SDK_INT >= 34 -> getSerializableExtra(key, T::class.java)
     else -> @Suppress("DEPRECATION") getSerializableExtra(key) as T?
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
index 18fc10bb..d541c0a7 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
@@ -3,11 +3,13 @@ package io.github.wulkanowy.utils
 import android.content.res.Resources
 import io.github.wulkanowy.R
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.AccountInactiveException
 import io.github.wulkanowy.sdk.scrapper.exception.CloudflareVerificationException
 import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.scrapper.exception.ScrapperException
 import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
 import io.github.wulkanowy.sdk.scrapper.exception.VulcanException
+import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.sdk.scrapper.login.NotLoggedInException
 import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
 import okhttp3.internal.http2.StreamResetException
@@ -33,6 +35,8 @@ fun Resources.getErrorString(error: Throwable): String = when (error) {
     is ServiceUnavailableException -> R.string.error_service_unavailable
     is FeatureDisabledException -> R.string.error_feature_disabled
     is FeatureNotAvailableException -> R.string.error_feature_not_available
+    is BadCredentialsException -> R.string.error_password_invalid
+    is AccountInactiveException -> R.string.error_account_inactive
     is VulcanException -> R.string.error_unknown_uonet
     is ScrapperException -> R.string.error_unknown_app
     is CloudflareVerificationException -> R.string.error_cloudflare_captcha
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
index 72129751..e43654b8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
@@ -23,7 +23,7 @@ fun getRefreshKey(name: String, semester: Semester): String {
 }
 
 fun getRefreshKey(name: String, student: Student): String {
-    return "${name}_${student.userLoginId}"
+    return "${name}_${student.studentId}"
 }
 
 fun getRefreshKey(name: String, mailbox: Mailbox?, folder: MessageFolder): String {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
deleted file mode 100644
index 9b6ca706..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Semester
-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
-    emptyCookieJarInterceptor = true
-
-    if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
-        mobileBaseUrl = student.mobileBaseUrl
-    } else {
-        scrapperBaseUrl = student.scrapperBaseUrl
-        domainSuffix = student.scrapperDomainSuffix
-        loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
-    }
-
-    mode = Sdk.Mode.valueOf(student.loginMode)
-    mobileBaseUrl = student.mobileBaseUrl
-    keyId = student.certificateKey
-    privatePem = student.privateKey
-
-    Timber.d("Sdk in ${student.loginMode} mode reinitialized")
-
-    return this
-}
-
-fun Sdk.switchSemester(semester: Semester): Sdk {
-    return switchDiary(
-        diaryId = semester.diaryId,
-        kindergartenDiaryId = semester.kindergartenDiaryId,
-        schoolYear = semester.schoolYear,
-        unitId = semester.unitId,
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index e3b8a3b4..6cfc4fa1 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -18,7 +18,7 @@ fun Semester.isCurrent(now: LocalDate = now()): Boolean {
 }
 
 fun List<Semester>.getCurrentOrLast(): Semester {
-    if (isEmpty()) throw RuntimeException("Empty semester list")
+    if (isEmpty()) throw IllegalStateException("Empty semester list")
 
     // when there is only one current semester
     singleOrNull { it.isCurrent() }?.let { return it }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SyncListAdapter.kt b/app/src/main/java/io/github/wulkanowy/utils/SyncListAdapter.kt
new file mode 100644
index 00000000..e9135f49
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SyncListAdapter.kt
@@ -0,0 +1,66 @@
+package io.github.wulkanowy.utils
+
+import android.annotation.SuppressLint
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Custom alternative to androidx.recyclerview.widget.ListAdapter. ListAdapter is asynchronous which
+ * caused data race problems in views when a Resource.Error arrived shortly after
+ * Resource.Intermediate/Success - occasionally in that case the user could see both the Resource's
+ * data and an error message one on top of the other. This is synchronized by design to avoid that
+ * problem, however it retains the quality of life improvements of the original.
+ */
+abstract class SyncListAdapter<T : Any, VH : RecyclerView.ViewHolder> private constructor(
+    private val updateStrategy: SyncListAdapter<T, VH>.(List<T>) -> Unit
+) : RecyclerView.Adapter<VH>() {
+
+    constructor(differ: DiffUtil.ItemCallback<T>) : this({ newItems ->
+        val diffResult = DiffUtil.calculateDiff(toCallback(differ, items, newItems))
+        items = newItems
+        diffResult.dispatchUpdatesTo(this)
+    })
+
+    var items = emptyList<T>()
+        private set
+
+    final override fun getItemCount() = items.size
+
+    fun getItem(position: Int): T {
+        return items[position]
+    }
+
+    /**
+     * Updates all items, same as submitList, however also disables animations temporarily.
+     * This prevents a flashing effect on some views. Should be used in favor of submitList when
+     * all data is changed (e.g. the selected day changes in timetable causing all lessons to change).
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    fun recreate(data: List<T>) {
+        items = data
+        notifyDataSetChanged()
+    }
+
+    fun submitList(data: List<T>) {
+        updateStrategy(data.toList())
+    }
+
+    private fun <T : Any> toCallback(
+        itemCallback: DiffUtil.ItemCallback<T>,
+        old: List<T>,
+        new: List<T>,
+    ) = object : DiffUtil.Callback() {
+        override fun getOldListSize() = old.size
+
+        override fun getNewListSize() = new.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.areItemsTheSame(old[oldItemPosition], new[newItemPosition])
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.areContentsTheSame(old[oldItemPosition], new[newItemPosition])
+
+        override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.getChangePayload(old[oldItemPosition], new[newItemPosition])
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/WebkitCookieManagerProxy.kt b/app/src/main/java/io/github/wulkanowy/utils/WebkitCookieManagerProxy.kt
index 3d41c711..4d2dde78 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/WebkitCookieManagerProxy.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/WebkitCookieManagerProxy.kt
@@ -5,17 +5,21 @@ import java.net.CookiePolicy
 import java.net.CookieStore
 import java.net.HttpCookie
 import java.net.URI
+import javax.inject.Inject
+import javax.inject.Singleton
 import android.webkit.CookieManager as WebkitCookieManager
 import java.net.CookieManager as JavaCookieManager
 
-class WebkitCookieManagerProxy : JavaCookieManager(null, CookiePolicy.ACCEPT_ALL) {
+@Singleton
+class WebkitCookieManagerProxy @Inject constructor() :
+    JavaCookieManager(null, CookiePolicy.ACCEPT_ALL) {
 
-    private val webkitCookieManager: WebkitCookieManager? = getWebkitCookieManager()
+    val webkitCookieManager: WebkitCookieManager? = getCookieManager()
 
     /**
      * @see [https://stackoverflow.com/a/70354583/6695449]
      */
-    private fun getWebkitCookieManager(): WebkitCookieManager? {
+    private fun getCookieManager(): WebkitCookieManager? {
         return try {
             WebkitCookieManager.getInstance()
         } catch (e: AndroidRuntimeException) {
diff --git a/app/src/main/play/listings/cs-CZ/full-description.txt b/app/src/main/play/listings/cs-CZ/full-description.txt
index 1420f5d6..3d142ebf 100644
--- a/app/src/main/play/listings/cs-CZ/full-description.txt
+++ b/app/src/main/play/listings/cs-CZ/full-description.txt
@@ -6,7 +6,7 @@ Zvýrazněné vlastnosti a funkce:
 - šťastné číslo,
 - náhled na další a dokončené lekce,
 - tmavý motiv,
-- žádné reklamy,
+- volitelné reklamy,
 - offline režim,
 - upozornění.
 
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 7da51da2..b0193b5d 100644
--- a/app/src/main/play/listings/pl-PL/full-description.txt
+++ b/app/src/main/play/listings/pl-PL/full-description.txt
@@ -6,7 +6,7 @@ Wyróżnione cechy i funkcje:
 - szczęśliwy numerek,
 - podgląd lekcji dodatkowych i zrealizowanych,
 - ciemny motyw.
-- brak reklam,
+- opcjonalne reklam,
 - tryb offline,
 - powiadomienia.
 
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg
index 0ed20c04..19b96d9a 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg
index f70e2c43..fe81aadc 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg
index 968fccdb..0e62c2e1 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg
index 3f49e774..980993af 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg
index f68daaf1..6ee7eeb9 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg
index ca5446a2..ec86cdb0 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg
index ca747aff..66c0db40 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg
index ce3af9bb..94788cd7 100644
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg differ
diff --git a/app/src/main/play/listings/sk/full-description.txt b/app/src/main/play/listings/sk/full-description.txt
index 2a4787d2..23682598 100644
--- a/app/src/main/play/listings/sk/full-description.txt
+++ b/app/src/main/play/listings/sk/full-description.txt
@@ -6,7 +6,7 @@ Zvýraznené vlastnosti a funkcie:
 - šťastné číslo,
 - náhľad na ďalšie a dokončené lekcie,
 - tmavý motív,
-- žiadne reklamy,
+- voliteľné reklamy,
 - offline režim,
 - upozornenia.
 
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 ef6308b6..889591fa 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,6 @@
-Wersja 2.4.2
+Wersja 2.6.8
 
-- naprawiliśmy crash przy przełączaniu uczniów, motywów i języków
-- naprawiliśmy crash przy dodawaniu dodatkowych lekcji
-- naprawiliśmy obsługę błędów widżetach
+— i znowu aktualizacja, żeby wiadomości działały chociaż w piątek. Później już pewnie nie będą
+— a i jeszcze naprawiliśmy dostęp mobilny, bo prosiliście
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable/ic_circle_notification.xml b/app/src/main/res/drawable/ic_circle_notification.xml
new file mode 100644
index 00000000..6059212c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circle_notification.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/colorPrimary" />
+
+    <size
+        android:width="10dp"
+        android:height="10dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_menu_attendance_calculator.xml b/app/src/main/res/drawable/ic_menu_attendance_calculator.xml
new file mode 100644
index 00000000..8a7d209a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_attendance_calculator.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,7H9C7.9,7 7,7.9 7,9v10c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V9C21,7.9 20.1,7 19,7zM19,9v2H9V9H19zM13,15v-2h2v2H13zM15,17v2h-2v-2H15zM11,15H9v-2h2V15zM17,13h2v2h-2V13zM9,17h2v2H9V17zM17,19v-2h2v2H17zM6,17H5c-1.1,0 -2,-0.9 -2,-2V5c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2v1h-2V5H5v10h1V17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_delete_forever.xml b/app/src/main/res/drawable/ic_menu_message_delete_forever.xml
new file mode 100644
index 00000000..a7b5ac53
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_delete_forever.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="M14.12,10.47L12,12.59l-2.13,-2.12 -1.41,1.41L10.59,14l-2.12,2.12 1.41,1.41L12,15.41l2.12,2.12 1.41,-1.41L13.41,14l2.12,-2.12zM15.5,4l-1,-1h-5l-1,1H5v2h14V4zM6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM8,9h8v10H8V9z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_restore.xml b/app/src/main/res/drawable/ic_menu_message_restore.xml
new file mode 100644
index 00000000..5c8544f2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_restore.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="M15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4zM6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8,14L8,9h8v10L8,19v-5zM10,18h4v-4h2l-4,-4 -4,4h2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_off.xml b/app/src/main/res/drawable/ic_notifications_off.xml
new file mode 100644
index 00000000..094ed75f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_off.xml
@@ -0,0 +1,5 @@
+<vector android:height="17dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="17dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d14de50a..a9284234 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/main_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/dialog_account_edit.xml b/app/src/main/res/layout/dialog_account_edit.xml
index 2ab4ccc6..ec5f93a6 100644
--- a/app/src/main/res/layout/dialog_account_edit.xml
+++ b/app/src/main/res/layout/dialog_account_edit.xml
@@ -85,7 +85,7 @@
             android:id="@+id/accountEditDetailsSave"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:layout_marginBottom="24dp"
@@ -93,6 +93,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_save"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -102,7 +103,7 @@
             android:id="@+id/accountEditDetailsCancel"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="24dp"
@@ -110,6 +111,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@android:string/cancel"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/accountEditDetailsSave"
diff --git a/app/src/main/res/layout/dialog_additional_add.xml b/app/src/main/res/layout/dialog_additional_add.xml
index 78967394..c042afd4 100644
--- a/app/src/main/res/layout/dialog_additional_add.xml
+++ b/app/src/main/res/layout/dialog_additional_add.xml
@@ -113,7 +113,7 @@
             android:id="@+id/additionalLessonDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="8dp"
@@ -122,6 +122,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/additionalLessonDialogAdd"
@@ -131,7 +132,7 @@
             android:id="@+id/additionalLessonDialogAdd"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="24dp"
@@ -139,6 +140,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_add"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index d832490a..b9c63539 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -150,7 +150,7 @@
             android:id="@+id/attendanceDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -158,6 +158,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_auth.xml b/app/src/main/res/layout/dialog_auth.xml
index e2e2aa30..a0b9d6ea 100644
--- a/app/src/main/res/layout/dialog_auth.xml
+++ b/app/src/main/res/layout/dialog_auth.xml
@@ -32,12 +32,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="8dp"
-                android:textSize="16sp"
+                android:textSize="14sp"
                 app:layout_constraintTop_toBottomOf="@id/auth_title"
-                app:lineHeight="24sp"
+                app:lineHeight="18sp"
                 tools:text="@string/auth_description" />
 
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/auth_input_layout"
                 style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
diff --git a/app/src/main/res/layout/dialog_captcha.xml b/app/src/main/res/layout/dialog_captcha.xml
index 539aa0cc..019d8932 100644
--- a/app/src/main/res/layout/dialog_captcha.xml
+++ b/app/src/main/res/layout/dialog_captcha.xml
@@ -7,15 +7,18 @@
     tools:context=".ui.modules.captcha.CaptchaDialog">
 
     <TextView
+        android:id="@+id/captcha_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="20dp"
         android:gravity="center_vertical"
+        android:paddingVertical="10dp"
         android:text="@string/captcha_dialog_title"
         app:layout_constraintBottom_toBottomOf="@id/captcha_close"
         app:layout_constraintEnd_toStartOf="@id/captcha_refresh"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/captcha_refresh"
@@ -41,11 +44,29 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/captcha_toolbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="captcha_title,captcha_close,captcha_refresh" />
+
     <WebView
         android:id="@+id/captcha_webview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/captcha_description"
+        app:layout_constraintDimensionRatio="1"
+        app:layout_constraintTop_toBottomOf="@id/captcha_toolbar" />
+
+    <TextView
+        android:id="@+id/captcha_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="10dp"
+        android:text="@string/captcha_dialog_description"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/captcha_close" />
+        app:layout_constraintTop_toBottomOf="@id/captcha_webview" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_conference.xml b/app/src/main/res/layout/dialog_conference.xml
index 72837b81..3d33fd56 100644
--- a/app/src/main/res/layout/dialog_conference.xml
+++ b/app/src/main/res/layout/dialog_conference.xml
@@ -181,7 +181,7 @@
             android:id="@+id/conferenceDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -189,6 +189,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 519d1531..e2f77e1f 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -220,7 +220,7 @@
             android:id="@+id/examDialogAddToCalendar"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="24dp"
             android:contentDescription="@string/all_add_to_calendar"
@@ -228,6 +228,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_add"
             app:icon="@drawable/ic_calendar_all"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -237,7 +238,7 @@
             android:id="@+id/examDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -245,6 +246,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index f47f6108..8606a5ce 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -212,7 +212,7 @@
                 android:id="@+id/gradeDialogClose"
                 style="@style/Widget.Material3.Button.TextButton.Dialog"
                 android:layout_width="wrap_content"
-                android:layout_height="36dp"
+                android:layout_height="wrap_content"
                 android:layout_below="@+id/gradeDialogColorValue"
                 android:layout_alignParentRight="true"
                 android:layout_marginTop="24dp"
@@ -222,6 +222,7 @@
                 android:insetTop="0dp"
                 android:insetRight="0dp"
                 android:insetBottom="0dp"
+                android:minHeight="36dp"
                 android:text="@string/all_close" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index 8c6cf0a7..10b71907 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -27,7 +27,7 @@
         android:id="@+id/homeworkDialogRead"
         style="@style/Widget.Material3.Button.TextButton.Dialog"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="24dp"
@@ -35,6 +35,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
+        android:minHeight="36dp"
         android:text="@string/homework_mark_as_done"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/homeworkDialogClose" />
@@ -43,13 +44,14 @@
         android:id="@+id/homeworkDialogClose"
         style="@style/Widget.Material3.Button.TextButton.Dialog"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         android:insetLeft="0dp"
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
+        android:minHeight="36dp"
         android:text="@string/all_close"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/dialog_homework_add.xml b/app/src/main/res/layout/dialog_homework_add.xml
index e0ff5b74..dc7ae32d 100644
--- a/app/src/main/res/layout/dialog_homework_add.xml
+++ b/app/src/main/res/layout/dialog_homework_add.xml
@@ -94,7 +94,7 @@
             android:id="@+id/homeworkDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="8dp"
@@ -103,6 +103,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/homeworkDialogAdd"
@@ -112,13 +113,14 @@
             android:id="@+id/homeworkDialogAdd"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_add"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 3a1d3fd0..fc32a252 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -212,7 +212,7 @@
             android:id="@+id/completedLessonDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -220,6 +220,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 9b81737f..c526ed74 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -18,10 +18,10 @@
             android:layout_marginTop="24dp"
             android:adjustViewBounds="true"
             android:contentDescription="@string/mobile_device_qr"
-            tools:src="@tools:sample/avatars"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@tools:sample/avatars" />
 
         <TextView
             android:id="@+id/mobileDeviceDialogTokenTitle"
@@ -66,6 +66,7 @@
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogTokenValue" />
+
         <TextView
             android:id="@+id/mobileDeviceDialogSymbolValue"
             android:layout_width="wrap_content"
@@ -113,7 +114,7 @@
             android:id="@+id/mobileDeviceDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:layout_marginBottom="24dp"
@@ -121,6 +122,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -131,19 +133,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="invisible"
-            tools:visibility="visible"
-            app:constraint_referenced_ids="mobileDeviceQr,mobileDeviceDialogTokenTitle,mobileDeviceDialogTokenValue,mobileDeviceDialogSymbolTitle,mobileDeviceDialogSymbolValue,mobileDeviceDialogPinTitle,mobileDeviceDialogPinValue,mobileDeviceDialogClose" />
+            app:constraint_referenced_ids="mobileDeviceQr,mobileDeviceDialogTokenTitle,mobileDeviceDialogTokenValue,mobileDeviceDialogSymbolTitle,mobileDeviceDialogSymbolValue,mobileDeviceDialogPinTitle,mobileDeviceDialogPinValue,mobileDeviceDialogClose"
+            tools:visibility="visible" />
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/mobileDeviceDialogProgress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:indeterminate="true"
-            tools:visibility="invisible"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            tools:visibility="invisible" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </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 9c8b18b3..3b88ea5f 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -180,7 +180,7 @@
             android:id="@+id/noteDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -188,6 +188,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_school_announcement.xml b/app/src/main/res/layout/dialog_school_announcement.xml
index 4e0ef556..a771b772 100644
--- a/app/src/main/res/layout/dialog_school_announcement.xml
+++ b/app/src/main/res/layout/dialog_school_announcement.xml
@@ -122,7 +122,7 @@
             android:id="@+id/announcementDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -130,6 +130,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index aeb01b3b..de269648 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -263,7 +263,7 @@
             android:id="@+id/timetableDialogClose"
             style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="24dp"
@@ -271,6 +271,7 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:minHeight="36dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_attendance_calculator.xml b/app/src/main/res/layout/fragment_attendance_calculator.xml
new file mode 100644
index 00000000..346c6aec
--- /dev/null
+++ b/app/src/main/res/layout/fragment_attendance_calculator.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"
+    tools:context=".ui.modules.attendance.calculator.AttendanceCalculatorFragment">
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/attendanceCalculatorSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/attendanceCalculatorRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_attendance_calculator_header" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/attendanceCalculatorProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        tools:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/attendanceCalculatorEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_attendance"
+            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/attendance_no_items"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/attendanceCalculatorError"
+        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/attendanceCalculatorErrorMessage"
+            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/attendanceCalculatorErrorDetails"
+                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/attendanceCalculatorErrorRetry"
+                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_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index 04c80885..6b603c9f 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -11,6 +11,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <include
+            android:id="@+id/login_student_select_admin_message"
+            layout="@layout/item_dashboard_admin_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/loginStudentSelectHeader"
             android:layout_width="match_parent"
@@ -28,7 +40,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/login_student_select_admin_message"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 37f4c731..612e8c21 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -95,6 +95,18 @@
                     android:background="?android:attr/listDivider" />
             </LinearLayout>
 
+            <include
+                android:id="@+id/login_symbol_admin_message"
+                layout="@layout/item_dashboard_admin_message"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="16dp"
+                android:visibility="gone"
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
+                app:layout_constraintVertical_chainStyle="packed"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/loginSymbolHeader"
                 android:layout_width="match_parent"
@@ -111,7 +123,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
+                app:layout_constraintTop_toBottomOf="@+id/login_symbol_admin_message"
                 app:layout_constraintVertical_chainStyle="packed" />
 
             <TextView
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index f2ba9a8c..1765d9d1 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -45,19 +45,43 @@
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/gradeHeaderAverageAllYear"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="@id/gradeHeaderSubject"
             app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
             tools:text="Average: 6,00" />
 
+        <TextView
+            android:id="@+id/gradeHeaderAverageAllYear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toStartOf="@id/gradeHeaderPointsSum"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
+            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
+            tools:text="Roczna: 5,00"
+            tools:visibility="gone" />
+
         <TextView
             android:id="@+id/gradeHeaderPointsSum"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
-            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toStartOf="@id/gradeHeaderNumber"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverageAllYear"
             app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
             tools:text="Points: 123/200 (61,5%)" />
 
@@ -67,8 +91,13 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
+            android:layout_marginEnd="8dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/gradeHeaderPointsSum"
             app:layout_constraintTop_toBottomOf="@id/gradeHeaderSubject"
             tools:text="12 grades" />
@@ -85,6 +114,9 @@
             android:paddingRight="5dp"
             android:textColor="?colorOnPrimary"
             android:textSize="14sp"
+            app:autoSizeMaxTextSize="16dp"
+            app:autoSizeMinTextSize="10dp"
+            app:autoSizeTextType="uniform"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_attendance_calculator_header.xml b/app/src/main/res/layout/item_attendance_calculator_header.xml
new file mode 100644
index 00000000..debc7997
--- /dev/null
+++ b/app/src/main/res/layout/item_attendance_calculator_header.xml
@@ -0,0 +1,111 @@
+<?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="wrap_content"
+    android:paddingStart="8dp"
+    android:paddingTop="6dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="6dp">
+
+    <TextView
+        android:id="@+id/attendanceCalculatorPercentage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="right|center_vertical"
+        android:minWidth="32dp"
+        android:minHeight="36dp"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="50" />
+
+    <TextView
+        android:id="@+id/attendanceCalculatorPercentagePercentSign"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="%"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBaseline_toBaselineOf="@+id/attendanceCalculatorPercentage"
+        app:layout_constraintStart_toEndOf="@+id/attendanceCalculatorPercentage" />
+
+    <TextView
+        android:id="@+id/attendanceCalculatorSummaryValues"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceCalculatorSummaryDot"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="@+id/attendanceCalculatorTitle"
+        app:layout_constraintTop_toBottomOf="@+id/attendanceCalculatorTitle"
+        tools:text="11/123 obecności" />
+
+    <TextView
+        android:id="@+id/attendanceCalculatorSummaryDot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="4dp"
+        android:gravity="center"
+        android:text="·"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceCalculatorSummaryBalance"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/attendanceCalculatorSummaryValues"
+        app:layout_constraintTop_toBottomOf="@+id/attendanceCalculatorTitle" />
+
+    <TextView
+        android:id="@+id/attendanceCalculatorSummaryBalance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:maxLines="1"
+        android:minWidth="24dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceCalculatorWarning"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@+id/attendanceCalculatorSummaryDot"
+        app:layout_constraintTop_toBottomOf="@+id/attendanceCalculatorTitle"
+        tools:text="12 powyżej celu" />
+
+    <TextView
+        android:id="@+id/attendanceCalculatorTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceCalculatorWarning"
+        app:layout_constraintStart_toEndOf="@+id/attendanceCalculatorPercentagePercentSign"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Informatyka" />
+
+    <ImageView
+        android:id="@+id/attendanceCalculatorWarning"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription=""
+        android:layout_marginStart="12dp"
+        android:gravity="center_vertical|right"
+        android:minWidth="24dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_all_round_mark"
+        app:tint="?colorPrimary"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index 2c8c4ea3..f425bad8 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -20,20 +20,80 @@
             android:id="@+id/gradeSummaryItemTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="@tools:sample/lorem" />
 
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/gradeSummaryItemAverageContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_average_semester"
+            android:textSize="14sp" />
+
         <TextView
             android:id="@+id/gradeSummaryItemAverage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="25dp"
             android:gravity="end"
             android:textSize="12sp"
-            tools:text="4.74" />
+            tools:text="2,50" />
     </LinearLayout>
 
+    <View
+        android:id="@+id/gradeSummaryItemAverageDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@drawable/ic_all_divider" />
+
+    <LinearLayout
+        android:id="@+id/gradeSummaryItemAverageAllYearContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_average_year"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemAverageAllYear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="25dp"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="4,50" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/gradeSummaryItemAverageAllYearDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@drawable/ic_all_divider" />
+
     <LinearLayout
         android:id="@+id/gradeSummaryItemPointsContainer"
         android:layout_width="match_parent"
@@ -63,9 +123,9 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/gradeSummaryItemPointsDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/gradeSummaryItemPointsDivider"
         android:background="@drawable/ic_all_divider" />
 
     <LinearLayout
@@ -97,8 +157,8 @@
     </LinearLayout>
 
     <View
-        android:layout_width="match_parent"
         android:id="@+id/gradeSummaryItemPredictedDivider"
+        android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@drawable/ic_all_divider" />
 
@@ -131,9 +191,9 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/gradeSummaryItemFinalDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:id="@+id/gradeSummaryItemFinalDivider"
         android:background="@drawable/ic_all_divider" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 39fbaad0..1346c3f0 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -81,9 +81,9 @@
 
     <ImageView
         android:id="@+id/messageItemUnreadIndicator"
-        android:layout_width="10dp"
-        android:layout_height="10dp"
-        android:src="@drawable/ic_circle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_circle_notification"
         app:layout_constraintBottom_toBottomOf="@id/messageItemDate"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/messageItemDate"
diff --git a/app/src/main/res/layout/item_school_announcement.xml b/app/src/main/res/layout/item_school_announcement.xml
index bb0cffd1..1197c66c 100644
--- a/app/src/main/res/layout/item_school_announcement.xml
+++ b/app/src/main/res/layout/item_school_announcement.xml
@@ -11,27 +11,41 @@
         android:id="@+id/schoolAnnouncementItemDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
+        android:layout_marginHorizontal="15dp"
         android:layout_marginTop="10dp"
-        android:layout_marginEnd="10dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/schoolAnnouncementItemAuthor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/ddmmyy" />
 
+    <TextView
+        android:id="@+id/schoolAnnouncementItemAuthor"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
+        android:gravity="end"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
+
     <TextView
         android:id="@+id/schoolAnnouncementItemType"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginVertical="5dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="@id/schoolAnnouncementItemDate"
-        app:layout_constraintStart_toStartOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/schoolAnnouncementItemDate"
         app:layout_goneMarginEnd="0dp"
         tools:text="@tools:sample/lorem" />
@@ -40,6 +54,7 @@
         android:id="@+id/schoolAnnouncementItemContent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="15dp"
         android:ellipsize="end"
@@ -47,8 +62,8 @@
         android:maxLines="2"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/schoolAnnouncementItemType"
-        app:layout_constraintStart_toStartOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/schoolAnnouncementItemType"
         tools:text="@tools:sample/lorem/random" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index 57af6f7e..d1310522 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,7 +1,6 @@
 <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/relativeLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
@@ -15,15 +14,17 @@
         android:id="@+id/timetableItemNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="40dp"
-        android:minHeight="40dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:textColor="?android:textColorPrimary"
         android:textSize="32sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
         tools:text="5" />
 
     <TextView
@@ -38,7 +39,7 @@
         android:textSize="15sp"
         app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
         app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeStart"
         tools:text="@tools:sample/lorem" />
 
     <TextView
@@ -49,8 +50,11 @@
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
+        app:layout_constraintBottom_toTopOf="@id/timetableItemTimeFinish"
         app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
-        app:layout_constraintTop_toTopOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="11:11" />
 
     <TextView
@@ -58,11 +62,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toBottomOf="@id/timetableItemTimeStart"
         tools:text="12:00" />
 
     <TextView
@@ -70,11 +76,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginEnd="0dp"
+        android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintEnd_toStartOf="@id/timetableItemGroup"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
         tools:text="22"
         tools:visibility="visible" />
 
@@ -83,13 +94,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="5dp"
+        android:layout_marginEnd="0dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
         app:layout_constraintEnd_toStartOf="@+id/timetableItemTeacher"
         app:layout_constraintStart_toEndOf="@+id/timetableItemRoom"
-        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
         tools:text="(2/2)"
         tools:visibility="visible" />
 
@@ -98,13 +110,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/timetableItemGroup"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
         tools:text="Agata Kowalska - Błaszczyk"
         tools:visibility="visible" />
 
@@ -118,8 +132,8 @@
         android:textColor="?colorTimetableChange"
         android:textSize="13sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTeacher"
-        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
+        app:layout_constraintStart_toEndOf="@id/timetableItemTimeFinish"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
         tools:visibility="gone" />
 
@@ -168,7 +182,7 @@
         android:visibility="gone"
         app:backgroundTint="?colorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeStart"
         tools:text="jeszcze 15 min"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_timetable_main_additional.xml b/app/src/main/res/layout/item_timetable_main_additional.xml
new file mode 100644
index 00000000..b3aa55d4
--- /dev/null
+++ b/app/src/main/res/layout/item_timetable_main_additional.xml
@@ -0,0 +1,153 @@
+<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="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="8dp"
+    android:paddingTop="6dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="6dp"
+    tools:context=".ui.modules.timetable.TimetableAdapter">
+
+    <TextView
+        android:id="@+id/timetableItemNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLength="2"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="32sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0" />
+
+    <TextView
+        android:id="@+id/timetableItemSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeStart"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeStart"
+        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_toTopOf="@id/timetableItemTimeFinish"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="11:11" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeFinish"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toBottomOf="@id/timetableItemTimeStart"
+        tools:text="12:00" />
+
+    <TextView
+        android:id="@+id/timetableItemTeacher"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
+        android:text="@string/timetable_additional_lesson"
+        tools:visibility="visible" />
+
+    <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/timetableItemTimeFinish"
+        app:layout_constraintTop_toTopOf="@id/timetableItemTimeFinish"
+        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
+        tools:visibility="gone" />
+
+    <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_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="@id/timetableItemTimeStart"
+        tools:text="jeszcze 15 min"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/pref_target_attendance.xml b/app/src/main/res/layout/pref_target_attendance.xml
new file mode 100644
index 00000000..558b0d36
--- /dev/null
+++ b/app/src/main/res/layout/pref_target_attendance.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Taken from https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-camerax-release/preference/preference/res/layout/preference_widget_seekbar_material.xml.
+
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ 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
+  ~
+  ~      http://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.
+  -->
+<!-- Layout used by SeekBarPreference for the seekbar widget style. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:gravity="center_vertical"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:baselineAligned="false">
+    <include layout="@layout/image_frame"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:ellipsize="marquee"/>
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:layout_gravity="start"
+                android:textAlignment="viewStart"
+                android:textColor="?android:attr/textColorSecondary"
+                android:maxLines="4"
+                style="@style/PreferenceSummaryTextStyle"/>
+        </RelativeLayout>
+        <!-- Using UnPressableLinearLayout as a workaround to disable the pressed state propagation
+        to the children of this container layout. Otherwise, the animated pressed state will also
+        play for the thumb in the AbsSeekBar in addition to the preference's ripple background.
+        The background of the SeekBar is also set to null to disable the ripple background -->
+        <androidx.preference.UnPressableLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:paddingLeft="0dp"
+            android:paddingStart="0dp"
+            android:paddingRight="16dp"
+            android:paddingEnd="16dp"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+            <!-- The total height of the Seekbar widget's area should be 48dp - this allows for an
+            increased touch area so you do not need to exactly tap the thumb to move it. However,
+            setting the Seekbar height directly causes the thumb and seekbar to be misaligned on
+            API 22 and 23 - so instead we just set 15dp padding above and below, to account for the
+            18dp default height of the Seekbar thumb for a total of 48dp.
+            Note: we set 0dp padding at the start and end of this seekbar to allow it to properly
+            fit into the layout, but this means that there's no leeway on either side for touch
+            input - this might be something we should reconsider down the line. -->
+            <SeekBar
+                android:id="@+id/seekbar"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/preference_seekbar_padding_horizontal"
+                android:paddingStart="@dimen/preference_seekbar_padding_horizontal"
+                android:paddingRight="@dimen/preference_seekbar_padding_horizontal"
+                android:paddingEnd="@dimen/preference_seekbar_padding_horizontal"
+                android:paddingTop="@dimen/preference_seekbar_padding_vertical"
+                android:paddingBottom="@dimen/preference_seekbar_padding_vertical"
+
+                android:background="@null"/>
+            <!-- If the value is shown, we reserve a minimum width of 36dp to allow for consistent
+            seekbar width for smaller values. If the value is ~4 or more digits, it will expand
+            into the seekbar width. -->
+            <TextView
+                android:id="@+id/seekbar_value"
+                android:minWidth="@dimen/preference_seekbar_value_minWidth"
+                android:paddingLeft="8dp"
+                android:paddingStart="8dp"
+                android:paddingRight="0dp"
+                android:paddingEnd="0dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:scrollbars="none"/>
+            <!-- Wulkanowy start -->
+            <TextView
+                android:minWidth="0dp"
+                android:paddingLeft="0dp"
+                android:paddingStart="0dp"
+                android:paddingRight="0dp"
+                android:paddingEnd="0dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:scrollbars="none"
+                android:text="%"
+                />
+            <!-- Wulkanowy end -->
+        </androidx.preference.UnPressableLinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
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 049219a9..e1b89887 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -10,10 +10,11 @@
     tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
 
     <LinearLayout
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="15dp"
+        android:layout_weight="1"
         android:orientation="vertical">
 
         <TextView
@@ -21,9 +22,9 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:minLines="2"
-            android:textStyle="bold"
             android:text="@string/grade_summary_calculated_average"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -61,9 +62,64 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
+        android:id="@+id/gradeSummaryScrollableHeaderCalculatedAnnualContainer"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="20dp"
+        android:layout_marginEnd="15dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minLines="2"
+            android:text="@string/grade_summary_calculated_average_annual"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/gradeSummaryScrollableHeaderCalculatedAnnual"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="21sp"
+                tools:text="6,00" />
+
+            <ImageButton
+                android:id="@+id/gradeSummaryCalculatedAverageHelpAnnual"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="8dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@+string/grade_summary_calculated_average_help_dialog_title"
+                app:srcCompat="@drawable/ic_help"
+                app:tint="?colorOnBackground" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/gradeSummaryScrollableHeaderCalculatedSubjectCountAnnual"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_horizontal"
+            android:textSize="13sp"
+            tools:text="from 8 subjects" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
         android:orientation="vertical">
 
         <TextView
@@ -71,9 +127,9 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:minLines="2"
-            android:textStyle="bold"
             android:text="@string/grade_summary_final_average"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -103,8 +159,8 @@
         <TextView
             android:id="@+id/gradeSummaryScrollableHeaderFinalSubjectCount"
             android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
             android:gravity="center_horizontal"
             android:textSize="13sp"
             tools:text="from 5 subjects" />
diff --git a/app/src/main/res/layout/subitem_dashboard_small_grade.xml b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
index 6800b72e..5d48313a 100644
--- a/app/src/main/res/layout/subitem_dashboard_small_grade.xml
+++ b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView 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/dashboard_small_grade_subitem_value"
     android:layout_width="wrap_content"
@@ -10,7 +11,11 @@
     android:gravity="center"
     android:maxLength="5"
     android:minWidth="20dp"
+    android:padding="1dp"
     android:textColor="@android:color/white"
     android:textSize="12sp"
     android:textStyle="bold"
+    app:autoSizeMaxTextSize="14dp"
+    app:autoSizeMinTextSize="10dp"
+    app:autoSizeTextType="uniform"
     tools:text="6" />
diff --git a/app/src/main/res/menu/action_menu_attendance.xml b/app/src/main/res/menu/action_menu_attendance.xml
index bb20c8ec..5c59d239 100644
--- a/app/src/main/res/menu/action_menu_attendance.xml
+++ b/app/src/main/res/menu/action_menu_attendance.xml
@@ -1,6 +1,13 @@
 <?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/attendanceMenuCalculator"
+        android:icon="@drawable/ic_menu_attendance_calculator"
+        android:orderInCategory="0"
+        android:title="@string/attendance_calculator_button"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/attendanceMenuSummary"
         android:icon="@drawable/ic_menu_attendance_summary"
diff --git a/app/src/main/res/menu/action_menu_attendance_calculator.xml b/app/src/main/res/menu/action_menu_attendance_calculator.xml
new file mode 100644
index 00000000..c5090690
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_attendance_calculator.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/attendance_calculator_menu_settings"
+        android:icon="@drawable/ic_more_settings"
+        android:orderInCategory="2"
+        android:title="@string/pref_attendance_calculator_appearance_settings_title"
+        app:iconTint="?colorControlNormal"
+        app:showAsAction="ifRoom" />
+</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 57cf05dd..04af8671 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -29,6 +29,13 @@
         android:title="@string/message_forward"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuRestore"
+        android:icon="@drawable/ic_menu_message_restore"
+        android:orderInCategory="1"
+        android:title="@string/message_restore_from_trash"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuDelete"
         android:icon="@drawable/ic_menu_message_delete"
@@ -36,4 +43,18 @@
         android:title="@string/message_move_to_trash"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuDeleteForever"
+        android:icon="@drawable/ic_menu_message_delete_forever"
+        android:orderInCategory="1"
+        android:title="@string/message_delete_forever"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuMute"
+        android:icon="@drawable/ic_settings_notifications"
+        android:orderInCategory="1"
+        android:title="@string/message_mute"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/context_menu_message_tab.xml b/app/src/main/res/menu/context_menu_message_tab.xml
index 36d4a8ba..013616c5 100644
--- a/app/src/main/res/menu/context_menu_message_tab.xml
+++ b/app/src/main/res/menu/context_menu_message_tab.xml
@@ -1,6 +1,13 @@
 <?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/messageTabContextMenuRestore"
+        android:icon="@drawable/ic_menu_message_restore"
+        android:orderInCategory="1"
+        android:title="@string/message_restore_from_trash"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="always" />
     <item
         android:id="@+id/messageTabContextMenuDelete"
         android:icon="@drawable/ic_menu_message_delete"
@@ -8,6 +15,13 @@
         android:title="@string/message_move_to_trash"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/messageTabContextMenuDeleteForever"
+        android:icon="@drawable/ic_menu_message_delete_forever"
+        android:orderInCategory="1"
+        android:title="@string/message_delete_forever"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="always" />
     <item
         android:id="@+id/messageTabContextMenuSelectAll"
         android:icon="@drawable/ic_message_select_all"
diff --git a/app/src/main/res/values-cs/mod_values.xml b/app/src/main/res/values-cs/mod_values.xml
new file mode 100644
index 00000000..937db4f5
--- /dev/null
+++ b/app/src/main/res/values-cs/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Skrytá nastavení</string>
+    <string name="pref_hidden_settings_attendance_percentage">Procento docházky</string>
+    <string name="pref_hidden_settings_hidden_grades">Skrýt známky</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Skryté položky docházky</string>
+    <string name="pref_mod_settings_show_notes">Poznámky k pořadu</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Neomluvená absence</item>
+        <item>Výjimka</item>
+        <item>Ospravedlněné zpoždění</item>
+        <item>Neomluvené zpoždění</item>
+        <item>Přítomnost</item>
+        <item>Smazáno</item>
+        <item>Ospravedlněná absence</item>
+        <item>Neznámá</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Režim pro vývojáře (přístup na tuto stránku)</string>
+    <string name="pref_mod_settings_developer_mode_summary">Po deaktivaci tohoto nastavení již nebudete mít přístup na tuto stránku, ale nastavení se bude nadále používat.</string>
+</resources>
diff --git a/app/src/main/res/values-cs/preferences_defaults.xml b/app/src/main/res/values-cs/preferences_defaults.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-cs/preferences_defaults.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 1590c47a..c9b2258f 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">Abecedně</string>
+    <string name="sort_by_date">Podle data</string>
+    <string name="sort_by_average">Podle průměru</string>
+    <string name="sort_by_attendance_percentage">Podle procenta docházky</string>
+    <string name="sort_by_subject_attendance_balance">Podle rovnováhy docházky předmětu</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Světlý</item>
         <item>Tmavý</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Abecedně</item>
-        <item>Podle data</item>
-        <item>Podle průměru</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,10 +56,15 @@
         <item>Pouze mezi lekcemi</item>
         <item>Před a mezi lekcemi</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Nezobrazovat</item>
+        <item>Zobrazit v řadě</item>
+        <item>Zobrazit pod pravidelnými hodinami</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
         <item>Nepřečtené zprávy</item>
-        <item>Frekvence</item>
+        <item>Docházka</item>
         <item>Lekce</item>
         <item>Známky</item>
         <item>Domácí úkoly</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e1cafa6e..3aa2b815 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -4,7 +4,7 @@
     <string name="login_title">Přihlášení</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Známky</string>
-    <string name="attendance_title">Frekvence</string>
+    <string name="attendance_title">Docházka</string>
     <string name="exam_title">Zkoušky</string>
     <string name="timetable_title">Plán lekce</string>
     <string name="settings_title">Nastavení</string>
@@ -31,7 +31,7 @@
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
-    <string name="login_header_default">Přihlaste se pomocí studentského nebo rodičovského účtu</string>
+    <string name="login_header_default">Přihlaste se pomocí žákovského nebo rodičovského účtu</string>
     <string name="login_header_symbol">Zadejte symbol ze stránky deníku: &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_nickname_hint">Uživatelské jméno</string>
     <string name="login_email_hint">Email</string>
@@ -56,7 +56,7 @@
     <string name="login_invalid_email">Neplatný e-mail</string>
     <string name="login_invalid_login">Místo e-mailu použijte přiřazené přihlašovací údaje</string>
     <string name="login_invalid_custom_email">Použijte přiřazené přihlašovací nebo e-mail v @%1$s</string>
-    <string name="login_invalid_domain_suffix">Invalid domain suffix</string>
+    <string name="login_invalid_domain_suffix">Neplatná přípona domény</string>
     <string name="login_invalid_symbol">Neplatný symbol. Pokud jej nemůžete najít, kontaktujte školu</string>
     <string name="login_invalid_symbol_definitely">Nevymýšlejte si! Pokud symbol nemůžete najít, kontaktujte školu</string>
     <string name="login_incorrect_symbol">Žák nebyl nalezen. Zkontrolujte správnost symbolu a vybrané varianty deníku UONET+</string>
@@ -64,7 +64,7 @@
     <string name="login_symbol_helper">Symbol najdete na stránce deníku v &#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUjistěte se, že jste nastavili správnou variantu deníku v poli <b>Variace deníku UONET+</b> na první přihlašovací obrazovce</string>
     <string name="login_select_student">Vyberte žáky, kteří se mají do aplikace přihlásit</string>
     <string name="login_advanced">Jiné možnosti</string>
-    <string name="login_advanced_warning_mobile_api">V tomto režimu nefungují následující: šťastné číslo, statistiky třídy, shrnutí frekvencí, ospravedlnění nepřítomnosti, dokončené lekce, informace o škole a prohlížení seznamu registrovaných zařízení</string>
+    <string name="login_advanced_warning_mobile_api">V tomto režimu nefungují následující: šťastné číslo, statistiky třídy, shrnutí docházky, ospravedlnění nepřítomnosti, dokončené lekce, informace o škole a prohlížení seznamu registrovaných zařízení</string>
     <string name="login_advanced_warning_scraper">Tento režim zobrazuje stejná data, která se zobrazují na webových stránkách deníka</string>
     <string name="login_advanced_warning_hybrid">Kombinace nejlepších vlastností ostatních dvou režimů. Funguje rychleji než scraper a poskytuje funkce, které nejsou k dispozici v režimu Mobile API. Je to v experimentální fázi</string>
     <string name="login_privacy_policy">Ochrana osobních údajů</string>
@@ -98,8 +98,8 @@
     <string name="main_log_in">Přihlásit se</string>
     <string name="main_session_expired">Relace vypršela</string>
     <string name="main_session_relogin">Relace vypršela. Přihlaste se prosím znovu</string>
-    <string name="main_expired_credentials_description">Heslo k vašemu účtu bylo změněno. Musíte se znovu přihlásit do Wulkanového</string>
-    <string name="main_expired_credentials_title">Heslo bylo změněno</string>
+    <string name="main_expired_credentials_title">Heslo vypršelo nebo bylo změněno</string>
+    <string name="main_expired_credentials_description">Platnost hesla k vašemu účtu vypršela nebo bylo změněno. Budete se muset znovu přihlásit do Wulkanového</string>
     <string name="main_support_title">Podpora aplikace</string>
     <string name="main_support_description">Líbí se Vám tato aplikace? Podpořte její vývoj tím, že povolíte neinvazivní reklamy, které můžete kdykoliv vypnout</string>
     <string name="main_support_positive">Zapnout reklamy</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Komentář</string>
     <string name="grade_number_new_items">Počet nových známek: %1$d</string>
     <string name="grade_average">Průměr: %1$.2f</string>
+    <string name="grade_average_year">Roční: %1$.2f</string>
     <string name="grade_points_sum">Body: %s</string>
     <string name="grade_no_average">Bez průměru</string>
+    <string name="grade_summary_average_semester">Pololetní průměr</string>
+    <string name="grade_summary_average_year">Roční průměr</string>
     <string name="grade_summary_points">Součet bodů</string>
     <string name="grade_summary_final_grade">Konečná známka</string>
     <string name="grade_summary_predicted_grade">Předpokládaná známka</string>
     <string name="grade_summary_descriptive">Popisná známka</string>
-    <string name="grade_summary_calculated_average">Vypočítaný průměr</string>
+    <string name="grade_summary_calculated_average">Vypočítaný pololetní průměr</string>
+    <string name="grade_summary_calculated_average_annual">Vypočítaný roční průměr</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Jak funguje vypočítaný průměr?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný průměr je aritmetický průměr vypočítaný z průměrů předmětů. Umožňuje vám to znát přibližný konečný průměr. Vypočítává se způsobem zvoleným uživatelem v nastavení aplikaci. Doporučuje se vybrat příslušnou možnost. Důvodem je rozdílný výpočet školních průměrů. Pokud vaše škola navíc uvádí průměr předmětů na stránce deníku Vulcan, aplikace si je stáhne a tyto průměry nepočítá. To lze změnit vynucením výpočtu průměru v nastavení aplikaci.\n\n<b>Průměr známek pouze z vybraného semestru</b>:\n1. Výpočet váženého průměru pro každý předmět v daném semestru\n2. Sčítání vypočítaných průměrů\n3. Výpočet aritmetického průměru součtených průměrů\n\n<b>Průměr průměrů z obou semestrů</b>:\n1. Výpočet váženého průměru pro každý předmět v semestru 1 a 2\n2. Výpočet aritmetického průměru vypočítaných průměrů za semestry 1 a 2 pro každý předmět.\n3. Sčítání vypočítaných průměrů\n4. Výpočet aritmetického průměru sečtených průměrů\n\n<b>Průměr známek z celého roku:</b>\n1. Výpočet váženého průměru za rok pro každý předmět. Konečný průměr v 1. semestru je nepodstatný.\n2. Sčítání vypočítaných průměrů\n3. Výpočet aritmetického průměru součtených průměrů</string>
     <string name="grade_summary_final_average_help_dialog_title">Jak funguje konečný průměr?</string>
@@ -194,6 +198,7 @@
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lekce</string>
+    <string name="timetable_additional_lesson">Další lekce</string>
     <string name="timetable_room">Učebna</string>
     <string name="timetable_group">Skupina</string>
     <string name="timetable_time">Hodiny</string>
@@ -264,7 +269,13 @@
     <string name="additional_lessons_end">Čas ukončení</string>
     <string name="additional_lessons_end_time_error">Čas ukončení musí být pozdější než čas zahájení</string>
     <!--Attendance-->
-    <string name="attendance_summary_button">Shrnutí frekvencí</string>
+    <string name="attendance_summary_button">Shrnutí docházky</string>
+    <string name="attendance_calculator_button">Kalkulačka docházky</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> nad cílem</string>
+    <string name="attendance_calculator_summary_balance_neutral">přesně v cíli</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> pod cílem</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d přítomnosti</string>
+    <string name="attendance_calculator_summary_values_empty">Nebyla zaznamenána žádná docházka</string>
     <string name="attendance_absence_school">Nepřítomnost ze školních důvodů</string>
     <string name="attendance_absence_excused">Omluvená nepřítomnost</string>
     <string name="attendance_absence_unexcused">Neomluvená nepřítomnost</string>
@@ -282,22 +293,22 @@
     <string name="attendance_excuse_no_selection">Musíte vybrat alespoň jednu nepřítomnost!</string>
     <string name="attendance_excuse_title">Ospravedlnit</string>
     <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">Nové frekvence</item>
-        <item quantity="few">Nové frekvence</item>
-        <item quantity="many">Nové frekvence</item>
-        <item quantity="other">Nové frekvence</item>
+        <item quantity="one">Nová docházka</item>
+        <item quantity="few">Nové docházky</item>
+        <item quantity="many">Nové docházky</item>
+        <item quantity="other">Nové docházky</item>
     </plurals>
     <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d nové frekvence</item>
-        <item quantity="few">%1$d nové frekvence</item>
-        <item quantity="many">%1$d nových frekvencí</item>
-        <item quantity="other">%1$d nových frekvencí</item>
+        <item quantity="one">%1$d nová docházka</item>
+        <item quantity="few">%1$d nové docházky</item>
+        <item quantity="many">%1$d nových docházek</item>
+        <item quantity="other">%1$d nových docházek</item>
     </plurals>
     <plurals name="attendance_number_item">
-        <item quantity="one">%d frekvence</item>
-        <item quantity="few">%d frekvence</item>
-        <item quantity="many">%d frekvencí</item>
-        <item quantity="other">%d frekvencí</item>
+        <item quantity="one">%d docházka</item>
+        <item quantity="few">%d docházky</item>
+        <item quantity="many">%d docházek</item>
+        <item quantity="other">%d docházek</item>
     </plurals>
     <!--Attendance summary-->
     <string name="attendance_summary_total">Společně</string>
@@ -336,8 +347,10 @@
     <string name="message_forward">Poslat dále</string>
     <string name="message_select_all">Vybrat vše</string>
     <string name="message_unselect_all">Odznačit vše</string>
+    <string name="message_restore_from_trash">Obnovit z koše</string>
     <string name="message_move_to_trash">Přesunout do koše</string>
     <string name="message_delete_forever">Odstranit natrvalo</string>
+    <string name="message_restore_success">Zpráva úspěšně obnovena</string>
     <string name="message_delete_success">Zpráva byla úspěšně odstraněna</string>
     <string name="message_mailbox_type_student">žák</string>
     <string name="message_mailbox_type_parent">rodič</string>
@@ -383,6 +396,7 @@
         <item quantity="other">%1$d vybraných</item>
     </plurals>
     <string name="message_messages_deleted">Zprávy odstraněné</string>
+    <string name="message_messages_restored">Obnovené zprávy</string>
     <string name="message_mailbox_chooser_title">Vyberte poštovní schránku</string>
     <string name="message_incognito_mode_on">Anonymní režim je zapnutý</string>
     <string name="message_incognito_description">Díky anonymnímu režimu není odesílatel upozorněn, když si zprávu přečtete</string>
@@ -728,9 +742,13 @@
     <string name="pref_view_grade_average_mode">Možnosti vypočítaného průměru</string>
     <string name="pref_view_grade_average_force_calc">Vynutit průměrný výpočet podle aplikace</string>
     <string name="pref_view_present">Zobrazit přítomnost</string>
+    <string name="pref_attendance_target">Cílová docházka</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Zobrazit předměty bez docházek</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Třídění kalkulačky docházky</string>
     <string name="pref_view_app_theme">Motiv</string>
     <string name="pref_view_expand_grade">Rozvíjení známek</string>
     <string name="pref_view_timetable_show_groups">Zobrazit skupiny vedle předmětů</string>
+    <string name="pref_view_timetable_show_additional_lessons">Zobrazit další lekce</string>
     <string name="pref_view_timetable_show_gaps">Zobrazit prázdné dlaždice, kde není žádná lekce</string>
     <string name="pref_view_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
     <string name="pref_view_subjects_without_grades">Zobrazit předměty bez známek</string>
@@ -794,7 +812,9 @@
     <string name="pref_grades_appearance_header">Známky</string>
     <string name="pref_dashboard_appearance_header">Domů</string>
     <string name="pref_dashboard_appearance_tiles_title">Viditelnost dlaždic</string>
-    <string name="pref_attendance_appearance_view">Frekvence</string>
+    <string name="pref_attendance_appearance_view">Docházka</string>
+    <string name="pref_attendance_calculator_appearance_view">Kalkulačka docházky</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Nastavení</string>
     <string name="pref_timetable_appearance_view">Plán lekce</string>
     <string name="pref_grades_advanced_header">Známky</string>
     <string name="pref_counted_average_advanced_header">Vypočítaný průměr</string>
@@ -822,7 +842,7 @@
     <string name="channel_upcoming_lessons">Nadcházející lekce</string>
     <string name="channel_debug">Ladění</string>
     <string name="channel_change_timetable">Změny plánu lekcí</string>
-    <string name="channel_new_attendance">Nové frekvence</string>
+    <string name="channel_new_attendance">Nové docházky</string>
     <!--Colors-->
     <string name="all_black">Černá</string>
     <string name="all_red">Červená</string>
@@ -846,16 +866,19 @@
     <string name="auth_button">Autorizovat</string>
     <string name="auth_success">Autorizace byla úspěšně dokončena</string>
     <string name="auth_title">Autorizace</string>
-    <string name="auth_description">Pro provoz aplikace potřebujeme potvrdit vaši identitu. Zadejte PESEL žáka &lt;b&gt;%1$s&lt;/b&gt; v níže uvedeném poli</string>
+    <string name="auth_description">Vážený rodiči,&lt;br/&gt;&lt;br/&gt;Chcete-li autorizovat a zajistit bezpečnost dat, prosíme Vás, abyste níže zadali PESEL číslo žáka &lt;b&gt;%1$s&lt;/b&gt;. Tyto detaily jsou nutné pro správné přidělování přístupu k osobním údajům a jejich ochranu v souladu s platnými předpisy.&lt;br/&gt;&lt;br/&gt;Po zadání údajů budou data ověřena, čímž se zajistí, že přístup do systému VULCAN získají pouze autorizované osoby. Pokud máte jakékoliv pochybnosti nebo problémy, kontaktujte prosím školního správce deníku pro objasnění situace.&lt;br/&gt;&lt;br/&gt;Udržujeme nejvyšší standardy ochrany osobních údajů a zajišťujeme, aby byly všechny poskytnuté informace chráněné. Wulkanowy neukládá ani nezpracovává číslo PESEL.&lt;br/&gt;&lt;br/&gt;Připomínáme, že poskytování úplných a přesných údajů je nutné a nezbytné k používání systému VULCAN.</string>
     <string name="auth_button_skip">Zatím přeskočit</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Probíhá ověřování. Počkejte…</string>
+    <string name="captcha_dialog_title">Webová stránka deníku VULCAN vyžaduje ověření</string>
+    <string name="captcha_dialog_description"><b>Proč se mi to zobrazuje?</b>\nWebová stránka deníku, ze které Wulkanowy stahuje data, zobrazuje stejnou obrazovku jako výše, takže Wulkanowy ji musí také zobrazit, aby bylo možné získávat data z této stránky. Nedá se to obejít</string>
     <string name="captcha_verified_message">Úspěšně ověřeno</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
+    <string name="error_account_inactive">Tento účet je neaktivní. Zkuste se znovu přihlásit</string>
     <string name="error_timeout">Nelze se připojit ke deníku. Servery mohou být přetíženy. Prosím zkuste to znovu později</string>
     <string name="error_login_failed">Načítání dat se nezdařilo. Prosím zkuste to znovu později</string>
+    <string name="error_password_invalid">Vaše heslo vypršelo nebo bylo změněno. Přihlaste se znovu</string>
     <string name="error_password_change_required">Je vyžadována změna hesla pro deník</string>
     <string name="error_service_unavailable">Probíhá údržba deníku UONET+. Zkuste to později znovu</string>
     <string name="error_unknown_uonet">Neznámá chyba deniku UONET+. Prosím zkuste to znovu později</string>
@@ -865,4 +888,10 @@
     <string name="error_feature_disabled">Funkce je deaktivována přes vaší školou</string>
     <string name="error_feature_not_available">Funkce není k dispozici. Přihlaste se v jiném režimu než Mobile API</string>
     <string name="error_field_required">Toto pole je povinné</string>
+    <!-- Mute system -->
+    <string name="message_mute">Ztlumit</string>
+    <string name="message_unmute">Zrušit ztlumení</string>
+    <string name="message_mute_success">Ztlumili jste tohoto uživatele</string>
+    <string name="message_unmute_success">Zrušili jste ztlumení tohoto uživatele</string>
+    <string name="pref_mod_settings_other_title">Jiné</string>
 </resources>
diff --git a/app/src/main/res/values-da-rDK/mod_values.xml b/app/src/main/res/values-da-rDK/mod_values.xml
new file mode 100644
index 00000000..8c3cb433
--- /dev/null
+++ b/app/src/main/res/values-da-rDK/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Hidden settings</string>
+    <string name="pref_hidden_settings_attendance_percentage">Attendance percentage</string>
+    <string name="pref_hidden_settings_hidden_grades">Hide grades</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Hidden attendance items</string>
+    <string name="pref_mod_settings_show_notes">Show notes</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Unexcused absence</item>
+        <item>Exemption</item>
+        <item>Excused lateness</item>
+        <item>Unexcused lateness</item>
+        <item>Present</item>
+        <item>Deleted</item>
+        <item>Excused absence</item>
+        <item>Unknown</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Developer mode (access to this page)</string>
+    <string name="pref_mod_settings_developer_mode_summary">After disabling this setting, you will not be able to access this page anymore, but the settings will still be applied.</string>
+</resources>
diff --git a/app/src/main/res/values-da-rDK/preferences_values.xml b/app/src/main/res/values-da-rDK/preferences_values.xml
deleted file mode 100644
index 5aff12de..00000000
--- a/app/src/main/res/values-da-rDK/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</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>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
new file mode 100644
index 00000000..549b35e2
--- /dev/null
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <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="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</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="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$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 from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</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">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</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_symbol_hint">Symbol</string>
+    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</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">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</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>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</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_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">Reset 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>
+    <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_support_title">Get help</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
+    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
+    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
+    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
+    <string name="login_support_submit">Submit</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <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_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_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <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>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
+    <!--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>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--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_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</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>
+    <string name="mobile_device_symbol">Symbol</string>
+    <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>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <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_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</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>
+    <!--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>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</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>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <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>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</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-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</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_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</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_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</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_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</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_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</string>
+    <!--Update helper-->
+    <string name="update_download_started">Download of updates has started…</string>
+    <string name="update_download_success">An update has just been downloaded.</string>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please 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>
+    <string name="error_field_required">This field is required</string>
+    <string name="pref_mod_settings_other_title">Other</string>
+</resources>
diff --git a/app/src/main/res/values-de/mod_values.xml b/app/src/main/res/values-de/mod_values.xml
new file mode 100644
index 00000000..4f2e5888
--- /dev/null
+++ b/app/src/main/res/values-de/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Geheime Einstellungen</string>
+    <string name="pref_hidden_settings_attendance_percentage">Prozentuale Erwartung</string>
+    <string name="pref_hidden_settings_hidden_grades">Hide Grades</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Versteckte Anwesenheitsposten</string>
+    <string name="pref_mod_settings_show_notes">Notizen anzeigen</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Unentschuldigtes Fehlen</item>
+        <item>Befreiung</item>
+        <item>Entschuldigtes Zuspätkommen</item>
+        <item>Unentschuldigtes Zuspätkommen</item>
+        <item>Anwesend</item>
+        <item>Löschen</item>
+        <item>Unentschuldigtes Fehlen</item>
+        <item>Unbekannt</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Entwicklermodus (Zugang zu dieser Seite)</string>
+    <string name="pref_mod_settings_developer_mode_summary">Wenn Sie diese Einstellung deaktivieren, können Sie nicht mehr auf diese Seite zugreifen, aber die Einstellungen werden weiterhin angewendet.</string>
+</resources>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index d1001c74..23828b03 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">Alphabetisch</string>
+    <string name="sort_by_date">Nach Datum</string>
+    <string name="sort_by_average">Nach Durchschnitt</string>
+    <string name="sort_by_attendance_percentage">Nach Anwesenheitsprozent</string>
+    <string name="sort_by_subject_attendance_balance">Nach Subjekt Anwesenheitssaldo</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Licht</item>
         <item>Dunkel</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetisch</item>
-        <item>Nach Datum</item>
-        <item>Nach Durchschnitt</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,6 +56,11 @@
         <item>Only between lessons</item>
         <item>Before and between lessons</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Nicht zeigen</item>
+        <item>Inline anzeigen</item>
+        <item>Unterhalb der regulären Lektionen anzeigen</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Glückszahl</item>
         <item>Ungelesene Nachrichten</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5bd71bb2..cc61a83c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,10 +10,10 @@
     <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="logviewer_title">Log Viewer</string>
     <string name="debug_title">Debuggen</string>
     <string name="notification_debug_title">Benachrichtigungen debuggen</string>
-    <string name="debug_cookies_clear">Clear webview cookies</string>
+    <string name="debug_cookies_clear">Webview-Cookies löschen</string>
     <string name="contributors_title">Mitarbeiter</string>
     <string name="license_title">Lizenzen</string>
     <string name="message_title">Nachrichten</string>
@@ -38,14 +38,14 @@
     <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+ Registervariante</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
+    <string name="login_domain_suffix_hint">Benutzerdefinierte Domeisensuffixe</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_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_symbol_placeholder">Zum Beispiel \"lodz\" oder \"powiatjaroslawski\"</string>
     <string name="login_sign_in">Anmelden</string>
     <string name="login_invalid_password">Passwort ist zu kurz</string>
     <string name="login_incorrect_password_default">Anmeldedaten sind falsch</string>
@@ -56,9 +56,9 @@
     <string name="login_invalid_email">Ungültige email</string>
     <string name="login_invalid_login">Den zugewiesenen Login anstelle von email verwenden</string>
     <string name="login_invalid_custom_email">Benutze den zugewiesenen Login oder E-Mail in @%1$s</string>
-    <string name="login_invalid_domain_suffix">Invalid domain suffix</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_invalid_domain_suffix">Ungültiges Domain-Suffix</string>
+    <string name="login_invalid_symbol">Ungültiges Symbol. Wenn Sie es nicht finden können, wenden Sie sich bitte an die Schule</string>
+    <string name="login_invalid_symbol_definitely">Denken Sie sich das nicht aus! Wenn Sie es nicht finden können, wenden Sie sich bitte an die Schule</string>
     <string name="login_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</string>
     <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
     <string name="login_symbol_helper">Das Symbol kann auf der Registerseite in&#160;<b>Student </b>→&#160;<b>Tost Möbeln</b> →&#160;<b>Registrieren Sie Ihr Mobilgerät</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben</string>
@@ -73,7 +73,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">email senden</string>
     <string name="login_recover_warning">Stellen Sie sicher, dass Sie die richtige UONET+ Registervariation wählen!</string>
-    <string name="login_recover_button">Reset password</string>
+    <string name="login_recover_button">Passwort zurücksetzen</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>
@@ -81,13 +81,13 @@
     <string name="login_other_search_locations">Andere Suchorte</string>
     <string name="login_no_active_student">Keine aktiven Schüler gefunden</string>
     <string name="login_symbol_enter">Geben Sie ein anderes Symbol ein</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name with the town (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_school_invalid">Enter correct name of the school</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
+    <string name="login_support_title">Hilfe anfragen</string>
+    <string name="login_support_school_hint">Vollschulname mit der Stadt (erforderlich)</string>
+    <string name="login_support_school_placeholder">Z. B. ZSTiO Jarosław oder SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Geben Sie den richtigen Namen der Schule ein</string>
+    <string name="login_support_additional_hint">Zusätzliche Informationen auf Polnisch (fakultativ)</string>
+    <string name="login_support_additional_placeholder">Z. B. „Ich habe kürzlich die Schule gewechselt und...“ oder „Ich bin ein Elternteil und kann das Konto des anderen Kindes nicht sehen...“</string>
+    <string name="login_support_submit">Einreichen</string>
     <!--Notifications-->
     <string name="notifications_header_title">Benachrichtigungen aktivieren</string>
     <string name="notifications_header_description">Aktivieren Sie Benachrichtigungen, damit Sie keine Nachricht vom Lehrer oder eine neue Klasse verpassen</string>
@@ -98,8 +98,8 @@
     <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>
-    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
-    <string name="main_expired_credentials_title">Password changed</string>
+    <string name="main_expired_credentials_title">Das Passwort ist abgelaufen oder wurde geändert</string>
+    <string name="main_expired_credentials_description">Ihr Passwort ist abgelaufen oder wurde geändert. Sie müssen sich erneut bei Wulkanowy anmelden</string>
     <string name="main_support_title">Anwendungsunterstützung</string>
     <string name="main_support_description">Gefällt Ihnen diese App? Unterstützen Sie ihre Entwicklung, indem Sie nicht-invasive Werbung aktivieren, die Sie jederzeit deaktivieren können</string>
     <string name="main_support_positive">Werbung aktivieren</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Kommentar</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_average_year">Jährlich: %1$.2f</string>
     <string name="grade_points_sum">Punkte: %s</string>
     <string name="grade_no_average">Kein Durchschnitt</string>
+    <string name="grade_summary_average_semester">Semesterdurchschnitt</string>
+    <string name="grade_summary_average_year">Jahresdurchschnitt</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_descriptive">Descriptive grade</string>
-    <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
+    <string name="grade_summary_descriptive">Deskriptive Note</string>
+    <string name="grade_summary_calculated_average">Berechneter Semesterdurchschnitt</string>
+    <string name="grade_summary_calculated_average_annual">Berechneter Jahresdurchschnitt</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Wie funktioniert der berechnete Durchschnitt?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Der berechnete Mittelwert ist das arithmetische Mittel, das aus den Durchschnittswerten der Probanden errechnet wird. Es erlaubt Ihnen, den ungefähre endgültigen Durchschnitt zu kennen. Sie wird auf eine vom Anwender in den Anwendungseinstellungen gewählte Weise berechnet. Es wird empfohlen, die entsprechende Option zu wählen. Das liegt daran, dass die Berechnung der Schuldurchschnitte unterschiedlich ist. Wenn Ihre Schule den Durchschnitt der Fächer auf der Vulcan-Seite angibt, lädt die Anwendung diese Fächer herunter und berechnet nicht den Durchschnitt. Dies kann geändert werden, indem die Berechnung des Durchschnitts in den Anwendungseinstellungen erzwungen wird. \n\n<b>Durchschnitt der Noten nur aus dem ausgewählten Semester </b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in einem bestimmten Semester\n2. Addition der berechneten Durchschnittswerte\n3. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Durchschnitte aus beiden Semestern</b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in Semester 1 und 2\n2. Berechnung des arithmetischen Mittels der berechneten Durchschnitte für Semester 1 und 2 für jedes Fach. \n3. Hinzufügen von berechneten Durchschnittswerten\n4. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Noten aus dem ganzen Jahr:</b>\n1. Berechnung des gewichteten Jahresdurchschnitts für jedes Fach. Der Abschlussdurchschnitt im 1. Semester ist irrelevant. \n2. Addition der berechneten Durchschnittswerte\n3. Berechnung des arithmetischen Mittels der summierten Mittelwerte</string>
     <string name="grade_summary_final_average_help_dialog_title">Wie funktioniert der endgültige Durchschnitt?</string>
@@ -155,8 +159,8 @@
         <item quantity="other">Neue Abschlussnoten</item>
     </plurals>
     <plurals name="grade_new_items_descriptive">
-        <item quantity="one">New descriptive grade</item>
-        <item quantity="other">New descriptive grades</item>
+        <item quantity="one">Neuer Deskriptive Grade</item>
+        <item quantity="other">Neuer Deskriptive Grades</item>
     </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Du hast %1$d Note bekommen</item>
@@ -171,11 +175,12 @@
         <item quantity="other">Sie haben %1$d Abschlussnoten bekommen</item>
     </plurals>
     <plurals name="grade_notify_new_items_descriptive">
-        <item quantity="one">You received %1$d descriptive grade</item>
-        <item quantity="other">You received %1$d descriptive grades</item>
+        <item quantity="one">Sie haben %1$d deskriptive Grade erhalten</item>
+        <item quantity="other">Sie haben %1$d deskriptive Grades erhalten</item>
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lektion</string>
+    <string name="timetable_additional_lesson">Zusätzliche Lektion</string>
     <string name="timetable_room">Klassenzimmer</string>
     <string name="timetable_group">Gruppe</string>
     <string name="timetable_time">Stunden</string>
@@ -194,8 +199,8 @@
     <string name="timetable_notify_change_teacher">Wechsel des Lehrers von %1$s zu %2$s</string>
     <string name="timetable_notify_change_subject">Thema von %1$s zu %2$s wechseln</string>
     <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="other">No lessons</item>
+        <item quantity="one">Keine Lektion</item>
+        <item quantity="other">Keine Lektionen</item>
     </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Änderung des Zeitplans</item>
@@ -237,6 +242,12 @@
     <string name="additional_lessons_end_time_error">Endzeit muss grösser sein als Startzeit</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
+    <string name="attendance_calculator_button">Anwesenheitsrechner</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> Über Ziel</string>
+    <string name="attendance_calculator_summary_balance_neutral">direkt am ziel</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> Unter Ziel</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d Präsenzen</string>
+    <string name="attendance_calculator_summary_values_empty">Keine Anwesenheit verzeichnet</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>
@@ -296,8 +307,10 @@
     <string name="message_forward">Weiterleiten</string>
     <string name="message_select_all">Alle auswählen</string>
     <string name="message_unselect_all">Alle abwählen</string>
+    <string name="message_restore_from_trash">Wiederherstellen aus dem Papierkorb</string>
     <string name="message_move_to_trash">In Papierkorb verschieben</string>
     <string name="message_delete_forever">Dauerhaft löschen</string>
+    <string name="message_restore_success">Nachricht erfolgreich wiederhergestellt</string>
     <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
     <string name="message_mailbox_type_student">schüler</string>
     <string name="message_mailbox_type_parent">Eltern</string>
@@ -335,9 +348,10 @@
         <item quantity="other">%1$d ausgewählt</item>
     </plurals>
     <string name="message_messages_deleted">Nachrichten gelöscht</string>
+    <string name="message_messages_restored">Wiederhergestellte Nachrichten</string>
     <string name="message_mailbox_chooser_title">Postfach auswählen</string>
-    <string name="message_incognito_mode_on">Incognito mode is on</string>
-    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
+    <string name="message_incognito_mode_on">Inkognito-Modus ist aktiviert</string>
+    <string name="message_incognito_description">Dank des Inkognito-Modus wird der Absender nicht benachrichtigt, wenn Sie die Nachricht lesen</string>
     <!--Note-->
     <string name="note_no_items">Keine Informationen über Eintragen</string>
     <string name="note_points">Punkte</string>
@@ -634,10 +648,14 @@
     <string name="pref_view_grade_average_mode">Berechnete Durchschnittsoptionen</string>
     <string name="pref_view_grade_average_force_calc">Mittelwertberechnung durch App erzwingen</string>
     <string name="pref_view_present">Anwesendheit zeigen</string>
+    <string name="pref_attendance_target">Anwesenheitsziel</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Lektion ohne Anwesenheit anzeigen</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Anwesenheitsrechner Sortierung</string>
     <string name="pref_view_app_theme">Thema</string>
     <string name="pref_view_expand_grade">Steigende Sorten</string>
     <string name="pref_view_timetable_show_groups">Gruppen neben Schulfächen anzeigen</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_timetable_show_additional_lessons">Zusätzliche Lektionen anzeigen</string>
+    <string name="pref_view_timetable_show_gaps">Leere Kacheln anzeigen, wenn es keinen Lektionen gibt</string>
     <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
     <string name="pref_view_subjects_without_grades">Schulfächer ohne Noten anzeigen</string>
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
@@ -678,12 +696,12 @@
     <string name="pref_other_grade_modifier_minus">Wert des Minus</string>
     <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
     <string name="pref_other_optional_arithmetic_average">Arithmetisches Mittel anzeigen, wenn keine Gewichte angegeben sind</string>
-    <string name="pref_other_incognito_mode">Incognito mode</string>
-    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
+    <string name="pref_other_incognito_mode">Inkognito-Modus</string>
+    <string name="pref_other_incognito_mode_summary">Nicht über das Lesen der Nachricht informieren</string>
     <string name="pref_ads_support_category_name">Unterstützung</string>
     <string name="pref_ads_privacy_policy">Datenschutz-Bestimmungen</string>
     <string name="pref_ads_agreements">Vereinbarungen</string>
-    <string name="pref_ads_consent">Show consent to data processing</string>
+    <string name="pref_ads_consent">Einwilligung zur Datenverarbeitung zeigen</string>
     <string name="pref_ads_show_in_app">Anzeigen in der App anzeigen</string>
     <string name="pref_ads_support">Einzelanzeige ansehen, um Projekt zu unterstützen</string>
     <string name="pref_ads_privacy_title">Einwilligung in die Datenverarbeitung</string>
@@ -701,6 +719,8 @@
     <string name="pref_dashboard_appearance_header">Dashboard</string>
     <string name="pref_dashboard_appearance_tiles_title">Sichtbarkeit der Kacheln</string>
     <string name="pref_attendance_appearance_view">Schulbesuch</string>
+    <string name="pref_attendance_calculator_appearance_view">Anwesenheits-Rechner</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Einstellungen</string>
     <string name="pref_timetable_appearance_view">Stundenplan</string>
     <string name="pref_grades_advanced_header">Noten</string>
     <string name="pref_counted_average_advanced_header">Berechneter Durchschnitt</string>
@@ -746,29 +766,37 @@
     <string name="menu_order_confirm_content">Die Anwendung muss neu gestartet werden, damit die Änderungen gespeichert werden</string>
     <string name="menu_order_confirm_restart">Restart</string>
     <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_api_error">Die Autorisierung wurde abgelehnt. Die vorgelegten Daten stimmen nicht mit denen des Sekretariats überein.</string>
+    <string name="auth_invalid_error">Ungültig PESEL</string>
     <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
+    <string name="auth_button">Autorisieren Sie</string>
+    <string name="auth_success">Autorisierung erfolgreich abgeschlossen</string>
+    <string name="auth_title">Autorisierung</string>
+    <string name="auth_description">Liebes Elternteil,&lt;br/&gt;&lt;br/&gt;Um die Sicherheit der Daten zu gewährleisten, bitten wir Sie, die PESEL-Nummer des Schülers/der Schülerin anzugeben&lt;b&gt;%1$s&lt;/b&gt;Diese Angaben sind für die ordnungsgemäße Zuweisung des Zugriffs und den Schutz der personenbezogenen Daten gemäß den geltenden Vorschriften unerlässlich.&lt;br/&gt;&lt;br/&gt;Nach der Eingabe der Daten werden diese überprüft, um sicherzustellen, dass nur berechtigte Personen Zugang zum VULCAN-System erhalten. Wenn Sie Zweifel oder Probleme haben, wenden Sie sich bitte an den Administrator des Schülerkalenders, um die Situation zu klären.&lt;br/&gt;&lt;br/&gt;Wir halten die höchsten Standards für den Schutz personenbezogener Daten ein und gewährleisten, dass alle bereitgestellten Informationen sicher sind. Die Wulkanowy-App speichert und verarbeitet die PESEL-Nummer nicht.&lt;br/&gt;&lt;br/&gt;Wir erinnern Sie daran, dass die Angabe vollständiger und korrekter Daten obligatorisch und notwendig für die Nutzung des VULCAN-Systems ist.</string>
+    <string name="auth_button_skip">Vorerst überspringen</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
-    <string name="captcha_verified_message">Verified successfully</string>
+    <string name="captcha_dialog_title">VULCAN\'s Website erfordert Überprüfung</string>
+    <string name="captcha_dialog_description"><b>Warum sehe ich das?</b>\nDie Website des Registers, von der Wulkanowy Daten herunterlädt, zeigt denselben Bildschirm wie oben an, so dass Wulkanowy ihn ebenfalls anzeigen muss, um Daten von dieser Website herunterladen zu können. Es gibt keinen Ausweg</string>
+    <string name="captcha_verified_message">Erfolgreich verifiziert</string>
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
     <string name="error_invalid_device_datetime">Es ist ein Fehler aufgetreten. Überprüfen Sie Ihre Geräteuhr</string>
+    <string name="error_account_inactive">Dieses Konto ist inaktiv. Versuchen Sie, sich erneut anzumelden</string>
     <string name="error_timeout">Registrierungsverbindung fehlgeschlagen. Server können überlastet sein. Bitte versuchen Sie es später noch einmal</string>
     <string name="error_login_failed">Das Laden der Daten ist fehlgeschlagen. Bitte versuchen Sie es später noch einmal</string>
+    <string name="error_password_invalid">Ihr Passwort ist abgelaufen oder wurde geändert. Bitte melden Sie sich erneut an</string>
     <string name="error_password_change_required">Passwortänderung für Registrierung erforderlich</string>
     <string name="error_service_unavailable">Wartung im Gange UONET + Klassenbuch. Versuchen Sie es später noch einmal</string>
     <string name="error_unknown_uonet">Unbekannter UONET + Registerfehler. Versuchen Sie es später erneut</string>
     <string name="error_unknown_app">Unbekannter Anwendungsfehler. Bitte versuchen Sie es später noch einmal</string>
-    <string name="error_cloudflare_captcha">Captcha verification required</string>
+    <string name="error_cloudflare_captcha">Captcha-Verifizierung erforderlich</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>
     <string name="error_field_required">Dieses Feld ist erforderlich</string>
+    <!-- Mute system -->
+    <string name="message_mute">Stumm</string>
+    <string name="message_unmute">Stummschaltung aufheben</string>
+    <string name="message_mute_success">Sie haben diesen Benutzer stummgeschaltet</string>
+    <string name="message_unmute_success">Sie haben die Stummschaltung dieses Benutzers aufgehoben</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/mod_values.xml b/app/src/main/res/values-es-rES/mod_values.xml
new file mode 100644
index 00000000..8c3cb433
--- /dev/null
+++ b/app/src/main/res/values-es-rES/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Hidden settings</string>
+    <string name="pref_hidden_settings_attendance_percentage">Attendance percentage</string>
+    <string name="pref_hidden_settings_hidden_grades">Hide grades</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Hidden attendance items</string>
+    <string name="pref_mod_settings_show_notes">Show notes</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Unexcused absence</item>
+        <item>Exemption</item>
+        <item>Excused lateness</item>
+        <item>Unexcused lateness</item>
+        <item>Present</item>
+        <item>Deleted</item>
+        <item>Excused absence</item>
+        <item>Unknown</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Developer mode (access to this page)</string>
+    <string name="pref_mod_settings_developer_mode_summary">After disabling this setting, you will not be able to access this page anymore, but the settings will still be applied.</string>
+</resources>
diff --git a/app/src/main/res/values-es-rES/preferences_values.xml b/app/src/main/res/values-es-rES/preferences_values.xml
deleted file mode 100644
index 5aff12de..00000000
--- a/app/src/main/res/values-es-rES/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</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>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000..549b35e2
--- /dev/null
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <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="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</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="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$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 from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</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">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</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_symbol_hint">Symbol</string>
+    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</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">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</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>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</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_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">Reset 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>
+    <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_support_title">Get help</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
+    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
+    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
+    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
+    <string name="login_support_submit">Submit</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <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_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_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <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>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
+    <!--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>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--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_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</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>
+    <string name="mobile_device_symbol">Symbol</string>
+    <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>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <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_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</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>
+    <!--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>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</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>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <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>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</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-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</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_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</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_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</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_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</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_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</string>
+    <!--Update helper-->
+    <string name="update_download_started">Download of updates has started…</string>
+    <string name="update_download_success">An update has just been downloaded.</string>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please 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>
+    <string name="error_field_required">This field is required</string>
+    <string name="pref_mod_settings_other_title">Other</string>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/mod_values.xml b/app/src/main/res/values-it-rIT/mod_values.xml
new file mode 100644
index 00000000..3bb47c23
--- /dev/null
+++ b/app/src/main/res/values-it-rIT/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Hidden settings</string>
+    <string name="pref_hidden_settings_attendance_percentage">Attendance percentage</string>
+    <string name="pref_hidden_settings_hidden_grades">Hide grades</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Hidden attendance items</string>
+    <string name="pref_mod_settings_show_notes">Note sullo spettacolo</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Unexcused absence</item>
+        <item>Exemption</item>
+        <item>Excused lateness</item>
+        <item>Unexcused lateness</item>
+        <item>Present</item>
+        <item>Deleted</item>
+        <item>Excused absence</item>
+        <item>Unknown</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Developer mode (access to this page)</string>
+    <string name="pref_mod_settings_developer_mode_summary">After disabling this setting, you will not be able to access this page anymore, but the settings will still be applied.</string>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/preferences_values.xml b/app/src/main/res/values-it-rIT/preferences_values.xml
deleted file mode 100644
index 5aff12de..00000000
--- a/app/src/main/res/values-it-rIT/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</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>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 00000000..549b35e2
--- /dev/null
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <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="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</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="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$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 from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</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">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</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_symbol_hint">Symbol</string>
+    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</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">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</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>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</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_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">Reset 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>
+    <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_support_title">Get help</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
+    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
+    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
+    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
+    <string name="login_support_submit">Submit</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <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_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_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <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>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
+    <!--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>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--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_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</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>
+    <string name="mobile_device_symbol">Symbol</string>
+    <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>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <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_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</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>
+    <!--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>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</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>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <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>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</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-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</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_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</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_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</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_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</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_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</string>
+    <!--Update helper-->
+    <string name="update_download_started">Download of updates has started…</string>
+    <string name="update_download_success">An update has just been downloaded.</string>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please 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>
+    <string name="error_field_required">This field is required</string>
+    <string name="pref_mod_settings_other_title">Other</string>
+</resources>
diff --git a/app/src/main/res/values-pl/mod_values.xml b/app/src/main/res/values-pl/mod_values.xml
new file mode 100644
index 00000000..cc53ad8a
--- /dev/null
+++ b/app/src/main/res/values-pl/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Sekretne ustawienia</string>
+    <string name="pref_hidden_settings_attendance_percentage">Procent frekwencji</string>
+    <string name="pref_hidden_settings_hidden_grades">Ukryj oceny</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Ukryte wpisy frekwencji</string>
+    <string name="pref_mod_settings_show_notes">Pokazuj uwagi</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Nieusprawiedliwiona nieobecność</item>
+        <item>Zwolnienie</item>
+        <item>Usprawiedliwione spóźnienie</item>
+        <item>Nieusprawiedliwione spóźnienie</item>
+        <item>Obecność</item>
+        <item>Usunięte</item>
+        <item>Nieobecność usprawiedliwiona</item>
+        <item>Nieznane</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Tryb dewelopera (dostęp do tej strony)</string>
+    <string name="pref_mod_settings_developer_mode_summary">Po wyłączeniu tego ustawienia nie będzie już można uzyskać dostępu do tej strony, ale ustawienia będą zachowane.</string>
+</resources>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 2f2432e9..8eafa1cb 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">Alfabetycznie</string>
+    <string name="sort_by_date">Według daty</string>
+    <string name="sort_by_average">Według średniej</string>
+    <string name="sort_by_attendance_percentage">Według procentu obecności</string>
+    <string name="sort_by_subject_attendance_balance">Według balansu frekwencji przedmiotu</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Jasny</item>
         <item>Ciemny</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alfabetycznie</item>
-        <item>Według daty</item>
-        <item>Według średniej</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,6 +56,11 @@
         <item>Tylko między lekcjami</item>
         <item>Przed i między lekcjami</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Nie pokazuj</item>
+        <item>Pokaż razem</item>
+        <item>Pokaż poniżej zwykłych lekcji</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Szczęśliwy numerek</item>
         <item>Nieprzeczytane wiadomości</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 70d4982b..e2c1ec5b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -98,8 +98,8 @@
     <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>
-    <string name="main_expired_credentials_description">Hasło do Twojego konta zostało zmienione. Musisz zalogować się ponownie do Wulkanowego</string>
-    <string name="main_expired_credentials_title">Hasło zostało zmienione</string>
+    <string name="main_expired_credentials_title">Hasło wygasło lub zostało zmienione</string>
+    <string name="main_expired_credentials_description">Hasło do twojego konta wygasło lub zostało zmienione. Musisz zalogować się ponownie do Wulkanowego</string>
     <string name="main_support_title">Wparcie aplikacji</string>
     <string name="main_support_description">Podoba Ci się ta aplikacja? Wspieraj jej rozwój poprzez włączenie nieinwazyjnych reklam, które możesz wyłączyć w dowolnym momencie</string>
     <string name="main_support_positive">Włącz reklamy</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Komentarz</string>
     <string name="grade_number_new_items">Ilość nowych ocen: %1$d</string>
     <string name="grade_average">Średnia: %1$.2f</string>
+    <string name="grade_average_year">Roczna: %1$.2f</string>
     <string name="grade_points_sum">Punkty: %s</string>
     <string name="grade_no_average">Brak średniej</string>
+    <string name="grade_summary_average_semester">Średnia semestralna</string>
+    <string name="grade_summary_average_year">Średnia roczna</string>
     <string name="grade_summary_points">Suma punktów</string>
     <string name="grade_summary_final_grade">Ocena końcowa</string>
     <string name="grade_summary_predicted_grade">Przewidywana ocena</string>
     <string name="grade_summary_descriptive">Ocena opisowa</string>
-    <string name="grade_summary_calculated_average">Obliczona średnia</string>
+    <string name="grade_summary_calculated_average">Obliczona średnia semestralna</string>
+    <string name="grade_summary_calculated_average_annual">Obliczona średnia roczna</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Jak działa obliczona średnia?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Obliczona średnia jest średnią arytmetyczną obliczoną ze średnich przedmiotów. Pozwala ona na poznanie przybliżonej średniej końcowej. Jest obliczana w sposób wybrany przez użytkownika w ustawieniach aplikacji. Zaleca się wybranie odpowiedniej opcji. Dzieje się tak dlatego, że obliczanie średnich w szkołach różni się. Dodatkowo, jeśli twoja szkoła ma włączone średnie przedmiotów na stronie dziennika Vulcan, aplikacja pobiera je i ich nie oblicza. Można to zmienić, wymuszając obliczanie średniej w ustawieniach aplikacji.\n\n<b>Średnia ocen tylko z wybranego semestru</b>:\n1. Obliczanie średniej arytmetycznej każdego przedmiotu w danym semestrze\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia ze średnich z obu semestrów</b>:\n1.Obliczanie średniej arytmetycznej każdego przedmiotu w semestrze 1 i 2\n2. Obliczanie średniej arytmetycznej obliczonych średnich w semestrze 1 i 2 każdego przedmiotu.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia wszystkich ocen z całego roku:</b>\n1. Obliczanie średniej arytmetycznej z każdego przedmiotu w ciągu całego roku. Końcowa ocena w 1 semestrze jest bez znaczenia.\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej z zsumowanych średnich</string>
     <string name="grade_summary_final_average_help_dialog_title">Jak działa końcowa średnia?</string>
@@ -194,6 +198,7 @@
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
+    <string name="timetable_additional_lesson">Dodatkowa lekcja</string>
     <string name="timetable_room">Sala</string>
     <string name="timetable_group">Grupa</string>
     <string name="timetable_time">Godziny</string>
@@ -265,6 +270,12 @@
     <string name="additional_lessons_end_time_error">Godzina zakończenia musi być późniejsza niż godzina rozpoczęcia</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
+    <string name="attendance_calculator_button">Kalkulator obecności</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> powyżej celu</string>
+    <string name="attendance_calculator_summary_balance_neutral">dokładnie u celu</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> poniżej celu</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d obecności</string>
+    <string name="attendance_calculator_summary_values_empty">Nie odnotowano żadnej frekwencji</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>
@@ -336,8 +347,10 @@
     <string name="message_forward">Prześlij dalej</string>
     <string name="message_select_all">Zaznacz wszystkie</string>
     <string name="message_unselect_all">Odznacz wszystkie</string>
+    <string name="message_restore_from_trash">Przywróć z kosza</string>
     <string name="message_move_to_trash">Przenieś do kosza</string>
     <string name="message_delete_forever">Usuń trwale</string>
+    <string name="message_restore_success">Wiadomość przywrócona pomyślnie</string>
     <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
     <string name="message_mailbox_type_student">uczeń</string>
     <string name="message_mailbox_type_parent">rodzic</string>
@@ -383,6 +396,7 @@
         <item quantity="other">%1$d wybranych</item>
     </plurals>
     <string name="message_messages_deleted">Wiadomości zostały usunięte</string>
+    <string name="message_messages_restored">Wiadomości przywrócone</string>
     <string name="message_mailbox_chooser_title">Wybierz skrzynkę</string>
     <string name="message_incognito_mode_on">Tryb incognito jest włączony</string>
     <string name="message_incognito_description">Dzięki trybowi incognito nadawca nie zobaczy, że przeczytałeś tę wiadomość</string>
@@ -728,9 +742,13 @@
     <string name="pref_view_grade_average_mode">Opcje obliczonej średniej</string>
     <string name="pref_view_grade_average_force_calc">Wymuś obliczanie średniej przez aplikację</string>
     <string name="pref_view_present">Pokazuj obecność</string>
+    <string name="pref_attendance_target">Docelowa obecność</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Pokazuj przedmioty bez frekwencji</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Sortowanie kalkulatora obecności</string>
     <string name="pref_view_app_theme">Motyw</string>
     <string name="pref_view_expand_grade">Rozwijanie ocen</string>
     <string name="pref_view_timetable_show_groups">Pokazuj grupę obok przedmiotu</string>
+    <string name="pref_view_timetable_show_additional_lessons">Pokaż dodatkowe lekcje</string>
     <string name="pref_view_timetable_show_gaps">Pokazuj puste kafelki gdzie nie ma lekcji</string>
     <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
     <string name="pref_view_subjects_without_grades">Pokazuj przedmioty bez ocen</string>
@@ -795,6 +813,8 @@
     <string name="pref_dashboard_appearance_header">Start</string>
     <string name="pref_dashboard_appearance_tiles_title">Widoczność kafelków</string>
     <string name="pref_attendance_appearance_view">Frekwencja</string>
+    <string name="pref_attendance_calculator_appearance_view">Kalkulator frekwencji</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Ustawienia</string>
     <string name="pref_timetable_appearance_view">Plan lekcji</string>
     <string name="pref_grades_advanced_header">Oceny</string>
     <string name="pref_counted_average_advanced_header">Obliczona średnia</string>
@@ -846,16 +866,19 @@
     <string name="auth_button">Potwierdź</string>
     <string name="auth_success">Autoryzacja zakończona pomyślnie</string>
     <string name="auth_title">Autoryzacja</string>
-    <string name="auth_description">Rodzicu, musimy mieć pewność, że Twój adres e-mail został powiązany z prawidłowym kontem ucznia. W celu autoryzacji konta podaj numer PESEL ucznia &lt;b&gt;%1$s&lt;/b&gt; w polu poniżej</string>
+    <string name="auth_description">Szanowny Rodzicu,&lt;br/&gt;&lt;br/&gt;W celu autoryzacji i zapewnienia bezpieczeństwa danych, uprzejmie prosimy o wprowadzenie poniżej numeru PESEL ucznia &lt;b&gt;%1$s&lt;/b&gt;. Te informacje są niezbędne do prawidłowego przypisania dostępu i ochrony danych osobowych zgodnie z obowiązującymi przepisami.&lt;br/&gt;&lt;br/&gt;Po wprowadzeniu danych, będą one weryfikowane w celu zapewnienia, że dostęp do systemu VULCAN jest przyznawany wyłącznie upoważnionym osobom. W przypadku jakichkolwiek wątpliwości lub problemów, prosimy o kontakt z administratorem dziennika szkolnego w celu wyjaśnienia sytuacji.&lt;br/&gt;&lt;br/&gt;Zachowujemy najwyższe standardy ochrony danych osobowych i zapewniamy, że wszelkie przekazane informacje są chronione. Wulkanowy nie przechowuje ani nie przetwarza numeru PESEL.&lt;br/&gt;&lt;br/&gt;Przypominamy, że podanie pełnych i prawdziwych danych jest obowiązkowe i konieczne do korzystania z systemu VULCAN.</string>
     <string name="auth_button_skip">Na razie pomiń</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Trwa weryfikacja. Czekaj…</string>
+    <string name="captcha_dialog_title">Strona dziennika VULCAN wymaga weryfikacji</string>
+    <string name="captcha_dialog_description"><b>Dlaczego to widzę?</b>\nStrona internetowa dziennika, z której Wulkanowy pobiera dane, wyświetla ten sam ekran jak powyżej, więc Wulkanowy musi również ją pokazać, aby móc pobrać dane z tej witryny. Nie da się tego obejść</string>
     <string name="captcha_verified_message">Pomyślnie zweryfikowano</string>
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_invalid_device_datetime">Wystąpił błąd. Sprawdź poprawność daty w urządzeniu</string>
+    <string name="error_account_inactive">Konto jest nieaktywne. Spróbuj zalogować się ponownie</string>
     <string name="error_timeout">Nie udało się połączyć z dziennikiem. Serwery mogą być przeciążone. Spróbuj ponownie później</string>
     <string name="error_login_failed">Ładowanie danych nie powiodło się. Spróbuj ponownie później</string>
+    <string name="error_password_invalid">Twoje hasło wygasło lub zostało zmienione. Zaloguj się ponownie</string>
     <string name="error_password_change_required">Wymagana zmiana hasła do dziennika</string>
     <string name="error_service_unavailable">Trwa przerwa techniczna dziennika UONET+. Spróbuj ponownie później</string>
     <string name="error_unknown_uonet">Nieznany błąd dziennika UONET+. Spróbuj ponownie później</string>
@@ -865,4 +888,10 @@
     <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>
     <string name="error_field_required">To pole jest wymagane</string>
+    <!-- Mute system -->
+    <string name="message_mute">Wycisz</string>
+    <string name="message_unmute">Wyłącz wyciszenie</string>
+    <string name="message_mute_success">Wyciszyleś tego użytkownika</string>
+    <string name="message_unmute_success">Wyłączyłeś wyciszenie tego użytkownika</string>
+    <string name="pref_mod_settings_other_title">Inne</string>
 </resources>
diff --git a/app/src/main/res/values-ru/mod_values.xml b/app/src/main/res/values-ru/mod_values.xml
new file mode 100644
index 00000000..ad733132
--- /dev/null
+++ b/app/src/main/res/values-ru/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Секретные настройки</string>
+    <string name="pref_hidden_settings_attendance_percentage">Процент посещаемости</string>
+    <string name="pref_hidden_settings_hidden_grades">Скрыть оценки</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Скрытые элементы посещаемости</string>
+    <string name="pref_mod_settings_show_notes">Показать заметки</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Отсутствие без уважительной причины</item>
+        <item>Исключение</item>
+        <item>Опоздание без уважительной причины</item>
+        <item>Не оправданное опоздание</item>
+        <item>Присутствует</item>
+        <item>Удалено</item>
+        <item>Отсутствие без уважительной причины</item>
+        <item>Неизвестный</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Режим разработчика (доступ к этой странице)</string>
+    <string name="pref_mod_settings_developer_mode_summary">После отключения этой настройки вы больше не сможете зайти на эту страницу, но настройки все равно будут применены.</string>
+</resources>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index df3629c0..6c7a74ae 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">Alphabetically</string>
+    <string name="sort_by_date">By date</string>
+    <string name="sort_by_average">By average</string>
+    <string name="sort_by_attendance_percentage">By attendance percentage</string>
+    <string name="sort_by_subject_attendance_balance">By subject attendance balance</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Светлая</item>
         <item>Тёмная</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>В алфавитном порядке</item>
-        <item>По дате</item>
-        <item>По средней</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,6 +56,11 @@
         <item>Only between lessons</item>
         <item>Before and between lessons</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Don\'t show</item>
+        <item>Show inline</item>
+        <item>Show below regular lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Счастливый номер</item>
         <item>Непрочитанные письма</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 717e0213..bd41b074 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -98,8 +98,8 @@
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, авторизуйтесь снова</string>
-    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
-    <string name="main_expired_credentials_title">Password changed</string>
+    <string name="main_expired_credentials_title">Password has expired or been changed</string>
+    <string name="main_expired_credentials_description">Your account password has expired or been changed. You will need to log in to Wulkanowy again</string>
     <string name="main_support_title">Поддержка приложения</string>
     <string name="main_support_description">Вам нравится это приложение? Поддержите его разработку, включив неинвазивную рекламу, которую можно отключить в любое время</string>
     <string name="main_support_positive">Включить рекламу</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Комментарий</string>
     <string name="grade_number_new_items">Количество новых оценок: %1$d</string>
     <string name="grade_average">Средняя оценка: %1$.2f</string>
+    <string name="grade_average_year">Annual: %1$.2f</string>
     <string name="grade_points_sum">Баллы: %s</string>
     <string name="grade_no_average">Нет средней оценки</string>
+    <string name="grade_summary_average_semester">Semester average</string>
+    <string name="grade_summary_average_year">Annual average</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_descriptive">Descriptive grade</string>
-    <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
+    <string name="grade_summary_calculated_average">Calculated semester average</string>
+    <string name="grade_summary_calculated_average_annual">Calculated annual average</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Как работает \"Рассчитанная средняя оценка\"?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Рассчитанная средняя оценка - это среднее арифметическое, рассчитанное на основе средних оценок по предметам. Это позволяет узнать приблизительную итоговую среднюю оценку. Она рассчитывается способом, выбранным пользователем в настройках приложения. Рекомендуется выбрать подходящий вариант, так как каждая школа по разному считает среднюю оценку. Кроме того, если ваша школа выставляет средние оценки по предметам на странице Vulcan, приложение просто загрузит их. Это можно изменить, заставив приложение считать среднюю оценку в настройках.\n\n<b>Средняя из оценок выбранного семестра</b>:\n1. Вычисление средневзвешенного значения по каждому предмету за семестр\n2.Суммирование вычисленных значений\n3. Вычисление среднего арифметического суммированных значений\n\n<b>Средняя из средних оценок семестров</b>:\n1.Расчет средневзвешенного значения для каждого предмета в семестрах. \n2. Вычисление среднего арифметического из средневзвешенных значений для каждого предмета в семестрах.\n3. Суммирование средних арифметических\n4. Вычисление среднего арифматического из суммированных значений\n\n<b>Средняя из оценок со всего года:</b>\n1. Расчет средневзвешенного значения по каждому предмету за год. Итоговое среднее значение за 1 семестр не имеет значения.\n2. Суммирование вычисленных средних\n3. Расчет среднего арифметического суммированных чисел</string>
     <string name="grade_summary_final_average_help_dialog_title">Как работает \"Итоговая средняя оценка\"?</string>
@@ -194,6 +198,7 @@
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
+    <string name="timetable_additional_lesson">Additional lesson</string>
     <string name="timetable_room">Аудитория</string>
     <string name="timetable_group">Группа</string>
     <string name="timetable_time">Часы</string>
@@ -265,6 +270,12 @@
     <string name="additional_lessons_end_time_error">Время окончания должно быть больше, чем время начала</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Итоговая посещаемость</string>
+    <string name="attendance_calculator_button">Attendance calculator</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> over target</string>
+    <string name="attendance_calculator_summary_balance_neutral">right on target</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> under target</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d presences</string>
+    <string name="attendance_calculator_summary_values_empty">No attendances recorded</string>
     <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
     <string name="attendance_absence_excused">Отсутствие по уважительной причине</string>
     <string name="attendance_absence_unexcused">Отсутствие по неуважительной причине</string>
@@ -336,8 +347,10 @@
     <string name="message_forward">Переслать</string>
     <string name="message_select_all">Выбрать все</string>
     <string name="message_unselect_all">Отменить выбор</string>
+    <string name="message_restore_from_trash">Restore from trash</string>
     <string name="message_move_to_trash">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
+    <string name="message_restore_success">Message restored successfully</string>
     <string name="message_delete_success">Сообщение успешно удалено</string>
     <string name="message_mailbox_type_student">ученик</string>
     <string name="message_mailbox_type_parent">родитель</string>
@@ -383,6 +396,7 @@
         <item quantity="other">%1$d выбрано</item>
     </plurals>
     <string name="message_messages_deleted">Сообщение удалено</string>
+    <string name="message_messages_restored">Messages restored</string>
     <string name="message_mailbox_chooser_title">Выбрать почтовый ящик</string>
     <string name="message_incognito_mode_on">Incognito mode is on</string>
     <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
@@ -728,9 +742,13 @@
     <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_attendance_target">Attendance target</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Show subjects without any attendances</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Attendance calculator sorting</string>
     <string name="pref_view_app_theme">Тема</string>
     <string name="pref_view_expand_grade">Разворачивание оценок</string>
     <string name="pref_view_timetable_show_groups">Показать группы рядом с темами</string>
+    <string name="pref_view_timetable_show_additional_lessons">Show additional lessons</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
     <string name="pref_view_subjects_without_grades">Показать предметы без оценок</string>
@@ -795,6 +813,8 @@
     <string name="pref_dashboard_appearance_header">Главная</string>
     <string name="pref_dashboard_appearance_tiles_title">Видимость плиток</string>
     <string name="pref_attendance_appearance_view">Посещаемость</string>
+    <string name="pref_attendance_calculator_appearance_view">Attendance calculator</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Settings</string>
     <string name="pref_timetable_appearance_view">Расписание</string>
     <string name="pref_grades_advanced_header">Оценки</string>
     <string name="pref_counted_average_advanced_header">Рассчитанная средняя оценка</string>
@@ -846,16 +866,19 @@
     <string name="auth_button">Авторизовать</string>
     <string name="auth_success">Авторизация прошла успешно</string>
     <string name="auth_title">Авторизация</string>
-    <string name="auth_description">Для работы приложения нам необходимо подтвердить вашу личность. Введите PESEL учащегося &lt;b&gt;%1$s&lt;/b&gt; в поле ниже</string>
+    <string name="auth_description">Dear Parent,&lt;br /&gt;&lt;br /&gt;To authorize and ensure the security of data, we kindly ask you to enter below PESEL number of student &lt;b&gt;%1$s&lt;/b&gt;. These details are essential for the proper assignment of access and protection of personal data in accordance with applicable regulations.&lt;br /&gt;&lt;br /&gt;After entering the data, it will be verified to ensure that access to the VULCAN system is granted exclusively to authorized individuals. Should you have any doubts or problems, please contact the school diary administrator to clarify the situation.&lt;br /&gt;&lt;br /&gt;We maintain the highest standards of personal data protection and ensure that all information provided is secure. Wulkanowy app does not store or process the PESEL number.&lt;br /&gt;&lt;br /&gt;We remind you that providing full and accurate data is mandatory and necessary for the use of the VULCAN system.</string>
     <string name="auth_button_skip">Пропустить сейчас</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
+    <string name="captcha_dialog_title">VULCAN\'s website requires verification</string>
+    <string name="captcha_dialog_description"><b>Why am I seeing this?</b>\nThe register website from which Wulkanowy downloads data displays the same screen as above, so Wulkanowy must also show it to be able to download data from this website. There\'s no way around it</string>
     <string name="captcha_verified_message">Verified successfully</string>
     <!--Errors-->
     <string name="error_no_internet">Интернет-соединение отсутствует</string>
     <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
+    <string name="error_account_inactive">This account is inactive. Try logging in again</string>
     <string name="error_timeout">Не удалось подключиться к дневнику. Возможно, сервера перегружены, повторите попытку позже</string>
     <string name="error_login_failed">Не удалось загрузить данные, повторите попытку позже</string>
+    <string name="error_password_invalid">Your password has expired or been changed. Please log in again</string>
     <string name="error_password_change_required">Необходимо изменить пароль дневника</string>
     <string name="error_service_unavailable">UONET+ проводит техническое обслуживание, повторите попытку позже</string>
     <string name="error_unknown_uonet">Неизвестная ошибка дневника UONET+, повторите попытку позже</string>
@@ -865,4 +888,10 @@
     <string name="error_feature_disabled">Функция отключена вашей школой</string>
     <string name="error_feature_not_available">Функция недоступна в режиме Mobile API. Воспользуйтесь другим режимом</string>
     <string name="error_field_required">Это поле обязательно</string>
+    <!-- Mute system -->
+    <string name="message_mute">Mute</string>
+    <string name="message_unmute">Unmute</string>
+    <string name="message_mute_success">You have muted this user</string>
+    <string name="message_unmute_success">You have unmuted this user</string>
+    <string name="pref_mod_settings_other_title">Прочее</string>
 </resources>
diff --git a/app/src/main/res/values-sk/mod_values.xml b/app/src/main/res/values-sk/mod_values.xml
new file mode 100644
index 00000000..ca805307
--- /dev/null
+++ b/app/src/main/res/values-sk/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Skryté nastavenia</string>
+    <string name="pref_hidden_settings_attendance_percentage">Percento dochádzky</string>
+    <string name="pref_hidden_settings_hidden_grades">Skryť známky</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Skryté položky dochádzky</string>
+    <string name="pref_mod_settings_show_notes">Zobraziť poznámky</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Neospravedlnená neprítomnosť</item>
+        <item>Vynechanie</item>
+        <item>Ospravedlnené meškanie</item>
+        <item>Neospravedlnené meškanie</item>
+        <item>Prítomnosť</item>
+        <item>Zrušené</item>
+        <item>Ospravedlnená absencia</item>
+        <item>Neznámy</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Vývojársky režim (prístup na túto stránku)</string>
+    <string name="pref_mod_settings_developer_mode_summary">Po vypnutí tohto nastavenia už nebudete mať prístup na túto stránku, ale nastavenia sa budú naďalej uplatňovať.</string>
+</resources>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index 6cd22154..b06f2b3f 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">Abecedne</string>
+    <string name="sort_by_date">Podľa dátumu</string>
+    <string name="sort_by_average">Podľa priemeru</string>
+    <string name="sort_by_attendance_percentage">Podľa percenta dochádzky</string>
+    <string name="sort_by_subject_attendance_balance">Podľa rovnováhy dochádzky predmetu</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Svetlý</item>
         <item>Tmavý</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Abecedne</item>
-        <item>Podľa dátumu</item>
-        <item>Podľa priemeru</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,10 +56,15 @@
         <item>Iba medzi lekciami</item>
         <item>Pred a medzi lekciami</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Nezobrazovať</item>
+        <item>Zobraziť v rade</item>
+        <item>Zobraziť pod pravidelnými hodinami</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
         <item>Neprečítané správy</item>
-        <item>Frekvencia</item>
+        <item>Dochádzka</item>
         <item>Lekcie</item>
         <item>Známky</item>
         <item>Domáce úlohy</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 368ead9d..840a66fc 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -4,7 +4,7 @@
     <string name="login_title">Prihlásenie</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Známky</string>
-    <string name="attendance_title">Frekvencia</string>
+    <string name="attendance_title">Dochádzka</string>
     <string name="exam_title">Skúšky</string>
     <string name="timetable_title">Plán lekcie</string>
     <string name="settings_title">Nastavenia</string>
@@ -31,7 +31,7 @@
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
-    <string name="login_header_default">Prihláste sa pomocou študentského alebo rodičovského konta</string>
+    <string name="login_header_default">Prihláste sa pomocou žiackeho alebo rodičovského účtu</string>
     <string name="login_header_symbol">Zadajte symbol zo stránky denníka: &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_nickname_hint">Užívateľské meno</string>
     <string name="login_email_hint">Email</string>
@@ -56,7 +56,7 @@
     <string name="login_invalid_email">Neplatný e-mail</string>
     <string name="login_invalid_login">Namiesto e-mailu použite priradené prihlasovacie údaje</string>
     <string name="login_invalid_custom_email">Použite priradené prihlasovacie alebo e-mail v @%1$s</string>
-    <string name="login_invalid_domain_suffix">Invalid domain suffix</string>
+    <string name="login_invalid_domain_suffix">Neplatná prípona domény</string>
     <string name="login_invalid_symbol">Neplatný symbol. Pokiaľ ho nemôžete nájsť, kontaktujte školu</string>
     <string name="login_invalid_symbol_definitely">Nevymýšľajte si! Pokiaľ symbol nemôžete nájsť, kontaktujte školu</string>
     <string name="login_incorrect_symbol">Žiak nebol nájdený. Skontrolujte správnosť symbolu a vybrané varianty denníka UONET+</string>
@@ -64,7 +64,7 @@
     <string name="login_symbol_helper">Symbol nájdete na stránke denníka v &#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUistite sa, že ste nastavili správny variant denníka v poli <b>Variácia denníka UONET+</b> na prvej prihlasovacej obrazovke</string>
     <string name="login_select_student">Vyberte žiakov, ktorí sa majú do aplikácie prihlásiť</string>
     <string name="login_advanced">Iné možnosti</string>
-    <string name="login_advanced_warning_mobile_api">V tomto režime nefungujú nasledovné: šťastné číslo, štatistiky triedy, zhrnutie frekvencií, ospravedlnenie neprítomnosti, dokončené lekcie, informácie o škole a prezeranie zoznamu registrovaných zariadení</string>
+    <string name="login_advanced_warning_mobile_api">V tomto režime nefungujú nasledovné: šťastné číslo, štatistiky triedy, zhrnutie dochádzky, ospravedlnenie neprítomnosti, dokončené lekcie, informácie o škole a prezeranie zoznamu registrovaných zariadení</string>
     <string name="login_advanced_warning_scraper">Tento režim zobrazuje rovnaké dáta, ktoré sa zobrazujú na webových stránkach denníka</string>
     <string name="login_advanced_warning_hybrid">Kombinácia najlepších vlastností ostatných dvoch režimov. Funguje rýchlejšie ako scraper a poskytuje funkcie, ktoré nie sú k dispozícii v režime Mobilne API. Je to v experimentálnej fáze</string>
     <string name="login_privacy_policy">Ochrana osobných údajov</string>
@@ -98,8 +98,8 @@
     <string name="main_log_in">Prihlásiť sa</string>
     <string name="main_session_expired">Relácia vypršala</string>
     <string name="main_session_relogin">Relácia vypršala. Prihláste sa prosím znovu</string>
-    <string name="main_expired_credentials_description">Heslo k vášmu účtu bolo zmenené. Musíte sa znovu prihlásiť do Wulkanového</string>
-    <string name="main_expired_credentials_title">Heslo bolo zmenené</string>
+    <string name="main_expired_credentials_title">Heslo vypršalo alebo bolo zmenené</string>
+    <string name="main_expired_credentials_description">Platnosť hesla k vášmu účtu vypršala alebo bolo zmenené. Budete sa musieť znova prihlásiť do Wulkanového</string>
     <string name="main_support_title">Podpora aplikácie</string>
     <string name="main_support_description">Páči sa Vám táto aplikácia? Podporte jej vývoj tým, že povolíte neinvazívne reklamy, ktoré môžete kedykoľvek vypnúť</string>
     <string name="main_support_positive">Zapnúť reklamy</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Komentár</string>
     <string name="grade_number_new_items">Počet nových známok %1$d</string>
     <string name="grade_average">Priemer: %1$.2f</string>
+    <string name="grade_average_year">Ročný: %1$.2f</string>
     <string name="grade_points_sum">Body: %s</string>
     <string name="grade_no_average">Bez priemeru</string>
+    <string name="grade_summary_average_semester">Polročný priemer</string>
+    <string name="grade_summary_average_year">Ročný priemer</string>
     <string name="grade_summary_points">Súčet bodov</string>
     <string name="grade_summary_final_grade">Konečná známka</string>
     <string name="grade_summary_predicted_grade">Predpokladaná známka</string>
     <string name="grade_summary_descriptive">Popisná známka</string>
-    <string name="grade_summary_calculated_average">Vypočítaný priemer</string>
+    <string name="grade_summary_calculated_average">Vypočítaný polročný priemer</string>
+    <string name="grade_summary_calculated_average_annual">Vypočítaný ročný priemer</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Ako funguje vypočítaný priemer?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný priemer je aritmetický priemer vypočítaný z priemerov predmetov. Umožňuje vám to poznať približný konečný priemer. Vypočítava sa spôsobom zvoleným užívateľom v nastaveniach aplikácii. Odporúča sa vybrať príslušnú možnosť. Dôvodom je rozdielny výpočet školských priemerov. Ak vaša škola navyše uvádza priemer predmetov na stránke denníka Vulcan, aplikácia si ich stiahne a tieto priemery nepočíta. To možno zmeniť vynútením výpočtu priemeru v nastavení aplikácii.\n\n<b>Priemer známok iba z vybraného semestra</b>:\n1. Výpočet váženého priemeru pre každý predmet v danom semestri\n2. Sčítanie vypočítaných priemerov\n3. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer priemerov z oboch semestrov</b>:\n1. Výpočet váženého priemeru pre každý predmet v semestri 1 a 2\n2. Výpočet aritmetického priemeru vypočítaných priemerov za semestre 1 a 2 pre každý predmet.\n3. Sčítanie vypočítaných priemerov\n4. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer známok z celého roka:</b>\n1. Výpočet váženého priemeru za rok pre každý predmet. Konečný priemer v 1. semestri je nepodstatný.\n2. Sčítanie vypočítaných priemerov\n3. Výpočet aritmetického priemeru součtených priemerov</string>
     <string name="grade_summary_final_average_help_dialog_title">Ako funguje konečný priemer?</string>
@@ -194,6 +198,7 @@
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Lekcia</string>
+    <string name="timetable_additional_lesson">Ďalšia lekcia</string>
     <string name="timetable_room">Učebňa</string>
     <string name="timetable_group">Skupina</string>
     <string name="timetable_time">Hodiny</string>
@@ -264,7 +269,13 @@
     <string name="additional_lessons_end">Čas ukončenia</string>
     <string name="additional_lessons_end_time_error">Čas ukončenia musí byť neskorší ako čas začatia</string>
     <!--Attendance-->
-    <string name="attendance_summary_button">Zhrnutie frekvencií</string>
+    <string name="attendance_summary_button">Zhrnutie dochádzky</string>
+    <string name="attendance_calculator_button">Kalkulačka dochádzky</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> nad cieľom</string>
+    <string name="attendance_calculator_summary_balance_neutral">presne v cieli</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> pod cieľom</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d prítomnosti</string>
+    <string name="attendance_calculator_summary_values_empty">Nebola zaznamenaná žiadna dochádzka</string>
     <string name="attendance_absence_school">Neprítomnosť zo školských dôvodov</string>
     <string name="attendance_absence_excused">Ospravedlnená neprítomnosť</string>
     <string name="attendance_absence_unexcused">Neospravedlnená neprítomnosť</string>
@@ -282,22 +293,22 @@
     <string name="attendance_excuse_no_selection">Musíte vybrať aspoň jednu neprítomnosť!</string>
     <string name="attendance_excuse_title">Ospravedlniť</string>
     <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">Nová frekvencia</item>
-        <item quantity="few">Nové frekvencie</item>
-        <item quantity="many">Nové frekvencie</item>
-        <item quantity="other">Nové frekvencie</item>
+        <item quantity="one">Nová dochádzka</item>
+        <item quantity="few">Nové dochádzky</item>
+        <item quantity="many">Nové dochádzky</item>
+        <item quantity="other">Nové dochádzky</item>
     </plurals>
     <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d nová frekvencia</item>
-        <item quantity="few">%1$d nové frekvencie</item>
-        <item quantity="many">%1$d nových frekvencií</item>
-        <item quantity="other">%1$d nových frekvencií</item>
+        <item quantity="one">%1$d nová dochádzka</item>
+        <item quantity="few">%1$d nové dochádzky</item>
+        <item quantity="many">%1$d nových dochádzok</item>
+        <item quantity="other">%1$d nových dochádzok</item>
     </plurals>
     <plurals name="attendance_number_item">
-        <item quantity="one">%d frekvencia</item>
-        <item quantity="few">%d frekvencie</item>
-        <item quantity="many">%d frekvencií</item>
-        <item quantity="other">%d frekvencií</item>
+        <item quantity="one">%d dochádzka</item>
+        <item quantity="few">%d dochádzky</item>
+        <item quantity="many">%d dochádzok</item>
+        <item quantity="other">%d dochádzok</item>
     </plurals>
     <!--Attendance summary-->
     <string name="attendance_summary_total">Spoločne</string>
@@ -336,8 +347,10 @@
     <string name="message_forward">Poslať ďalej</string>
     <string name="message_select_all">Vybrať všetko</string>
     <string name="message_unselect_all">Odznačiť všetko</string>
+    <string name="message_restore_from_trash">Obnoviť z koša</string>
     <string name="message_move_to_trash">Presunúť do koša</string>
     <string name="message_delete_forever">Odstrániť natrvalo</string>
+    <string name="message_restore_success">Správa úspešne obnovená</string>
     <string name="message_delete_success">Správa bola úspešne odstránená</string>
     <string name="message_mailbox_type_student">žiak</string>
     <string name="message_mailbox_type_parent">rodič</string>
@@ -383,6 +396,7 @@
         <item quantity="other">%1$d vybraných</item>
     </plurals>
     <string name="message_messages_deleted">Správy odstránené</string>
+    <string name="message_messages_restored">Obnovené správy</string>
     <string name="message_mailbox_chooser_title">Vyberte poštovú schránku</string>
     <string name="message_incognito_mode_on">Režim inkognito je zapnutý</string>
     <string name="message_incognito_description">Vďaka inkognito režimu nie je odosielateľ upozornený, keď si správu prečítate</string>
@@ -728,9 +742,13 @@
     <string name="pref_view_grade_average_mode">Možnosti vypočítaného priemeru</string>
     <string name="pref_view_grade_average_force_calc">Vynútiť priemerný výpočet podľa aplikácie</string>
     <string name="pref_view_present">Zobraziť prítomnosť</string>
+    <string name="pref_attendance_target">Cieľová dochádzka</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Zobraziť predmety bez dochádzok</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Triedenie kalkulačky dochádzky</string>
     <string name="pref_view_app_theme">Motív</string>
     <string name="pref_view_expand_grade">Rozvijanie známok</string>
     <string name="pref_view_timetable_show_groups">Zobraziť skupiny vedľa predmetov</string>
+    <string name="pref_view_timetable_show_additional_lessons">Zobraziť ďalšie lekcie</string>
     <string name="pref_view_timetable_show_gaps">Zobraziť prázdne dlaždice, kde nie je žiadne lekcie</string>
     <string name="pref_view_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
     <string name="pref_view_subjects_without_grades">Zobraziť predmety bez známok</string>
@@ -794,7 +812,9 @@
     <string name="pref_grades_appearance_header">Známky</string>
     <string name="pref_dashboard_appearance_header">Domov</string>
     <string name="pref_dashboard_appearance_tiles_title">Viditeľnosť dlaždíc</string>
-    <string name="pref_attendance_appearance_view">Frekvencia</string>
+    <string name="pref_attendance_appearance_view">Dochádzka</string>
+    <string name="pref_attendance_calculator_appearance_view">Kalkulačka dochádzky</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Nastavenia</string>
     <string name="pref_timetable_appearance_view">Plán lekcie</string>
     <string name="pref_grades_advanced_header">Známky</string>
     <string name="pref_counted_average_advanced_header">Vypočítaný priemer</string>
@@ -822,7 +842,7 @@
     <string name="channel_upcoming_lessons">Nadchádzajúce lekcie</string>
     <string name="channel_debug">Ladenie</string>
     <string name="channel_change_timetable">Zmeny plánu lekcií</string>
-    <string name="channel_new_attendance">Nové frekvencie</string>
+    <string name="channel_new_attendance">Nové dochádzky</string>
     <!--Colors-->
     <string name="all_black">Čierna</string>
     <string name="all_red">Červená</string>
@@ -846,16 +866,19 @@
     <string name="auth_button">Autorizovať</string>
     <string name="auth_success">Autorizácia bola úspešne dokončená</string>
     <string name="auth_title">Autorizácia</string>
-    <string name="auth_description">Na prevádzku aplikácie potrebujeme potvrdiť vašu identitu. Zadajte PESEL žiaka &lt;b&gt;%1$s&lt;/b&gt; v nižšie uvedenom poli</string>
+    <string name="auth_description">Vážený rodiči,&lt;br/&gt;&lt;br/&gt;Ak chcete autorizovať a zaistiť bezpečnosť dát, prosíme Vás, aby ste nižšie zadali PESEL číslo žiaka &lt;b&gt;%1$s&lt;/b&gt;. Tieto detaily sú nutné pre správne prideľovanie prístupu k osobným údajom a ich ochranu v súlade s platnými predpismi.&lt;br/&gt;&lt;br/&gt;Po zadaní údajov budú dáta overené, čím sa zaistí, že prístup do systému VULCAN získajú iba autorizované osoby. Pokiaľ máte akékoľvek pochybnosti alebo problémy, kontaktujte prosím školského správcu denníka pre objasnenie situácie.&lt;br/&gt;&lt;br/&gt;Udržujeme najvyššie štandardy ochrany osobných údajov a zaisťujeme, aby boli všetky poskytnuté informácie chránené. Wulkanowy neukladá ani nespracováva číslo PESEL.&lt;br/&gt;&lt;br/&gt;Pripomíname, že poskytovanie úplných a presných údajov je nutné a nevyhnutné na používanie systému VULCAN.</string>
     <string name="auth_button_skip">Zatiaľ preskočiť</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Overovanie prebieha. Počkajte…</string>
+    <string name="captcha_dialog_title">Webová stránka denníka VULCAN vyžaduje overenie</string>
+    <string name="captcha_dialog_description"><b>Prečo sa mi to zobrazuje?</b>\nWebová stránka denníka, z ktorej Wulkanowy sťahuje dáta, zobrazuje rovnakú obrazovku ako vyššie, takže Wulkanowy ju musí tiež zobraziť, aby bolo možné získavať dáta z tejto stránky. Nedá sa to obísť</string>
     <string name="captcha_verified_message">Úspešne overené</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>
+    <string name="error_account_inactive">Tento účet je neaktívny. Skúste sa znova prihlásiť</string>
     <string name="error_timeout">Nedá sa pripojiť ku denníku. Servery môžu byť preťažené. Prosím skúste to znova neskôr</string>
     <string name="error_login_failed">Načítanie údajov zlyhalo. Skúste neskôr prosím</string>
+    <string name="error_password_invalid">Vaše heslo vypršalo alebo bolo zmenené. Prihláste sa znova</string>
     <string name="error_password_change_required">Je vyžadovaná zmena hesla pre denník</string>
     <string name="error_service_unavailable">Prebieha údržba denníka UONET+. Skúste to neskôr znova</string>
     <string name="error_unknown_uonet">Neznáma chyba dennika UONET+. Prosím skúste to znova neskôr</string>
@@ -865,4 +888,10 @@
     <string name="error_feature_disabled">Funkcia je deaktivovaná cez vašou školou</string>
     <string name="error_feature_not_available">Funkcia nie je k dispozícii. Prihláste sa v inom režime než Mobile API</string>
     <string name="error_field_required">Toto pole je povinné</string>
+    <!-- Mute system -->
+    <string name="message_mute">Stlmiť</string>
+    <string name="message_unmute">Zrušiť stlmenie</string>
+    <string name="message_mute_success">Stlmili ste tohto používateľa</string>
+    <string name="message_unmute_success">Zrušili ste stlmenie tohto používateľa</string>
+    <string name="pref_mod_settings_other_title">Iné</string>
 </resources>
diff --git a/app/src/main/res/values-uk/mod_values.xml b/app/src/main/res/values-uk/mod_values.xml
new file mode 100644
index 00000000..b6d71406
--- /dev/null
+++ b/app/src/main/res/values-uk/mod_values.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Секретні налаштування</string>
+    <string name="pref_hidden_settings_attendance_percentage">Відсоток відвідуваності</string>
+    <string name="pref_hidden_settings_hidden_grades">Приховати оцінки</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Приховані елементи відвідування</string>
+    <string name="pref_mod_settings_show_notes">Показати нотатки</string>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Прогул без поважних причин</item>
+        <item>Звільнення</item>
+        <item>Поважне запізнення</item>
+        <item>Запізнення без поважних причин</item>
+        <item>Присутній</item>
+        <item>Видалено</item>
+        <item>Поважна відсутність</item>
+        <item>Невідомо</item>
+    </string-array>
+    <string name="pref_mod_settings_developer_mode">Режим розробника (доступ до цієї сторінки)</string>
+    <string name="pref_mod_settings_developer_mode_summary">Після вимкнення цього налаштування ви більше не зможете отримати доступ до цієї сторінки, але налаштування все одно будуть застосовані.</string>
+</resources>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index c02efb54..72abe1f7 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="sort_alphabetically">За алфавітом</string>
+    <string name="sort_by_date">За датою</string>
+    <string name="sort_by_average">За середньою</string>
+    <string name="sort_by_attendance_percentage">За відсотком відвідуваності</string>
+    <string name="sort_by_subject_attendance_balance">За балансом відвідування теми</string>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Світла</item>
         <item>Темна</item>
@@ -31,11 +36,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>За алфавітом</item>
-        <item>За датою</item>
-        <item>За середньою</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -56,6 +56,11 @@
         <item>Тільки між уроками</item>
         <item>Перед і між уроками</item>
     </string-array>
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Не показувати</item>
+        <item>Показати у рядку</item>
+        <item>Показати нижче стандартних уроків</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Щасливий номер</item>
         <item>Непрочитані листи</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3d10f117..eeb10e8f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -56,7 +56,7 @@
     <string name="login_invalid_email">Недійсна адреса e-mail</string>
     <string name="login_invalid_login">Використовуйте призначений логін замість адреси e-mail</string>
     <string name="login_invalid_custom_email">Використовуйте призначений логін або адресу e-mail в @%1$s</string>
-    <string name="login_invalid_domain_suffix">Invalid domain suffix</string>
+    <string name="login_invalid_domain_suffix">Невірний суфікс домену</string>
     <string name="login_invalid_symbol">Некоректний символ. Якщо ви не можете знайти його, будь ласка, зв\'яжіться зі школою</string>
     <string name="login_invalid_symbol_definitely">Не вигадуйте! Якщо ви не можете знайти його, будь ласка, зв\'яжіться зі школою</string>
     <string name="login_incorrect_symbol">Студента не знайдено. Перевірте symbol та обраний тип щоденника UONET+</string>
@@ -98,8 +98,8 @@
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
-    <string name="main_expired_credentials_description">Пароль вашого облікового запису був змінений. Ви повинні увійти в Wulkanowy знову</string>
-    <string name="main_expired_credentials_title">Пароль змінено</string>
+    <string name="main_expired_credentials_title">Термін дії пароля закінчився або його було змінено</string>
+    <string name="main_expired_credentials_description">Термін дії пароля для вашого облікового запису закінчився або було змінено. Необхідно зайти в Wulkanowy знову</string>
     <string name="main_support_title">Підтримка додатку</string>
     <string name="main_support_description">Вам подобається цей додаток? Підтримайте його розвиток, увімкнувши неінвазивну рекламу, яку ви можете відключити в будь-який час</string>
     <string name="main_support_positive">Увімкнути рекламу</string>
@@ -113,13 +113,17 @@
     <string name="grade_comment">Коментар</string>
     <string name="grade_number_new_items">Кількість нових оцінок: %1$d</string>
     <string name="grade_average">Середня оцінка: %1$.2f</string>
+    <string name="grade_average_year">Підсумкова: %1$.2f</string>
     <string name="grade_points_sum">Бали: %s</string>
     <string name="grade_no_average">Середня оцінка відсутня</string>
+    <string name="grade_summary_average_semester">Середня за семестр</string>
+    <string name="grade_summary_average_year">Підсумкова середня оцінка</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_descriptive">Описова оцінка</string>
-    <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
+    <string name="grade_summary_calculated_average">Розрахована середня за семестр</string>
+    <string name="grade_summary_calculated_average_annual">Розрахована підсумкова середня оцінка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Як працює \"Розрахована середня оцінка\"?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів. Це дозволяє дізнатися приблизну кінцеву середню оцінку. Вона розраховується спосібом, обраним користувачем у налаштуваннях програми. Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку. Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки і не розраховує їх самостійно. Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
     <string name="grade_summary_final_average_help_dialog_title">Як працює \"Підсумкова середня оцінка\"?</string>
@@ -194,6 +198,7 @@
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
+    <string name="timetable_additional_lesson">Додатковий урок</string>
     <string name="timetable_room">Аудиторія</string>
     <string name="timetable_group">Група</string>
     <string name="timetable_time">Години</string>
@@ -265,6 +270,12 @@
     <string name="additional_lessons_end_time_error">Час завершення має бути пізніше часу початку</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Підсумок відвідуваності</string>
+    <string name="attendance_calculator_button">Калькулятор відвідуваності</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> понад ціль</string>
+    <string name="attendance_calculator_summary_balance_neutral">точно у цілі</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> під ціллю</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d відвідуваності</string>
+    <string name="attendance_calculator_summary_values_empty">Немає жодних записаних відвідувань</string>
     <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
     <string name="attendance_absence_excused">Відсутність з поважних причин</string>
     <string name="attendance_absence_unexcused">Відсутність без поважних причин</string>
@@ -336,8 +347,10 @@
     <string name="message_forward">Переслати</string>
     <string name="message_select_all">Вибрати всі</string>
     <string name="message_unselect_all">Відмінити вибір</string>
+    <string name="message_restore_from_trash">Відновити зі смітника</string>
     <string name="message_move_to_trash">Перемістити до кошика</string>
     <string name="message_delete_forever">Видалити назавжди</string>
+    <string name="message_restore_success">Повідомлення успішно відновлено</string>
     <string name="message_delete_success">Лист було успішно видалено</string>
     <string name="message_mailbox_type_student">учень</string>
     <string name="message_mailbox_type_parent">родич</string>
@@ -383,6 +396,7 @@
         <item quantity="other">%1$d вибрано</item>
     </plurals>
     <string name="message_messages_deleted">Листи видалено</string>
+    <string name="message_messages_restored">Повідомлення відновлені</string>
     <string name="message_mailbox_chooser_title">Вибрати поштову скриньку</string>
     <string name="message_incognito_mode_on">Режим анонімності включено</string>
     <string name="message_incognito_description">Завдяки режиму анонімності, відправник не буде сповіщений коли ви прочитаєте повідомлення</string>
@@ -728,9 +742,13 @@
     <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_attendance_target">Цільова відвідуваність</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Показувати уроки без відвідувань</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Сортування калькулятора відвідування</string>
     <string name="pref_view_app_theme">Тема</string>
     <string name="pref_view_expand_grade">Розгортання оцінок</string>
     <string name="pref_view_timetable_show_groups">Показувати групи поруч з темами</string>
+    <string name="pref_view_timetable_show_additional_lessons">Показати додаткові уроки</string>
     <string name="pref_view_timetable_show_gaps">Показувати порожні плитки там, де немає уроків</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
     <string name="pref_view_subjects_without_grades">Показати предмети без оцінок</string>
@@ -795,6 +813,8 @@
     <string name="pref_dashboard_appearance_header">Головна</string>
     <string name="pref_dashboard_appearance_tiles_title">Видимість плиток</string>
     <string name="pref_attendance_appearance_view">Відвідуваність</string>
+    <string name="pref_attendance_calculator_appearance_view">Калькулятор відвідуваності</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Налаштування</string>
     <string name="pref_timetable_appearance_view">Розклад</string>
     <string name="pref_grades_advanced_header">Оцінки</string>
     <string name="pref_counted_average_advanced_header">Розрахована середня оцінка</string>
@@ -846,16 +866,19 @@
     <string name="auth_button">Авторизовать</string>
     <string name="auth_success">Авторизація пройшла успішно</string>
     <string name="auth_title">Авторизувати</string>
-    <string name="auth_description">Для роботи програми нам потрібно підтвердити вашу особу. Будь ласка, введіть число PESEL &lt;b&gt;%1$s&lt;/b&gt; студента в поле нижче</string>
+    <string name="auth_description">Шановні батьки,&lt;br/&gt;&lt;br/&gt;Для авторизації та забезпечення безпеки даних просимо Вас ввести нижче PESEL номер учня &lt;b&gt;%1$s&lt;/b&gt;. Ці дані необхідні для правильного призначення доступу та захисту персональних даних відповідно до чинного законодавства.&lt;br/&gt;&lt;br/&gt;Після введення даних буде проведена перевірка, щоб переконатися, що доступ до системи VULCAN надається виключно уповноваженим особам. У разі виникнення будь-яких сумнівів або проблем, будь ласка, зв\'яжіться з адміністратором шкільного щоденника для з\'ясування ситуації.&lt;br/&gt;&lt;br/&gt;Ми підтримуємо найвищі стандарти захисту персональних даних і гарантуємо, що вся надана інформація є безпечною. Додаток Wulkanowy не зберігає і не обробляє номер PESEL.&lt;br/&gt;&lt;br/&gt;Нагадуємо, що надання повних і точних даних є обов\'язковим і необхідним для використання системи VULCAN.</string>
     <string name="auth_button_skip">Поки що пропустити</string>
     <!--Captcha-->
-    <string name="captcha_dialog_title">Верифікація в процесі. Чекайте…</string>
+    <string name="captcha_dialog_title">Веб-сайт VULCAN потребує підтвердження</string>
+    <string name="captcha_dialog_description"><b>Чому я це бачу?</b>\nСайт реєстру, з якого Wulkanowy завантажує дані, відображає той самий екран, що й вище, тому Wulkanowy також повинен показувати його, щоб мати змогу завантажувати дані з цього сайту. Це неможливо обійти</string>
     <string name="captcha_verified_message">Верифікація завершена</string>
     <!--Errors-->
     <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>
+    <string name="error_account_inactive">Цей обліковий запис неактивний. Спробуйте увійти ще раз</string>
     <string name="error_timeout">Помилка підключення до щоденнику. Сервери можуть бути перевантажені, спробуйте пізніше</string>
     <string name="error_login_failed">Помилка завантаження даних, спробуйте пізніше</string>
+    <string name="error_password_invalid">Термін дії вашого пароля минув або був змінений. Будь ласка увійдіть знову</string>
     <string name="error_password_change_required">Необхідна зміна пароля щоденника</string>
     <string name="error_service_unavailable">UONET+ проводить технічне осблуговування, спробуйте пізніше</string>
     <string name="error_unknown_uonet">Невідома помилка щоденника UONET+, спробуйте пізніше</string>
@@ -865,4 +888,10 @@
     <string name="error_feature_disabled">Функція вимкнена вашою школою</string>
     <string name="error_feature_not_available">Функція недоступна в режимі Mobile API. Увійдіть в інший режим</string>
     <string name="error_field_required">Це поле обовʼязкове</string>
+    <!-- Mute system -->
+    <string name="message_mute">Вимкнути сповіщення</string>
+    <string name="message_unmute">Ввімкнути сповіщення</string>
+    <string name="message_mute_success">Ви ігноруєте цього користувача</string>
+    <string name="message_unmute_success">Ви не ігноруєте цього користувача</string>
+    <string name="pref_mod_settings_other_title">Інше</string>
 </resources>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 6439b462..9768329d 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -66,7 +66,7 @@
         <item>gminaulanmajorat</item>
         <item>gminaozorkow</item>
         <item>gminalopiennikgorny</item>
-        <item>warszawa</item>
+        <item>saas1</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 4b61db48..510995b9 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,Typos">
     <string-array name="symbols">
+        <item>Adamów, powiat łukowski</item>
+        <item>Aleksandrów, powiat biłgorajski</item>
         <item>Andrychów</item>
         <item>Augustów</item>
         <item>Baranów Sandomierski</item>
@@ -8,6 +10,8 @@
         <item>Bełchatów</item>
         <item>Bełżyce</item>
         <item>Biała Podlaska</item>
+        <item>Biała, powiat prudnicki</item>
+        <item>Biała, powiat wielunski</item>
         <item>Biała Rawska</item>
         <item>Biały Bór</item>
         <item>Białystok</item>
@@ -23,11 +27,17 @@
         <item>Boguchwała</item>
         <item>Boguty-Pianki</item>
         <item>Bolesławiec</item>
+        <item>Bolesław, powiat dąbrowski</item>
         <item>Braniewo</item>
         <item>Brodnica</item>
+        <item>Brodnica, powiat śremski</item>
+        <item>Brody, powiat starachowicki</item>
+        <item>Brójce, powiat łódzki wschodni</item>
         <item>Brwinów</item>
         <item>Brzeg</item>
         <item>Brzeski</item>
+        <item>Powiat brzeski</item>
+        <item>Brzeźnica, powiat wadowicki</item>
         <item>Buk</item>
         <item>Bukowno</item>
         <item>Busko-Zdrój</item>
@@ -36,6 +46,7 @@
         <item>Bystrzyca Kłodzka</item>
         <item>Bytom</item>
         <item>Bytom Odrzański</item>
+        <item>CECH bialski</item>
         <item>Chełm</item>
         <item>Chełmno</item>
         <item>Chełmża</item>
@@ -44,18 +55,28 @@
         <item>Chojnice</item>
         <item>Chojnów</item>
         <item>Chorzów</item>
+        <item>Chrzanów, powiat janowski</item>
         <item>Ciechanów</item>
         <item>Cieszyn</item>
+        <item>Czarna, powiat bieszczadzki</item>
+        <item>Czarna, powiat dębicki</item>
         <item>Czarnków</item>
         <item>Czeladź</item>
+        <item>Czermin, powiat mielecki</item>
+        <item>Czermin, powiat pleszewski</item>
         <item>Czersk</item>
         <item>Częstochowa</item>
         <item>Człuchów</item>
+        <item>Dąbie, powiat krośnieński</item>
         <item>Dąbrowa Białostocka</item>
         <item>Dąbrowa Górnicza</item>
+        <item>Dabrowa, powiat opolski</item>
         <item>Dąbrowa Tarnowska</item>
         <item>Dębica</item>
         <item>Dębno</item>
+        <item>Dębowiec, powiat jasielski</item>
+        <item>Dobra, powiat lobeski</item>
+        <item>Dobre, powiat radziejowski</item>
         <item>Dobrzeń Wielki</item>
         <item>Dobrzeń Wielki 2</item>
         <item>Dobrzyń Nad Wisłą</item>
@@ -67,6 +88,8 @@
         <item>Elbląg</item>
         <item>Ełk</item>
         <item>Frampol</item>
+        <item>Fundacja Elementarz</item>
+        <item>Fundacja Mozaika</item>
         <item>Garwolin</item>
         <item>Gdańsk</item>
         <item>Gdynia</item>
@@ -124,6 +147,7 @@
         <item>Gmina Brańszczyk</item>
         <item>Gmina Brąszewice</item>
         <item>Gmina Brenna</item>
+        <item>Gmina Brochów</item>
         <item>Gmina Brok</item>
         <item>Gmina Brzeg Dolny</item>
         <item>Gmina Brzeziny</item>
@@ -221,6 +245,7 @@
         <item>Gmina Działoszyce</item>
         <item>Gmina Dziemiany</item>
         <item>Gmina Dzierżoniów</item>
+        <item>Gmina Dziwnów</item>
         <item>Gmina Dzwola</item>
         <item>Gmina Elbląg</item>
         <item>Gmina Ełk</item>
@@ -296,6 +321,7 @@
         <item>Gmina Hrubieszów</item>
         <item>Gmina Huszlew</item>
         <item>Gmina Hyżne</item>
+        <item>Gmina Igołomia-Wawrzeńczyce</item>
         <item>Gmina Imielno</item>
         <item>Gmina Inowrocław</item>
         <item>Gmina Irządze</item>
@@ -339,6 +365,7 @@
         <item>Gmina Kamienica</item>
         <item>Gmina Kamiennik</item>
         <item>Gmina Kamionka</item>
+        <item>Gmina Kampinos</item>
         <item>Gmina Karczmiska</item>
         <item>Gmina Kargowa</item>
         <item>Gmina Karlino</item>
@@ -410,6 +437,7 @@
         <item>Gmina Krasocin</item>
         <item>Gmina Krempna</item>
         <item>Gmina Krokowa</item>
+        <item>Gmina Krościenko</item>
         <item>Gmina Krośnice</item>
         <item>Gmina Krupski Młyn</item>
         <item>Gmina Kruszwica</item>
@@ -477,6 +505,7 @@
         <item>Gmina Łopiennik Górny</item>
         <item>Gmina Łopuszno</item>
         <item>Gmina Łosice</item>
+        <item>Gmina Łososina Dolna</item>
         <item>Gmina Lubań</item>
         <item>Gmina Lubartów</item>
         <item>Gmina Lubasz</item>
@@ -524,6 +553,7 @@
         <item>Gmina Miejsce Piastowe</item>
         <item>Gmina Miękinia</item>
         <item>Gmina Mielec</item>
+        <item>Gmina Mieleszyn</item>
         <item>Gmina Mielno</item>
         <item>Gmina Mieszkowice</item>
         <item>Gmina Milanów</item>
@@ -575,6 +605,7 @@
         <item>Gmina Nowy Kawęczyn</item>
         <item>Gmina Nowy Korczyn</item>
         <item>Gmina Nowy Staw</item>
+        <item>Gmina Nowy Wiśnicz</item>
         <item>Gmina Nowy Targ</item>
         <item>Gmina Nowy Tomyśl</item>
         <item>Gmina Nozdrzec</item>
@@ -587,6 +618,7 @@
         <item>Gmina Olszyna</item>
         <item>Gmina Opatowiec</item>
         <item>Gmina Orneta</item>
+        <item>Gmina Orchowo</item>
         <item>Gmina Osieczna</item>
         <item>Gmina Osiek</item>
         <item>Gmina Osiek Jasielski</item>
@@ -629,9 +661,12 @@
         <item>Gmina Piątnica</item>
         <item>Gmina Piekoszów</item>
         <item>Gmina Pieniężno</item>
+        <item>Gmina Pietrowice Wielkie</item>
         <item>Gmina Pilchowice</item>
+        <item>Gmina Pielgrzymka</item>
         <item>Gmina Pińczów</item>
         <item>Gmina Pionki</item>
+        <item>Gmina Piszczac</item>
         <item>Gmina Płaska</item>
         <item>Gmina Platerówka</item>
         <item>Gmina Pleśna</item>
@@ -655,6 +690,7 @@
         <item>Gmina Popów</item>
         <item>Gmina Potęgowo</item>
         <item>Gmina Potok Wielki</item>
+        <item>Gmina Paradyż</item>
         <item>Gmina Praszka</item>
         <item>Gmina Prochowice</item>
         <item>Gmina Promna</item>
@@ -733,6 +769,7 @@
         <item>Gmina Sanok</item>
         <item>Gmina Sawin</item>
         <item>Gmina Ścinawa</item>
+        <item>Gmina Secemin</item>
         <item>Gmina Sędziejowice</item>
         <item>Gmina Sejny</item>
         <item>Gmina Sękowa</item>
@@ -758,6 +795,7 @@
         <item>Gmina Sitno</item>
         <item>Gmina Skarżysko Kościelne</item>
         <item>Gmina Skępe</item>
+        <item>Gmina Skierbieszów</item>
         <item>Gmina Skierniewice</item>
         <item>Gmina Skoczów</item>
         <item>Gmina Skoki</item>
@@ -779,6 +817,7 @@
         <item>Gmina Sobótka</item>
         <item>Gmina Sokółka</item>
         <item>Gmina Solina</item>
+        <item>Gmina Somonino</item>
         <item>Gmina Sośnicowice</item>
         <item>Gmina Sośnie</item>
         <item>Gmina Sośno</item>
@@ -800,11 +839,13 @@
         <item>Gmina Stoczek Łukowski</item>
         <item>Gmina Stopnica</item>
         <item>Gmina Strawczyn</item>
+        <item>Gmina Stromiec</item>
         <item>Gmina Stryków</item>
         <item>Gmina Stryszawa</item>
         <item>Gmina Stryszów</item>
         <item>Gmina Strzałkowo</item>
         <item>Gmina Strzelce Opolskie</item>
+        <item>Gmina Strzelce Opolskie 2</item>
         <item>Gmina Strzelin</item>
         <item>Gmina Strzelno</item>
         <item>Gmina Strzyżewice</item>
@@ -846,6 +887,7 @@
         <item>Gmina Tarnów</item>
         <item>Gmina Tarnowiec</item>
         <item>Gmina Tarnów Opolski</item>
+        <item>Gmina Tarnów Opolski 2</item>
         <item>Gmina Teresin</item>
         <item>Gmina Tereszpol</item>
         <item>Gmina Tłuchowo</item>
@@ -870,6 +912,7 @@
         <item>Gmina Tyrawa Wołoska</item>
         <item>Gmina Uchanie</item>
         <item>Gmina Ujazd</item>
+        <item>Gmina PSP Ujazd</item>
         <item>Gmina Ulan-Majorat</item>
         <item>Gmina Ulanów</item>
         <item>Gmina Ułęż</item>
@@ -898,6 +941,7 @@
         <item>Gmina Wielgomłyny</item>
         <item>Gmina Wieliszew</item>
         <item>Gmina Wielka Nieszawka</item>
+        <item>Gmina Gmina Wielopole Skrzyńskie</item>
         <item>Gmina Wieniawa</item>
         <item>Gmina Wieprz</item>
         <item>Gmina Wieruszów</item>
@@ -937,6 +981,7 @@
         <item>Gmina Wolsztyn</item>
         <item>Gmina Wręczyca Wielka</item>
         <item>Gmina Wronki</item>
+        <item>Gmina Wyryki</item>
         <item>Gmina Wyrzysk</item>
         <item>Gmina Wysokie</item>
         <item>Gmina Żabno</item>
@@ -980,6 +1025,7 @@
         <item>Gmina Żołynia</item>
         <item>Gmina Żukowice</item>
         <item>Gmina Żurawica</item>
+        <item>Gmina Żychlin</item>
         <item>Gmina Żyraków</item>
         <item>Gmina Żyrzyn</item>
         <item>Gmina Żytno</item>
@@ -992,9 +1038,11 @@
         <item>Górzno</item>
         <item>Gorzów Śląski</item>
         <item>Gorzów Wielkopolski</item>
+        <item>Gorzyce powiat tarnobrzeski</item>
         <item>Gostynin</item>
         <item>Grajewo</item>
         <item>Grodzisk Mazowiecki</item>
+        <item>Grodzisk Wielkopolski</item>
         <item>Grudziądz</item>
         <item>Grybów</item>
         <item>Gryfino</item>
@@ -1002,10 +1050,14 @@
         <item>Hel</item>
         <item>Hrubieszów</item>
         <item>Inowrocław</item>
+        <item>IR Tarnów</item>
         <item>Izbica Kujawska</item>
+        <item>Jabłonna, powiat legionowski</item>
+        <item>Jabłonna, powiat lubelski</item>
         <item>Jabłonowo Pomorskie</item>
         <item>Janowiec Wielkopolski</item>
         <item>Janów Lubelski</item>
+        <item>Janów, powiat sokolski</item>
         <item>Jarocin</item>
         <item>Jarosław</item>
         <item>Jasło</item>
@@ -1040,6 +1092,7 @@
         <item>Kołobrzeg</item>
         <item>Koniecpol</item>
         <item>Konin</item>
+        <item>Konopnica powiat lubelski</item>
         <item>Konstancin-Jeziorna</item>
         <item>Konstantynów Łódzki</item>
         <item>Koronowo</item>
@@ -1060,6 +1113,7 @@
         <item>Krosno</item>
         <item>Krotoszyce</item>
         <item>Krotoszyn</item>
+        <item>Krynica</item>
         <item>Krzeszowice</item>
         <item>Krzyż Wielkopolski</item>
         <item>Książ Wielkopolski</item>
@@ -1079,12 +1133,14 @@
         <item>Lędziny</item>
         <item>Legionowo</item>
         <item>Legnica</item>
+        <item>Leśnica opolska</item>
         <item>Leszno</item>
         <item>Lewin Brzeski</item>
         <item>Lewin Brzeski 2</item>
         <item>Leżajsk</item>
         <item>Limanowa</item>
         <item>Lipno</item>
+        <item>Lipno, powiat lipnowski</item>
         <item>Łódź</item>
         <item>Łódzkie</item>
         <item>Łowicz</item>
@@ -1095,6 +1151,7 @@
         <item>Lubin</item>
         <item>Lublin</item>
         <item>Lubliniec</item>
+        <item>Lubnice, powiat staszowski</item>
         <item>Lubuskie</item>
         <item>Łuków</item>
         <item>Lwówecki</item>
@@ -1102,18 +1159,30 @@
         <item>Malbork</item>
         <item>Małopolskie</item>
         <item>Marki</item>
+        <item>Maszewo, powiat goleniowski</item>
         <item>Mazowieckie</item>
+        <item>MEN</item>
+        <item>Miasto Toruń</item>
         <item>Michałowice</item>
         <item>Miechów</item>
         <item>Międzyrzec Podlaski</item>
         <item>Miejska Górka</item>
         <item>Mielec</item>
         <item>Milanówek</item>
+        <item>Ministerstwo Rolnictwa</item>
         <item>Mińsk Mazowiecki</item>
+        <item>Ministerstwo Kultury i Dziedzictwa Narodowego</item>
         <item>Mniszków</item>
+        <item>Ministerstwo Nauki i Szkolnictwa</item>
+        <item>Ministerstwo Obrony Narodowej</item>
+        <item>Ministerstwo Środowiska</item>
         <item>Mosina</item>
+        <item>Moszczenica powiat gorlicki</item>
+        <item>Moszczenica powiat piotrkowski</item>
         <item>Mrągowo</item>
         <item>Mrągowski</item>
+        <item>Ministerstwo Sprawiedliwości</item>
+        <item>Ministerstwo Spraw Wewnętrznych</item>
         <item>Mszana Dolna</item>
         <item>Mszczonów</item>
         <item>Muszyna</item>
@@ -1137,9 +1206,17 @@
         <item>Nowy Żmigród</item>
         <item>Nysa</item>
         <item>Oborniki Śląskie</item>
+        <item>Oborniki Wielkopolskie</item>
         <item>Obrzycko</item>
+        <item>Oleśnica, powiat olesnicki</item>
+        <item>Oleśnica, powiat staszowski</item>
+        <item>Olesno powiat dąbrowski</item>
+        <item>Olesno powiat oleski</item>
         <item>Olkusz</item>
+        <item>Olszanka, powiat brzeski</item>
         <item>Olsztyn</item>
+        <item>Opatów, powiat kłobucki</item>
+        <item>Opatów, powiat opatowski</item>
         <item>Opinogóra Górna</item>
         <item>Opoczno</item>
         <item>Opole</item>
@@ -1148,8 +1225,10 @@
         <item>Orzesze</item>
         <item>Osieczna</item>
         <item>Osiecznica</item>
+        <item>Osiek, powiat starogardzki</item>
         <item>Ostróda</item>
         <item>Ostrołęka</item>
+        <item>Ostrowiec Świętokrzyski</item>
         <item>Ostrów Wielkopolski</item>
         <item>Oświęcim</item>
         <item>Otwock</item>
@@ -1166,6 +1245,7 @@
         <item>Pilzno</item>
         <item>Piotrków Trybunalski</item>
         <item>Pisz</item>
+        <item>Piwniczna</item>
         <item>Płock</item>
         <item>Płońsk</item>
         <item>Pniewy</item>
@@ -1177,6 +1257,8 @@
         <item>Pomorskie</item>
         <item>Poniec</item>
         <item>Poręba</item>
+        <item>Poświętne, powiat opoczyński</item>
+        <item>Poświętne, powiat wołomiński</item>
         <item>Powiat aleksandrowski</item>
         <item>Powiat augustowski</item>
         <item>Powiat będziński</item>
@@ -1217,6 +1299,7 @@
         <item>Powiat giżycki</item>
         <item>Powiat gliwicki</item>
         <item>Powiat głogowski</item>
+        <item>Powiat głubczycki</item>
         <item>Powiat gnieźnieński</item>
         <item>Powiat gołdapski</item>
         <item>Powiat goleniowski</item>
@@ -1226,6 +1309,8 @@
         <item>Powiat gorzowski</item>
         <item>Powiat gostyński</item>
         <item>Powiat grajewski</item>
+        <item>Powiat grodziski, mazowieckie</item>
+        <item>Powiat grodziski, wielkopolskie</item>
         <item>Powiat grójecki</item>
         <item>Powiat gryficki</item>
         <item>Powiat gryfiński</item>
@@ -1293,6 +1378,7 @@
         <item>Powiat makowski</item>
         <item>Powiat malborski</item>
         <item>Powiat miechowski</item>
+        <item>Powiat międzyrzecki</item>
         <item>Powiat mielecki</item>
         <item>Powiat mikołowski</item>
         <item>Powiat milicki</item>
@@ -1321,17 +1407,21 @@
         <item>Powiat olsztyński</item>
         <item>Powiat opatowski</item>
         <item>Powiat opoczyński</item>
+        <item>Powiat opole lubelskie</item>
         <item>Powiat opolski</item>
+        <item>Powiat opolski 2</item>
         <item>Powiat ostródzki</item>
         <item>Powiat ostrowiecki</item>
         <item>Powiat ostrzeszowski</item>
         <item>Powiat oświęcimski</item>
+        <item>Powiat ostrowski, mazowieckie</item>
         <item>Powiat otwocki</item>
         <item>Powiat pabianicki</item>
         <item>Powiat piaseczyński</item>
         <item>Powiat pilski</item>
         <item>Powiat pińczowski</item>
         <item>Powiat piotrkowski</item>
+        <item>Powiat piski, warmińsko-mazurskie</item>
         <item>Powiat pleszewski</item>
         <item>Powiat płocki</item>
         <item>Powiat płoński</item>
@@ -1391,6 +1481,7 @@
         <item>Powiat suski</item>
         <item>Powiat świdnicki</item>
         <item>Powiat świdwiński</item>
+        <item>Powiat świdnicki w Świdniku</item>
         <item>Powiat świebodziński</item>
         <item>Powiat świecki</item>
         <item>Powiat szamotulski</item>
@@ -1403,6 +1494,7 @@
         <item>Powiat tatrzański</item>
         <item>Powiat tczewski</item>
         <item>Powiat tomaszowski</item>
+        <item>Powiat tomaszowski, lubelskie</item>
         <item>Powiat toruński</item>
         <item>Powiat trzebnicki</item>
         <item>Powiat tucholski</item>
@@ -1444,6 +1536,7 @@
         <item>Powiat żyrardowski</item>
         <item>Powiat żywiecki</item>
         <item>Poznań</item>
+        <item>prfrawamaz</item>
         <item>Proszowice</item>
         <item>Prudnik</item>
         <item>Pruszcz Gdański</item>
@@ -1461,6 +1554,7 @@
         <item>Rabka-Zdrój</item>
         <item>Raciąż</item>
         <item>Racibórz</item>
+        <item>Radków Kłodzki</item>
         <item>Radom</item>
         <item>Radomsko</item>
         <item>Radomyśl Wielki</item>
@@ -1468,12 +1562,17 @@
         <item>Radziejów</item>
         <item>Radzionków</item>
         <item>Radzyń Podlaski</item>
+        <item>Rakoniewice</item>
         <item>Rawa Mazowiecka</item>
         <item>Rawicz</item>
         <item>Reda</item>
+        <item>Rejowiec, powiat chełmski</item>
+        <item>Rogowo, powiat rypiński</item>
+        <item>Rogowo, powiat żniński</item>
         <item>Rogóźno</item>
         <item>Ropczyce</item>
         <item>Ruda Śląska</item>
+        <item>Rudnik, powiat raciborski</item>
         <item>Rumia</item>
         <item>Rybnik</item>
         <item>Rychwał</item>
@@ -1482,6 +1581,7 @@
         <item>Rypin</item>
         <item>Rzeszów</item>
         <item>Rzeszów projekt</item>
+        <item>Rzgów, powiat koniński</item>
         <item>Sandomierz</item>
         <item>Sanok</item>
         <item>Sędziszów Małopolski</item>
@@ -1503,14 +1603,19 @@
         <item>Sokołów Podlaski</item>
         <item>Sopot</item>
         <item>Sosnowiec</item>
+        <item>spmajkowskarzysko</item>
+        <item>spteodory</item>
         <item>Śrem</item>
         <item>Środa Śląska</item>
         <item>Środa Wielkopolska</item>
         <item>Starachowice</item>
         <item>Stargard</item>
         <item>Starogard Gdański</item>
+        <item>starostwokrosnienskie</item>
         <item>Stary Sącz</item>
         <item>Staszów</item>
+        <item>stezycapowiatrycki</item>
+        <item>stowarzyszenieintegracja</item>
         <item>Stronie Śląskie</item>
         <item>Strzyżów</item>
         <item>Sulejówek</item>
@@ -1518,9 +1623,12 @@
         <item>Sulmierzyce</item>
         <item>Swarzędz</item>
         <item>Świdnica</item>
+        <item>swidnicapowiatswidnicki</item>
+        <item>swidnicapowiatzielonogorski</item>
         <item>Świdnik</item>
         <item>Świdwin</item>
         <item>Świeradów-Zdrój</item>
+        <item>swietajnopowiatszczycienski</item>
         <item>Świętochłowice</item>
         <item>Świnoujście</item>
         <item>Syców</item>
@@ -1532,6 +1640,7 @@
         <item>Szprotawa</item>
         <item>Sztum</item>
         <item>Szubin</item>
+        <item>szydlowopowiatpilski</item>
         <item>Tarnobrzeg</item>
         <item>Tarnów</item>
         <item>Tarnowskie Góry</item>
@@ -1548,6 +1657,7 @@
         <item>Turawa</item>
         <item>Tuszyn</item>
         <item>Tychy</item>
+        <item>UG Gołcza</item>
         <item>Ujazd</item>
         <item>Ustka</item>
         <item>Ustroń</item>
@@ -1557,6 +1667,20 @@
         <item>Wałcz</item>
         <item>Warmińsko-Mazurskie</item>
         <item>Warszawa</item>
+        <item>Warszawa Bemowo</item>
+        <item>Warszawa Białołęka</item>
+        <item>Warszawa Bielany</item>
+        <item>Warszawa Mokotów</item>
+        <item>Warszawa Praga Południe</item>
+        <item>Warszawa Śródmiśscie</item>
+        <item>Warszawa Targówek</item>
+        <item>Warszawa Ursus</item>
+        <item>Warszawa Ursynow</item>
+        <item>Warszawa Wawer</item>
+        <item>Warszawa Wesoła</item>
+        <item>Warszawa Włochy</item>
+        <item>Warszawa Wola</item>
+        <item>Warszawa Żoliborz</item>
         <item>Wąsosz</item>
         <item>Węgrów</item>
         <item>Wejherowo</item>
@@ -1564,6 +1688,10 @@
         <item>Wieliczka</item>
         <item>Wielkopolskie</item>
         <item>Wieluń</item>
+        <item>Wierzbica, powiat chełmski</item>
+        <item>Wierzbica, powiat radomski</item>
+        <item>Wilków, powiat namysłowski</item>
+        <item>Wiśniowa, powiat myślenicki</item>
         <item>Władysławowo</item>
         <item>Włocławek</item>
         <item>Włodawa</item>
@@ -1580,24 +1708,36 @@
         <item>Żagań</item>
         <item>Zakliczyn</item>
         <item>Zakopane</item>
+        <item>Zakrzewo, powiat aleksandrowski</item>
         <item>Zambrów</item>
         <item>Zamość</item>
         <item>Żary</item>
         <item>Zawidów</item>
         <item>Zduńska Wola</item>
         <item>Zduny</item>
+        <item>ZDZ Warszawa</item>
         <item>Żelechów</item>
+        <item>Zespół Szkół PPC Kumarszew</item>
         <item>Zgierz</item>
         <item>Zgorzelec</item>
         <item>Zielona Góra</item>
         <item>Zielonka</item>
+        <item>ZKSO 1 Katowice</item>
         <item>Złotoryja</item>
         <item>Złotów</item>
         <item>Żory</item>
+        <item>ZS2 Lubin</item>
+        <item>ZSK Sieradz</item>
+        <item>ZSKZ Kwidzyn</item>
+        <item>ZSKZ Sochaczew</item>
+        <item>ZSP Stare Koźle</item>
+        <item>ZST powiat opoczyński</item>
         <item>Zwoleń</item>
         <item>Żyrardów</item>
     </string-array>
     <string-array name="symbols_values">
+        <item>adamowpowiatlukowski</item>
+        <item>aleksandrowpowiatbilgorajski</item>
         <item>andrychow</item>
         <item>augustow</item>
         <item>baranowsandomierski</item>
@@ -1605,6 +1745,8 @@
         <item>belchatow</item>
         <item>belzyce</item>
         <item>bialapodlaska</item>
+        <item>bialapowiatprudnicki</item>
+        <item>bialapowiatwielunski</item>
         <item>bialarawska</item>
         <item>bialybor</item>
         <item>bialystok</item>
@@ -1620,11 +1762,17 @@
         <item>boguchwala</item>
         <item>bogutypianki</item>
         <item>boleslawiec</item>
+        <item>boleslawpowiatdabrowski</item>
         <item>braniewo</item>
         <item>brodnica</item>
+        <item>brodnicapowiatsremski</item>
+        <item>brodypowiatstarachowicki</item>
+        <item>brojcepowiatlodzkiwsch</item>
         <item>brwinow</item>
         <item>brzeg</item>
         <item>brzeski</item>
+        <item>brzeskipowiat</item>
+        <item>brzeznicapowiatwadowicki</item>
         <item>buk</item>
         <item>bukowno</item>
         <item>buskozdroj</item>
@@ -1633,6 +1781,7 @@
         <item>bystrzycaklodzka</item>
         <item>bytom</item>
         <item>bytomodrzanski</item>
+        <item>cechbialski</item>
         <item>chelm</item>
         <item>chelmno</item>
         <item>chelmza</item>
@@ -1641,18 +1790,28 @@
         <item>chojnice</item>
         <item>chojnow</item>
         <item>chorzow</item>
+        <item>chrzanowpowiatjanowski</item>
         <item>ciechanow</item>
         <item>cieszyn</item>
+        <item>czarnapowiatbieszczadzki</item>
+        <item>czarnapowiatdebicki</item>
         <item>czarnkow</item>
         <item>czeladz</item>
+        <item>czerminpowiatmielecki</item>
+        <item>czerminpowiatpleszewski</item>
         <item>czersk</item>
         <item>czestochowa</item>
         <item>czluchow</item>
+        <item>dabiepowiatkrosnienski</item>
         <item>dabrowabialostocka</item>
         <item>dabrowagornicza</item>
+        <item>dabrowapowiatopolski</item>
         <item>dabrowatarnowska</item>
         <item>debica</item>
         <item>debno</item>
+        <item>debowiecpowiatjasielski</item>
+        <item>dobrapowiatlobeski</item>
+        <item>dobrepowiatradziejowski</item>
         <item>dobrzenwielki</item>
         <item>dobrzenwielki2</item>
         <item>dobrzynnadwisla</item>
@@ -1664,6 +1823,8 @@
         <item>elblag</item>
         <item>elk</item>
         <item>frampol</item>
+        <item>fundacjaelementarz</item>
+        <item>fundacjamozaika</item>
         <item>garwolin</item>
         <item>gdansk</item>
         <item>gdynia</item>
@@ -1721,6 +1882,7 @@
         <item>gminabranszczyk</item>
         <item>gminabraszewice</item>
         <item>gminabrenna</item>
+        <item>gminabrochow</item>
         <item>gminabrok</item>
         <item>gminabrzegdolny</item>
         <item>gminabrzeziny</item>
@@ -1818,6 +1980,7 @@
         <item>gminadzialoszyce</item>
         <item>gminadziemiany</item>
         <item>gminadzierzoniow</item>
+        <item>gminadziwnow</item>
         <item>gminadzwola</item>
         <item>gminaelblag</item>
         <item>gminaelk</item>
@@ -1893,6 +2056,7 @@
         <item>gminahrubieszow</item>
         <item>gminahuszlew</item>
         <item>gminahyzne</item>
+        <item>gminaiglomniawawrzenczyce</item>
         <item>gminaimielno</item>
         <item>gminainowroclaw</item>
         <item>gminairzadze</item>
@@ -1936,6 +2100,7 @@
         <item>gminakamienica</item>
         <item>gminakamiennik</item>
         <item>gminakamionka</item>
+        <item>gminakampinos</item>
         <item>gminakarczmiska</item>
         <item>gminakargowa</item>
         <item>gminakarlino</item>
@@ -2007,6 +2172,7 @@
         <item>gminakrasocin</item>
         <item>gminakrempna</item>
         <item>gminakrokowa</item>
+        <item>gminakroscienko</item>
         <item>gminakrosnice</item>
         <item>gminakrupskimlyn</item>
         <item>gminakruszwica</item>
@@ -2074,6 +2240,7 @@
         <item>gminalopiennikgorny</item>
         <item>gminalopuszno</item>
         <item>gminalosice</item>
+        <item>gminalososinadolna</item>
         <item>gminaluban</item>
         <item>gminalubartow</item>
         <item>gminalubasz</item>
@@ -2121,6 +2288,7 @@
         <item>gminamiejscepiastowe</item>
         <item>gminamiekinia</item>
         <item>gminamielec</item>
+        <item>gminamieleszyn</item>
         <item>gminamielno</item>
         <item>gminamieszkowice</item>
         <item>gminamilanow</item>
@@ -2172,6 +2340,7 @@
         <item>gminanowykaweczyn</item>
         <item>gminanowykorczyn</item>
         <item>gminanowystaw</item>
+        <item>gminanowyswisnicz</item>
         <item>gminanowytarg</item>
         <item>gminanowytomysl</item>
         <item>gminanozdrzec</item>
@@ -2184,6 +2353,7 @@
         <item>gminaolszyna</item>
         <item>gminaopatowiec</item>
         <item>gminaorneta</item>
+        <item>gminaorochowo</item>
         <item>gminaosieczna</item>
         <item>gminaosiek</item>
         <item>gminaosiekjasielski</item>
@@ -2226,9 +2396,12 @@
         <item>gminapiatnica</item>
         <item>gminapiekoszow</item>
         <item>gminapieniezno</item>
+        <item>gminapietrowicewlk</item>
         <item>gminapilchowice</item>
+        <item>gminapilelgrzymka</item>
         <item>gminapinczow</item>
         <item>gminapionki</item>
+        <item>gminapiszac</item>
         <item>gminaplaska</item>
         <item>gminaplaterowka</item>
         <item>gminaplesna</item>
@@ -2252,6 +2425,7 @@
         <item>gminapopow</item>
         <item>gminapotegowo</item>
         <item>gminapotokwielki</item>
+        <item>gminapradyz</item>
         <item>gminapraszka</item>
         <item>gminaprochowice</item>
         <item>gminapromna</item>
@@ -2330,6 +2504,7 @@
         <item>gminasanok</item>
         <item>gminasawin</item>
         <item>gminascinawa</item>
+        <item>gminasecemin</item>
         <item>gminasedziejowice</item>
         <item>gminasejny</item>
         <item>gminasekowa</item>
@@ -2355,6 +2530,7 @@
         <item>gminasitno</item>
         <item>gminaskarzyskokoscielne</item>
         <item>gminaskepe</item>
+        <item>gminaskierbieszow</item>
         <item>gminaskierniewice</item>
         <item>gminaskoczow</item>
         <item>gminaskoki</item>
@@ -2376,6 +2552,7 @@
         <item>gminasobotka</item>
         <item>gminasokolka</item>
         <item>gminasolina</item>
+        <item>gminasomonino</item>
         <item>gminasosnicowice</item>
         <item>gminasosnie</item>
         <item>gminasosno</item>
@@ -2397,11 +2574,13 @@
         <item>gminastoczeklukowski</item>
         <item>gminastopnica</item>
         <item>gminastrawczyn</item>
+        <item>gminastromiec</item>
         <item>gminastrykow</item>
         <item>gminastryszawa</item>
         <item>gminastryszow</item>
         <item>gminastrzalkowo</item>
         <item>gminastrzelceopolskie</item>
+        <item>gminastrzelceopolskie2</item>
         <item>gminastrzelin</item>
         <item>gminastrzelno</item>
         <item>gminastrzyzewice</item>
@@ -2443,6 +2622,7 @@
         <item>gminatarnow</item>
         <item>gminatarnowiec</item>
         <item>gminatarnowopolski</item>
+        <item>gminatarnowopolski2</item>
         <item>gminateresin</item>
         <item>gminatereszpol</item>
         <item>gminatluchowo</item>
@@ -2467,6 +2647,7 @@
         <item>gminatyrawawoloska</item>
         <item>gminauchanie</item>
         <item>gminaujazd</item>
+        <item>gminaujazdpsp</item>
         <item>gminaulanmajorat</item>
         <item>gminaulanow</item>
         <item>gminaulez</item>
@@ -2495,6 +2676,7 @@
         <item>gminawielgomlyny</item>
         <item>gminawieliszew</item>
         <item>gminawielkanieszawka</item>
+        <item>gminawielopoleskrzynskie</item>
         <item>gminawieniawa</item>
         <item>gminawieprz</item>
         <item>gminawieruszow</item>
@@ -2534,6 +2716,7 @@
         <item>gminawolsztyn</item>
         <item>gminawreczycawielka</item>
         <item>gminawronki</item>
+        <item>gminawyrki</item>
         <item>gminawyrzysk</item>
         <item>gminawysokie</item>
         <item>gminazabno</item>
@@ -2577,6 +2760,7 @@
         <item>gminazolynia</item>
         <item>gminazukowice</item>
         <item>gminazurawica</item>
+        <item>gminazychlin</item>
         <item>gminazyrakow</item>
         <item>gminazyrzyn</item>
         <item>gminazytno</item>
@@ -2589,9 +2773,11 @@
         <item>gorzno</item>
         <item>gorzowslaski</item>
         <item>gorzowwielkopolski</item>
+        <item>gorzycepowiattarnobrzeski</item>
         <item>gostynin</item>
         <item>grajewo</item>
         <item>grodziskmazowiecki</item>
+        <item>grodziskwielkopolski</item>
         <item>grudziadz</item>
         <item>grybow</item>
         <item>gryfino</item>
@@ -2599,10 +2785,14 @@
         <item>hel</item>
         <item>hrubieszow</item>
         <item>inowroclaw</item>
+        <item>irtarnow</item>
         <item>izbicakujawska</item>
+        <item>jablonnapowiatlegionowski</item>
+        <item>jablonnapowiatlubelski</item>
         <item>jablonowopomorskie</item>
         <item>janowiecwielkopolski</item>
         <item>janowlubelski</item>
+        <item>janowpowiatsokolski</item>
         <item>jarocin</item>
         <item>jaroslaw</item>
         <item>jaslo</item>
@@ -2637,6 +2827,7 @@
         <item>kolobrzeg</item>
         <item>koniecpol</item>
         <item>konin</item>
+        <item>konopnicapowiatlubelski</item>
         <item>konstancinjeziorna</item>
         <item>konstantynowlodzki</item>
         <item>koronowo</item>
@@ -2657,6 +2848,7 @@
         <item>krosno</item>
         <item>krotoszyce</item>
         <item>krotoszyn</item>
+        <item>krynica</item>
         <item>krzeszowice</item>
         <item>krzyzwielkopolski</item>
         <item>ksiazwielkopolski</item>
@@ -2676,12 +2868,14 @@
         <item>ledziny</item>
         <item>legionowo</item>
         <item>legnica</item>
+        <item>lesnicaopolska</item>
         <item>leszno</item>
         <item>lewinbrzeski</item>
         <item>lewinbrzeski2</item>
         <item>lezajsk</item>
         <item>limanowa</item>
         <item>lipno</item>
+        <item>lipnopowiatlipnowski</item>
         <item>lodz</item>
         <item>lodzkie</item>
         <item>lowicz</item>
@@ -2692,6 +2886,7 @@
         <item>lubin</item>
         <item>lublin</item>
         <item>lubliniec</item>
+        <item>lubnicepowiatstaszowski</item>
         <item>lubuskie</item>
         <item>lukow</item>
         <item>lwowecki</item>
@@ -2699,18 +2894,30 @@
         <item>malbork</item>
         <item>malopolskie</item>
         <item>marki</item>
+        <item>maszewopowiatgoleniowski</item>
         <item>mazowieckie</item>
+        <item>men</item>
+        <item>miastotorun</item>
         <item>michalowice</item>
         <item>miechow</item>
         <item>miedzyrzecpodlaski</item>
         <item>miejskagorka</item>
         <item>mielec</item>
         <item>milanowek</item>
+        <item>minrol</item>
         <item>minskmazowiecki</item>
+        <item>mkdn</item>
         <item>mniszkow</item>
+        <item>mnsw</item>
+        <item>mon</item>
+        <item>mos</item>
         <item>mosina</item>
+        <item>moszczenicapowiatgorlicki</item>
+        <item>moszczenicapowiatpiotrkowski</item>
         <item>mragowo</item>
         <item>mragowski</item>
+        <item>ms</item>
+        <item>msw</item>
         <item>mszanadolna</item>
         <item>mszczonow</item>
         <item>muszyna</item>
@@ -2734,9 +2941,17 @@
         <item>nowyzmigrod</item>
         <item>nysa</item>
         <item>obornikislaskie</item>
+        <item>obornikiwielkopolskie</item>
         <item>obrzycko</item>
+        <item>olesnicapowiatolesnicki</item>
+        <item>olesnicapowiatstaszowski</item>
+        <item>olesnopowiatdabrowski</item>
+        <item>olesnopowiatoleski</item>
         <item>olkusz</item>
+        <item>olszankapowiatbrzeski</item>
         <item>olsztyn</item>
+        <item>opatowpowiatklobucki</item>
+        <item>opatowpowiatopatowski</item>
         <item>opinogoragorna</item>
         <item>opoczno</item>
         <item>opole</item>
@@ -2745,8 +2960,10 @@
         <item>orzesze</item>
         <item>osieczna</item>
         <item>osiecznica</item>
+        <item>osiekpowiatstarogardzki</item>
         <item>ostroda</item>
         <item>ostroleka</item>
+        <item>ostrowiecsw</item>
         <item>ostrowwielkopolski</item>
         <item>oswiecim</item>
         <item>otwock</item>
@@ -2763,6 +2980,7 @@
         <item>pilzno</item>
         <item>piotrkowtrybunalski</item>
         <item>pisz</item>
+        <item>piwniczna</item>
         <item>plock</item>
         <item>plonsk</item>
         <item>pniewy</item>
@@ -2774,6 +2992,8 @@
         <item>pomorskie</item>
         <item>poniec</item>
         <item>poreba</item>
+        <item>poswietnepowiatopoczynski</item>
+        <item>poswietnepowiatwolominski</item>
         <item>powiataleksandrowski</item>
         <item>powiataugustowski</item>
         <item>powiatbedzinski</item>
@@ -2814,6 +3034,7 @@
         <item>powiatgizycki</item>
         <item>powiatgliwicki</item>
         <item>powiatglogowski</item>
+        <item>powiatglubczycki</item>
         <item>powiatgnieznienski</item>
         <item>powiatgoldapski</item>
         <item>powiatgoleniowski</item>
@@ -2823,6 +3044,8 @@
         <item>powiatgorzowski</item>
         <item>powiatgostynski</item>
         <item>powiatgrajewski</item>
+        <item>powiatgrodziskimazowieckie</item>
+        <item>powiatgrodziskiwielkopolskie</item>
         <item>powiatgrojecki</item>
         <item>powiatgryficki</item>
         <item>powiatgryfinski</item>
@@ -2890,6 +3113,7 @@
         <item>powiatmakowski</item>
         <item>powiatmalborski</item>
         <item>powiatmiechowski</item>
+        <item>powiatmiedzyrzecki</item>
         <item>powiatmielecki</item>
         <item>powiatmikolowski</item>
         <item>powiatmilicki</item>
@@ -2918,17 +3142,21 @@
         <item>powiatolsztynski</item>
         <item>powiatopatowski</item>
         <item>powiatopoczynski</item>
+        <item>powiatopolelubelskie</item>
         <item>powiatopolski</item>
+        <item>powiatopolski2</item>
         <item>powiatostrodzki</item>
         <item>powiatostrowiecki</item>
         <item>powiatostrzeszowski</item>
         <item>powiatoswiecimski</item>
+        <item>powiatostrowskimazowieckie</item>
         <item>powiatotwocki</item>
         <item>powiatpabianicki</item>
         <item>powiatpiaseczynski</item>
         <item>powiatpilski</item>
         <item>powiatpinczowski</item>
         <item>powiatpiotrkowski</item>
+        <item>powiatpiskiwarminskomazurskie</item>
         <item>powiatpleszewski</item>
         <item>powiatplocki</item>
         <item>powiatplonski</item>
@@ -2988,6 +3216,7 @@
         <item>powiatsuski</item>
         <item>powiatswidnicki</item>
         <item>powiatswidwinski</item>
+        <item>powiatswidnickiwswidniku</item>
         <item>powiatswiebodzinski</item>
         <item>powiatswiecki</item>
         <item>powiatszamotulski</item>
@@ -3000,6 +3229,7 @@
         <item>powiattatrzanski</item>
         <item>powiattczewski</item>
         <item>powiattomaszowski</item>
+        <item>powiattomaszowskilubelskie</item>
         <item>powiattorunski</item>
         <item>powiattrzebnicki</item>
         <item>powiattucholski</item>
@@ -3041,6 +3271,7 @@
         <item>powiatzyrardowski</item>
         <item>powiatzywiecki</item>
         <item>poznan</item>
+        <item>prfrawamaz</item>
         <item>proszowice</item>
         <item>prudnik</item>
         <item>pruszczgdanski</item>
@@ -3058,6 +3289,7 @@
         <item>rabkazdroj</item>
         <item>raciaz</item>
         <item>raciborz</item>
+        <item>radkowklodzki</item>
         <item>radom</item>
         <item>radomsko</item>
         <item>radomyslwielki</item>
@@ -3065,12 +3297,17 @@
         <item>radziejow</item>
         <item>radzionkow</item>
         <item>radzynpodlaski</item>
+        <item>rakoniewice</item>
         <item>rawamazowiecka</item>
         <item>rawicz</item>
         <item>reda</item>
+        <item>rejowiecpowiatchelmski</item>
+        <item>rogowopowiatrypinski</item>
+        <item>rogowopowiatzninski</item>
         <item>rogozno</item>
         <item>ropczyce</item>
         <item>rudaslaska</item>
+        <item>rudnikpowiatraciborski</item>
         <item>rumia</item>
         <item>rybnik</item>
         <item>rychwal</item>
@@ -3079,6 +3316,7 @@
         <item>rypin</item>
         <item>rzeszow</item>
         <item>rzeszowprojekt</item>
+        <item>rzgowpowiatkoninski</item>
         <item>sandomierz</item>
         <item>sanok</item>
         <item>sedziszowmalopolski</item>
@@ -3100,14 +3338,19 @@
         <item>sokolowpodlaski</item>
         <item>sopot</item>
         <item>sosnowiec</item>
+        <item>spmajkowskarzysko</item>
+        <item>spteodory</item>
         <item>srem</item>
         <item>srodaslaska</item>
         <item>srodawielkopolska</item>
         <item>starachowice</item>
         <item>stargard</item>
         <item>starogardgdanski</item>
+        <item>starostwokrosnienskie</item>
         <item>starysacz</item>
         <item>staszow</item>
+        <item>stezycapowiatrycki</item>
+        <item>stowarzyszenieintegracja</item>
         <item>stronieslaskie</item>
         <item>strzyzow</item>
         <item>sulejowek</item>
@@ -3115,9 +3358,12 @@
         <item>sulmierzyce</item>
         <item>swarzedz</item>
         <item>swidnica</item>
+        <item>swidnicapowiatswidnicki</item>
+        <item>swidnicapowiatzielonogorski</item>
         <item>swidnik</item>
         <item>swidwin</item>
         <item>swieradowzdroj</item>
+        <item>swietajnopowiatszczycienski</item>
         <item>swietochlowice</item>
         <item>swinoujscie</item>
         <item>sycow</item>
@@ -3129,6 +3375,7 @@
         <item>szprotawa</item>
         <item>sztum</item>
         <item>szubin</item>
+        <item>szydlowopowiatpilski</item>
         <item>tarnobrzeg</item>
         <item>tarnow</item>
         <item>tarnowskiegory</item>
@@ -3145,6 +3392,7 @@
         <item>turawa</item>
         <item>tuszyn</item>
         <item>tychy</item>
+        <item>uggolcza</item>
         <item>ujazd</item>
         <item>ustka</item>
         <item>ustron</item>
@@ -3154,6 +3402,20 @@
         <item>walcz</item>
         <item>warminskomazurskie</item>
         <item>warszawa</item>
+        <item>warszawabemowo</item>
+        <item>warszawabialoleka</item>
+        <item>warszawabielany</item>
+        <item>warszawamokotow</item>
+        <item>warszawapragapoludnie</item>
+        <item>warszawasrodmiescie</item>
+        <item>warszawatargowek</item>
+        <item>warszawaursus</item>
+        <item>warszawaursynow</item>
+        <item>warszawawawer</item>
+        <item>warszawawesola</item>
+        <item>warszawawlochy</item>
+        <item>warszawawola</item>
+        <item>warszawazoliborz</item>
         <item>wasosz</item>
         <item>wegrow</item>
         <item>wejherowo</item>
@@ -3161,6 +3423,10 @@
         <item>wieliczka</item>
         <item>wielkopolskie</item>
         <item>wielun</item>
+        <item>wierzbicapowiatchelmski</item>
+        <item>wierzbicapowiatradomski</item>
+        <item>wilkowpowiatnamyslowski</item>
+        <item>wisniowapowiatmyslenicki</item>
         <item>wladyslawowo</item>
         <item>wloclawek</item>
         <item>wlodawa</item>
@@ -3177,20 +3443,30 @@
         <item>zagan</item>
         <item>zakliczyn</item>
         <item>zakopane</item>
+        <item>zakrzewopowiataleksandrowski</item>
         <item>zambrow</item>
         <item>zamosc</item>
         <item>zary</item>
         <item>zawidow</item>
         <item>zdunskawola</item>
         <item>zduny</item>
+        <item>zdzwarszawa</item>
         <item>zelechow</item>
+        <item>zespolszkolppckumarszew</item>
         <item>zgierz</item>
         <item>zgorzelec</item>
         <item>zielonagora</item>
         <item>zielonka</item>
+        <item>zkso1katowice</item>
         <item>zlotoryja</item>
         <item>zlotow</item>
         <item>zory</item>
+        <item>zs2lubin</item>
+        <item>zsksieradz</item>
+        <item>zskzkwidzyn</item>
+        <item>zskzsochaczew</item>
+        <item>zspstarekozle</item>
+        <item>zstpowiatopoczynski</item>
         <item>zwolen</item>
         <item>zyrardow</item>
     </string-array>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8ad27ad8..f31a5f94 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -46,14 +46,15 @@
 
     <color name="timetable_canceled_light">#d32f2f</color>
     <color name="timetable_canceled_dark">#e57373</color>
+
     <color name="timetable_change_light">#ff8f00</color>
     <color name="timetable_change_dark">#ffd54f</color>
 
     <color name="attendance_absence_light">#d32f2f</color>
     <color name="attendance_absence_dark">#e57373</color>
 
-    <color name="attendance_lateness_light">#cd2a01</color>
-    <color name="attendance_lateness_dark">#f05d0e</color>
+    <color name="attendance_lateness_light">#ff8f00</color>
+    <color name="attendance_lateness_dark">#ffd54f</color>
 
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
diff --git a/app/src/main/res/values/mod_values.xml b/app/src/main/res/values/mod_values.xml
new file mode 100644
index 00000000..dd3c8001
--- /dev/null
+++ b/app/src/main/res/values/mod_values.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_mod_settings_title">Hidden settings</string>
+    <string name="pref_mod_settings_hidden_attendance_items">Hidden attendance items</string>
+    <string name="pref_hidden_settings_attendance_percentage">Attendance percentage</string>
+    <string name="pref_hidden_settings_hidden_grades">Hidden grades</string>
+
+    <string name="pref_key_hidden_grades" translatable="false">hidden_grades</string>
+    <string name="pref_key_attendance_items" translatable="false">attendance_items</string>
+    <string name="pref_key_attendance_percentage" translatable="false">attendance_percentage</string>
+    <string name="pref_key_developer_mode" translatable="false">developer_mode</string>
+    <string name="pref_default_attendance_percentage" translatable="false">-1</string>
+    <string name="pref_key_show_notes" translatable="false">show_notes</string>
+
+    <string name="pref_mod_settings_developer_mode">Developer mode (access to this page)</string>
+    <string name="pref_mod_settings_developer_mode_summary">After disabling this setting, you will not be able to access this page anymore, but the settings will still be applied.</string>
+    <string name="pref_mod_settings_show_notes">Show notes</string>
+
+    <bool name="pref_default_developer_mode">false</bool>
+    <bool name="pref_default_show_notes">true</bool>
+
+    <string-array name="mod_settings_attendance_entries">
+        <item>Unexcused absence</item>
+        <item>Exemption</item>
+        <item>Excused lateness</item>
+        <item>Unexcused lateness</item>
+        <item>Present</item>
+        <item>Deleted</item>
+        <item>Excused absence</item>
+        <item>Unknown</item>
+    </string-array>
+
+    <string-array name="mod_settings_attendance_values" translatable="false">
+        <item>UNEXCUSED_ABSENCE</item>
+        <item>EXEMPTION</item>
+        <item>EXCUSED_LATENESS</item>
+        <item>UNEXCUSED_LATENESS</item>
+        <item>PRESENT</item>
+        <item>DELETED</item>
+        <item>EXCUSED_ABSENCE</item>
+        <item>UNKNOWN</item>
+    </string-array>
+
+    <string-array name="pref_default_hidden_attendance_items">
+
+    </string-array>
+
+    <string-array name="hidden_settings_bad_grades" translatable="false">
+        <item>1</item>
+        <item>1+</item>
+        <item>2-</item>
+        <item>2</item>
+        <item>2+</item>
+        <item>3-</item>
+        <item>3</item>
+        <item>3+</item>
+        <item>4-</item>
+        <item>4</item>
+        <item>4+</item>
+        <item>5-</item>
+        <item>5</item>
+        <item>5+</item>
+        <item>6</item>
+        <item>6-</item>
+        <item>nb</item>
+        <item>0</item>
+    </string-array>
+    <string-array name="pref_default_hidden_grades" translatable="false">
+        <item>1</item>
+        <item>1+</item>
+        <item>2-</item>
+        <item>2</item>
+        <item>2+</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index 8e6fc7d6..0845dcc5 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -2,6 +2,9 @@
 <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>
+    <integer name="pref_default_attendance_target">50</integer>
+    <string name="pref_default_attendance_calculator_sorting_mode">alphabetic</string>
+    <bool name="pref_default_attendance_calculator_show_empty_subjects">false</bool>
     <string name="pref_default_grade_average_mode">only_one_semester</string>
     <bool name="pref_default_grade_average_force_calc">false</bool>
     <string name="pref_default_expand_grade_mode">one</string>
@@ -19,7 +22,8 @@
     <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>
-    <bool name="pref_default_timetable_show_groups">false</bool>
+    <bool name="pref_default_timetable_show_groups">true</bool>
+    <string name="pref_default_timetable_show_additional_lessons">below</string>
     <string name="pref_default_timetable_show_whole_class">no</string>
     <string name="pref_default_grade_sorting_mode">alphabetic</string>
     <string name="pref_default_timetable_show_gaps">between</string>
@@ -36,6 +40,7 @@
         <item>GRADES</item>
         <item>ANNOUNCEMENTS</item>
     </string-array>
+    <string-array name="pref_default_hidden_settings_tiles"/>
     <bool name="pref_default_ads_enabled">false</bool>
     <bool name="pref_default_ads_consent_data_processing">false</bool>
     <bool name="pref_default_incognito_mode">false</bool>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 74af9262..ce877308 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="pref_key_start_menu">default_menu_index</string>
+    <string name="pref_key_attendance_calculator">attendance_calculator</string>
     <string name="pref_key_attendance_present">attendance_present</string>
+    <string name="pref_key_attendance_target">attendance_target</string>
+    <string name="pref_key_attendance_calculator_sorting_mode">attendance_calculator_sorting_mode</string>
+    <string name="pref_key_attendance_calculator_show_empty_subjects">attendance_calculator_show_empty_subjects</string>
     <string name="pref_key_app_theme">app_theme</string>
     <string name="pref_key_dashboard_tiles">dashboard_tiles</string>
     <string name="pref_key_grade_color_scheme">grade_color_scheme</string>
@@ -27,6 +31,7 @@
     <string name="pref_key_grade_sorting_mode">grade_sorting_mode</string>
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
     <string name="pref_key_timetable_show_groups">show_groups_in_plan</string>
+    <string name="pref_key_timetable_show_additional_lessons">show_additional_lessons</string>
     <string name="pref_key_timetable_show_gaps">timetable_show_gaps</string>
     <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
     <string name="pref_key_optional_arithmetic_average">optional_arithmetic_average</string>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index f56707c8..e5020b53 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="sort_alphabetically">Alphabetically</string>
+    <string name="sort_by_date">By date</string>
+    <string name="sort_by_average">By average</string>
+    <string name="sort_by_attendance_percentage">By attendance percentage</string>
+    <string name="sort_by_subject_attendance_balance">By subject attendance balance</string>
+
     <string-array name="startup_tab_entries" translatable="false">
         <item>@string/dashboard_title</item>
         <item>@string/grade_title</item>
@@ -79,10 +86,21 @@
         <item>0.75</item>
     </string-array>
 
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
+    <string-array name="attendance_calculator_sorting_mode_entries" translatable="false">
+        <item>@string/sort_alphabetically</item>
+        <item>@string/sort_by_attendance_percentage</item>
+        <item>@string/sort_by_subject_attendance_balance</item>
+    </string-array>
+    <string-array name="attendance_calculator_sorting_mode_values" translatable="false">
+        <item>alphabetic</item>
+        <item>attendance_percentage</item>
+        <item>lesson_balance</item>
+    </string-array>
+
+    <string-array name="grade_sorting_mode_entries" translatable="false">
+        <item>@string/sort_alphabetically</item>
+        <item>@string/sort_by_date</item>
+        <item>@string/sort_by_average</item>
     </string-array>
     <string-array name="grade_sorting_mode_values" translatable="false">
         <item>alphabetic</item>
@@ -134,6 +152,17 @@
         <item>before_and_between</item>
     </string-array>
 
+    <string-array name="timetable_show_additional_lessons_entries">
+        <item>Don\'t show</item>
+        <item>Show inline</item>
+        <item>Show below regular lessons</item>
+    </string-array>
+    <string-array name="timetable_show_additional_lessons_values" translatable="false">
+        <item>none</item>
+        <item>inline</item>
+        <item>below</item>
+    </string-array>
+
     <string-array name="dashboard_tile_entries">
         <item>Lucky number</item>
         <item>Unread messages</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a4dcf7f..2a015f29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="student_info_title">Student info</string>
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
-    <string name="menu_order_title">Menu configuartion</string>
+    <string name="menu_order_title">Menu configuration</string>
 
 
     <!--Subtitles-->
@@ -109,8 +109,8 @@
     <string name="main_log_in">Log in</string>
     <string name="main_session_expired">Session expired</string>
     <string name="main_session_relogin">Session expired, log in again</string>
-    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
-    <string name="main_expired_credentials_title">Password changed</string>
+    <string name="main_expired_credentials_title">Password has expired or been changed</string>
+    <string name="main_expired_credentials_description">Your account password has expired or been changed. You will need to log in to Wulkanowy again</string>
     <string name="main_support_title">Application support</string>
     <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
     <string name="main_support_positive">Enable ads</string>
@@ -126,13 +126,17 @@
     <string name="grade_comment">Comment</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_average_year">Annual: %1$.2f</string>
     <string name="grade_points_sum">Points: %s</string>
     <string name="grade_no_average">No average</string>
+    <string name="grade_summary_average_semester">Semester average</string>
+    <string name="grade_summary_average_year">Annual average</string>
     <string name="grade_summary_points">Total points</string>
     <string name="grade_summary_final_grade">Final grade</string>
     <string name="grade_summary_predicted_grade">Predicted grade</string>
     <string name="grade_summary_descriptive">Descriptive grade</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average">Calculated semester average</string>
+    <string name="grade_summary_calculated_average_annual">Calculated annual average</string>
     <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
     <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
     <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
@@ -191,6 +195,7 @@
 
     <!--Timetable-->
     <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_additional_lesson">Additional lesson</string>
     <string name="timetable_room">Room</string>
     <string name="timetable_group">Group</string>
     <string name="timetable_time">Hours</string>
@@ -258,6 +263,12 @@
 
     <!--Attendance-->
     <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_calculator_button">Attendance calculator</string>
+    <string name="attendance_calculator_summary_balance_positive"><b>%1$d</b> over target</string>
+    <string name="attendance_calculator_summary_balance_neutral">right on target</string>
+    <string name="attendance_calculator_summary_balance_negative"><b>%1$d</b> under target</string>
+    <string name="attendance_calculator_summary_values">%1$d/%2$d presences</string>
+    <string name="attendance_calculator_summary_values_empty">No attendances recorded</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
     <string name="attendance_absence_excused">Excused absence</string>
     <string name="attendance_absence_unexcused">Unexcused absence</string>
@@ -325,8 +336,10 @@
     <string name="message_forward">Forward</string>
     <string name="message_select_all">Select all</string>
     <string name="message_unselect_all">Unselect all</string>
+    <string name="message_restore_from_trash">Restore from trash</string>
     <string name="message_move_to_trash">Move to trash</string>
     <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_restore_success">Message restored successfully</string>
     <string name="message_delete_success">Message deleted successfully</string>
     <string name="message_mailbox_type_student">student</string>
     <string name="message_mailbox_type_parent">parent</string>
@@ -364,6 +377,7 @@
         <item quantity="other">%1$d selected</item>
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_messages_restored">Messages restored</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
     <string name="message_incognito_mode_on">Incognito mode is on</string>
     <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
@@ -712,9 +726,13 @@
     <string name="pref_view_grade_average_mode">Calculated average options</string>
     <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
     <string name="pref_view_present">Show presence</string>
+    <string name="pref_attendance_target">Attendance target</string>
+    <string name="pref_attendance_calculator_show_empty_subjects">Show subjects without any attendances</string>
+    <string name="pref_view_attendance_calculator_sorting_mode">Attendance calculator sorting</string>
     <string name="pref_view_app_theme">Theme</string>
     <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_additional_lessons">Show additional lessons</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
@@ -780,6 +798,8 @@
     <string name="pref_dashboard_appearance_header">Dashboard</string>
     <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
     <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_attendance_calculator_appearance_view">Attendance calculator</string>
+    <string name="pref_attendance_calculator_appearance_settings_title">Settings</string>
     <string name="pref_timetable_appearance_view">Timetable</string>
     <string name="pref_grades_advanced_header">Grades</string>
     <string name="pref_counted_average_advanced_header">Calculated average</string>
@@ -840,20 +860,23 @@
     <string name="auth_button">Authorize</string>
     <string name="auth_success">Authorization completed successfully</string>
     <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b>%1$s&lt;/b> in the field below</string>
+    <string name="auth_description">Dear Parent,&lt;br />&lt;br />To authorize and ensure the security of data, we kindly ask you to enter below PESEL number of student &lt;b>%1$s&lt;/b>. These details are essential for the proper assignment of access and protection of personal data in accordance with applicable regulations.&lt;br />&lt;br />After entering the data, it will be verified to ensure that access to the VULCAN system is granted exclusively to authorized individuals. Should you have any doubts or problems, please contact the school diary administrator to clarify the situation.&lt;br />&lt;br />We maintain the highest standards of personal data protection and ensure that all information provided is secure. Wulkanowy app does not store or process the PESEL number.&lt;br />&lt;br />We remind you that providing full and accurate data is mandatory and necessary for the use of the VULCAN system.</string>
     <string name="auth_button_skip">Skip for now</string>
 
 
     <!--Captcha-->
-    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
+    <string name="captcha_dialog_title">VULCAN\'s website requires verification</string>
+    <string name="captcha_dialog_description"><b>Why am I seeing this?</b>\nThe register website from which Wulkanowy downloads data displays the same screen as above, so Wulkanowy must also show it to be able to download data from this website. There\'s no way around it</string>
     <string name="captcha_verified_message">Verified successfully</string>
 
 
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_account_inactive">This account is inactive. Try logging in again</string>
     <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
     <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_invalid">Your password has expired or been changed. Please log in again</string>
     <string name="error_password_change_required">Register password change required</string>
     <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
     <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
@@ -863,4 +886,11 @@
     <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>
     <string name="error_field_required">This field is required</string>
+
+    <!-- Mute system -->
+    <string name="message_mute">Mute</string>
+    <string name="message_unmute">Unmute</string>
+    <string name="message_mute_success">You have muted this user</string>
+    <string name="message_unmute_success">You have unmuted this user</string>
+    <string name="pref_mod_settings_other_title">Other</string>
 </resources>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 5bf7ad8a..11b84a92 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:key="settings_preferences">
     <Preference
         app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment"
         app:icon="@drawable/ic_settings_appearance"
@@ -30,4 +32,9 @@
         app:key="about"
         app:summary="@string/pref_about_category_summary"
         app:title="@string/about_title" />
+    <Preference
+        app:fragment="io.github.wulkanowy.ui.modules.settings.mod_settings.ModSettingsFragment"
+        app:icon="@drawable/ic_dashboard_warning"
+        app:key="mod_settings"
+        app:title="@string/pref_mod_settings_title" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
index 9c02a491..55f425d9 100644
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ b/app/src/main/res/xml/scheme_preferences_appearance.xml
@@ -86,6 +86,34 @@
             app:key="@string/pref_key_attendance_present"
             app:title="@string/pref_view_present" />
     </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:key="@string/pref_key_attendance_calculator"
+        app:title="@string/pref_attendance_calculator_appearance_view">
+        <SeekBarPreference
+            android:layout="@layout/pref_target_attendance"
+            android:max="99"
+            app:defaultValue="@integer/pref_default_attendance_target"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_target"
+            app:min="1"
+            app:showSeekBarValue="true"
+            app:title="@string/pref_attendance_target"
+            app:updatesContinuously="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_attendance_calculator_sorting_mode"
+            app:entries="@array/attendance_calculator_sorting_mode_entries"
+            app:entryValues="@array/attendance_calculator_sorting_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_calculator_sorting_mode"
+            app:title="@string/pref_view_attendance_calculator_sorting_mode"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_attendance_calculator_show_empty_subjects"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_calculator_show_empty_subjects"
+            app:title="@string/pref_attendance_calculator_show_empty_subjects" />
+    </PreferenceCategory>
     <PreferenceCategory
         android:layout_height="wrap_content"
         app:iconSpaceReserved="false"
@@ -114,5 +142,13 @@
             app:key="@string/pref_key_timetable_show_gaps"
             app:title="@string/pref_view_timetable_show_gaps"
             app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_timetable_show_additional_lessons"
+            app:entries="@array/timetable_show_additional_lessons_entries"
+            app:entryValues="@array/timetable_show_additional_lessons_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_additional_lessons"
+            app:title="@string/pref_view_timetable_show_additional_lessons"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/scheme_preferences_mod_settings.xml b/app/src/main/res/xml/scheme_preferences_mod_settings.xml
new file mode 100644
index 00000000..b6588511
--- /dev/null
+++ b/app/src/main/res/xml/scheme_preferences_mod_settings.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/attendance_title">
+        <EditTextPreference
+            android:inputType="numberDecimal"
+            android:digits="0123456789"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_percentage"
+            app:title="@string/pref_hidden_settings_attendance_percentage"
+            app:useSimpleSummaryProvider="true" />
+
+        <MultiSelectListPreference
+            app:defaultValue="@array/pref_default_hidden_attendance_items"
+            app:entries="@array/mod_settings_attendance_entries"
+            app:entryValues="@array/mod_settings_attendance_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_items"
+            app:title="@string/pref_mod_settings_hidden_attendance_items"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/grade_title">
+        <MultiSelectListPreference
+            app:entries="@array/hidden_settings_bad_grades"
+            app:entryValues="@array/hidden_settings_bad_grades"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_hidden_grades"
+            app:title="@string/pref_hidden_settings_hidden_grades"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/note_title">
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_show_notes"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_show_notes"
+            app:singleLineTitle="false"
+            app:title="@string/pref_mod_settings_show_notes" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_mod_settings_other_title">
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_developer_mode"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_developer_mode"
+            app:singleLineTitle="false"
+            app:title="@string/pref_mod_settings_developer_mode"
+            app:summary="@string/pref_mod_settings_developer_mode_summary"/>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
new file mode 100644
index 00000000..38f6306f
--- /dev/null
+++ b/app/src/play/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application tools:ignore="MissingApplicationIcon">
+        <property
+            android:name="android.adservices.AD_SERVICES_CONFIG"
+            android:resource="@xml/gma_ad_services_config"
+            tools:replace="android:resource" />
+    </application>
+</manifest>
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
index bd17d52c..a873c99e 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -93,8 +93,12 @@ class AdsHelper @Inject constructor(
     private fun initializeMobileAds() {
         if (isMobileAdsInitializeCalled.getAndSet(true)) return
 
-        MobileAds.initialize(context) {
-            isMobileAdsSdkInitialized.value = true
+        try {
+            MobileAds.initialize(context) {
+                isMobileAdsSdkInitialized.value = true
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
         }
     }
 
diff --git a/app/src/play/res/xml/scheme_preferences.xml b/app/src/play/res/xml/scheme_preferences.xml
index 05b0bf64..f9c1c0bc 100644
--- a/app/src/play/res/xml/scheme_preferences.xml
+++ b/app/src/play/res/xml/scheme_preferences.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:key="settings_preferences">
     <Preference
         app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment"
         app:icon="@drawable/ic_settings_appearance"
@@ -36,4 +38,9 @@
         app:key="about"
         app:summary="@string/pref_about_category_summary"
         app:title="@string/about_title" />
+    <Preference
+        app:fragment="io.github.wulkanowy.ui.modules.settings.mod_settings.ModSettingsFragment"
+        app:icon="@drawable/ic_dashboard_warning"
+        app:key="mod_settings"
+        app:title="@string/pref_mod_settings_title" />
 </PreferenceScreen>
diff --git a/app/src/release/google-services.json b/app/src/release/google-services.json
deleted file mode 100644
index ebd157e1..00000000
--- a/app/src/release/google-services.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "project_info": {
-    "project_number": "",
-    "firebase_url": "",
-    "project_id": "",
-    "storage_bucket": ""
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:1091101852179:android:b558a25f65d088b1",
-        "android_client_info": {
-          "package_name": "io.github.wulkanowy"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index 9f5d731b..96b75c35 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -5,8 +5,8 @@ import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import java.time.LocalDate
 import java.time.Instant.now
+import java.time.LocalDate
 import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
 
 fun getSemesterEntity(diaryId: Int = 1, semesterId: Int = 1, start: LocalDate = LocalDate.now(), end: LocalDate = LocalDate.now(), semesterName: Int = 1) = Semester(
@@ -72,6 +72,8 @@ fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.HEBE) = Student(
     symbol = "",
     userLoginId = 1,
     userName = "",
+    isEduOne = false,
+    isAuthorized = false
 ).apply {
     id = 1
 }
diff --git a/app/src/test/java/io/github/wulkanowy/WulkanowySdkFactoryCreator.kt b/app/src/test/java/io/github/wulkanowy/WulkanowySdkFactoryCreator.kt
new file mode 100644
index 00000000..4a8ff656
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/WulkanowySdkFactoryCreator.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.data.WulkanowySdkFactory
+import io.github.wulkanowy.sdk.Sdk
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+
+fun createWulkanowySdkFactoryMock(sdk: Sdk) = mockk<WulkanowySdkFactory>()
+    .apply {
+        every { createBase() } returns sdk
+        coEvery { create() } returns sdk
+        coEvery { create(any(), any()) } returns sdk
+    }
diff --git a/app/src/test/java/io/github/wulkanowy/data/ResourceTest.kt b/app/src/test/java/io/github/wulkanowy/data/ResourceTest.kt
index ea846a57..aa79a637 100644
--- a/app/src/test/java/io/github/wulkanowy/data/ResourceTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/ResourceTest.kt
@@ -1,6 +1,10 @@
 package io.github.wulkanowy.data
 
-import io.mockk.*
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerifyOrder
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flowOf
@@ -42,7 +46,6 @@ class ResourceTest {
         // first
         networkBoundResource(
             isResultEmpty = { false },
-            showSavedOnLoading = false,
             query = { repo.query() },
             fetch = {
                 val data = repo.fetch()
@@ -57,7 +60,6 @@ class ResourceTest {
         // second
         networkBoundResource(
             isResultEmpty = { false },
-            showSavedOnLoading = false,
             query = { repo.query() },
             fetch = {
                 val data = repo.fetch()
@@ -124,7 +126,6 @@ class ResourceTest {
         networkBoundResource(
             isResultEmpty = { false },
             mutex = saveResultMutex,
-            showSavedOnLoading = false,
             query = { repo.query() },
             fetch = {
                 val data = repo.fetch()
@@ -143,7 +144,6 @@ class ResourceTest {
         networkBoundResource(
             isResultEmpty = { false },
             mutex = saveResultMutex,
-            showSavedOnLoading = false,
             query = { repo.query() },
             fetch = {
                 val data = repo.fetch()
diff --git a/app/src/test/java/io/github/wulkanowy/data/WulkanowySdkFactoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/WulkanowySdkFactoryTest.kt
new file mode 100644
index 00000000..93980429
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/WulkanowySdkFactoryTest.kt
@@ -0,0 +1,130 @@
+package io.github.wulkanowy.data
+
+import android.os.Build
+import dagger.hilt.android.testing.HiltTestApplication
+import io.github.wulkanowy.data.db.dao.StudentDao
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsEduOne
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.RegisterStudent
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
+class WulkanowySdkFactoryTest {
+
+    private lateinit var wulkanowySdkFactory: WulkanowySdkFactory
+    private lateinit var studentDao: StudentDao
+    private lateinit var sdk: Sdk
+
+    @Before
+    fun setUp() {
+        sdk = mockk(relaxed = true)
+        studentDao = mockk()
+        wulkanowySdkFactory = spyk(
+            WulkanowySdkFactory(
+                chuckerInterceptor = mockk(),
+                remoteConfig = mockk(relaxed = true),
+                webkitCookieManagerProxy = mockk(),
+                studentDb = studentDao,
+                wulkanowyRepository = mockk(relaxed = true),
+                context = mockk(),
+            )
+        )
+
+        coEvery { wulkanowySdkFactory.create() } returns sdk
+    }
+
+    @Test
+    fun `check sdk flag isEduOne when local student is eduone`() = runTest {
+        val student = getStudentEntity().copy(isEduOne = true)
+
+        wulkanowySdkFactory.create(student)
+
+        verify { sdk.isEduOne = true }
+        coVerify(exactly = 0) { sdk.getCurrentStudent() }
+    }
+
+    @Test
+    fun `check sdk flag isEduOne when local student is not eduone`() = runTest {
+        val student = getStudentEntity().copy(isEduOne = false)
+
+        wulkanowySdkFactory.create(student)
+
+        verify { sdk.isEduOne = false }
+        coVerify(exactly = 0) { sdk.getCurrentStudent() }
+    }
+
+    @Test
+    fun `check sdk flag isEduOne when local student is eduone null and remote student is eduone true`() =
+        runTest {
+            val studentToProcess = getStudentEntity().copy(isEduOne = null)
+            val registerStudent = studentToProcess.toRegisterStudent(isEduOne = true)
+
+            coEvery { studentDao.loadById(any()) } returns studentToProcess
+            coEvery { studentDao.update(any(StudentIsEduOne::class)) } just Runs
+            coEvery { sdk.getCurrentStudent() } returns registerStudent
+
+            wulkanowySdkFactory.create(studentToProcess)
+
+            verify { sdk.isEduOne = true }
+            coVerify { sdk.getCurrentStudent() }
+        }
+
+    @Test
+    fun `check sdk flag isEduOne when local student is eduone null and remote student is eduone false`() =
+        runTest {
+            val studentToProcess = getStudentEntity().copy(isEduOne = null)
+            val registerStudent = studentToProcess.toRegisterStudent(isEduOne = false)
+
+            coEvery { studentDao.loadById(any()) } returns studentToProcess
+            coEvery { studentDao.update(any(StudentIsEduOne::class)) } just Runs
+            coEvery { sdk.getCurrentStudent() } returns registerStudent
+
+            wulkanowySdkFactory.create(studentToProcess)
+
+            verify { sdk.isEduOne = false }
+            coVerify { sdk.getCurrentStudent() }
+        }
+
+    @Test
+    fun `check sdk flag isEduOne when sdk getCurrentStudent throws error`() =
+        runTest {
+            val studentToProcess = getStudentEntity().copy(isEduOne = null)
+
+            coEvery { studentDao.loadById(any()) } returns studentToProcess
+            coEvery { studentDao.update(any(StudentIsEduOne::class)) } just Runs
+            coEvery { sdk.getCurrentStudent() } throws Exception()
+
+            wulkanowySdkFactory.create(studentToProcess)
+
+            verify { sdk.isEduOne = false }
+            coVerify { sdk.getCurrentStudent() }
+        }
+
+    private fun Student.toRegisterStudent(isEduOne: Boolean) = RegisterStudent(
+        studentId = studentId,
+        studentName = studentName,
+        studentSecondName = studentName,
+        studentSurname = studentName,
+        className = className,
+        classId = classId,
+        isParent = isParent,
+        isAuthorized = isAuthorized,
+        semesters = emptyList(),
+        isEduOne = isEduOne,
+    )
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
index 18ff9339..0ac2a3cb 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -21,10 +21,10 @@ abstract class AbstractMigrationTest {
 
     @get:Rule
     val helper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java,
-        listOf(Migration55()),
-        FrameworkSQLiteOpenHelperFactory()
+        instrumentation = InstrumentationRegistry.getInstrumentation(),
+        databaseClass = AppDatabase::class.java,
+        specs = listOf(Migration63()),
+        openFactory = FrameworkSQLiteOpenHelperFactory()
     )
 
     fun runMigrationsAndValidate(migration: Migration) {
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt
index 1855e0d5..ccff05d8 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt
@@ -7,8 +7,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.HiltTestApplication
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.Sdk.ScrapperLoginType.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import io.github.wulkanowy.sdk.Sdk.ScrapperLoginType.ADFSLight
+import io.github.wulkanowy.sdk.Sdk.ScrapperLoginType.ADFSLightScoped
+import io.github.wulkanowy.sdk.Sdk.ScrapperLoginType.STANDARD
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -19,7 +20,6 @@ import kotlin.test.assertEquals
 
 @HiltAndroidTest
 @RunWith(RobolectricTestRunner::class)
-@OptIn(ExperimentalCoroutinesApi::class)
 @Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
 class Migration54Test : AbstractMigrationTest() {
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration63Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration63Test.kt
new file mode 100644
index 00000000..dcca9069
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration63Test.kt
@@ -0,0 +1,89 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import android.os.Build
+import androidx.sqlite.db.SupportSQLiteDatabase
+import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
+import kotlinx.coroutines.test.runTest
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import kotlin.random.Random
+import kotlin.test.Test
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@HiltAndroidTest
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
+class Migration63Test : AbstractMigrationTest() {
+
+    @Test
+    fun `update is_edu_one to null if 0`() = runTest {
+        with(helper.createDatabase(dbName, 62)) {
+            createStudent(1, 0)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 63, true)
+
+        val database = getMigratedRoomDatabase()
+        val studentDb = database.studentDao
+        val student = studentDb.loadById(1)
+
+        assertNull(student!!.isEduOne)
+
+        database.close()
+    }
+
+    @Test
+    fun `check is_edu_one is stay same`() = runTest {
+        with(helper.createDatabase(dbName, 62)) {
+            createStudent(1, 1)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 63, true)
+
+        val database = getMigratedRoomDatabase()
+        val studentDb = database.studentDao
+        val student = studentDb.loadById(1)
+
+        val isEduOne = assertNotNull(student!!.isEduOne)
+        assertTrue(isEduOne)
+        database.close()
+    }
+
+    private fun SupportSQLiteDatabase.createStudent(id: Long, isEduOneValue: Int) {
+        insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("scrapper_base_url", "https://fakelog.cf")
+            put("mobile_base_url", "")
+            put("login_type", "SCRAPPER")
+            put("login_mode", "SCRAPPER")
+            put("certificate_key", "")
+            put("private_key", "")
+            put("is_parent", false)
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "symbol")
+            put("student_id", Random.nextInt())
+            put("user_login_id", 123)
+            put("user_name", "studentName")
+            put("student_name", "studentName")
+            put("school_id", "123")
+            put("school_short", "")
+            put("school_name", "")
+            put("class_name", "")
+            put("class_id", Random.nextInt())
+            put("is_current", false)
+            put("registration_date", "0")
+            put("id", id)
+            put("nick", "")
+            put("avatar_color", "")
+            put("is_edu_one", isEduOneValue)
+        })
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
index d0e500f1..b3490236 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
@@ -10,11 +11,17 @@ import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -24,8 +31,8 @@ import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
 
 class AttendanceRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var attendanceDb: AttendanceDao
@@ -57,30 +64,41 @@ class AttendanceRepositoryTest {
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
         coEvery { timetableDb.load(any(), any(), any(), any()) } returns emptyList()
 
-        attendanceRepository = AttendanceRepository(attendanceDb, timetableDb, sdk, refreshHelper)
+        attendanceRepository =
+            AttendanceRepository(attendanceDb, timetableDb, wulkanowySdkFactory, refreshHelper)
     }
 
     @Test
-    fun `force refresh without difference`() {
+    fun `force refresh without difference`() = runTest {
         // prepare
         coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester, emptyList())),
             flowOf(remoteList.mapToEntities(semester, emptyList()))
         )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
+        coEvery { attendanceDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = attendanceRepository.getAttendance(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true,
+        ).toFirstResult()
+
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
         coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
-        coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
+        coVerify {
+            attendanceDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match { it.isEmpty() },
+            )
+        }
     }
 
     @Test
@@ -89,14 +107,23 @@ class AttendanceRepositoryTest {
         coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())), // after fetch end before save result
+            flowOf(
+                remoteList.dropLast(1).mapToEntities(semester, emptyList())
+            ), // after fetch end before save result
             flowOf(remoteList.mapToEntities(semester, emptyList()))
         )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
+        coEvery { attendanceDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = runBlocking {
+            attendanceRepository.getAttendance(
+                student,
+                semester,
+                startDate,
+                endDate,
+                true
+            ).toFirstResult()
+        }
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -104,11 +131,13 @@ class AttendanceRepositoryTest {
         coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
         coVerify {
-            attendanceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
-            })
+            attendanceDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
+                },
+            )
         }
-        coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
     }
 
     @Test
@@ -117,25 +146,39 @@ class AttendanceRepositoryTest {
         coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList.dropLast(1)
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester, emptyList())),
-            flowOf(remoteList.mapToEntities(semester, emptyList())), // after fetch end before save result
+            flowOf(
+                remoteList.mapToEntities(
+                    semester,
+                    emptyList()
+                )
+            ), // after fetch end before save result
             flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList()))
         )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
+        coEvery { attendanceDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = runBlocking {
+            attendanceRepository.getAttendance(
+                student,
+                semester,
+                startDate,
+                endDate,
+                true
+            ).toFirstResult()
+        }
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(1, res.dataOrNull?.size)
         coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
         coVerify {
-            attendanceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
-            })
+            attendanceDb.removeOldAndSaveNew(
+                oldItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
+                },
+                newItems = emptyList(),
+            )
         }
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt
index c28ea304..e20603d2 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.errorOrNull
@@ -9,11 +10,16 @@ import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -23,8 +29,8 @@ import io.github.wulkanowy.sdk.pojo.CompletedLesson as SdkCompletedLesson
 
 class CompletedLessonsRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var completedLessonDb: CompletedLessonsDao
@@ -52,46 +58,28 @@ class CompletedLessonsRepositoryTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        completedLessonRepository = CompletedLessonsRepository(completedLessonDb, sdk, refreshHelper)
+        completedLessonRepository =
+            CompletedLessonsRepository(completedLessonDb, wulkanowySdkFactory, refreshHelper)
     }
 
     @Test
-    fun `force refresh without difference`() {
+    fun `force refresh without difference`() = runTest {
         // prepare
         coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList
         coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
         )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
+        coEvery { completedLessonDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.errorOrNull)
-        assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getCompletedLessons(startDate, endDate) }
-        coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { completedLessonDb.insertAll(match { it.isEmpty() }) }
-        coVerify { completedLessonDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList
-        coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = completedLessonRepository.getCompletedLessons(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -99,15 +87,52 @@ class CompletedLessonsRepositoryTest {
         coVerify { sdk.getCompletedLessons(startDate, endDate) }
         coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
         coVerify {
-            completedLessonDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
+            completedLessonDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match { it.isEmpty() },
+            )
         }
-        coVerify { completedLessonDb.deleteAll(match { it.isEmpty() }) }
     }
 
     @Test
-    fun `force refresh with more items in local`() {
+    fun `force refresh with more items in remote`() = runTest {
+        // prepare
+        coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList
+        coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
+            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
+            flowOf(
+                remoteList.dropLast(1).mapToEntities(semester)
+            ), // after fetch end before save result
+            flowOf(remoteList.mapToEntities(semester))
+        )
+        coEvery { completedLessonDb.removeOldAndSaveNew(any(), any()) } just Runs
+
+        // execute
+        val res = completedLessonRepository.getCompletedLessons(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true
+        ).toFirstResult()
+
+        // verify
+        assertEquals(null, res.errorOrNull)
+        assertEquals(2, res.dataOrNull?.size)
+        coVerify { sdk.getCompletedLessons(startDate, endDate) }
+        coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
+        coVerify {
+            completedLessonDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                }
+            )
+        }
+    }
+
+    @Test
+    fun `force refresh with more items in local`() = runTest {
         // prepare
         coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList.dropLast(1)
         coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
@@ -115,22 +140,29 @@ class CompletedLessonsRepositoryTest {
             flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
             flowOf(remoteList.dropLast(1).mapToEntities(semester))
         )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
+        coEvery { completedLessonDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = completedLessonRepository.getCompletedLessons(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(1, res.dataOrNull?.size)
         coVerify { sdk.getCompletedLessons(startDate, endDate) }
         coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { completedLessonDb.insertAll(match { it.isEmpty() }) }
         coVerify {
-            completedLessonDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
+            completedLessonDb.removeOldAndSaveNew(
+                oldItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                },
+                newItems = match { it.isEmpty() },
+            )
         }
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
index fb037a87..671c66f9 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.errorOrNull
@@ -9,11 +10,17 @@ import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -22,8 +29,8 @@ import io.github.wulkanowy.sdk.pojo.Exam as SdkExam
 
 class ExamRemoteTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var examDb: ExamDao
@@ -53,7 +60,7 @@ class ExamRemoteTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        examRepository = ExamRepository(examDb, sdk, refreshHelper)
+        examRepository = ExamRepository(examDb, wulkanowySdkFactory, refreshHelper)
     }
 
     @Test
@@ -64,35 +71,42 @@ class ExamRemoteTest {
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
         )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
+        coEvery { examDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = runBlocking {
+            examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult()
+        }
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
         coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
-        coVerify { examDb.insertAll(match { it.isEmpty() }) }
-        coVerify { examDb.deleteAll(match { it.isEmpty() }) }
+        coVerify { examDb.removeOldAndSaveNew(emptyList(), emptyList()) }
     }
 
     @Test
-    fun `force refresh with more items in remote`() {
+    fun `force refresh with more items in remote`() = runTest {
         // prepare
         coEvery { sdk.getExams(startDate, realEndDate) } returns remoteList
         coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
             flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
+            flowOf(
+                remoteList.dropLast(1).mapToEntities(semester)
+            ), // after fetch end before save result
             flowOf(remoteList.mapToEntities(semester))
         )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
+        coEvery { examDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = examRepository.getExams(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -100,15 +114,17 @@ class ExamRemoteTest {
         coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
         coVerify {
-            examDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
+            examDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                },
+            )
         }
-        coVerify { examDb.deleteAll(match { it.isEmpty() }) }
     }
 
     @Test
-    fun `force refresh with more items in local`() {
+    fun `force refresh with more items in local`() = runTest {
         // prepare
         coEvery { sdk.getExams(startDate, realEndDate) } returns remoteList.dropLast(1)
         coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
@@ -116,22 +132,27 @@ class ExamRemoteTest {
             flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
             flowOf(remoteList.dropLast(1).mapToEntities(semester))
         )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
+        coEvery { examDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = examRepository.getExams(
+            student = student,
+            semester = semester,
+            start = startDate,
+            end = endDate,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(1, res.dataOrNull?.size)
         coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
-        coVerify { examDb.insertAll(match { it.isEmpty() }) }
         coVerify {
-            examDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
+            examDb.removeOldAndSaveNew(
+                oldItems = match { it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1] },
+                newItems = emptyList()
+            )
         }
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
index 515b0d66..0045badf 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.dao.GradeDescriptiveDao
@@ -18,10 +19,11 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -34,8 +36,8 @@ import io.github.wulkanowy.sdk.pojo.Grade as SdkGrade
 
 class GradeRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var gradeDb: GradeDao
@@ -60,26 +62,27 @@ class GradeRepositoryTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        gradeRepository =
-            GradeRepository(gradeDb, gradeSummaryDb, gradeDescriptiveDb, sdk, refreshHelper)
+        gradeRepository = GradeRepository(
+            gradeDb = gradeDb,
+            gradeSummaryDb = gradeSummaryDb,
+            gradeDescriptiveDb = gradeDescriptiveDb,
+            wulkanowySdkFactory = wulkanowySdkFactory,
+            refreshHelper = refreshHelper,
+        )
 
-        coEvery { gradeDb.deleteAll(any()) } just Runs
-        coEvery { gradeDb.insertAll(any()) } returns listOf()
+        coEvery { gradeDb.removeOldAndSaveNew(any(), any()) } just Runs
 
+        coEvery { gradeSummaryDb.removeOldAndSaveNew(any(), any()) } just Runs
         coEvery { gradeSummaryDb.loadAll(1, 1) } returnsMany listOf(
             flowOf(listOf()),
             flowOf(listOf()),
             flowOf(listOf())
         )
-        coEvery { gradeSummaryDb.deleteAll(any()) } just Runs
-        coEvery { gradeSummaryDb.insertAll(any()) } returns listOf()
 
+        coEvery { gradeDescriptiveDb.removeOldAndSaveNew(any(), any()) } just Runs
         coEvery { gradeDescriptiveDb.loadAll(any(), any()) } returnsMany listOf(
             flowOf(listOf()),
         )
-
-        coEvery { gradeDescriptiveDb.deleteAll(any()) } just Runs
-        coEvery { gradeDescriptiveDb.insertAll(any()) } returns listOf()
     }
 
     @Test
@@ -113,13 +116,16 @@ class GradeRepositoryTest {
         assertEquals(null, res.errorOrNull)
         assertEquals(4, res.dataOrNull?.first?.size)
         coVerify {
-            gradeDb.insertAll(withArg {
-                assertEquals(4, it.size)
-                assertTrue(it[0].isRead)
-                assertTrue(it[1].isRead)
-                assertFalse(it[2].isRead)
-                assertFalse(it[3].isRead)
-            })
+            gradeDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = withArg {
+                    assertEquals(4, it.size)
+                    assertTrue(it[0].isRead)
+                    assertTrue(it[1].isRead)
+                    assertFalse(it[2].isRead)
+                    assertFalse(it[3].isRead)
+                },
+            )
         }
     }
 
@@ -167,23 +173,23 @@ class GradeRepositoryTest {
         assertEquals(null, res.errorOrNull)
         assertEquals(4, res.dataOrNull?.first?.size)
         coVerify {
-            gradeDb.insertAll(withArg {
-                assertEquals(3, it.size)
-                assertTrue(it[0].isRead)
-                assertTrue(it[1].isRead)
-                assertFalse(it[2].isRead)
-                assertEquals(remoteList.mapToEntities(semester).last(), it[2])
-            })
-        }
-        coVerify {
-            gradeDb.deleteAll(withArg {
-                assertEquals(2, it.size)
-            })
+            gradeDb.removeOldAndSaveNew(
+                oldItems = withArg {
+                    assertEquals(2, it.size)
+                },
+                newItems = withArg {
+                    assertEquals(3, it.size)
+                    assertTrue(it[0].isRead)
+                    assertTrue(it[1].isRead)
+                    assertFalse(it[2].isRead)
+                    assertEquals(remoteList.mapToEntities(semester).last(), it[2])
+                }
+            )
         }
     }
 
     @Test
-    fun `force refresh when local contains duplicated grades`() {
+    fun `force refresh when local contains duplicated grades`() = runTest {
         // prepare
         val remoteList = listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
@@ -203,13 +209,17 @@ class GradeRepositoryTest {
         )
 
         // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
+        val res = gradeRepository.getGrades(student, semester, true).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.first?.size)
-        coVerify { gradeDb.insertAll(match { it.isEmpty() }) }
-        coVerify { gradeDb.deleteAll(match { it.size == 1 }) } // ... here
+        coVerify {
+            gradeDb.removeOldAndSaveNew(
+                oldItems = match { it.size == 1 }, // ... here
+                newItems = emptyList()
+            )
+        }
     }
 
     @Test
@@ -238,8 +248,12 @@ class GradeRepositoryTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(3, res.dataOrNull?.first?.size)
-        coVerify { gradeDb.insertAll(match { it.size == 1 }) } // ... here
-        coVerify { gradeDb.deleteAll(match { it.isEmpty() }) }
+        coVerify {
+            gradeDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = match { it.size == 1 }, // ... here
+            )
+        }
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt
index 8e2f7c6e..6733190b 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
@@ -13,9 +14,14 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.GradeStatisticsItem
 import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -24,8 +30,8 @@ import org.junit.Test
 
 class GradeStatisticsRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var gradePartialStatisticsDb: GradePartialStatisticsDao
@@ -54,7 +60,7 @@ class GradeStatisticsRepositoryTest {
             gradePartialStatisticsDb = gradePartialStatisticsDb,
             gradePointsStatisticsDb = gradePointsStatisticsDb,
             gradeSemesterStatisticsDb = gradeSemesterStatisticsDb,
-            sdk = sdk,
+            wulkanowySdkFactory = wulkanowySdkFactory,
             refreshHelper = refreshHelper,
         )
     }
@@ -71,8 +77,7 @@ class GradeStatisticsRepositoryTest {
             flowOf(remotePartialList.mapToEntities(semester)),
             flowOf(remotePartialList.mapToEntities(semester))
         )
-        coEvery { gradePartialStatisticsDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { gradePartialStatisticsDb.deleteAll(any()) } just Runs
+        coEvery { gradePartialStatisticsDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
         val res = runBlocking {
@@ -93,8 +98,7 @@ class GradeStatisticsRepositoryTest {
         assertEquals("", items[2].partial?.studentAverage)
         coVerify { sdk.getGradesPartialStatistics(1) }
         coVerify { gradePartialStatisticsDb.loadAll(1, 1) }
-        coVerify { gradePartialStatisticsDb.insertAll(match { it.isEmpty() }) }
-        coVerify { gradePartialStatisticsDb.deleteAll(match { it.isEmpty() }) }
+        coVerify { gradePartialStatisticsDb.removeOldAndSaveNew(emptyList(), emptyList()) }
     }
 
     @Test
@@ -109,8 +113,7 @@ class GradeStatisticsRepositoryTest {
             flowOf(remotePartialList.mapToEntities(semester)),
             flowOf(remotePartialList.mapToEntities(semester))
         )
-        coEvery { gradePartialStatisticsDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { gradePartialStatisticsDb.deleteAll(any()) } just Runs
+        coEvery { gradePartialStatisticsDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
         val res = runBlocking {
@@ -131,8 +134,7 @@ class GradeStatisticsRepositoryTest {
         assertEquals("5.0", items[2].partial?.studentAverage)
         coVerify { sdk.getGradesPartialStatistics(1) }
         coVerify { gradePartialStatisticsDb.loadAll(1, 1) }
-        coVerify { gradePartialStatisticsDb.insertAll(match { it.isEmpty() }) }
-        coVerify { gradePartialStatisticsDb.deleteAll(match { it.isEmpty() }) }
+        coVerify { gradePartialStatisticsDb.removeOldAndSaveNew(emptyList(), emptyList()) }
     }
 
     private fun getGradeStatisticsPartialSubject(
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt
index 3225c3bd..cec16ca0 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.errorOrNull
@@ -7,11 +8,17 @@ import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
-import io.mockk.*
+import io.github.wulkanowy.utils.AppWidgetUpdater
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -20,12 +27,15 @@ import io.github.wulkanowy.sdk.pojo.LuckyNumber as SdkLuckyNumber
 
 class LuckyNumberRemoteTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var luckyNumberDb: LuckyNumberDao
 
+    @MockK(relaxed = true)
+    private lateinit var appWidgetUpdater: AppWidgetUpdater
+
     private val student = getStudentEntity()
 
     private lateinit var luckyNumberRepository: LuckyNumberRepository
@@ -38,7 +48,11 @@ class LuckyNumberRemoteTest {
     fun setUp() {
         MockKAnnotations.init(this)
 
-        luckyNumberRepository = LuckyNumberRepository(luckyNumberDb, sdk)
+        luckyNumberRepository = LuckyNumberRepository(
+            luckyNumberDb = luckyNumberDb,
+            wulkanowySdkFactory = wulkanowySdkFactory,
+            appWidgetUpdater = appWidgetUpdater,
+        )
     }
 
     @Test
@@ -53,7 +67,8 @@ class LuckyNumberRemoteTest {
         coEvery { luckyNumberDb.deleteAll(any()) } just Runs
 
         // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
+        val res =
+            runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -65,19 +80,19 @@ class LuckyNumberRemoteTest {
     }
 
     @Test
-    fun `force refresh with different item on remote`() {
+    fun `force refresh with different item on remote`() = runTest {
         // prepare
         coEvery { sdk.getLuckyNumber(student.schoolShortName) } returns luckyNumber
         coEvery { luckyNumberDb.load(1, date) } returnsMany listOf(
             flowOf(luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)),
-            flowOf(luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)), // after fetch end before save result
+            // after fetch end before save result
+            flowOf(luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)),
             flowOf(luckyNumber.mapToEntity(student))
         )
-        coEvery { luckyNumberDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { luckyNumberDb.deleteAll(any()) } just Runs
+        coEvery { luckyNumberDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
+        val res = luckyNumberRepository.getLuckyNumber(student, true).toFirstResult()
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -85,13 +100,16 @@ class LuckyNumberRemoteTest {
         coVerify { sdk.getLuckyNumber(student.schoolShortName) }
         coVerify { luckyNumberDb.load(1, date) }
         coVerify {
-            luckyNumberDb.insertAll(match {
-                it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
-            })
+            luckyNumberDb.removeOldAndSaveNew(
+                oldItems = match {
+                    it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
+                        .copy(luckyNumber = 6666)
+                },
+                newItems = match {
+                    it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
+                }
+            )
         }
-        coVerify { luckyNumberDb.deleteAll(match {
-            it.size == 1 && it[0] == luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)
-        }) }
     }
 
     @Test
@@ -103,11 +121,11 @@ class LuckyNumberRemoteTest {
             flowOf(null), // after fetch end before save result
             flowOf(luckyNumber.mapToEntity(student))
         )
-        coEvery { luckyNumberDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { luckyNumberDb.deleteAll(any()) } just Runs
+        coEvery { luckyNumberDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
+        val res =
+            runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
 
         // verify
         assertEquals(null, res.errorOrNull)
@@ -115,10 +133,12 @@ class LuckyNumberRemoteTest {
         coVerify { sdk.getLuckyNumber(student.schoolShortName) }
         coVerify { luckyNumberDb.load(1, date) }
         coVerify {
-            luckyNumberDb.insertAll(match {
-                it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
-            })
+            luckyNumberDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = match {
+                    it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
+                }
+            )
         }
-        coVerify(exactly = 0) { luckyNumberDb.deleteAll(any()) }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 3a18ee97..9819fb1f 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -1,13 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
 import android.content.Context
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.dao.MutedMessageSendersDao
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.MutedMessageSender
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.errorOrNull
 import io.github.wulkanowy.data.toFirstResult
@@ -19,10 +22,16 @@ import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.Status
 import io.github.wulkanowy.utils.status
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.checkEquals
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
@@ -36,15 +45,17 @@ import java.time.Instant
 import java.time.ZoneOffset
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class MessageRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var messageDb: MessagesDao
 
+    @MockK
+    private lateinit var mutesDb: MutedMessageSendersDao
+
     @MockK
     private lateinit var messageAttachmentDao: MessageAttachmentDao
 
@@ -73,11 +84,24 @@ class MessageRepositoryTest {
     fun setUp() {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
-
+        coEvery { mutesDb.checkMute(any()) } returns false
+        coEvery {
+            messageDb.loadMessagesWithMutedAuthor(
+                mailboxKey = any(),
+                folder = any()
+            )
+        } returns flowOf(emptyList())
+        coEvery {
+            messageDb.loadMessagesWithMutedAuthor(
+                folder = any(),
+                email = any()
+            )
+        } returns flowOf(emptyList())
         repository = MessageRepository(
             messagesDb = messageDb,
+            mutedMessageSendersDao = mutesDb,
             messageAttachmentDao = messageAttachmentDao,
-            sdk = sdk,
+            wulkanowySdkFactory = wulkanowySdkFactory,
             context = context,
             refreshHelper = refreshHelper,
             sharedPrefProvider = sharedPrefProvider,
@@ -88,7 +112,7 @@ class MessageRepositoryTest {
     }
 
     @Test
-    fun `get messages when fetched completely new message without notify`() = runBlocking {
+    fun `get messages when fetched completely new message without notify`() = runTest {
         coEvery { mailboxDao.loadAll(any()) } returns listOf(mailbox)
         every { messageDb.loadAll(mailbox.globalKey, any()) } returns flowOf(emptyList())
         coEvery { sdk.getMessages(Folder.RECEIVED, any()) } returns listOf(
@@ -97,8 +121,7 @@ class MessageRepositoryTest {
                 readBy = 10,
             )
         )
-        coEvery { messageDb.deleteAll(any()) } just Runs
-        coEvery { messageDb.insertAll(any()) } returns listOf()
+        coEvery { messageDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         val res = repository.getMessages(
             student = student,
@@ -109,12 +132,14 @@ class MessageRepositoryTest {
         ).toFirstResult()
 
         assertEquals(null, res.errorOrNull)
-        coVerify(exactly = 1) { messageDb.deleteAll(withArg { checkEquals(emptyList<Message>()) }) }
         coVerify {
-            messageDb.insertAll(withArg {
-                assertEquals(4, it.single().messageId)
-                assertTrue(it.single().isNotified)
-            })
+            messageDb.removeOldAndSaveNew(
+                oldItems = withArg { checkEquals(emptyList<Message>()) },
+                newItems = withArg {
+                    assertEquals(4, it.single().messageId)
+                    assertTrue(it.single().isNotified)
+                },
+            )
         }
     }
 
@@ -131,7 +156,11 @@ class MessageRepositoryTest {
     @Test
     fun `get message when content already in db`() {
         val testMessage = getMessageEntity(123, "Test", false)
-        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+        val messageWithAttachment = MessageWithAttachment(
+            testMessage,
+            emptyList(),
+            MutedMessageSender("Jan Kowalski - P - (WULKANOWY)")
+        )
 
         coEvery { messageDb.loadMessageWithAttachment("v4") } returns flowOf(
             messageWithAttachment
@@ -149,8 +178,16 @@ class MessageRepositoryTest {
         val testMessage = getMessageEntity(123, "", true)
         val testMessageWithContent = testMessage.copy().apply { content = "Test" }
 
-        val mWa = MessageWithAttachment(testMessage, emptyList())
-        val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
+        val mWa = MessageWithAttachment(
+            testMessage,
+            emptyList(),
+            MutedMessageSender("Jan Kowalski - P - (WULKANOWY)")
+        )
+        val mWaWithContent = MessageWithAttachment(
+            testMessageWithContent,
+            emptyList(),
+            MutedMessageSender("Jan Kowalski - P - (WULKANOWY)")
+        )
 
         coEvery {
             messageDb.loadMessageWithAttachment("v4")
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
index 1a3f9679..5513a95f 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.errorOrNull
@@ -16,10 +17,10 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -28,8 +29,8 @@ import java.time.ZonedDateTime.of
 
 class MobileDeviceRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var mobileDeviceDb: MobileDeviceDao
@@ -53,46 +54,26 @@ class MobileDeviceRepositoryTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        mobileDeviceRepository = MobileDeviceRepository(mobileDeviceDb, sdk, refreshHelper)
+        mobileDeviceRepository =
+            MobileDeviceRepository(mobileDeviceDb, wulkanowySdkFactory, refreshHelper)
     }
 
     @Test
-    fun `force refresh without difference`() {
+    fun `force refresh without difference`() = runTest {
         // prepare
         coEvery { sdk.getRegisteredDevices() } returns remoteList
         coEvery { mobileDeviceDb.loadAll(student.studentId) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(student)),
             flowOf(remoteList.mapToEntities(student))
         )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
+        coEvery { mobileDeviceDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
-
-        // verify
-        Assert.assertEquals(null, res.errorOrNull)
-        Assert.assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getRegisteredDevices() }
-        coVerify { mobileDeviceDb.loadAll(1) }
-        coVerify { mobileDeviceDb.insertAll(match { it.isEmpty() }) }
-        coVerify { mobileDeviceDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getRegisteredDevices() } returns remoteList
-        coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(student)),
-            flowOf(remoteList.dropLast(1).mapToEntities(student)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(student))
-        )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
+        val res = mobileDeviceRepository.getDevices(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         Assert.assertEquals(null, res.errorOrNull)
@@ -100,15 +81,50 @@ class MobileDeviceRepositoryTest {
         coVerify { sdk.getRegisteredDevices() }
         coVerify { mobileDeviceDb.loadAll(1) }
         coVerify {
-            mobileDeviceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
-            })
+            mobileDeviceDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match { it.isEmpty() },
+            )
         }
-        coVerify { mobileDeviceDb.deleteAll(match { it.isEmpty() }) }
     }
 
     @Test
-    fun `force refresh with more items in local`() {
+    fun `force refresh with more items in remote`() = runTest {
+        // prepare
+        coEvery { sdk.getRegisteredDevices() } returns remoteList
+        coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
+            flowOf(remoteList.dropLast(1).mapToEntities(student)),
+            flowOf(
+                remoteList.dropLast(1).mapToEntities(student)
+            ), // after fetch end before save result
+            flowOf(remoteList.mapToEntities(student))
+        )
+        coEvery { mobileDeviceDb.removeOldAndSaveNew(any(), any()) } just Runs
+
+        // execute
+        val res = mobileDeviceRepository.getDevices(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+        ).toFirstResult()
+
+        // verify
+        Assert.assertEquals(null, res.errorOrNull)
+        Assert.assertEquals(2, res.dataOrNull?.size)
+        coVerify { sdk.getRegisteredDevices() }
+        coVerify { mobileDeviceDb.loadAll(1) }
+        coVerify {
+            mobileDeviceDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
+                },
+            )
+        }
+    }
+
+    @Test
+    fun `force refresh with more items in local`() = runTest {
         // prepare
         coEvery { sdk.getRegisteredDevices() } returns remoteList.dropLast(1)
         coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
@@ -116,22 +132,27 @@ class MobileDeviceRepositoryTest {
             flowOf(remoteList.mapToEntities(student)), // after fetch end before save result
             flowOf(remoteList.dropLast(1).mapToEntities(student))
         )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
+        coEvery { mobileDeviceDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
+        val res = mobileDeviceRepository.getDevices(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+        ).toFirstResult()
 
         // verify
         Assert.assertEquals(null, res.errorOrNull)
         Assert.assertEquals(1, res.dataOrNull?.size)
         coVerify { sdk.getRegisteredDevices() }
         coVerify { mobileDeviceDb.loadAll(1) }
-        coVerify { mobileDeviceDb.insertAll(match { it.isEmpty() }) }
         coVerify {
-            mobileDeviceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
-            })
+            mobileDeviceDb.removeOldAndSaveNew(
+                oldItems = match {
+                    it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
+                },
+                newItems = match { it.isEmpty() },
+            )
         }
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
index ae73a795..0ecaad9e 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.getMailboxEntity
@@ -7,9 +8,14 @@ import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.MailboxType
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -18,8 +24,8 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 class RecipientLocalTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var recipientDb: RecipientDao
@@ -63,13 +69,18 @@ class RecipientLocalTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        recipientRepository = RecipientRepository(recipientDb, sdk, refreshHelper)
+        recipientRepository = RecipientRepository(recipientDb, wulkanowySdkFactory, refreshHelper)
     }
 
     @Test
     fun `load recipients when items already in database`() {
         // prepare
-        coEvery { recipientDb.loadAll(io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN, "v4") } returnsMany listOf(
+        coEvery {
+            recipientDb.loadAll(
+                io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+                "v4"
+            )
+        } returnsMany listOf(
             remoteList.mapToEntities("v4"),
             remoteList.mapToEntities("v4")
         )
@@ -108,8 +119,7 @@ class RecipientLocalTest {
             emptyList(),
             remoteList.mapToEntities("v4")
         )
-        coEvery { recipientDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { recipientDb.deleteAll(any()) } just Runs
+        coEvery { recipientDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
         val res = runBlocking {
@@ -123,8 +133,12 @@ class RecipientLocalTest {
         // verify
         assertEquals(3, res.size)
         coVerify { sdk.getRecipients("v4") }
-        coVerify { recipientDb.loadAll(io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN, "v4") }
-        coVerify { recipientDb.insertAll(match { it.isEmpty() }) }
-        coVerify { recipientDb.deleteAll(match { it.isEmpty() }) }
+        coVerify {
+            recipientDb.loadAll(
+                io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+                "v4"
+            )
+        }
+        coVerify { recipientDb.removeOldAndSaveNew(match { it.isEmpty() }, match { it.isEmpty() }) }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
index 31098d2e..3a18ac48 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.TestDispatchersProvider
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.getSemesterEntity
@@ -12,8 +13,8 @@ import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.mockk.just
+import io.mockk.spyk
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
@@ -24,8 +25,8 @@ import java.time.LocalDate.now
 
 class SemesterRepositoryTest {
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var semesterDb: SemesterDao
@@ -38,7 +39,8 @@ class SemesterRepositoryTest {
     fun initTest() {
         MockKAnnotations.init(this)
 
-        semesterRepository = SemesterRepository(semesterDb, sdk, TestDispatchersProvider())
+        semesterRepository =
+            SemesterRepository(semesterDb, wulkanowySdkFactory, TestDispatchersProvider())
     }
 
     @Test
@@ -50,13 +52,16 @@ class SemesterRepositoryTest {
 
         coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
         coEvery { sdk.getSemesters() } returns semesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns emptyList()
+        coEvery { semesterDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         runBlocking { semesterRepository.getSemesters(student) }
 
-        coVerify { semesterDb.insertSemesters(semesters.mapToEntities(student.studentId)) }
-        coVerify { semesterDb.deleteAll(emptyList()) }
+        coVerify {
+            semesterDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = semesters.mapToEntities(student.studentId),
+            )
+        }
     }
 
     @Test
@@ -71,12 +76,17 @@ class SemesterRepositoryTest {
             getSemesterPojo(123, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns badSemesters.mapToEntities(student.studentId)
+        coEvery {
+            semesterDb.loadAll(
+                student.studentId,
+                student.classId
+            )
+        } returns badSemesters.mapToEntities(student.studentId)
         coEvery { sdk.getSemesters() } returns goodSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
+        coEvery { semesterDb.removeOldAndSaveNew(any(), any()) } just Runs
 
-        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.HEBE.name)) }
+        val items =
+            runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.HEBE.name)) }
         assertEquals(2, items.size)
         assertEquals(0, items[0].diaryId)
     }
@@ -99,8 +109,7 @@ class SemesterRepositoryTest {
             goodSemesters.mapToEntities(student.studentId)
         )
         coEvery { sdk.getSemesters() } returns goodSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
+        coEvery { semesterDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         val items = semesterRepository.getSemesters(
             student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
@@ -157,13 +166,16 @@ class SemesterRepositoryTest {
 
         coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
         coEvery { sdk.getSemesters() } returns semesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
+        coEvery { semesterDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
 
-        coVerify { semesterDb.deleteAll(emptyList()) }
-        coVerify { semesterDb.insertSemesters(semesters.mapToEntities(student.studentId)) }
+        coVerify {
+            semesterDb.removeOldAndSaveNew(
+                oldItems = emptyList(),
+                newItems = semesters.mapToEntities(student.studentId),
+            )
+        }
     }
 
     @Test
@@ -181,12 +193,17 @@ class SemesterRepositoryTest {
             getSemesterPojo(2, 2, now().plusMonths(5), now().plusMonths(11)),
         )
 
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semestersWithNoCurrent
+        coEvery {
+            semesterDb.loadAll(
+                student.studentId,
+                student.classId
+            )
+        } returns semestersWithNoCurrent
         coEvery { sdk.getSemesters() } returns newSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
+        coEvery { semesterDb.removeOldAndSaveNew(any(), any()) } just Runs
 
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items =
+            runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
         assertEquals(2, items.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
index 92ad01b1..2a45f175 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.createWulkanowySdkFactoryMock
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
@@ -11,6 +12,7 @@ import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.utils.AppWidgetUpdater
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
@@ -18,9 +20,9 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.spyk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -37,8 +39,8 @@ class TimetableRepositoryTest {
     @MockK(relaxed = true)
     private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
 
-    @SpyK
-    private var sdk = Sdk()
+    private var sdk = spyk<Sdk>()
+    private val wulkanowySdkFactory = createWulkanowySdkFactoryMock(sdk)
 
     @MockK
     private lateinit var timetableDb: TimetableDao
@@ -52,6 +54,9 @@ class TimetableRepositoryTest {
     @MockK(relaxUnitFun = true)
     private lateinit var refreshHelper: AutoRefreshHelper
 
+    @MockK(relaxed = true)
+    private lateinit var appWidgetUpdater: AppWidgetUpdater
+
     private val student = getStudentEntity()
 
     private val semester = getSemesterEntity()
@@ -71,9 +76,10 @@ class TimetableRepositoryTest {
             timetableDb,
             timetableAdditionalDao,
             timetableHeaderDao,
-            sdk,
+            wulkanowySdkFactory,
             timetableNotificationSchedulerHelper,
-            refreshHelper
+            refreshHelper,
+            appWidgetUpdater
         )
     }
 
@@ -108,8 +114,7 @@ class TimetableRepositoryTest {
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
         )
-        coEvery { timetableDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { timetableDb.deleteAll(any()) } just Runs
+        coEvery { timetableDb.removeOldAndSaveNew(any(), any()) } just Runs
 
         coEvery {
             timetableAdditionalDao.loadAll(
@@ -119,12 +124,10 @@ class TimetableRepositoryTest {
                 end = endDate
             )
         } returns flowOf(listOf())
-        coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
-        coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
+        coEvery { timetableAdditionalDao.removeOldAndSaveNew(any(), any()) } just Runs
 
         coEvery { timetableHeaderDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
-        coEvery { timetableHeaderDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
-        coEvery { timetableHeaderDao.deleteAll(emptyList()) } just Runs
+        coEvery { timetableHeaderDao.removeOldAndSaveNew(any(), any()) } just Runs
 
         // execute
         val res = runBlocking {
@@ -142,8 +145,12 @@ class TimetableRepositoryTest {
         assertEquals(2, res.dataOrNull!!.lessons.size)
         coVerify { sdk.getTimetable(startDate, endDate) }
         coVerify { timetableDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { timetableDb.insertAll(match { it.isEmpty() }) }
-        coVerify { timetableDb.deleteAll(match { it.isEmpty() }) }
+        coVerify {
+            timetableDb.removeOldAndSaveNew(
+                oldItems = match { it.isEmpty() },
+                newItems = match { it.isEmpty() },
+            )
+        }
     }
 
     private fun createTimetableRemote(
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 34a8fe99..2a63c6b8 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -222,5 +222,7 @@ class GetMailboxByStudentUseCaseTest {
         symbol = "",
         userLoginId = 1,
         userName = userName,
+        isAuthorized = false,
+        isEduOne = false
     )
 }
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 6a717f6f..b9f56efe 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
@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -71,7 +72,9 @@ class GradeAverageProviderTest {
         className = "",
         classId = 1,
         isCurrent = true,
-        registrationDate = Instant.now()
+        registrationDate = Instant.now(),
+        isAuthorized = false,
+        isEduOne = false
     )
 
     private val semesters = mutableListOf(
@@ -112,8 +115,8 @@ class GradeAverageProviderTest {
 
     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)
+        getGrade(24, "Język polski", 3.0, -0.50, entry = "3-"),
+        getGrade(24, "Język polski", 4.0, 0.25, entry = "4+")
     )
 
     private val secondSummariesWithModifier = listOf(
@@ -122,8 +125,8 @@ class GradeAverageProviderTest {
 
     private val noWeightGrades = listOf(
         // standard: 0.0, arithmetic: 4.0
-        getGrade(22, "Matematyka", 5.0, 0.0, 0.0),
-        getGrade(22, "Matematyka", 3.0, 0.0, 0.0),
+        getGrade(22, "Matematyka", 5.0, 0.0, 0.0, "5"),
+        getGrade(22, "Matematyka", 3.0, 0.0, 0.0, "3"),
         getGrade(22, "Matematyka", 1.0, 0.0, 0.0, "np.")
     )
 
@@ -132,7 +135,7 @@ class GradeAverageProviderTest {
     )
 
     private val noWeightGradesArithmeticSummary = listOf(
-        getSummary(23, "Matematyka", 4.0)
+        getSummary(23, "Matematyka", .0)
     )
 
     @Before
@@ -211,6 +214,51 @@ class GradeAverageProviderTest {
         ) // from summary: 4,0
     }
 
+    @Test
+    fun `calc current semester arithmetic average with no weights in second semester`() = runTest {
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(true)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
+        coEvery {
+            gradeRepository.getGrades(
+                student = student,
+                semester = semesters[1],
+                forceRefresh = true,
+            )
+        } returns resourceFlow {
+            Triple(
+                first = noWeightGrades,
+                second = noWeightGradesArithmeticSummary,
+                third = emptyList(),
+            )
+        }
+        coEvery {
+            gradeRepository.getGrades(
+                student = student,
+                semester = semesters[2],
+                forceRefresh = true,
+            )
+        } returns resourceFlow {
+            Triple(
+                first = noWeightGrades,
+                second = noWeightGradesArithmeticSummary,
+                third = emptyList(),
+            )
+        }
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(
+            student = student,
+            semesterId = semesters[2].semesterId,
+            forceRefresh = true
+        ).getResult()
+
+        assertEquals(
+            4.0,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // from summary: 4,0
+    }
+
     @Test
     fun `calc current semester average with load from cache sequence`() {
         every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
@@ -1631,7 +1679,9 @@ class GradeAverageProviderTest {
             finalPoints = "",
             finalGrade = "",
             predictedGrade = "",
-            position = 0
+            position = 0,
+            pointsSumAllYear = null,
+            averageAllYear = null,
         )
     }
 }
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 34965f00..5ef7a295 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
@@ -5,8 +5,10 @@ import io.github.wulkanowy.data.pojos.RegisterStudent
 import io.github.wulkanowy.data.pojos.RegisterSymbol
 import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SchoolsRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.services.sync.SyncManager
@@ -44,6 +46,12 @@ class LoginStudentSelectPresenterTest {
     @MockK
     lateinit var schoolsRepository: SchoolsRepository
 
+    @MockK
+    lateinit var preferencesRepository: PreferencesRepository
+
+    @MockK
+    lateinit var getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase
+
     @MockK(relaxed = true)
     lateinit var analytics: AnalyticsHelper
 
@@ -71,6 +79,8 @@ class LoginStudentSelectPresenterTest {
         classId = 0,
         isParent = false,
         semesters = listOf(),
+        isEduOne = false,
+        isAuthorized = false,
     )
 
     private val school = RegisterUnit(
@@ -130,6 +140,8 @@ class LoginStudentSelectPresenterTest {
             syncManager = syncManager,
             analytics = analytics,
             appInfo = appInfo,
+            preferencesRepository = preferencesRepository,
+            getAppropriateAdminMessageUseCase = getAppropriateAdminMessageUseCase
         )
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 460c8385..afb60305 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,26 +1,40 @@
 package io.github.wulkanowy.ui.modules.main
 
+import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.clearMocks
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import kotlinx.serialization.json.Json
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
 class MainPresenterTest {
 
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
     @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler
 
     @MockK
     lateinit var studentRepository: StudentRepository
 
+    @MockK(relaxed = true)
+    lateinit var wulkanowyRepository: WulkanowyRepository
+
     @MockK(relaxed = true)
     lateinit var prefRepository: PreferencesRepository
 
@@ -55,7 +69,8 @@ class MainPresenterTest {
             analytics = analytics,
             json = Json,
             appInfo = appInfo,
-            adsHelper = adsHelper
+            adsHelper = adsHelper,
+            wulkanowyRepository = wulkanowyRepository
         )
         presenter.onAttachView(mainView, null)
     }
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 35dc4e5b..37363f37 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -23,13 +23,15 @@ class GradeExtensionTest {
 
     @Test
     fun calcWeightedAverage() {
-        assertEquals(3.47, listOf(
-            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(false), 0.005)
+        assertEquals(
+            3.47, listOf(
+                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(false), 0.005
+        )
     }
 
     @Test
@@ -86,7 +88,11 @@ class GradeExtensionTest {
         assertEquals(-.25, createGrade(5.0, .0, -.33).changeModifier(.0, .25).modifier, .0)
     }
 
-    private fun createGrade(value: Double, 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,
@@ -116,7 +122,9 @@ class GradeExtensionTest {
             proposedPoints = "",
             finalPoints = "",
             pointsSum = "",
-            average = .0
+            average = .0,
+            pointsSumAllYear = null,
+            averageAllYear = null,
         )
     }
 }
diff --git a/build.gradle b/build.gradle
index f7f3d209..da83864e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
-        kotlin_version = '1.9.22'
-        about_libraries = '10.10.0'
-        hilt_version = '2.50'
+        kotlin_version = '1.9.23'
+        about_libraries = '11.1.4'
+        hilt_version = '2.51.1'
     }
     repositories {
         mavenCentral()
@@ -13,15 +13,15 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.16"
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.19"
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.huawei.agconnect:agcp:1.9.1.303'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "com.github.triplet.gradle:play-publisher:3.8.4"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:5.0.0.4638"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 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 e6aba251..2ea3535d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME