diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41ae..29204aff 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -11,7 +15,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -22,7 +25,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -34,7 +36,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -45,7 +46,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -56,7 +56,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -67,7 +66,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -78,7 +76,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -90,7 +87,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -102,7 +98,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -112,5 +107,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000..79ee123c
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..8b487d4c
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.7">
+      <module name="annotation" target="1.7" />
+      <module name="codegen" target="1.7" />
+      <module name="Szkolny.eu.agendacalendarview" target="11" />
+      <module name="Szkolny.eu.app" target="11" />
+      <module name="Szkolny.eu.cafebar" target="11" />
+      <module name="Szkolny.eu.material-about-library" target="11" />
+      <module name="Szkolny.eu.mhttp" target="11" />
+      <module name="Szkolny.eu.nachos" target="11" />
+      <module name="Szkolny.eu.szkolny-font" target="11" />
+      <module name="Szkolny.eu.wear" target="11" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
index 59b11d1d..a04e4e5f 100644
--- a/.idea/discord.xml
+++ b/.idea/discord.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
-    <option name="show" value="true" />
+    <option name="show" value="PROJECT_FILES" />
   </component>
   <component name="ProjectNotificationSettings">
     <option name="askShowProject" value="false" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 24f8c447..2f82ed79 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,7 +11,6 @@
       <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.RecentlyNonNull" />
@@ -51,7 +50,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d..e497da99 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 9bc32c1a..880d6f0f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     signingConfigs {
@@ -54,10 +54,11 @@ android {
     lintOptions {
         checkReleaseBuilds false
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility '1.8'
         targetCompatibility '1.8'
     }
@@ -75,6 +76,7 @@ android {
             version "3.10.2"
         }
     }
+    ndkVersion '21.3.6528147'
 }
 
 /*task finalizeBundleDebug(type: Copy) {
@@ -104,6 +106,8 @@ tasks.whenTaskAdded { task ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+
     kapt "androidx.room:room-compiler:${versions.room}"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
 
@@ -114,7 +118,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${versions.ktx}"
     implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}"
     implementation "androidx.legacy:legacy-support-v4:${versions.legacy}"
-    implementation "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}"
     implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
     implementation "androidx.room:room-runtime:${versions.room}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
@@ -137,7 +141,7 @@ dependencies {
 
     implementation "cat.ereza:customactivityoncrash:2.2.0"
     implementation "com.applandeo:material-calendar-view:1.5.0"
-    implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
     implementation "com.evernote:android-job:1.2.6"
     implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
@@ -147,7 +151,7 @@ dependencies {
     implementation "com.jaredrummler:colorpicker:1.0.2"
     implementation("com.squareup.okhttp3:okhttp") {
         version {
-            strictly "3.12.2"
+            strictly "3.12.13"
         }
     }
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
@@ -157,7 +161,7 @@ dependencies {
     implementation "me.grantland:autofittextview:0.2.1"
     implementation "me.leolin:ShortcutBadger:1.1.22@aar"
     implementation "org.greenrobot:eventbus:3.1.1"
-    implementation "org.jsoup:jsoup:1.10.1"
+    implementation "org.jsoup:jsoup:1.12.1"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
     //implementation "se.emilsjolander:stickylistheaders:2.7.0"
     implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'
@@ -179,7 +183,7 @@ dependencies {
 
     //implementation "org.redundent:kotlin-xml-builder:1.5.3"
 
-    implementation "io.github.wulkanowy:signer-android:0.1.1"
+    implementation 'com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31'
 
     implementation "androidx.work:work-runtime-ktx:${versions.work}"
 
@@ -203,10 +207,10 @@ dependencies {
 
     implementation 'com.google.android:flexbox:2.0.1'
 
-    implementation 'com.qifan.powerpermission:powerpermission:1.0.0'
-    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.0.0'
+    implementation 'com.qifan.powerpermission:powerpermission:1.3.0'
+    implementation 'com.qifan.powerpermission:powerpermission-coroutines:1.3.0'
 
-    implementation 'com.github.kuba2k2.FSLogin:lib:master-SNAPSHOT'
+    implementation 'com.github.kuba2k2.FSLogin:lib:2.0.0'
     implementation 'pl.droidsonroids:jspoon:1.3.2'
     implementation "com.squareup.retrofit2:converter-scalars:2.8.1"
     implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2"
diff --git a/app/proguard/app.pro b/app/proguard/app.pro
index 68d1fde8..4d84d11d 100644
--- a/app/proguard/app.pro
+++ b/app/proguard/app.pro
@@ -64,6 +64,9 @@
 
 -keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
 
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; }
+-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
+-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
+
+-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
+-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }
diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html
index d7181f1b..1db852ec 100644
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@@ -1,11 +1,14 @@
-<h3>Wersja 4.2.1, 2020-05-21</h3>
+<h3>Wersja 4.6, 2021-02-26</h3>
 <ul>
-    <li>Poprawiona błędna godzina synchronizacji danych (przesunięcie w przód o 1-2h).</li>
-    <li>Vulcan: Naprawione logowanie.</li>
-    <li>Mobidziennik: Poprawione pobieranie szczęśliwego numerka.</li>
-    <li>Prymus: Naprawione logowane.</li>
+    <li>Vulcan: aplikacja Szkolny.eu zaktualizowana w związku z wygaszeniem aplikacji Dzienniczek+.</li>
+    <li>Vulcan: dodano wyświetlanie <b>szczęśliwego numerka.</b></li>
+    <li>Vulcan: dodano możliwość logowania adresem e-mail lub nazwą użytkownika - wersja testowa.</li>
+    <li>Vulcan: usunięto wyświetlanie zadań domowych i sprawdzianów z poprzednich lat.</li>
+    <li>Mobidziennik: naprawiono otwieranie wysłanej wiadomości.</li>
+    <li>Mobidziennik: poprawiono wyświetlanie oraz liczenie e-obecności.</li>
+    <li>iDziennik: usunięto dziennik w związku z wygaszeniem systemu. [*]</li>
 </ul>
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>
-<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2021</i>
diff --git a/app/src/main/cpp/szkolny-signing.cpp b/app/src/main/cpp/szkolny-signing.cpp
index 2b2922e6..474d9ba5 100644
--- a/app/src/main/cpp/szkolny-signing.cpp
+++ b/app/src/main/cpp/szkolny-signing.cpp
@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x43, 0xfc, 0x2d, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x9f, 0xff, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff   };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index bea90a98..88bdc603 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -57,8 +57,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         val profileId
             get() = profile.id
 
-        var devMode = false
         var debugMode = false
+        var devMode = false
     }
 
     val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
@@ -107,7 +107,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .readTimeout(30, TimeUnit.SECONDS)
         builder.installHttpsSupport(this)
 
-        if (debugMode || BuildConfig.DEBUG) {
+        if (devMode || BuildConfig.DEBUG) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
@@ -162,7 +162,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         Iconics.registerFont(SzkolnyFont)
         App.db = AppDb(this)
         Themes.themeInt = config.ui.theme
-        debugMode = config.debugMode
+        devMode = config.debugMode
         MHttp.instance().customOkHttpClient(http)
 
         if (!profileLoadById(config.lastProfileId)) {
@@ -173,9 +173,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             setLanguage(it)
         }
 
-        devMode = BuildConfig.DEBUG
+        debugMode = BuildConfig.DEBUG
         if (BuildConfig.DEBUG)
-            debugMode = true
+            devMode = true
 
         Signing.getCert(this)
 
@@ -185,7 +185,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
 
                 if (config.devModePassword != null)
                     checkDevModePassword()
-                debugMode = devMode || config.debugMode
+                devMode = debugMode || config.debugMode
 
                 if (config.sync.enabled)
                     SyncWorker.scheduleNext(this@App, false)
@@ -294,6 +294,19 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                         "Vulcan"
                 )
 
+                val pushVulcanHebeApp = FirebaseApp.initializeApp(
+                    this@App,
+                    FirebaseOptions.Builder()
+                        .setProjectId("dzienniczekplus")
+                        .setStorageBucket("dzienniczekplus.appspot.com")
+                        .setDatabaseUrl("https://dzienniczekplus.firebaseio.com")
+                        .setGcmSenderId("987828170337")
+                        .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
+                        .setApplicationId("1:987828170337:android:7e16404b9e5deaaa")
+                        .build(),
+                    "VulcanHebe"
+                )
+
                 try {
                     FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
@@ -324,6 +337,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                             config.sync.tokenVulcanList = listOf()
                         }
                     }
+                    FirebaseInstanceId.getInstance(pushVulcanHebeApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        d("Firebase", "Got VulcanHebe token: $token")
+                        if (token != config.sync.tokenVulcanHebe) {
+                            config.sync.tokenVulcanHebe = token
+                            config.sync.tokenVulcanHebeList = listOf()
+                        }
+                    }
                     FirebaseMessaging.getInstance().subscribeToTopic(packageName)
                 } catch (e: IllegalStateException) {
                     e.printStackTrace()
@@ -364,6 +385,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             if (!success) {
                 EventBus.getDefault().post(ProfileListEmptyEvent())
             }
+            else {
+                onSuccess(profile)
+            }
         }
     }
     fun profileSave() = profileSave(profile)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
index 2443679b..71febada 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@@ -42,10 +42,10 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.security.ProviderInstaller
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.gson.*
 import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
-import com.google.gson.JsonParser
 import im.wangchao.mhttp.Response
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -95,30 +95,30 @@ fun List<Teacher>.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull {
 
 fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
 
-fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
-fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString }
-fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt }
-fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong }
-fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat }
-fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
+fun JsonObject?.getString(key: String): String? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
+fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
+fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
+fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
+fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
-fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue
-fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue
-fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue
-fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue
-fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue
-fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(it.isJsonNull) defaultValue else it.asCharacter } ?: defaultValue
+fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asBoolean } ?: defaultValue
+fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asString } ?: defaultValue
+fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asInt } ?: defaultValue
+fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asLong } ?: defaultValue
+fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asFloat } ?: defaultValue
+fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asCharacter } ?: defaultValue
 fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue
 fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue
 
-fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
-fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asString }
-fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asInt }
-fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asLong }
-fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asFloat }
-fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
+fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
+fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
+fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
+fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
+fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
@@ -298,7 +298,7 @@ fun colorFromCssName(name: String): Int {
         "orange" -> 0xffffa500
         "black" -> 0xff000000
         "white" -> 0xffffffff
-        else -> -1
+        else -> -1L
     }.toInt()
 }
 
@@ -537,6 +537,12 @@ fun String.md5(): String {
     return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
 }
 
+fun String.sha1Hex(): String {
+    val md = MessageDigest.getInstance("SHA-1")
+    md.update(toByteArray())
+    return md.digest().joinToString("") { "%02x".format(it) }
+}
+
 fun String.sha256(): ByteArray {
     val md = MessageDigest.getInstance("SHA-256")
     md.update(toByteArray())
@@ -672,6 +678,16 @@ fun TextView.setText(@StringRes resid: Int, vararg formatArgs: Any) {
     text = context.getString(resid, *formatArgs)
 }
 
+fun MaterialAlertDialogBuilder.setTitle(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setTitle(context.getString(resid, *formatArgs))
+    return this
+}
+
+fun MaterialAlertDialogBuilder.setMessage(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder {
+    setMessage(context.getString(resid, *formatArgs))
+    return this
+}
+
 fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     return JsonObject().apply {
         for (property in properties) {
@@ -686,6 +702,21 @@ fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     }
 }
 
+fun JsonObject.toBundle(): Bundle {
+    return Bundle().also {
+        for ((key, value) in this.entrySet()) {
+            when (value) {
+                is JsonObject -> it.putBundle(key, value.toBundle())
+                is JsonPrimitive -> when {
+                    value.isString -> it.putString(key, value.asString)
+                    value.isBoolean -> it.putBoolean(key, value.asBoolean)
+                    value.isNumber -> it.putInt(key, value.asInt)
+                }
+            }
+        }
+    }
+}
+
 fun JsonArray(vararg properties: Any?): JsonArray {
     return JsonArray().apply {
         for (property in properties) {
@@ -1161,7 +1192,7 @@ fun Iterable<Float>.averageOrNull() = this.average().let { if (it.isNaN()) null
 fun String.copyToClipboard(context: Context) {
     val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
     val clipData = ClipData.newPlainText("Tekst", this)
-    clipboard.primaryClip = clipData
+    clipboard.setPrimaryClip(clipData)
 }
 
 fun TextView.getTextPosition(range: IntRange): Rect {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 3033f0f0..1e73e267 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -38,16 +38,22 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
+import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
+import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.ServerMessageDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
@@ -59,6 +65,7 @@ import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
 import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
 import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
@@ -227,7 +234,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES)
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
-            if (App.debugMode) {
+            if (App.devMode) {
                 list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
                 list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
                         .withIcon(CommunityMaterial.Icon.cmd_flask_outline)
@@ -295,12 +302,21 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
         errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
 
-        if (BuildConfig.VERSION_NAME.contains("nightly")) {
-            b.nightlyText.isVisible = true
-            b.nightlyText.text = "Nightly\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+        when {
+            BuildConfig.VERSION_NAME.contains("nightly") -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Nightly\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+            }
+            BuildConfig.VERSION_NAME.contains("daily") -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Daily\n"+BuildConfig.VERSION_NAME.substringAfterLast(".")
+            }
+            BuildConfig.DEBUG -> {
+                b.nightlyText.isVisible = true
+                b.nightlyText.text = "Debug\n"+BuildConfig.VERSION_NAME
+            }
+            else -> b.nightlyText.isVisible = false
         }
-        else
-            b.nightlyText.isVisible = false
 
         navLoading = true
 
@@ -399,7 +415,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
 
         app.db.profileDao().all.observe(this, Observer { profiles ->
-            drawer.setProfileList(profiles.filter { it.id >= 0 }.toMutableList())
+            val allArchived = profiles.all { it.archived }
+            drawer.setProfileList(profiles.filter { it.id >= 0 && (!it.archived || allArchived) }.toMutableList())
+            //prepend the archived profile if loaded
+            if (app.profile.archived && !allArchived) {
+                drawer.prependProfile(Profile(
+                        id = app.profile.id,
+                        loginStoreId = app.profile.loginStoreId,
+                        loginStoreType = app.profile.loginStoreType,
+                        name = app.profile.name,
+                        subname = "Archiwum - ${app.profile.subname}"
+                ).also {
+                    it.archived = true
+                })
+            }
             drawer.currentProfile = App.profileId
         })
 
@@ -415,7 +444,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         })
 
         b.swipeRefreshLayout.isEnabled = true
-        b.swipeRefreshLayout.setOnRefreshListener { this.syncCurrentFeature() }
+        b.swipeRefreshLayout.setOnRefreshListener { launch { syncCurrentFeature() } }
         b.swipeRefreshLayout.setColorSchemeResources(
                 R.color.md_blue_500,
                 R.color.md_amber_500,
@@ -425,6 +454,23 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         SyncWorker.scheduleNext(app)
         UpdateWorker.scheduleNext(app)
 
+        // if loaded profile is archived, switch to the up-to-date version of it
+        if (app.profile.archived) {
+            launch {
+                if (app.profile.archiveId != null) {
+                    val profile = withContext(Dispatchers.IO) {
+                        app.db.profileDao().getNotArchivedOf(app.profile.archiveId!!)
+                    }
+                    if (profile != null)
+                        loadProfile(profile)
+                    else
+                        loadProfile(0)
+                } else {
+                    loadProfile(0)
+                }
+            }
+        }
+
         // APP BACKGROUND
         if (app.config.ui.appBackground != null) {
             try {
@@ -522,7 +568,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
-        if (App.debugMode) {
+        if (App.devMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
                     .withIcon(CommunityMaterial.Icon.cmd_android_studio)
@@ -564,7 +610,66 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
          |_____/ \__, |_| |_|\___|
                   __/ |
                  |__*/
-    fun syncCurrentFeature() {
+    suspend fun syncCurrentFeature() {
+        if (app.profile.archived) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archived_title)
+                    .setMessage(
+                            R.string.profile_archived_text,
+                            app.profile.studentSchoolYearStart,
+                            app.profile.studentSchoolYearStart + 1
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+        if (app.profile.shouldArchive()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_archiving_title)
+                    .setMessage(
+                            R.string.profile_archiving_format,
+                            app.profile.dateYearEnd.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+        }
+        if (app.profile.isBeforeYear()) {
+            MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.profile_year_not_started_title)
+                    .setMessage(
+                            R.string.profile_year_not_started_format,
+                            app.profile.dateSemester1Start.formattedString
+                    )
+                    .setPositiveButton(R.string.ok, null)
+                    .show()
+            swipeRefreshLayout.isRefreshing = false
+            return
+        }
+
+        app.profile.registerName?.let { registerName ->
+            var status = app.config.sync.registerAvailability[registerName]
+            if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                withContext(Dispatchers.IO) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching(this@MainActivity) {
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }
+                }
+            }
+
+            if (status?.available != true
+                    || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                swipeRefreshLayout.isRefreshing = false
+                loadTarget(DRAWER_ITEM_HOME)
+                if (status != null)
+                    RegisterUnavailableDialog(this, status!!)
+                return
+            }
+        }
+
         swipeRefreshLayout.isRefreshing = true
         Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show()
         val fragmentParam = when (navTargetId) {
@@ -581,6 +686,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 arguments = arguments
         ).enqueue(this)
     }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onUpdateEvent(event: Update) {
+        EventBus.getDefault().removeStickyEvent(event)
+        UpdateAvailableDialog(this, event)
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
+        EventBus.getDefault().removeStickyEvent(event)
+        app.profile.registerName?.let { registerName ->
+            event.data[registerName]?.let {
+                RegisterUnavailableDialog(this, it)
+            }
+        }
+    }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
@@ -632,6 +751,11 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) {
         EventBus.getDefault().removeStickyEvent(event)
+        if (event.error.errorCode == ERROR_VULCAN_API_DEPRECATED) {
+            if (event.error.profileId != App.profileId)
+                return
+            ErrorDetailsDialog(this, listOf(event.error))
+        }
         navView.toolbar.apply {
             subtitleFormat = R.string.toolbar_subtitle
             subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
@@ -885,23 +1009,51 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
     fun loadProfile(id: Int) = loadProfile(id, navTargetId)
     fun loadProfile(id: Int, arguments: Bundle?) = loadProfile(id, navTargetId, arguments)
-    fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
+    fun loadProfile(profile: Profile) = loadProfile(
+            profile,
+            navTargetId,
+            null,
+            if (app.profile.archived) app.profile.id else null
+    )
+    private fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) {
         if (App.profileId == id) {
             drawer.currentProfile = app.profile.id
             loadTarget(drawerSelection, arguments)
             return
         }
+        val previousArchivedId = if (app.profile.archived) app.profile.id else null
         app.profileLoad(id) {
-            MessagesFragment.pageSelection = -1
-
-            setDrawerItems()
-            // the drawer profile is updated automatically when the drawer item is clicked
-            // update it manually when switching profiles from other source
-            //if (drawer.currentProfile != app.profile.id)
-            drawer.currentProfile = app.profileId
-            loadTarget(drawerSelection, arguments)
+            loadProfile(it, drawerSelection, arguments, previousArchivedId)
         }
     }
+    private fun loadProfile(profile: Profile, drawerSelection: Int, arguments: Bundle?, previousArchivedId: Int?) {
+        App.profile = profile
+        MessagesFragment.pageSelection = -1
+
+        setDrawerItems()
+
+        if (previousArchivedId != null) {
+            // prevents accidentally removing the first item if the archived profile is not shown
+            drawer.removeProfileById(previousArchivedId)
+        }
+        if (profile.archived) {
+            drawer.prependProfile(Profile(
+                    id = profile.id,
+                    loginStoreId = profile.loginStoreId,
+                    loginStoreType = profile.loginStoreType,
+                    name = profile.name,
+                    subname = "Archiwum - ${profile.subname}"
+            ).also {
+                it.archived = true
+            })
+        }
+
+        // the drawer profile is updated automatically when the drawer item is clicked
+        // update it manually when switching profiles from other source
+        //if (drawer.currentProfile != app.profile.id)
+        drawer.currentProfile = app.profileId
+        loadTarget(drawerSelection, arguments)
+    }
     fun loadTarget(id: Int, arguments: Bundle? = null) {
         var loadId = id
         if (loadId == -1) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
index 98240be5..5cdf30bc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
@@ -105,6 +105,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() }
         set(value) { set("widgetConfigs", value); mWidgetConfigs = value }
 
+    private var mArchiverEnabled: Boolean? = null
+    var archiverEnabled: Boolean
+        get() { mArchiverEnabled = mArchiverEnabled ?: values.get("archiverEnabled", true); return mArchiverEnabled ?: true }
+        set(value) { set("archiverEnabled", value); mArchiverEnabled = value }
+
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
index a6bb68df..068400a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
@@ -4,12 +4,18 @@
 
 package pl.szczodrzynski.edziennik.config
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.config.utils.setMap
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class ConfigSync(private val config: Config) {
+    private val gson = Gson()
+
     private var mDontShowAppManagerDialog: Boolean? = null
     var dontShowAppManagerDialog: Boolean
         get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false }
@@ -93,6 +99,10 @@ class ConfigSync(private val config: Config) {
     var tokenVulcan: String?
         get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
         set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
+    private var mTokenVulcanHebe: String? = null
+    var tokenVulcanHebe: String?
+        get() { mTokenVulcanHebe = mTokenVulcanHebe ?: config.values.get("tokenVulcanHebe", null as String?); return mTokenVulcanHebe }
+        set(value) { config.set("tokenVulcanHebe", value); mTokenVulcanHebe = value }
 
     private var mTokenMobidziennikList: List<Int>? = null
     var tokenMobidziennikList: List<Int>
@@ -106,4 +116,13 @@ class ConfigSync(private val config: Config) {
     var tokenVulcanList: List<Int>
         get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
         set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
+    private var mTokenVulcanHebeList: List<Int>? = null
+    var tokenVulcanHebeList: List<Int>
+        get() { mTokenVulcanHebeList = mTokenVulcanHebeList ?: config.values.getIntList("tokenVulcanHebeList", listOf()); return mTokenVulcanHebeList ?: listOf() }
+        set(value) { config.set("tokenVulcanHebeList", value); mTokenVulcanHebeList = value }
+
+    private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
+    var registerAvailability: Map<String, RegisterAvailabilityStatus>
+        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
+        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt
index 490fe2dd..6434aac7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigGrades.kt
@@ -49,4 +49,9 @@ class ProfileConfigGrades(private val config: ProfileConfig) {
     var dontCountGrades: List<String>
         get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() }
         set(value) { config.set("dontCountGrades", value); mDontCountGrades = value }
+
+    private var mHideSticksFromOld: Boolean? = null
+    var hideSticksFromOld: Boolean
+        get() { mHideSticksFromOld = mHideSticksFromOld ?: config.values.get("hideSticksFromOld", false); return mHideSticksFromOld ?: false }
+        set(value) { config.set("hideSticksFromOld", value); mHideSticksFromOld = value }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt
index 1188b1a4..c98cf832 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt
@@ -49,6 +49,9 @@ fun AbstractConfig.setIntList(key: String, value: List<Int>?) {
 fun AbstractConfig.setLongList(key: String, value: List<Long>?) {
     set(key, value?.let { gson.toJson(it) })
 }
+fun <K, V> AbstractConfig.setMap(key: String, value: Map<K, V>?) {
+    set(key, value?.let { gson.toJson(it) })
+}
 
 fun HashMap<String, String?>.get(key: String, default: String?): String? {
     return this[key] ?: default
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
index 60d0da59..f06ef354 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
@@ -24,14 +24,14 @@ const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"
 
 val LIBRUS_USER_AGENT = "${SYSTEM_USER_AGENT}LibrusMobileApp"
 const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0"
-const val LIBRUS_CLIENT_ID = "6XPsKf10LPz1nxgHQLcvZ1KM48DYzlBAhxipaXY8"
-const val LIBRUS_REDIRECT_URL = "http://localhost/bar"
+const val LIBRUS_CLIENT_ID = "0RbsDOkV9tyKEQYzlLv5hs3DM1ukrynFI4p6C1Yc"
+const val LIBRUS_REDIRECT_URL = "app://librus"
 const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
 const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
 const val LIBRUS_TOKEN_URL = "https://portal.librus.pl/oauth2/access_token"
 
-const val LIBRUS_ACCOUNT_URL = "/v2/SynergiaAccounts/fresh/" // + login
-const val LIBRUS_ACCOUNTS_URL = "/v2/SynergiaAccounts"
+const val LIBRUS_ACCOUNT_URL = "/v3/SynergiaAccounts/fresh/" // + login
+const val LIBRUS_ACCOUNTS_URL = "/v3/SynergiaAccounts"
 
 /** https://api.librus.pl/2.0 */
 const val LIBRUS_API_URL = "https://api.librus.pl/2.0"
@@ -90,35 +90,39 @@ const val IDZIENNIK_API_MESSAGES_SENT = "Wiadomosci/Wyslane"
 
 val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
 
-const val VULCAN_API_USER_AGENT = "MobileUserAgent"
-const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
-const val VULCAN_API_APP_VERSION = "20.5.1.470"
-const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
-const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
-val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
+const val VULCAN_HEBE_USER_AGENT = "Dart/2.10 (dart:io)"
+const val VULCAN_HEBE_APP_NAME = "DzienniczekPlus 2.0"
+const val VULCAN_HEBE_APP_VERSION = "21.02.09 (G)"
+private const val VULCAN_API_DEVICE_NAME_PREFIX = "Szkolny.eu "
+private const val VULCAN_API_DEVICE_NAME_SUFFIX = " - nie usuwać"
+val VULCAN_API_DEVICE_NAME by lazy {
+    val base = "$VULCAN_API_DEVICE_NAME_PREFIX${Build.MODEL}"
+    val baseMaxLength = 50 - VULCAN_API_DEVICE_NAME_SUFFIX.length
+    base.take(baseMaxLength) + VULCAN_API_DEVICE_NAME_SUFFIX
+}
 
-const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
-const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
-const val VULCAN_API_ENDPOINT_DICTIONARIES = "mobile-api/Uczen.v3.Uczen/Slowniki"
-const val VULCAN_API_ENDPOINT_TIMETABLE = "mobile-api/Uczen.v3.Uczen/PlanLekcjiZeZmianami"
-const val VULCAN_API_ENDPOINT_GRADES = "mobile-api/Uczen.v3.Uczen/Oceny"
-const val VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS = "mobile-api/Uczen.v3.Uczen/OcenyPodsumowanie"
-const val VULCAN_API_ENDPOINT_EVENTS = "mobile-api/Uczen.v3.Uczen/Sprawdziany"
-const val VULCAN_API_ENDPOINT_HOMEWORK = "mobile-api/Uczen.v3.Uczen/ZadaniaDomowe"
-const val VULCAN_API_ENDPOINT_NOTICES = "mobile-api/Uczen.v3.Uczen/UwagiUcznia"
-const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje"
-const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane"
-const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane"
-const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
-const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWiadomosc"
-const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
-const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
-const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
 const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
 const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
+const val VULCAN_HEBE_ENDPOINT_REGISTER_NEW = "api/mobile/register/new"
+const val VULCAN_HEBE_ENDPOINT_MAIN = "api/mobile/register/hebe"
+const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes"
+const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook"
+const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam"
+const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
+const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary"
+const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework"
+const val VULCAN_HEBE_ENDPOINT_NOTICES = "api/mobile/note"
+const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_SEND = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER = "api/mobile/school/lucky"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
 
-const val PODLASIE_API_VERSION = "1.0.31"
+const val PODLASIE_API_VERSION = "1.0.62"
 const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
 const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"
+const val PODLASIE_API_LOGOUT_DEVICES_ENDPOINT = "/wyczyscUrzadzenia"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
index 8301f62f..153c30c2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt
@@ -148,17 +148,11 @@ const val ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM             = 218
 
 const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL                 = 301
 const val ERROR_LOGIN_VULCAN_INVALID_TOKEN                  = 302
-const val ERROR_LOGIN_VULCAN_INVALID_PIN                    = 309
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING        = 310
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING        = 311
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING        = 312
 const val ERROR_LOGIN_VULCAN_EXPIRED_TOKEN                  = 321
-const val ERROR_LOGIN_VULCAN_OTHER                          = 322
-const val ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN              = 330
 const val ERROR_LOGIN_VULCAN_NO_PUPILS                      = 331
-const val ERROR_VULCAN_API_MAINTENANCE                      = 340
-const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
-const val ERROR_VULCAN_API_OTHER                            = 342
 const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD                  = 343
 const val ERROR_VULCAN_WEB_DATA_MISSING                     = 344
 const val ERROR_VULCAN_WEB_429                              = 345
@@ -170,28 +164,14 @@ const val ERROR_VULCAN_WEB_LOGGED_OUT                       = 350
 const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED          = 351
 const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT                 = 352
 const val ERROR_VULCAN_WEB_NO_SCHOOLS                       = 353
-
-const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
-const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
-const val ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED  = 403
-const val ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE             = 404
-const val ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR            = 405
-const val ERROR_LOGIN_IDZIENNIK_WEB_OTHER                   = 410
-const val ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS           = 411 /* {"d":{"__type":"mds.Web.mod_komunikator.WS_mod_wiadomosci+detailWiadomosci","Wiadomosc":{"_recordId":0,"DataNadania":null,"DataOdczytania":null,"Nadawca":null,"ListaOdbiorcow":[],"Tytul":null,"Text":null,"ListaZal":[]},"Bledy":{"__type":"mds.Module.Globalne+sBledy","CzyJestBlad":true,"ListaBledow":["Nie masz dostępu do tych zasobów!"],"ListaKodowBledow":[]},"czyJestWiecej":false}} */
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION              = 420
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH                 = 421
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER               = 422
-const val ERROR_IDZIENNIK_WEB_ACCESS_DENIED                 = 430
-const val ERROR_IDZIENNIK_WEB_OTHER                         = 431
-const val ERROR_IDZIENNIK_WEB_MAINTENANCE                   = 432
-const val ERROR_IDZIENNIK_WEB_SERVER_ERROR                  = 433
-const val ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED        = 434
-const val ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR        = 440
-const val ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA               = 441
-const val ERROR_IDZIENNIK_API_ACCESS_DENIED                 = 450
-const val ERROR_IDZIENNIK_API_OTHER                         = 451
-const val ERROR_IDZIENNIK_API_NO_REGISTER                   = 452
-const val ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION  = 453
+const val ERROR_VULCAN_HEBE_OTHER                           = 354
+const val ERROR_VULCAN_HEBE_SIGNATURE_ERROR                 = 360
+const val ERROR_VULCAN_HEBE_INVALID_PAYLOAD                 = 361
+const val ERROR_VULCAN_HEBE_FIREBASE_ERROR                  = 362
+const val ERROR_VULCAN_HEBE_CERTIFICATE_GONE                = 363
+const val ERROR_VULCAN_HEBE_SERVER_ERROR                    = 364
+const val ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND                = 365
+const val ERROR_VULCAN_API_DEPRECATED                       = 390
 
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
@@ -215,19 +195,16 @@ const val EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN            = 903
 const val EXCEPTION_LIBRUS_API_REQUEST                      = 904
 const val EXCEPTION_LIBRUS_SYNERGIA_REQUEST                 = 905
 const val EXCEPTION_MOBIDZIENNIK_WEB_REQUEST                = 906
-const val EXCEPTION_VULCAN_API_REQUEST                      = 907
 const val EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST           = 908
 const val EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST            = 909
 const val EXCEPTION_NOTIFY                                  = 910
 const val EXCEPTION_LIBRUS_MESSAGES_REQUEST                 = 911
-const val EXCEPTION_IDZIENNIK_WEB_REQUEST                   = 912
-const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
-const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
 const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
 const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
 const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
 const val EXCEPTION_VULCAN_WEB_LOGIN                        = 931
 const val EXCEPTION_VULCAN_WEB_REQUEST                      = 932
 const val EXCEPTION_PODLASIE_API_REQUEST                    = 940
+const val EXCEPTION_VULCAN_HEBE_REQUEST                     = 950
 
 const val LOGIN_NO_ARGUMENTS                                = 1201
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
index 24444a58..b3db9f71 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt
@@ -5,8 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api
 
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginApi
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginMessages
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
@@ -16,13 +14,13 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.Mobidzie
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 
 // librus
 // mobidziennik
-// idziennik
+// idziennik [*]
 // vulcan
 // mobireg
 
@@ -34,14 +32,10 @@ const val LOGIN_TYPE_IDZIENNIK = 3
 const val LOGIN_TYPE_TEMPLATE = 21
 
 // LOGIN MODES
-const val LOGIN_MODE_IDZIENNIK_WEB = 0
-
 const val LOGIN_MODE_TEMPLATE_WEB = 0
 
 // LOGIN METHODS
 const val LOGIN_METHOD_NOT_NEEDED = -1
-const val LOGIN_METHOD_IDZIENNIK_WEB = 100
-const val LOGIN_METHOD_IDZIENNIK_API = 200
 const val LOGIN_METHOD_TEMPLATE_WEB = 100
 const val LOGIN_METHOD_TEMPLATE_API = 200
 
@@ -98,11 +92,12 @@ val mobidziennikLoginMethods = listOf(
 const val LOGIN_TYPE_VULCAN = 4
 const val LOGIN_MODE_VULCAN_API = 0
 const val LOGIN_MODE_VULCAN_WEB = 1
+const val LOGIN_MODE_VULCAN_HEBE = 2
 const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
 const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
 const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
 const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
-const val LOGIN_METHOD_VULCAN_API = 500
+const val LOGIN_METHOD_VULCAN_HEBE = 600
 val vulcanLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
                 .withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") }
@@ -116,21 +111,11 @@ val vulcanLoginMethods = listOf(
                 .withIsPossible { _, _ -> false }
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
 
-        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, loginStore ->
-                    if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_HEBE, VulcanLoginHebe::class.java)
+                .withIsPossible { _, loginStore ->
+                        loginStore.mode != LOGIN_MODE_VULCAN_API
                 }
-)
-
-val idziennikLoginMethods = listOf(
-        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_WEB, IdziennikLoginWeb::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
-
-        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_API, IdziennikLoginApi::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_IDZIENNIK_WEB }
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
 )
 
 const val LOGIN_TYPE_EDUDZIENNIK = 5
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
index b21a38bb..5d847e3f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt
@@ -12,6 +12,10 @@ object Regexes {
         """color: (\w+);?""".toRegex()
     }
 
+    val NOT_DIGITS by lazy {
+        """[^0-9]""".toRegex()
+    }
+
 
 
     val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
@@ -80,6 +84,15 @@ object Regexes {
     val MOBIDZIENNIK_ATTENDANCE_ENTRIES by lazy {
         """font-size:.+?class=".*?">(.*?)</td>""".toRegex(DOT_MATCHES_ALL)
     }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMNS by lazy {
+        """<tr><td class="border-right1".+?/td>(.+?)</tr>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMN by lazy {
+        """(<td.+?>)(.*?)</td>""".toRegex(DOT_MATCHES_ALL)
+    }
+    val MOBIDZIENNIK_ATTENDANCE_COLUMN_SPAN by lazy {
+        """colspan="(\d+)"""".toRegex()
+    }
     val MOBIDZIENNIK_ATTENDANCE_RANGE by lazy {
         """<span>([0-9:]+) - .+? (.+?)</span></a>""".toRegex(DOT_MATCHES_ALL)
     }
@@ -143,7 +156,7 @@ object Regexes {
         """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
     }
     val VULCAN_WEB_PERMISSIONS by lazy {
-        """permissions: '([A-z0-9/=+\-_]+?)'""".toRegex()
+        """permissions: '([A-z0-9/=+\-_|]+?)'""".toRegex()
     }
     val VULCAN_WEB_SYMBOL_VALIDATE by lazy {
         """[A-z0-9]+""".toRegex(IGNORE_CASE)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
index 4d3f0aca..7a578356 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
@@ -5,19 +5,20 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik
 
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.R
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.Edudziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.Idziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.Librus
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.Mobidziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.Podlasie
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan
+import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
@@ -25,6 +26,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.utils.Utils.d
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
@@ -71,15 +73,55 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     private var edziennikInterface: EdziennikInterface? = null
 
     internal fun run(app: App, taskCallback: EdziennikCallback) {
-        if (profile?.archived == true) {
-            taskCallback.onError(ApiError(TAG, ERROR_PROFILE_ARCHIVED))
-            return
+        profile?.let { profile ->
+            if (profile.archived) {
+                d(TAG, "The profile $profileId is archived")
+                taskCallback.onError(ApiError(TAG, ERROR_PROFILE_ARCHIVED))
+                return
+            }
+            else if (profile.shouldArchive()) {
+                d(TAG, "The profile $profileId's year ended on ${profile.dateYearEnd}, archiving")
+                ProfileArchiver(app, profile)
+            }
+            if (profile.isBeforeYear()) {
+                d(TAG, "The profile $profileId's school year has not started yet; aborting sync")
+                cancel()
+                taskCallback.onCompleted()
+                return
+            }
+
+            profile.registerName?.let { registerName ->
+                var status = app.config.sync.registerAvailability[registerName]
+                if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching({
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }, onError = {
+                        taskCallback.onError(it.toApiError(TAG))
+                        return
+                    })
+                }
+
+                if (status?.available != true
+                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(
+                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
+                        )
+                    }
+                    cancel()
+                    taskCallback.onCompleted()
+                    return
+                }
+            }
         }
+
         edziennikInterface = when (loginStore.type) {
             LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)
@@ -108,6 +150,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     }
 
     override fun cancel() {
+        d(TAG, "Task ${toString()} cancelling...")
         edziennikInterface?.cancel()
     }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt
new file mode 100644
index 00000000..15da9765
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-8-25.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik
+
+import android.content.Intent
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.Intent
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class ProfileArchiver(val app: App, val profile: Profile) {
+    companion object {
+        private const val TAG = "ProfileArchiver"
+    }
+
+    init {
+        if (profile.archiveId == null)
+            profile.archiveId = profile.id
+        d(TAG, "Processing ${profile.name}#${profile.id}, archiveId = ${profile.archiveId}")
+
+        profile.archived = true
+        app.db.profileDao().add(profile)
+        //app.db.metadataDao().setAllSeen(profile.id, true)
+        app.db.notificationDao().clear(profile.id)
+        app.db.endpointTimerDao().clear(profile.id)
+        d(TAG, "Archived profile ${profile.id} saved")
+        profile.archived = false
+
+        // guess the nearest school year
+        val today = Date.getToday()
+        profile.studentSchoolYearStart = when {
+            today.month <= profile.dateYearEnd.month -> today.year - 1
+            else -> today.year
+        }
+
+        // set default semester dates
+        profile.dateSemester1Start = Date(profile.studentSchoolYearStart, 9, 1)
+        profile.dateSemester2Start = Date(profile.studentSchoolYearStart + 1, 2, 1)
+        profile.dateYearEnd = Date(profile.studentSchoolYearStart + 1, 6, 30)
+
+        val oldId = profile.id
+        val newId = (app.db.profileDao().lastId ?: profile.id) + 1
+        profile.id = newId
+        profile.subname = "Nowy rok szkolny - ${profile.studentSchoolYearStart}"
+        profile.studentClassName = null
+
+        d(TAG, "New profile ID for ${profile.name}: ${profile.id}")
+
+        when (profile.loginStoreType) {
+            LOGIN_TYPE_LIBRUS -> {
+                profile.removeStudentData("isPremium")
+                profile.removeStudentData("pushDeviceId")
+                profile.removeStudentData("startPointsSemester1")
+                profile.removeStudentData("startPointsSemester2")
+                profile.removeStudentData("enablePointGrades")
+                profile.removeStudentData("enableDescriptiveGrades")
+            }
+            LOGIN_TYPE_MOBIDZIENNIK -> {
+
+            }
+            LOGIN_TYPE_VULCAN -> {
+                // DataVulcan.isApiLoginValid() returns false so it will update the semester
+                profile.removeStudentData("currentSemesterEndDate")
+                profile.removeStudentData("studentSemesterId")
+                profile.removeStudentData("studentSemesterNumber")
+                profile.removeStudentData("semester1Id")
+                profile.removeStudentData("semester2Id")
+                profile.removeStudentData("studentClassId")
+            }
+            LOGIN_TYPE_IDZIENNIK -> {
+                profile.removeStudentData("schoolYearId")
+            }
+            LOGIN_TYPE_EDUDZIENNIK -> {
+
+            }
+            LOGIN_TYPE_PODLASIE -> {
+
+            }
+        }
+
+        d(TAG, "Processed student data: ${profile.studentData}")
+
+        app.db.profileDao().add(profile)
+
+        if (app.profileId == oldId) {
+            val intent = Intent(
+                    Intent.ACTION_MAIN,
+                    "profileId" to newId
+            )
+            app.sendBroadcast(intent)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
index 17bf771f..23d9d3b1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt
@@ -110,7 +110,6 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
deleted file mode 100644
index 3e974539..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
-import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-
-class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
-
-    fun isWebLoginValid() = loginExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty() && webAuth.isNotNullNorEmpty()
-    fun isApiLoginValid() = apiExpiryTime-30 > currentTimeUnix() && apiBearer.isNotNullNorEmpty()
-
-    override fun satisfyLoginMethods() {
-        loginMethods.clear()
-        if (isWebLoginValid()) {
-            loginMethods += LOGIN_METHOD_IDZIENNIK_WEB
-            app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", webSessionId)
-            app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", webAuth)
-        }
-        if (isApiLoginValid())
-            loginMethods += LOGIN_METHOD_IDZIENNIK_API
-    }
-
-    override fun generateUserCode() = "$webSchoolName:$webUsername:$registerId"
-
-    private var mLoginExpiryTime: Long? = null
-    var loginExpiryTime: Long
-        get() { mLoginExpiryTime = mLoginExpiryTime ?: loginStore.getLoginData("loginExpiryTime", 0L); return mLoginExpiryTime ?: 0L }
-        set(value) { loginStore.putLoginData("loginExpiryTime", value); mLoginExpiryTime = value }
-
-    private var mApiExpiryTime: Long? = null
-    var apiExpiryTime: Long
-        get() { mApiExpiryTime = mApiExpiryTime ?: loginStore.getLoginData("apiExpiryTime", 0L); return mApiExpiryTime ?: 0L }
-        set(value) { loginStore.putLoginData("apiExpiryTime", value); mApiExpiryTime = value }
-
-    /*   __          __  _
-         \ \        / / | |
-          \ \  /\  / /__| |__
-           \ \/  \/ / _ \ '_ \
-            \  /\  /  __/ |_) |
-             \/  \/ \___|_._*/
-    private var mWebSchoolName: String? = null
-    var webSchoolName: String?
-        get() { mWebSchoolName = mWebSchoolName ?: loginStore.getLoginData("schoolName", null); return mWebSchoolName }
-        set(value) { loginStore.putLoginData("schoolName", value); mWebSchoolName = value }
-    private var mWebUsername: String? = null
-    var webUsername: String?
-        get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("username", null); return mWebUsername }
-        set(value) { loginStore.putLoginData("username", value); mWebUsername = value }
-    private var mWebPassword: String? = null
-    var webPassword: String?
-        get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("password", null); return mWebPassword }
-        set(value) { loginStore.putLoginData("password", value); mWebPassword = value }
-
-    private var mWebSessionId: String? = null
-    var webSessionId: String?
-        get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId }
-        set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value }
-    private var mWebAuth: String? = null
-    var webAuth: String?
-        get() { mWebAuth = mWebAuth ?: loginStore.getLoginData("webAuth", null); return mWebAuth }
-        set(value) { loginStore.putLoginData("webAuth", value); mWebAuth = value }
-
-    private var mWebSelectedRegister: Int? = null
-    var webSelectedRegister: Int
-        get() { mWebSelectedRegister = mWebSelectedRegister ?: loginStore.getLoginData("webSelectedRegister", 0); return mWebSelectedRegister ?: 0 }
-        set(value) { loginStore.putLoginData("webSelectedRegister", value); mWebSelectedRegister = value }
-
-    /*                   _
-             /\         (_)
-            /  \   _ __  _
-           / /\ \ | '_ \| |
-          / ____ \| |_) | |
-         /_/    \_\ .__/|_|
-                  | |
-                  |*/
-    private var mApiBearer: String? = null
-    var apiBearer: String?
-        get() { mApiBearer = mApiBearer ?: loginStore.getLoginData("apiBearer", null); return mApiBearer }
-        set(value) { loginStore.putLoginData("apiBearer", value); mApiBearer = value }
-
-    /*     ____  _   _
-          / __ \| | | |
-         | |  | | |_| |__   ___ _ __
-         | |  | | __| '_ \ / _ \ '__|
-         | |__| | |_| | | |  __/ |
-          \____/ \__|_| |_|\___|*/
-    private var mStudentId: String? = null
-    var studentId: String?
-        get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId }
-        set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value }
-
-    private var mRegisterId: Int? = null
-    var registerId: Int
-        get() { mRegisterId = mRegisterId ?: profile?.getStudentData("registerId", 0); return mRegisterId ?: 0 }
-        set(value) { profile?.putStudentData("registerId", value) ?: return; mRegisterId = value }
-
-    private var mSchoolYearId: Int? = null
-    var schoolYearId: Int
-        get() { mSchoolYearId = mSchoolYearId ?: profile?.getStudentData("schoolYearId", 0); return mSchoolYearId ?: 0 }
-        set(value) { profile?.putStudentData("schoolYearId", value) ?: return; mSchoolYearId = value }
-
-
-
-    /*    _    _ _   _ _
-         | |  | | | (_) |
-         | |  | | |_ _| |___
-         | |  | | __| | / __|
-         | |__| | |_| | \__ \
-          \____/ \__|_|_|__*/
-    fun getSubject(name: String, id: Long?, shortName: String): Subject {
-        var subject = if (id == null)
-            subjectList.singleOrNull { it.longName == name }
-        else
-            subjectList.singleOrNull { it.id == id }
-
-        if (subject == null) {
-            subject = Subject(profileId, id
-                    ?: name.crc16().toLong(), name, shortName)
-            subjectList[subject.id] = subject
-        }
-        return subject
-    }
-
-    fun getTeacher(firstName: String, lastName: String): Teacher {
-        val teacher = teacherList.singleOrNull { it.fullName == "$firstName $lastName" }
-        return validateTeacher(teacher, firstName, lastName)
-    }
-
-    fun getTeacher(firstNameChar: Char, lastName: String): Teacher {
-        val teacher = teacherList.singleOrNull { it.shortName == "$firstNameChar.$lastName" }
-        return validateTeacher(teacher, firstNameChar.toString(), lastName)
-    }
-
-    fun getTeacherByLastFirst(nameLastFirst: String): Teacher {
-        val nameParts = nameLastFirst.split(" ")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[1], nameParts[0])
-    }
-
-    fun getTeacherByFirstLast(nameFirstLast: String): Teacher {
-        val nameParts = nameFirstLast.split(" ")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0], nameParts[1])
-    }
-
-    fun getTeacherByFDotLast(nameFDotLast: String): Teacher {
-        val nameParts = nameFDotLast.split(".")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
-    }
-
-    fun getTeacherByFDotSpaceLast(nameFDotSpaceLast: String): Teacher {
-        val nameParts = nameFDotSpaceLast.split(".")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
-    }
-
-    private fun validateTeacher(teacher: Teacher?, firstName: String, lastName: String): Teacher {
-        (teacher ?: Teacher(profileId, -1, firstName, lastName).apply {
-            id = shortName.crc16().toLong()
-            teacherList[id] = this
-        }).apply {
-            if (firstName.length > 1)
-                name = firstName
-            surname = lastName
-            return this
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
deleted file mode 100644
index e1fa6f00..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikData
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin.IdziennikFirstLogin
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
-import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.utils.Utils.d
-
-class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Idziennik"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataIdziennik
-    private var afterLogin: (() -> Unit)? = null
-
-    init {
-        data = DataIdziennik(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Idziennik.callback)
-            satisfyLoginMethods()
-        }
-    }
-
-    private fun completed() {
-        data.saveData()
-        callback.onCompleted()
-    }
-
-    /*    _______ _                     _                  _ _   _
-         |__   __| |              /\   | |                (_) | | |
-            | |  | |__   ___     /  \  | | __ _  ___  _ __ _| |_| |__  _ __ ___
-            | |  | '_ \ / _ \   / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \
-            | |  | | | |  __/  / ____ \| | (_| | (_) | |  | | |_| | | | | | | | |
-            |_|  |_| |_|\___| /_/    \_\_|\__, |\___/|_|  |_|\__|_| |_|_| |_| |_|
-                                           __/ |
-                                          |__*/
-    override fun sync(featureIds: List<Int>, viewId: Int?, onlyEndpoints: List<Int>?, arguments: JsonObject?) {
-        data.arguments = arguments
-        data.prepare(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId, onlyEndpoints)
-        login()
-    }
-
-    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
-        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        loginMethodId?.let { data.prepareFor(idziennikLoginMethods, it) }
-        afterLogin?.let { this.afterLogin = it }
-        IdziennikLogin(data) {
-            data()
-        }
-    }
-
-    private fun data() {
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        afterLogin?.invoke() ?: IdziennikData(data) {
-            completed()
-        }
-    }
-
-    override fun getMessage(message: MessageFull) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetMessage(data, message) {
-                completed()
-            }
-        }
-    }
-
-    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
-        login(LOGIN_METHOD_IDZIENNIK_API) {
-            IdziennikWebSendMessage(data, recipients, subject, text) {
-                completed()
-            }
-        }
-    }
-
-    override fun markAllAnnouncementsAsRead() {}
-    override fun getAnnouncement(announcement: AnnouncementFull) {}
-
-    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            if (owner is Message) {
-                IdziennikWebGetAttachment(data, owner, attachmentId, attachmentName) {
-                    completed()
-                }
-            }
-            else if (owner is Event) {
-                IdziennikWebGetHomeworkAttachment(data, owner, attachmentId, attachmentName) {
-                    completed()
-                }
-            }
-        }
-    }
-
-    override fun getRecipientList() {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetRecipientList(data) {
-                completed()
-            }
-        }
-    }
-
-    override fun getEvent(eventFull: EventFull) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetHomework(data, eventFull) {
-                completed()
-            }
-        }
-    }
-
-    override fun firstLogin() { IdziennikFirstLogin(data) { completed() } }
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-        callback.onCompleted()
-    }
-
-    private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
-        return object : EdziennikCallback {
-            override fun onCompleted() { callback.onCompleted() }
-            override fun onProgress(step: Float) { callback.onProgress(step) }
-            override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) }
-            override fun onError(apiError: ApiError) {
-                if (apiError.errorCode in internalErrorList) {
-                    // finish immediately if the same error occurs twice during the same sync
-                    callback.onError(apiError)
-                    return
-                }
-                internalErrorList.add(apiError.errorCode)
-                when (apiError.errorCode) {
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION,
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH,
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER,
-                    ERROR_IDZIENNIK_WEB_ACCESS_DENIED,
-                    ERROR_IDZIENNIK_API_ACCESS_DENIED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_IDZIENNIK_WEB)
-                        data.prepareFor(idziennikLoginMethods, LOGIN_METHOD_IDZIENNIK_WEB)
-                        data.loginExpiryTime = 0
-                        login()
-                    }
-                    ERROR_IDZIENNIK_API_NO_REGISTER -> {
-                        data()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt
deleted file mode 100644
index 02aaabb2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.models.Feature
-
-const val ENDPOINT_IDZIENNIK_WEB_TIMETABLE              = 1030
-const val ENDPOINT_IDZIENNIK_WEB_GRADES                 = 1040
-const val ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES        = 1050
-const val ENDPOINT_IDZIENNIK_WEB_EXAMS                  = 1060
-const val ENDPOINT_IDZIENNIK_WEB_HOMEWORK               = 1061
-const val ENDPOINT_IDZIENNIK_WEB_NOTICES                = 1070
-const val ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS          = 1080
-const val ENDPOINT_IDZIENNIK_WEB_ATTENDANCE             = 1090
-const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX         = 1110
-const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT          = 1120
-const val ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER       = 2010
-const val ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX         = 2110
-const val ENDPOINT_IDZIENNIK_API_MESSAGES_SENT          = 2120
-
-val IdziennikFeatures = listOf(
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_TIMETABLE, listOf(
-                ENDPOINT_IDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_GRADES, listOf(
-                ENDPOINT_IDZIENNIK_WEB_GRADES to LOGIN_METHOD_IDZIENNIK_WEB,
-                ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_AGENDA, listOf(
-                ENDPOINT_IDZIENNIK_WEB_EXAMS to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_HOMEWORK, listOf(
-                ENDPOINT_IDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_BEHAVIOUR, listOf(
-                ENDPOINT_IDZIENNIK_WEB_NOTICES to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ATTENDANCE, listOf(
-                ENDPOINT_IDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf(
-                ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        /*Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),*/
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_IDZIENNIK_API_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
-                ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API))
-)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt
deleted file mode 100644
index 8da75603..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-29.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.net.HttpURLConnection
-
-open class IdziennikApi(open val data: DataIdziennik, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "IdziennikApi"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun apiGet(tag: String, endpointTemplate: String, method: Int = GET, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonElement) -> Unit) {
-        val endpoint = endpointTemplate.replace("\$STUDENT_ID", data.studentId ?: "")
-        Utils.d(tag, "Request: Idziennik/API - $IDZIENNIK_API_URL/$endpoint")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                val json = try {
-                    JsonParser().parse(text)
-                } catch (_: Exception) { null }
-
-                var error: String? = null
-                if (json == null) {
-                    error = text
-                }
-                else if (json is JsonObject) {
-                    error = if (response?.code() == 200) null else
-                        json.getString("message") ?: json.toString()
-                }
-                error?.let { code ->
-                    when (code) {
-                        "Uczeń nie posiada aktywnej pozycji w dzienniku" -> ERROR_IDZIENNIK_API_NO_REGISTER
-                        "Authorization has been denied for this request." -> ERROR_IDZIENNIK_API_ACCESS_DENIED
-                        else -> ERROR_IDZIENNIK_API_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(tag, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                try {
-                    onSuccess(json!!)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_API_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(text))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_API_URL/$endpoint")
-                .userAgent(IDZIENNIK_API_USER_AGENT)
-                .addHeader("Authorization", "Bearer ${data.apiBearer}")
-                .apply {
-                    when (method) {
-                        GET -> get()
-                        POST -> {
-                            postJson()
-                            val json = JsonObject()
-                            parameters.map { (name, value) ->
-                                when (value) {
-                                    is JsonObject -> json.add(name, value)
-                                    is JsonArray -> json.add(name, value)
-                                    is String -> json.addProperty(name, value)
-                                    is Int -> json.addProperty(name, value)
-                                    is Long -> json.addProperty(name, value)
-                                    is Float -> json.addProperty(name, value)
-                                    is Char -> json.addProperty(name, value)
-                                }
-                            }
-                            setJsonBody(json)
-                        }
-                    }
-                }
-                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
-                .allowErrorCode(HttpURLConnection.HTTP_INTERNAL_ERROR)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt
deleted file mode 100644
index 8acb04cb..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiCurrentRegister
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesInbox
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikData"
-    }
-
-    init {
-        nextEndpoint(onSuccess)
-    }
-
-    private fun nextEndpoint(onSuccess: () -> Unit) {
-        if (data.targetEndpointIds.isEmpty()) {
-            onSuccess()
-            return
-        }
-        if (data.cancelled) {
-            onSuccess()
-            return
-        }
-        val id = data.targetEndpointIds.firstKey()
-        val lastSync = data.targetEndpointIds.remove(id)
-        useEndpoint(id, lastSync) { endpointId ->
-            data.progress(data.progressStep)
-            nextEndpoint(onSuccess)
-        }
-    }
-
-    private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) {
-        Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync")
-        when (endpointId) {
-            ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                IdziennikWebTimetable(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                IdziennikWebGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                IdziennikWebProposedGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_EXAMS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_exams)
-                IdziennikWebExams(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                IdziennikWebHomework(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                IdziennikWebNotices(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
-                IdziennikWebAnnouncements(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                IdziennikWebAttendance(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                IdziennikApiCurrentRegister(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                IdziennikApiMessagesInbox(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                IdziennikApiMessagesSent(data, lastSync, onSuccess)
-            }
-            else -> onSuccess(endpointId)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
deleted file mode 100644
index b871cd37..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.FileCallbackHandler
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebSwitchRegister
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.io.File
-import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
-import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
-
-open class IdziennikWeb(open val data: DataIdziennik, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "IdziennikWeb"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun webApiGet(tag: String, endpoint: String, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonObject) -> Unit) {
-        d(tag, "Request: Idziennik/Web/API - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null && response?.parserErrorBody == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (response?.code() == HTTP_INTERNAL_ERROR && endpoint == IDZIENNIK_WEB_GET_RECIPIENT_LIST) {
-                    data.error(ApiError(tag, ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION)
-                            .withResponse(response)
-                            .withApiResponse(json))
-                    return
-                }
-
-                if (response?.code() == HTTP_INTERNAL_ERROR && endpoint == IDZIENNIK_WEB_GRADES) {
-                    // special override for accounts where displaying grades
-                    // for another student requires switching it manually
-                    if (data.registerId != data.webSelectedRegister) {
-                        IdziennikWebSwitchRegister(data, data.registerId) {
-                            webApiGet(tag, endpoint, parameters, onSuccess)
-                        }
-                        return
-                    }
-                }
-
-                when {
-                    response?.code() == HTTP_UNAUTHORIZED -> ERROR_IDZIENNIK_WEB_ACCESS_DENIED
-                    response?.code() == HTTP_INTERNAL_ERROR -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                    response?.parserErrorBody != null -> when {
-                        response.parserErrorBody.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                        response.parserErrorBody.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                        response.parserErrorBody.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
-                        else -> ERROR_IDZIENNIK_WEB_OTHER
-                    }
-                    else -> null
-                }?.let { errorCode ->
-                    data.error(ApiError(TAG, errorCode)
-                            .withApiResponse(json?.toString() ?: response?.parserErrorBody)
-                            .withResponse(response))
-                    return
-                }
-
-                if (json == null) {
-                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(json)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_API_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(json))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .postJson()
-                .apply {
-                    val json = JsonObject()
-                    parameters.map { (name, value) ->
-                        when (value) {
-                            is JsonObject -> json.add(name, value)
-                            is JsonArray -> json.add(name, value)
-                            is String -> json.addProperty(name, value)
-                            is Int -> json.addProperty(name, value)
-                            is Long -> json.addProperty(name, value)
-                            is Float -> json.addProperty(name, value)
-                            is Char -> json.addProperty(name, value)
-                            is Boolean -> json.addProperty(name, value)
-                        }
-                    }
-                    setJsonBody(json)
-                }
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_INTERNAL_ERROR)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-
-    fun webGet(tag: String, endpoint: String, parameters: Map<String, Any> = emptyMap(), onSuccess: (text: String) -> Unit) {
-        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (!text.contains("czyWyswietlicDostepMobilny")) {
-                    when {
-                        text.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                        text.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                        text.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
-                        else -> ERROR_IDZIENNIK_WEB_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                try {
-                    onSuccess(text)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(text))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .apply {
-                    if (parameters.isEmpty()) get()
-                    else post()
-
-                    parameters.map { (name, value) ->
-                        addParameter(name, value)
-                    }
-                }
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-
-    fun webGetFile(tag: String, endpoint: String, targetFile: File, parameters: Map<String, Any>,
-                   onSuccess: (file: File) -> Unit, onProgress: (written: Long, total: Long) -> Unit) {
-
-        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : FileCallbackHandler(targetFile) {
-            override fun onSuccess(file: File?, response: Response?) {
-                if (file == null) {
-                    data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(file)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e))
-                }
-            }
-
-            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
-                try {
-                    onProgress(bytesWritten, bytesTotal)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
-                            .withThrowable(e))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .apply {
-                    parameters.forEach { (k, v) -> addParameter(k, v) }
-                }
-                .contentType("application/x-www-form-urlencoded")
-                .post()
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
deleted file mode 100644
index d5e59596..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-29.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_CURRENT_REGISTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class IdziennikApiCurrentRegister(override val data: DataIdziennik,
-                                  override val lastSync: Long?,
-                                  val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiCurrentRegister"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_CURRENT_REGISTER) { json ->
-            if (json !is JsonObject) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER)
-                return@apiGet
-            }
-
-            var nextSync = System.currentTimeMillis() + 14*DAY*1000
-
-            val settings = json.getJsonObject("ustawienia")?.apply {
-                getString("poczatekSemestru1")?.let { profile?.dateSemester1Start = Date.fromY_m_d(it) }
-                getString("koniecSemestru1")?.let { profile?.dateSemester2Start = Date.fromY_m_d(it).stepForward(0, 0, 1) }
-                getString("koniecSemestru2")?.let { profile?.dateYearEnd = Date.fromY_m_d(it) }
-            }
-
-            json.getInt("szczesliwyNumerek")?.let { luckyNumber ->
-                val luckyNumberDate = Date.getToday()
-                settings.getString("godzinaPublikacjiSzczesliwegoLosu")
-                        ?.let { Time.fromH_m(it) }
-                        ?.let { publishTime ->
-                            val now = Time.getNow()
-                            if (publishTime.value < 150000 && now.value < publishTime.value) {
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                                luckyNumberDate.stepForward(0, 0, -1) // the lucky number is still for yesterday
-                            }
-                            else if (publishTime.value >= 150000 && now.value > publishTime.value) {
-                                luckyNumberDate.stepForward(0, 0, 1) // the lucky number is already for tomorrow
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                            }
-                            else if (publishTime.value < 150000) {
-                                nextSync = luckyNumberDate
-                                        .clone()
-                                        .stepForward(0, 0, 1)
-                                        .combineWith(publishTime)
-                            }
-                            else {
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                            }
-                        }
-
-
-                val luckyNumberObject = LuckyNumber(
-                        profileId = data.profileId,
-                        date = luckyNumberDate,
-                        number = luckyNumber
-                )
-
-                data.luckyNumberList.add(luckyNumberObject)
-                data.metadataList.add(
-                        Metadata(
-                                profileId,
-                                Metadata.TYPE_LUCKY_NUMBER,
-                                luckyNumberObject.date.value.toLong(),
-                                true,
-                                data.profile?.empty ?: false
-                        ))
-            }
-
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER, syncAt = nextSync)
-            onSuccess(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
deleted file mode 100644
index 622068e2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.getBoolean
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils.crc32
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikApiMessagesInbox(override val data: DataIdziennik,
-                                override val lastSync: Long?,
-                                val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiMessagesInbox"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_MESSAGES_INBOX) { json ->
-            if (json !is JsonArray) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX)
-                return@apiGet
-            }
-
-            json.asJsonObjectList().forEach { jMessage ->
-                val subject = jMessage.getString("tytul") ?: ""
-                if (subject.contains("(") && subject.startsWith("iDziennik - "))
-                    return@forEach
-                if (subject.startsWith("Uwaga dla ucznia (klasa:"))
-                    return@forEach
-
-                val messageIdStr = jMessage.getString("id")
-                val messageId = crc32((messageIdStr + "0").toByteArray())
-
-                var body = "[META:$messageIdStr;-1]"
-                body += jMessage.getString("tresc")?.replace("\n".toRegex(), "<br>")
-
-                val readDate = if (jMessage.getBoolean("odczytana") == true) Date.fromIso(jMessage.getString("wersjaRekordu")) else 0
-                val sentDate = Date.fromIso(jMessage.getString("dataWyslania"))
-
-                val sender = jMessage.getAsJsonObject("nadawca")
-                var firstName = sender.getString("imie")
-                var lastName = sender.getString("nazwisko")
-                if (firstName.isNullOrEmpty() || lastName.isNullOrEmpty()) {
-                    firstName = "usunięty"
-                    lastName = "użytkownik"
-                }
-                val rTeacher = data.getTeacher(
-                        firstName,
-                        lastName
-                )
-                rTeacher.loginId = /*sender.getString("id") + ":" + */sender.getString("usr")
-                rTeacher.setTeacherType(Teacher.TYPE_OTHER)
-
-                val message = Message(
-                        profileId = profileId,
-                        id = messageId,
-                        type = if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
-                        subject = subject,
-                        body = body,
-                        senderId = rTeacher.id,
-                        addedDate = sentDate
-                )
-
-                val messageRecipient = MessageRecipient(
-                        profileId,
-                        -1 /* me */,
-                        -1,
-                        readDate,
-                        /*messageId*/ messageId
-                )
-
-                data.messageList.add(message)
-                data.messageRecipientList.add(messageRecipient)
-                data.setSeenMetadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_MESSAGE,
-                        message.id,
-                        readDate > 0,
-                        readDate > 0 || profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
deleted file mode 100644
index 87b3264d..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.utils.Utils.crc32
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikApiMessagesSent(override val data: DataIdziennik,
-                               override val lastSync: Long?,
-                               val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiMessagesSent"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_MESSAGES_SENT) { json ->
-            if (json !is JsonArray) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
-                return@apiGet
-            }
-
-            json.asJsonObjectList()?.forEach { jMessage ->
-                val messageIdStr = jMessage.get("id").asString
-                val messageId = crc32((messageIdStr + "1").toByteArray())
-
-                val subject = jMessage.get("tytul").asString
-
-                var body = "[META:$messageIdStr;-1]"
-                body += jMessage.get("tresc").asString.replace("\n".toRegex(), "<br>")
-
-                val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString)
-
-                val message = Message(
-                        profileId = profileId,
-                        id = messageId,
-                        type = TYPE_SENT,
-                        subject = subject,
-                        body = body,
-                        senderId = null,
-                        addedDate = sentDate
-                )
-
-                for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
-                    val recipient = recipientEl.asJsonObject
-                    var firstName = recipient.get("imie").asString
-                    var lastName = recipient.get("nazwisko").asString
-                    if (firstName.isEmpty() || lastName.isEmpty()) {
-                        firstName = "usunięty"
-                        lastName = "użytkownik"
-                    }
-                    val rTeacher = data.getTeacher(firstName, lastName)
-                    rTeacher.loginId = /*recipient.get("id").asString + ":" + */recipient.get("usr").asString
-
-                    val messageRecipient = MessageRecipient(
-                            profileId,
-                            rTeacher.id,
-                            -1,
-                            -1,
-                            /*messageId*/ messageId
-                    )
-                    data.messageRecipientIgnoreList.add(messageRecipient)
-                }
-
-                data.messageList.add(message)
-                data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
-            onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
deleted file mode 100644
index 531cbeeb..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Announcement
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebAnnouncements(override val data: DataIdziennik,
-                                override val lastSync: Long?,
-                                val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebAnnouncements"
-    }
-
-    init {
-        val param = JsonObject()
-        param.add("parametryFiltrow", JsonArray())
-
-        webApiGet(TAG, IDZIENNIK_WEB_ANNOUNCEMENTS, mapOf(
-                "uczenId" to (data.studentId ?: ""),
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jAnnouncementEl in json.getAsJsonArray("ListK")) {
-                val jAnnouncement = jAnnouncementEl.asJsonObject
-                // jAnnouncement
-                val announcementId = jAnnouncement.getLong("Id") ?: -1
-
-                val rTeacher = data.getTeacherByFirstLast(jAnnouncement.getString("Autor") ?: "")
-                val addedDate = jAnnouncement.getString("DataDodania")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull() ?: System.currentTimeMillis()
-                val startDate = jAnnouncement.getString("DataWydarzenia")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull()?.let { Date.fromMillis(it) }
-
-                val announcementObject = Announcement(
-                        profileId = profileId,
-                        id = announcementId,
-                        subject = jAnnouncement.get("Temat").asString,
-                        text = jAnnouncement.get("Tresc").asString,
-                        startDate = startDate,
-                        endDate = null,
-                        teacherId = rTeacher.id,
-                        addedDate = addedDate
-                )
-                data.announcementList.add(announcementObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_ANNOUNCEMENT,
-                        announcementObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
deleted file mode 100644
index e77c9eac..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_BELATED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT_CUSTOM
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_UNKNOWN
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class IdziennikWebAttendance(override val data: DataIdziennik,
-                             override val lastSync: Long?,
-                             val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebAttendance"
-    }
-
-    private var attendanceYear = Date.getToday().year
-    private var attendanceMonth = Date.getToday().month
-    private var attendancePrevMonthChecked = false
-
-    init {
-        getAttendance()
-    }
-
-    private fun getAttendance() {
-        webApiGet(TAG, IDZIENNIK_WEB_ATTENDANCE, mapOf(
-                "idPozDziennika" to data.registerId,
-                "mc" to attendanceMonth,
-                "rok" to attendanceYear,
-                "dataTygodnia" to ""
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) {
-                val jAttendance = jAttendanceEl.asJsonObject
-                // jAttendance
-                val type = jAttendance.get("TypObecnosci").asInt
-
-                // skip "zajęcia nie odbyły się" and "Ferie"
-                if (type == 5 || type == 7)
-                    continue
-
-                val date = Date.fromY_m_d(jAttendance.get("Data").asString)
-                val time = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
-                if (date.combineWith(time) > System.currentTimeMillis())
-                    continue
-
-                val id = jAttendance.get("IdLesson").asString.crc16().toLong()
-                val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "")
-                val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString)
-
-                var baseType = TYPE_UNKNOWN
-                var typeName = "nieznany rodzaj"
-                var typeSymbol: String? = null
-                var typeColor: Long? = null
-
-                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosciUcznia_lmt637231494660000000.js */
-                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosci_lmt637231494660000000.css */
-                when (type) {
-                    1 -> {
-                        baseType = TYPE_ABSENT_EXCUSED
-                        typeName = "nieobecność usprawiedliwiona"
-                        typeColor = 0xffffe099
-                    }
-                    2 -> {
-                        baseType = TYPE_BELATED
-                        typeName = "spóźnienie"
-                        typeColor = 0xffffffaa
-                    }
-                    3 -> {
-                        baseType = TYPE_ABSENT
-                        typeName = "nieobecność nieusprawiedliwiona"
-                        typeColor = 0xffffad99
-                    }
-                    4, 9 -> {
-                        baseType = TYPE_RELEASED
-                        if (type == 4) {
-                            typeName = "zwolnienie"
-                            typeColor = 0xffa8beff
-                        }
-                        if (type == 9) {
-                            typeName = "zwolniony / obecny"
-                            typeSymbol = "zb"
-                            typeColor = 0xffff69b4
-                        }
-                    }
-                    8 -> {
-                        baseType = TYPE_PRESENT_CUSTOM
-                        typeName = "wycieczka"
-                        typeSymbol = "w"
-                        typeColor = null
-                    }
-                    0 -> {
-                        baseType = TYPE_PRESENT
-                        typeName = "obecny"
-                        typeColor = 0xffccffcc
-                    }
-                }
-
-                val semester = profile?.dateToSemester(date) ?: 1
-
-                val attendanceObject = Attendance(
-                        profileId = profileId,
-                        id = id,
-                        baseType = baseType,
-                        typeName = typeName,
-                        typeShort = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
-                        typeSymbol = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
-                        typeColor = typeColor?.toInt(),
-                        date = date,
-                        startTime = time,
-                        semester = semester,
-                        teacherId = rTeacher.id,
-                        subjectId = rSubject.id
-                ).also {
-                    it.lessonTopic = jAttendance.getString("PrzedmiotTemat")
-                    it.lessonNumber = jAttendance.getInt("Godzina")
-                }
-
-                data.attendanceList.add(attendanceObject)
-                if (attendanceObject.baseType != TYPE_PRESENT) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_ATTENDANCE,
-                            attendanceObject.id,
-                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
-                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
-                    ))
-                }
-            }
-
-            val attendanceDateValue = attendanceYear * 10000 + attendanceMonth * 100
-            if (profile?.empty == true && attendanceDateValue > profile?.getSemesterStart(1)?.value ?: 99999999) {
-                attendancePrevMonthChecked = true // do not need to check prev month later
-                attendanceMonth--
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12
-                    attendanceYear--
-                }
-                getAttendance()
-            } else if (!attendancePrevMonthChecked /* get also the previous month */) {
-                attendanceMonth--
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12
-                    attendanceYear--
-                }
-                attendancePrevMonthChecked = true
-                getAttendance()
-            } else {
-                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
deleted file mode 100644
index 25c06945..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-import java.util.*
-
-class IdziennikWebExams(override val data: DataIdziennik,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebExams"
-    }
-
-    private var examsYear = Date.getToday().year
-    private var examsMonth = Date.getToday().month
-    private var examsMonthsChecked = 0
-    private var examsNextMonthChecked = false // TO DO temporary // no more // idk
-
-    init {
-        getExams()
-    }
-
-    private fun getExams() {
-        val param = JsonObject().apply {
-            addProperty("strona", 1)
-            addProperty("iloscNaStrone", "99")
-            addProperty("iloscRekordow", -1)
-            addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu")
-            addProperty("kierunekSort", 0)
-            addProperty("maxIloscZaznaczonych", 0)
-            addProperty("panelFiltrow", 0)
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf(
-                "idP" to data.registerId,
-                "rok" to examsYear,
-                "miesiac" to examsMonth,
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { exam ->
-                val id = exam.getLong("_recordId") ?: return@forEach
-                val examDate = Date.fromY_m_d(exam.getString("data") ?: return@forEach)
-                val subjectName = exam.getString("przedmiot") ?: return@forEach
-                val subjectId = data.getSubject(subjectName, null, subjectName).id
-                val teacherName = exam.getString("wpisal") ?: return@forEach
-                val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val topic = exam.getString("zakres")?.trim() ?: ""
-
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, examDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
-
-                val eventType = when (exam.getString("rodzaj")?.toLowerCase(Locale.getDefault())) {
-                    "sprawdzian/praca klasowa",
-                    "sprawdzian",
-                    "praca klasowa" -> Event.TYPE_EXAM
-                    "kartkówka" -> Event.TYPE_SHORT_QUIZ
-                    else -> Event.TYPE_EXAM
-                }
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = examDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = eventType,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = data.teamClass?.id ?: -1
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_EVENT,
-                        eventObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) {
-                examsMonthsChecked++
-                examsMonth--
-                if (examsMonth < 1) {
-                    examsMonth = 12
-                    examsYear--
-                }
-                getExams()
-            } else if (!examsNextMonthChecked /* get also one month forward */) {
-                val showDate = Date.getToday().stepForward(0, 1, 0)
-                examsYear = showDate.year
-                examsMonth = showDate.month
-                examsNextMonthChecked = true
-                getExams()
-            } else {
-                data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
-
-                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_IDZIENNIK_WEB_EXAMS)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
deleted file mode 100644
index b7a462f6..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-28
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_ATTACHMENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.io.File
-
-class IdziennikWebGetAttachment(override val data: DataIdziennik,
-                                val owner: Any,
-                                val attachmentId: Long,
-                                val attachmentName: String,
-                                val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        const val TAG = "IdziennikWebGetAttachment"
-    }
-
-    init {
-        val message = owner as Message
-
-        val messageId = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex().find(message.body ?: "")?.get(2) ?: -1
-        val targetFile = File(Utils.getStorageDir(), attachmentName)
-
-        webGetFile(TAG, IDZIENNIK_WEB_GET_ATTACHMENT, targetFile, mapOf(
-                "id" to messageId,
-                "fileName" to attachmentName
-        ), { file ->
-            val event = AttachmentGetEvent(
-                    profileId,
-                    owner,
-                    attachmentId,
-                    AttachmentGetEvent.TYPE_FINISHED,
-                    file.absolutePath
-            )
-
-            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
-            Utils.writeStringToFile(attachmentDataFile, event.fileName)
-
-            EventBus.getDefault().postSticky(event)
-
-            onSuccess()
-
-        }) { written, _ ->
-            val event = AttachmentGetEvent(
-                    profileId,
-                    owner,
-                    attachmentId,
-                    AttachmentGetEvent.TYPE_PROGRESS,
-                    bytesWritten = written
-            )
-
-            EventBus.getDefault().postSticky(event)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt
deleted file mode 100644
index 12d804db..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-4-1.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.getBoolean
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-
-class IdziennikWebGetHomework(override val data: DataIdziennik,
-                              val event: EventFull,
-                              val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        private const val TAG = "IdziennikWebGetHomework"
-    }
-
-    init {
-        webApiGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK, mapOf(
-                "idP" to data.registerId,
-                "idPD" to event.id
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            val homework = json.getJsonObject("praca") ?: return@webApiGet
-
-            if (homework.getBoolean("zalacznik", false)) {
-                event.attachmentIds = mutableListOf(event.id)
-                event.attachmentNames = mutableListOf("Załącznik do zadania")
-            }
-            else {
-                event.attachmentIds = mutableListOf()
-                event.attachmentNames = mutableListOf()
-            }
-            event.homeworkBody = homework.getString("tresc")
-
-            data.eventList.add(event)
-            data.eventListReplace = true
-
-            EventBus.getDefault().postSticky(EventGetEvent(event))
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt
deleted file mode 100644
index f4a60f98..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-4-1.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.set
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.io.File
-
-class IdziennikWebGetHomeworkAttachment(override val data: DataIdziennik,
-                                        val owner: Any,
-                                        val attachmentId: Long,
-                                        val attachmentName: String,
-                                        val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        const val TAG = "IdziennikWebGetHomeworkAttachment"
-    }
-
-    init {
-        val homework = owner as Event
-
-        /*val request = Request.Builder()
-                .url("")
-                .build()
-        data.app.http.newCall(request).enqueue(object : Callback {
-            override fun onFailure(call: Call, e: IOException) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withThrowable(e))
-            }
-
-            override fun onResponse(call: Call, response: Response) {
-                val filename = response.header("content-disposition")?.substringAfter("\"")?.substringBeforeLast("\"")
-
-                val file: File = File(Utils.getStorageDir(), filename)
-                val sink = file.sink().buffer()
-                response.body()?.source()?.let {
-                    sink.writeAll(it)
-                }
-                sink.close()
-            }
-        })*/
-
-        webGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT) { text ->
-            val hiddenFields = JsonObject()
-            Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text).forEach {
-                hiddenFields[it[1]] = it[2]
-            }
-
-            webGetFile(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT, Utils.getStorageDir(), mapOf(
-                    "__VIEWSTATE" to hiddenFields.getString("__VIEWSTATE", ""),
-                    "__VIEWSTATEGENERATOR" to hiddenFields.getString("__VIEWSTATEGENERATOR", ""),
-                    "__EVENTVALIDATION" to hiddenFields.getString("__EVENTVALIDATION", ""),
-                    "__EVENTTARGET" to "ctl00\$cphContent\$bt_pobraniePliku",
-                    "ctl00\$dxComboUczniowie" to data.registerId,
-                    "ctl00\$cphContent\$idPracyDomowej" to attachmentId
-            ), { file ->
-                val event = AttachmentGetEvent(
-                        profileId,
-                        owner,
-                        attachmentId,
-                        AttachmentGetEvent.TYPE_FINISHED,
-                        file.absolutePath
-                )
-
-                val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
-                Utils.writeStringToFile(attachmentDataFile, event.fileName)
-
-                homework.attachmentNames = mutableListOf(file.name)
-                data.eventList.add(homework)
-                data.eventListReplace = true
-
-                EventBus.getDefault().postSticky(event)
-                onSuccess()
-
-            }) { written, _ ->
-                val event = AttachmentGetEvent(
-                        profileId,
-                        owner,
-                        attachmentId,
-                        AttachmentGetEvent.TYPE_PROGRESS,
-                        bytesWritten = written
-                )
-
-                EventBus.getDefault().postSticky(event)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
deleted file mode 100644
index bd1808df..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-28
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_MESSAGE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebGetMessage(override val data: DataIdziennik,
-                             private val message: MessageFull,
-                             val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        const val TAG = "IdziennikWebGetMessage"
-    }
-
-    init { data.profile?.also { profile ->
-        val metaPattern = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex()
-        val meta = metaPattern.find(message.body!!)
-        val messageIdString = meta?.get(1) ?: ""
-
-        webApiGet(TAG, IDZIENNIK_WEB_GET_MESSAGE, parameters = mapOf(
-                "idWiadomosci" to messageIdString,
-                "typWiadomosci" to if (message.type == TYPE_SENT) 1 else 0
-        )) { json ->
-            json.getJsonObject("d")?.getJsonObject("Wiadomosc")?.also {
-                val id = it.getLong("_recordId")
-                message.body = message.body?.replace(metaPattern, "[META:$messageIdString;$id]")
-
-                message.clearAttachments()
-                it.getJsonArray("ListaZal")?.asJsonObjectList()?.forEach { attachment ->
-                    message.addAttachment(
-                            attachment.getLong("Id") ?: return@forEach,
-                            attachment.getString("Nazwa") ?: return@forEach,
-                            -1
-                    )
-                }
-
-                message.recipients?.clear()
-                when (message.type) {
-                    TYPE_RECEIVED -> {
-                        val recipientObject = MessageRecipientFull(
-                                profileId = profileId,
-                                id = -1,
-                                messageId = message.id
-                        )
-
-                        val readDateString = it.getString("DataOdczytania")
-                        recipientObject.readDate = if (readDateString.isNullOrBlank()) System.currentTimeMillis()
-                        else Date.fromIso(readDateString)
-
-                        recipientObject.fullName = profile.accountName ?: profile.studentNameLong
-
-                        data.messageRecipientList.add(recipientObject)
-                        message.addRecipient(recipientObject)
-                    }
-
-                    TYPE_SENT -> {
-                        it.getJsonArray("ListaOdbiorcow")?.asJsonObjectList()?.forEach { recipient ->
-                            val recipientName = recipient.getString("NazwaOdbiorcy") ?: return@forEach
-                            val teacher = data.getTeacherByLastFirst(recipientName)
-
-                            val recipientObject = MessageRecipientFull(
-                                    profileId = profileId,
-                                    id = teacher.id,
-                                    messageId = message.id
-                            )
-
-                            recipientObject.readDate = recipient.getLong("Status") ?: return@forEach
-                            recipientObject.fullName = teacher.fullName
-
-                            data.messageRecipientList.add(recipientObject)
-                            message.addRecipient(recipientObject)
-                        }
-                    }
-                }
-
-                if (!message.seen) {
-                    message.seen = true
-
-                    data.setSeenMetadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            message.id,
-                            message.seen,
-                            message.notified
-                    ))
-                }
-
-                data.messageList.add(message)
-                data.messageListReplace = true
-
-                EventBus.getDefault().postSticky(MessageGetEvent(message))
-                onSuccess()
-            }
-        }
-    } ?: onSuccess() }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
deleted file mode 100644
index a14efc24..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-12-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import androidx.room.OnConflictStrategy
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_RECIPIENT_LIST
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-
-class IdziennikWebGetRecipientList(override val data: DataIdziennik,
-                                   val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        private const val TAG = "IdziennikWebGetRecipientList"
-    }
-
-    init {
-        webApiGet(TAG, IDZIENNIK_WEB_GET_RECIPIENT_LIST, mapOf(
-                "idP" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("ListK_Pracownicy")?.asJsonObjectList()?.forEach { recipient ->
-                val name = recipient.getString("ImieNazwisko") ?: ": "
-                val (fullName, subject) = name.split(": ").let {
-                    Pair(it.getOrNull(0), it.getOrNull(1))
-                }
-                val guid = recipient.getString("Id") ?: ""
-                // get teacher by ID or create it
-                val teacher = data.getTeacherByFirstLast(fullName ?: " ")
-                teacher.loginId = guid
-                teacher.setTeacherType(Teacher.TYPE_TEACHER)
-                // unset OTHER that is automatically set in IdziennikApiMessages*
-                teacher.unsetTeacherType(Teacher.TYPE_OTHER)
-                teacher.typeDescription = subject
-            }
-
-            json.getJsonArray("ListK_Opiekunowie")?.asJsonObjectList()?.forEach { recipient ->
-                val name = recipient.getString("ImieNazwisko") ?: ": "
-                val (fullName, parentOf) = Regexes.IDZIENNIK_MESSAGES_RECIPIENT_PARENT.find(name)?.let {
-                    Pair(it.groupValues.getOrNull(1), it.groupValues.getOrNull(2))
-                } ?: Pair(null, null)
-                val guid = recipient.getString("Id") ?: ""
-                // get teacher by ID or create it
-                val teacher = data.getTeacherByFirstLast(fullName ?: " ")
-                teacher.loginId = guid
-                teacher.setTeacherType(Teacher.TYPE_PARENT)
-                // unset OTHER that is automatically set in IdziennikApiMessages*
-                teacher.unsetTeacherType(Teacher.TYPE_OTHER)
-                teacher.typeDescription = parentOf
-            }
-
-            val event = RecipientListGetEvent(
-                    data.profileId,
-                    data.teacherList.filter { it.loginId != null }
-            )
-
-            profile?.lastReceiversSync = System.currentTimeMillis()
-
-            data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
-            EventBus.getDefault().postSticky(event)
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
deleted file mode 100644
index 90e17401..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import android.graphics.Color
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebGrades(override val data: DataIdziennik,
-                         override val lastSync: Long?,
-                         val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebGrades"
-    }
-
-    init { data.profile?.also { profile ->
-        webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.onEach { subjectJson ->
-                val subject = data.getSubject(
-                        subjectJson.getString("Przedmiot") ?: return@onEach,
-                        subjectJson.getLong("IdPrzedmiotu") ?: return@onEach,
-                        subjectJson.getString("Przedmiot") ?: return@onEach
-                )
-                subjectJson.getJsonArray("Oceny")?.asJsonObjectList()?.forEach { grade ->
-                    val id = grade.getLong("idK") ?: return@forEach
-                    val category = grade.getString("Kategoria") ?: ""
-                    val name = grade.getString("Ocena") ?: "?"
-                    val semester = grade.getInt("Semestr") ?: 1
-                    val teacher = data.getTeacherByLastFirst(grade.getString("Wystawil") ?: return@forEach)
-
-                    val countToAverage = grade.getBoolean("DoSredniej") ?: true
-                    var value = grade.getFloat("WartoscDoSred") ?: 0.0f
-                    val weight = if (countToAverage)
-                        grade.getFloat("Waga") ?: 0.0f
-                    else
-                        0.0f
-
-                    val gradeColor = grade.getString("Kolor") ?: ""
-                    var colorInt = 0xff2196f3.toInt()
-                    if (gradeColor.isNotEmpty()) {
-                        colorInt = Color.parseColor("#$gradeColor")
-                    }
-
-                    val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = id,
-                            name = name,
-                            type = TYPE_NORMAL,
-                            value = value,
-                            weight = weight,
-                            color = colorInt,
-                            category = category,
-                            description = null,
-                            comment = null,
-                            semester = semester,
-                            teacherId = teacher.id,
-                            subjectId = subject.id,
-                            addedDate = addedDate
-                    )
-
-                    when (grade.getInt("Typ")) {
-                        0 -> {
-                            val history = grade.getJsonArray("Historia")?.asJsonObjectList()
-                            if (history?.isNotEmpty() == true) {
-                                var sum = gradeObject.value * gradeObject.weight
-                                var count = gradeObject.weight
-                                for (historyItem in history) {
-                                    val countToTheAverage = historyItem.getBoolean("DoSredniej") ?: false
-                                    value = historyItem.get("WartoscDoSred").asFloat
-                                    val weight = historyItem.get("Waga").asFloat
-
-                                    if (value > 0 && countToTheAverage) {
-                                        sum += value * weight
-                                        count += weight
-                                    }
-
-                                    val historyColor = historyItem.getString("Kolor") ?: ""
-                                    colorInt = 0xff2196f3.toInt()
-                                    if (historyColor.isNotEmpty()) {
-                                        colorInt = Color.parseColor("#$historyColor")
-                                    }
-
-                                    val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
-                                    val historyObject = Grade(
-                                            profileId = profileId,
-                                            id = gradeObject.id * -1,
-                                            name = historyItem.getString("Ocena") ?: "",
-                                            type = TYPE_NORMAL,
-                                            value = value,
-                                            weight = if (value > 0f && countToTheAverage) weight * -1f else 0f,
-                                            color = colorInt,
-                                            category = historyItem.getString("Kategoria"),
-                                            description = historyItem.getString("Uzasadnienie"),
-                                            comment = null,
-                                            semester = historyItem.getInt("Semestr") ?: 1,
-                                            teacherId = teacher.id,
-                                            subjectId = subject.id,
-                                            addedDate = addedDate
-                                    )
-                                    historyObject.parentId = gradeObject.id
-
-                                    data.gradeList.add(historyObject)
-                                    data.metadataList.add(Metadata(
-                                            profileId,
-                                            Metadata.TYPE_GRADE,
-                                            historyObject.id,
-                                            true,
-                                            true
-                                    ))
-                                }
-                                // update the current grade's value with an average of all historical grades and itself
-                                if (sum > 0 && count > 0) {
-                                    gradeObject.value = sum / count
-                                }
-                                gradeObject.isImprovement = true // gradeObject is the improved grade. Originals are historyObjects
-                            }
-                        }
-                        1 -> {
-                            gradeObject.type = Grade.TYPE_SEMESTER1_FINAL
-                            gradeObject.name = value.toInt().toString()
-                            gradeObject.weight = 0f
-                        }
-                        2 -> {
-                            gradeObject.type = Grade.TYPE_YEAR_FINAL
-                            gradeObject.name = value.toInt().toString()
-                            gradeObject.weight = 0f
-                        }
-                    }
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(
-                            Metadata(
-                                    profileId,
-                                    Metadata.TYPE_GRADE,
-                                    id,
-                                    data.profile.empty,
-                                    data.profile.empty
-                            ))
-                }
-            }
-
-            data.toRemove.addAll(listOf(
-                    Grade.TYPE_NORMAL,
-                    Grade.TYPE_SEMESTER1_FINAL,
-                    Grade.TYPE_YEAR_FINAL
-            ).map {
-                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
-            })
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES)
-        }
-    } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES) }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
deleted file mode 100644
index 10b4a0c3..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-25
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebHomework(override val data: DataIdziennik,
-                           override val lastSync: Long?,
-                           val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebHomework"
-    }
-
-    init {
-        val param = JsonObject().apply {
-            addProperty("strona", 1)
-            addProperty("iloscNaStrone", 997)
-            addProperty("iloscRekordow", -1)
-            addProperty("kolumnaSort", "DataZadania")
-            addProperty("kierunekSort", 0)
-            addProperty("maxIloscZaznaczonych", 0)
-            addProperty("panelFiltrow", 0)
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_HOMEWORK, mapOf(
-                "idP" to data.registerId,
-                "data" to Date.getToday().stringY_m_d,
-                "wszystkie" to true,
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework ->
-                val id = homework.getLong("_recordId") ?: return@forEach
-                val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach)
-                val addedDate = Date.fromY_m_d(homework.getString("dataZ") ?: return@forEach)
-                val subjectName = homework.getString("przed") ?: return@forEach
-                val subjectId = data.getSubject(subjectName, null, subjectName).id
-                val teacherName = homework.getString("usr") ?: return@forEach
-                val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime
-                val topic = homework.getString("tytul")?.trim() ?: ""
-
-                val seen = when (profile?.empty) {
-                    true -> true
-                    else -> eventDate < Date.getToday()
-                }
-
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = eventDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = Event.TYPE_HOMEWORK,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = data.teamClass?.id ?: -1,
-                        addedDate = addedDate.inMillis
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_HOMEWORK,
-                        eventObject.id,
-                        seen,
-                        seen
-                ))
-            }
-
-            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_HOMEWORK)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
deleted file mode 100644
index 64108bfd..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEGATIVE
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEUTRAL
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_POSITIVE
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebNotices(override val data: DataIdziennik,
-                          override val lastSync: Long?,
-                          val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebNotices"
-    }
-
-    init {
-        webApiGet(TAG, IDZIENNIK_WEB_NOTICES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jNoticeEl in json.getAsJsonArray("SUwaga")) {
-                val jNotice = jNoticeEl.asJsonObject
-                // jNotice
-                val noticeId = jNotice.get("id").asString.crc16().toLong()
-
-                val rTeacher = data.getTeacherByLastFirst(jNotice.get("Nauczyciel").asString)
-                val addedDate = Date.fromY_m_d(jNotice.get("Data").asString)
-
-                var nType = TYPE_NEUTRAL
-                val jType = jNotice.get("Typ").asString
-                if (jType == "n") {
-                    nType = TYPE_NEGATIVE
-                } else if (jType == "p") {
-                    nType = TYPE_POSITIVE
-                }
-
-                val noticeObject = Notice(
-                        profileId = profileId,
-                        id = noticeId,
-                        type = nType,
-                        semester = jNotice.get("Semestr").asInt,
-                        text = jNotice.getString("Tresc") ?: "",
-                        category = null,
-                        points = null,
-                        teacherId = rTeacher.id,
-                        addedDate = addedDate.inMillis
-                )
-
-                data.noticeList.add(noticeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_NOTICE,
-                        noticeObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_NOTICES)
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
deleted file mode 100644
index b23e9f98..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_MISSING_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-
-class IdziennikWebProposedGrades(override val data: DataIdziennik,
-                                 override val lastSync: Long?,
-                                 val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebProposedGrades"
-    }
-
-    init { data.profile?.also { profile ->
-        webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-            val manager = data.app.gradesManager
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { subject ->
-                val subjectName = subject.getString("Przedmiot") ?: return@forEach
-                val subjectObject = data.getSubject(subjectName, null, subjectName)
-
-                val semester1Proposed = subject.getString("OcenaSem1") ?: ""
-                val semester1Value = manager.getGradeValue(semester1Proposed)
-                val semester1Id = subjectObject.id * (-100) - 1
-                val semester1Type =
-                        if (semester1Value == 0f) TYPE_DESCRIPTIVE
-                        else TYPE_SEMESTER1_PROPOSED
-                val semester1Name = when {
-                    semester1Value == 0f -> " "
-                    semester1Value % 1.0f == 0f -> semester1Value.toInt().toString()
-                    else -> semester1Value.toString()
-                }
-                val semester1Color =
-                        if (semester1Value == 0f) 0xff536dfe.toInt()
-                        else -1
-
-                val semester2Proposed = subject.getString("OcenaSem2") ?: ""
-                val semester2Value = manager.getGradeValue(semester2Proposed)
-                val semester2Id = subjectObject.id * (-100) - 2
-                val semester2Type =
-                        if (semester2Value == 0f) TYPE_DESCRIPTIVE
-                        else TYPE_YEAR_PROPOSED
-                val semester2Name = when {
-                    semester2Value == 0f -> " "
-                    semester2Value % 1.0f == 0f -> semester2Value.toInt().toString()
-                    else -> semester2Value.toString()
-                }
-                val semester2Color =
-                        if (semester2Value == 0f) 0xffff4081.toInt()
-                        else -1
-
-                if (semester1Proposed != "") {
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester1Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = semester1Id,
-                            name = semester1Name,
-                            type = semester1Type,
-                            value = semester1Value,
-                            weight = 0f,
-                            color = semester1Color,
-                            category = if (semester1Value == 0f) "Ocena opisowa semestralna" else null,
-                            description = if (semester1Value == 0f) semester1Proposed else null,
-                            comment = null,
-                            semester = 1,
-                            teacherId = -1,
-                            subjectId = subjectObject.id,
-                            addedDate = addedDate
-                    )
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile.empty,
-                            profile.empty
-                    ))
-                }
-
-                if (semester2Proposed != "") {
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester2Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = semester2Id,
-                            name = semester2Name,
-                            type = semester2Type,
-                            value = semester2Value,
-                            weight = 0f,
-                            color = semester2Color,
-                            category = if (semester2Value == 0f) "Ocena opisowa końcoworoczna" else null,
-                            description = if (semester2Value == 0f) semester2Proposed else null,
-                            comment = null,
-                            semester = 2,
-                            teacherId = -1,
-                            subjectId = subjectObject.id,
-                            addedDate = addedDate
-                    )
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile.empty,
-                            profile.empty
-                    ))
-                }
-            }
-
-            data.toRemove.addAll(listOf(TYPE_SEMESTER1_PROPOSED, TYPE_YEAR_PROPOSED).map {
-                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
-            })
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES)
-        }
-    } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES) }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
deleted file mode 100644
index 343ebcac..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-12-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SEND_MESSAGE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
-import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import java.util.*
-
-class IdziennikWebSendMessage(override val data: DataIdziennik,
-                              val recipients: List<Teacher>,
-                              val subject: String,
-                              val text: String,
-                              val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        private const val TAG = "IdziennikWebSendMessage"
-    }
-
-    init {
-        val recipientsArray = JsonArray()
-        for (teacher in recipients) {
-            teacher.loginId?.let {
-                recipientsArray += it
-            }
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_SEND_MESSAGE, mapOf(
-                "Wiadomosc" to JsonObject(
-                        "Tytul" to subject,
-                        "Tresc" to text,
-                        "Confirmation" to false,
-                        "GuidMessage" to UUID.randomUUID().toString().toUpperCase(Locale.ROOT),
-                        "Odbiorcy" to recipientsArray
-                )
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            if (json.getBoolean("CzyJestBlad") != false) {
-                // TODO error
-                return@webApiGet
-            }
-
-            IdziennikApiMessagesSent(data, null) {
-                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
-                val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id }
-                val event = MessageSentEvent(data.profileId, message, message?.addedDate)
-
-                EventBus.getDefault().postSticky(event)
-                onSuccess()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSwitchRegister.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSwitchRegister.kt
deleted file mode 100644
index f225f177..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSwitchRegister.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOME
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
-
-class IdziennikWebSwitchRegister(override val data: DataIdziennik,
-                                 val registerId: Int,
-                                 val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        private const val TAG = "IdziennikWebSwitchRegister"
-    }
-
-    init {
-        val hiddenFields = data.loginStore.getLoginData("hiddenFields", JsonObject())
-        // TODO error checking
-
-        webGet(TAG, IDZIENNIK_WEB_HOME, mapOf(
-                "__VIEWSTATE" to hiddenFields.getString("__VIEWSTATE", ""),
-                "__VIEWSTATEGENERATOR" to hiddenFields.getString("__VIEWSTATEGENERATOR", ""),
-                "__EVENTVALIDATION" to hiddenFields.getString("__EVENTVALIDATION", ""),
-                "ctl00\$dxComboUczniowie" to registerId
-        )) { text ->
-            Regexes.IDZIENNIK_WEB_SELECTED_REGISTER.find(text)?.let {
-                val registerId = it[1].toIntOrNull() ?: return@let
-                data.webSelectedRegister = registerId
-            }
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
deleted file mode 100644
index e7d293c4..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-22
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
-import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class IdziennikWebTimetable(override val data: DataIdziennik,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebTimetable"
-    }
-
-    init { data.profile?.also { profile ->
-        val currentWeekStart = Week.getWeekStart()
-
-        if (Date.getToday().weekDay > 4) {
-            currentWeekStart.stepForward(0, 0, 7)
-        }
-
-        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
-
-        val weekStart = Date.fromY_m_d(getDate)
-        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
-
-        webApiGet(TAG, IDZIENNIK_WEB_TIMETABLE, mapOf(
-                "idPozDziennika" to data.registerId,
-                "pidRokSzkolny" to data.schoolYearId,
-                "data" to "${weekStart.stringY_m_d}T10:00:00.000Z"
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEachIndexed { index, range ->
-                val lessonRange = LessonRange(
-                        profileId,
-                        index + 1,
-                        range.getString("Poczatek")?.let { Time.fromH_m(it) }
-                                ?: return@forEachIndexed,
-                        range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEachIndexed
-                )
-                data.lessonRanges[lessonRange.lessonNumber] = lessonRange
-            }
-
-            val dates = mutableSetOf<Int>()
-            val lessons = mutableListOf<Lesson>()
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { lesson ->
-                val subject = data.getSubject(
-                        lesson.getString("Nazwa") ?: return@forEach,
-                        lesson.getLong("Id"),
-                        lesson.getString("Skrot") ?: ""
-                )
-                val teacher = data.getTeacherByFDotLast(lesson.getString("Nauczyciel")
-                        ?: return@forEach)
-
-                val newSubjectName = lesson.getString("PrzedmiotZastepujacy")
-                val newSubject = when (newSubjectName.isNullOrBlank()) {
-                    true -> null
-                    else -> data.getSubject(newSubjectName, null, newSubjectName)
-                }
-
-                val newTeacherName = lesson.getString("NauZastepujacy")
-                val newTeacher = when (newTeacherName.isNullOrBlank()) {
-                    true -> null
-                    else -> data.getTeacherByFDotLast(newTeacherName)
-                }
-
-                val weekDay = lesson.getInt("DzienTygodnia")?.minus(1) ?: return@forEach
-                val lessonRange = data.lessonRanges[lesson.getInt("Godzina")?.plus(1)
-                        ?: return@forEach]
-                val lessonDate = weekStart.clone().stepForward(0, 0, weekDay)
-                val classroom = lesson.getString("NazwaSali")
-
-                val type = lesson.getInt("TypZastepstwa") ?: -1
-
-                val lessonObject = Lesson(profileId, -1)
-
-                when (type) {
-                    1, 2, 3, 4, 5 -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_CHANGE
-
-                            this.date = lessonDate
-                            this.lessonNumber = lessonRange.lessonNumber
-                            this.startTime = lessonRange.startTime
-                            this.endTime = lessonRange.endTime
-                            this.subjectId = newSubject?.id
-                            this.teacherId = newTeacher?.id
-                            this.teamId = data.teamClass?.id
-                            this.classroom = classroom
-
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonRange.lessonNumber
-                            this.oldStartTime = lessonRange.startTime
-                            this.oldEndTime = lessonRange.endTime
-                            this.oldSubjectId = subject.id
-                            this.oldTeacherId = teacher.id
-                            this.oldTeamId = data.teamClass?.id
-                            this.oldClassroom = classroom
-                        }
-                    }
-                    0 -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_CANCELLED
-
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonRange.lessonNumber
-                            this.oldStartTime = lessonRange.startTime
-                            this.oldEndTime = lessonRange.endTime
-                            this.oldSubjectId = subject.id
-                            this.oldTeacherId = teacher.id
-                            this.oldTeamId = data.teamClass?.id
-                            this.oldClassroom = classroom
-                        }
-                    }
-                    else -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_NORMAL
-
-                            this.date = lessonDate
-                            this.lessonNumber = lessonRange.lessonNumber
-                            this.startTime = lessonRange.startTime
-                            this.endTime = lessonRange.endTime
-                            this.subjectId = subject.id
-                            this.teacherId = teacher.id
-                            this.teamId = data.teamClass?.id
-                            this.classroom = classroom
-                        }
-                    }
-                }
-
-                lessonObject.id = lessonObject.buildId()
-
-                dates.add(lessonDate.value)
-                lessons.add(lessonObject)
-
-                val seen = profile.empty || lessonDate < Date.getToday()
-
-                if (lessonObject.type != Lesson.TYPE_NORMAL && lessonDate >= Date.getToday()) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            lessonObject.id,
-                            seen,
-                            seen
-                    ))
-                }
-            }
-
-            val date: Date = weekStart.clone()
-            while (date <= weekEnd) {
-                if (!dates.contains(date.value)) {
-                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
-                        this.type = Lesson.TYPE_NO_LESSONS
-                        this.date = date.clone()
-                    })
-                }
-
-                date.stepForward(0, 0, 1)
-            }
-
-            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
-
-            data.lessonList.addAll(lessons)
-            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_TIMETABLE)
-        }
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
deleted file mode 100644
index 1a07c609..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SETTINGS
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_IDZIENNIK
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
-import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.fixName
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.set
-import pl.szczodrzynski.edziennik.swapFirstLastName
-
-class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikFirstLogin"
-    }
-
-    private val web = IdziennikWeb(data, null)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        val loginStoreId = data.loginStore.id
-        val loginStoreType = LOGIN_TYPE_IDZIENNIK
-        var firstProfileId = loginStoreId
-
-        IdziennikLoginWeb(data) {
-            web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text ->
-                //val accounts = json.getJsonArray("accounts")
-
-                val isParent = Regexes.IDZIENNIK_LOGIN_FIRST_IS_PARENT.find(text)?.get(1) != "0"
-                val accountNameLong = if (isParent)
-                    Regexes.IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME.find(text)?.get(1)?.swapFirstLastName()?.fixName()
-                else null
-
-                var schoolYearStart: Int? = null
-                var schoolYearEnd: Int? = null
-                var schoolYearName: String? = null
-                val schoolYearId = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
-                    schoolYearName = it[2]+"/"+it[3]
-                    schoolYearStart = it[2].toIntOrNull()
-                    schoolYearEnd = it[3].toIntOrNull()
-                    it[1].toIntOrNull()
-                } ?: run {
-                    data.error(ApiError(TAG, ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR)
-                            .withApiResponse(text))
-                    return@webGet
-                }
-
-                Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
-                        .toMutableList()
-                        .reversed()
-                        .forEach { match ->
-                            val registerId = match[1].toIntOrNull() ?: return@forEach
-                            val studentId = match[2]
-                            val firstName = match[3]
-                            val lastName = match[4]
-                            val className = match[5] + " " + match[6]
-
-                            val studentNameLong = "$firstName $lastName".fixName()
-                            val studentNameShort = "$firstName ${lastName[0]}.".fixName()
-                            val accountName = if (accountNameLong == studentNameLong) null else accountNameLong
-
-                            val profile = Profile(
-                                    firstProfileId++,
-                                    loginStoreId,
-                                    loginStoreType,
-                                    studentNameLong,
-                                    data.webUsername,
-                                    studentNameLong,
-                                    studentNameShort,
-                                    accountName
-                            ).apply {
-                                schoolYearStart?.let { studentSchoolYearStart = it }
-                                studentClassName = className
-                                studentData["studentId"] = studentId
-                                studentData["registerId"] = registerId
-                                studentData["schoolYearId"] = schoolYearId
-                            }
-                            profileList.add(profile)
-                        }
-
-                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
-                onSuccess()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt
deleted file mode 100644
index e1cef5c1..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLogin"
-    }
-
-    private var cancelled = false
-
-    init {
-        nextLoginMethod(onSuccess)
-    }
-
-    private fun nextLoginMethod(onSuccess: () -> Unit) {
-        if (data.targetLoginMethodIds.isEmpty()) {
-            onSuccess()
-            return
-        }
-        if (cancelled) {
-            onSuccess()
-            return
-        }
-        useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId ->
-            data.progress(data.progressStep)
-            if (usedMethodId != -1)
-                data.loginMethods.add(usedMethodId)
-            nextLoginMethod(onSuccess)
-        }
-    }
-
-    private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) {
-        // this should never be true
-        if (data.loginMethods.contains(loginMethodId)) {
-            onSuccess(-1)
-            return
-        }
-        Utils.d(TAG, "Using login method $loginMethodId")
-        when (loginMethodId) {
-            LOGIN_METHOD_IDZIENNIK_WEB -> {
-                data.startProgress(R.string.edziennik_progress_login_idziennik_web)
-                IdziennikLoginWeb(data) { onSuccess(loginMethodId) }
-            }
-            LOGIN_METHOD_IDZIENNIK_API -> {
-                data.startProgress(R.string.edziennik_progress_login_idziennik_api)
-                IdziennikLoginApi(data) { onSuccess(loginMethodId) }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt
deleted file mode 100644
index 2afe481d..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-
-class IdziennikLoginApi(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLoginApi"
-    }
-
-    init { run {
-        if (data.isApiLoginValid()) {
-            onSuccess()
-        }
-        else {
-            onSuccess()
-        }
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt
deleted file mode 100644
index 2c6ad0e7..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-26.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLoginWeb"
-    }
-
-    init { run {
-        if (data.isWebLoginValid()) {
-            data.app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", data.webSessionId)
-            data.app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", data.webAuth)
-            onSuccess()
-        }
-        else {
-            data.app.cookieJar.clear("iuczniowie.progman.pl")
-            if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) {
-                loginWithCredentials()
-            }
-            else {
-                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
-            }
-        }
-    }}
-
-    private fun loginWithCredentials() {
-        Utils.d(TAG, "Request: Idziennik/Login/Web - $IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-
-        val loginCallback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text.isNullOrEmpty()) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                // login succeeded: there is a start page
-                if (text.contains("czyWyswietlicDostepMobilny")) {
-                    val cookies = data.app.cookieJar.getAll("iuczniowie.progman.pl")
-                    run {
-                        data.webSessionId = cookies["ASP.NET_SessionId_iDziennik"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
-                        data.webAuth = cookies[".ASPXAUTH"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
-                        data.apiBearer = cookies["Bearer"]?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
-                        data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */
-                        data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */
-
-                        val hiddenFields = JsonObject()
-                        Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text).forEach {
-                            hiddenFields[it[1]] = it[2]
-                        }
-                        data.loginStore.putLoginData("hiddenFields", hiddenFields)
-
-                        Regexes.IDZIENNIK_WEB_SELECTED_REGISTER.find(text)?.let {
-                            val registerId = it[1].toIntOrNull() ?: return@let
-                            data.webSelectedRegister = registerId
-                        }
-
-                        data.profile?.let { profile ->
-                            Regexes.IDZIENNIK_WEB_LUCKY_NUMBER.find(text)?.also {
-                                val number = it[1].toIntOrNull() ?: return@also
-                                val luckyNumberObject = LuckyNumber(
-                                        profileId = data.profileId,
-                                        date = Date.getToday(),
-                                        number = number
-                                )
-
-                                data.luckyNumberList.add(luckyNumberObject)
-                                data.metadataList.add(
-                                        Metadata(
-                                                profile.id,
-                                                Metadata.TYPE_LUCKY_NUMBER,
-                                                luckyNumberObject.date.value.toLong(),
-                                                true,
-                                                profile.empty
-                                        ))
-                            }
-                        }
-
-                        return@run null
-                    }?.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-
-                    onSuccess()
-                    return
-                }
-
-                val errorText = Regexes.IDZIENNIK_LOGIN_ERROR.find(text)?.get(1)
-                when {
-                    errorText?.contains("nieprawidłową nazwę szkoły") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME
-                    errorText?.contains("nieprawidłowy login lub hasło") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN
-                    text.contains("Identyfikator zgłoszenia") -> ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR
-                    text.contains("Hasło dostępu do systemu wygasło") -> ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                    text.contains("Trwają prace konserwacyjne") -> ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE
-                    else -> ERROR_LOGIN_IDZIENNIK_WEB_OTHER
-                }.let { errorCode ->
-                    data.error(ApiError(TAG, errorCode)
-                            .withApiResponse(text)
-                            .withResponse(response))
-                    return
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        val getCallback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                Request.builder()
-                        .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                        .userAgent(IDZIENNIK_USER_AGENT)
-                        .addHeader("Origin", "https://iuczniowie.progman.pl")
-                        .addHeader("Referer", "$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                        .apply {
-                            Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text ?: return@apply).forEach {
-                                addParameter(it[1], it[2])
-                            }
-                        }
-                        .addParameter("ctl00\$ContentPlaceHolder\$nazwaPrzegladarki", IDZIENNIK_USER_AGENT)
-                        .addParameter("ctl00\$ContentPlaceHolder\$NazwaSzkoly", data.webSchoolName)
-                        .addParameter("ctl00\$ContentPlaceHolder\$UserName", data.webUsername)
-                        .addParameter("ctl00\$ContentPlaceHolder\$Password", data.webPassword)
-                        .addParameter("ctl00\$ContentPlaceHolder\$captcha", "")
-                        .addParameter("ctl00\$ContentPlaceHolder\$Logowanie", "Zaloguj")
-                        .post()
-                        .allowErrorCode(502)
-                        .callback(loginCallback)
-                        .build()
-                        .enqueue()
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .get()
-                .allowErrorCode(502)
-                .callback(getCallback)
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
index 48f308f8..abf3ac5f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt
@@ -157,7 +157,6 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt
index 94ab5ed1..3652f18a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt
@@ -36,11 +36,14 @@ class LibrusRecaptchaHelper(
     }
 
     private var timeout: Job? = null
+    private var timedOut = false
 
     inner class WebViewClient : android.webkit.WebViewClient() {
         override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
             timeout?.cancel()
-            onSuccess(url)
+            if (!timedOut) {
+                onSuccess(url)
+            }
             return true
         }
     }
@@ -50,6 +53,7 @@ class LibrusRecaptchaHelper(
             webView.loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
         }
         timeout = startCoroutineTimer(delayMillis = 10000L) {
+            timedOut = true
             onTimeout()
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt
index 5198d155..f164e3ed 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt
@@ -66,7 +66,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                     override fun onSuccess(text: String, response: Response) {
                         val location = response.headers().get("Location")
                         if (location != null) {
-                            val authMatcher = Pattern.compile("http://localhost/bar\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
+                            val authMatcher = Pattern.compile("$LIBRUS_REDIRECT_URL\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location)
                             when {
                                 authMatcher.find() -> {
                                     accessToken(authMatcher.group(1), null)
@@ -127,7 +127,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
                 .callback(object : JsonCallbackHandler() {
                     override fun onSuccess(json: JsonObject?, response: Response) {
                         val location = response.headers()?.get("Location")
-                        if (location == "http://localhost/bar?command=close") {
+                        if (location == "$LIBRUS_REDIRECT_URL?command=close") {
                             data.error(ApiError(TAG, ERROR_LIBRUS_PORTAL_MAINTENANCE)
                                     .withApiResponse(json)
                                     .withResponse(response))
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt
index ae5c6072..0e002576 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt
@@ -130,7 +130,6 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt
index a82ab4ef..aa07b1c3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt
@@ -44,7 +44,7 @@ class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
 
             dataDays.remove(date.value)
 
-            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5] }?.id ?: -1
+            val subjectId = data.subjectList.singleOrNull { it.longName == lesson[5].trim() }?.id ?: -1
             val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == (lesson[7]+" "+lesson[6]).fixName() }?.id ?: -1
             val teamId = data.teamList.singleOrNull { it.name == lesson[8]+lesson[9] }?.id ?: -1
             val classroom = lesson[11]
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAttendance.kt
index 36dbe1e9..f23478b6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAttendance.kt
@@ -91,8 +91,11 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
 
             Regexes.MOBIDZIENNIK_ATTENDANCE_TABLE.findAll(text).forEach { tableResult ->
                 val table = tableResult[1]
+
                 val lessonDates = mutableListOf<Date>()
                 val entries = mutableListOf<String>()
+                val ranges = mutableListOf<MatchResult?>()
+
                 Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON_COUNT.findAll(table).forEach {
                     val date = Date.fromY_m_d(it[1])
                     for (i in 0 until (it[2].toIntOrNull() ?: 0)) {
@@ -101,102 +104,52 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
                 }
                 Regexes.MOBIDZIENNIK_ATTENDANCE_ENTRIES.findAll(table).mapTo(entries) { it[1] }
 
+                Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMNS.findAll(table).forEach { columns ->
+                    var index = 0
+                    Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMN.findAll(columns[1]).forEach { column ->
+                        if (column[1].contains("colspan")) {
+                            val colspan =
+                                    Regexes.MOBIDZIENNIK_ATTENDANCE_COLUMN_SPAN.find(column[1])
+                                            ?.get(1)
+                                            ?.toIntOrNull() ?: 0
+                            entries.addAll(index, List(colspan) { "" })
+                            ranges.addAll(List(colspan) { null })
+                            index += colspan
+                        }
+                        else {
+                            val range = Regexes.MOBIDZIENNIK_ATTENDANCE_RANGE.find(column[2])
+                            ranges.add(range)
+                            index++
+                        }
+                    }
+                }
+
                 val dateIterator = lessonDates.iterator()
                 val entriesIterator = entries.iterator()
-                Regexes.MOBIDZIENNIK_ATTENDANCE_RANGE.findAll(table).let { ranges ->
-                    val count = ranges.count()
-                    // verify the lesson count is the same as dates & entries
-                    if (count != lessonDates.count() || count != entries.count())
+
+                val count = ranges.count()
+                // verify the lesson count is the same as dates & entries
+                if (count != lessonDates.count() || count != entries.count())
+                    return@forEach
+                ranges.forEach { range ->
+                    val lessonDate = dateIterator.next()
+                    val entry = entriesIterator.next()
+                    if (range == null || entry.isBlank())
                         return@forEach
-                    ranges.forEach { range ->
-                        val lessonDate = dateIterator.next()
-                        var entry = entriesIterator.next()
-                        if (entry.isBlank())
-                            return@forEach
-                        val startTime = Time.fromH_m(range[1])
+                    val startTime = Time.fromH_m(range[1])
 
-                        range[2].split(" / ").mapNotNull { Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it) }.forEachIndexed { index, lesson ->
-                            val topic = lesson[1].substringAfter(" - ", missingDelimiterValue = "").takeIf { it.isNotBlank() }
-                            if (topic?.startsWith("Lekcja odwołana: ") == true || entry.isEmpty())
-                                return@forEachIndexed
-                            val subjectName = lesson[1].substringBefore(" - ")
-                            //val team = lesson[3]
-                            val teacherName = lesson[3].fixName()
-
-                            val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
-                            val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
-
-                            var typeSymbol = ""
-                            for (symbol in typeSymbols) {
-                                if (entry.startsWith(symbol) && symbol.length > typeSymbol.length)
-                                    typeSymbol = symbol
-                            }
-                            entry = entry.removePrefix(typeSymbol)
-
-                            var isCounted = true
-                            val baseType = when (typeSymbol) {
-                                "." -> TYPE_PRESENT
-                                "|" -> TYPE_ABSENT
-                                "+" -> TYPE_ABSENT_EXCUSED
-                                "s" -> TYPE_BELATED
-                                "z" -> TYPE_RELEASED
-                                else -> {
-                                    isCounted = false
-                                    when (typeSymbol) {
-                                        "e" -> TYPE_PRESENT_CUSTOM
-                                        "en" -> TYPE_ABSENT
-                                        "ep" -> TYPE_PRESENT_CUSTOM
-                                        else -> TYPE_UNKNOWN
-                                    }
-                                }
-                            }
-                            val typeName = types?.get(typeSymbol) ?: ""
-                            val typeColor = when (typeSymbol) {
-                                "e" -> 0xff673ab7
-                                "en" -> 0xffec407a
-                                "ep" -> 0xff4caf50
-                                else -> null
-                            }?.toInt()
-
-                            val typeShort = if (isCounted)
-                                data.app.attendanceManager.getTypeShort(baseType)
-                            else
-                                typeSymbol
-
-                            val semester = data.profile?.dateToSemester(lessonDate) ?: 1
-
-                            val id = lessonDate.combineWith(startTime) / 6L * 10L + (lesson[0].hashCode() and 0xFFFF) + index
-
-                            val attendanceObject = Attendance(
-                                    profileId = profileId,
-                                    id = id,
-                                    baseType = baseType,
-                                    typeName = typeName,
-                                    typeShort = typeShort,
-                                    typeSymbol = typeSymbol,
-                                    typeColor = typeColor,
-                                    date = lessonDate,
-                                    startTime = startTime,
-                                    semester = semester,
-                                    teacherId = teacherId,
-                                    subjectId = subjectId
-                            ).also {
-                                it.lessonTopic = topic
-                                it.isCounted = isCounted
-                            }
-
-                            data.attendanceList.add(attendanceObject)
-                            if (baseType != TYPE_PRESENT) {
-                                data.metadataList.add(
-                                        Metadata(
-                                                data.profileId,
-                                                Metadata.TYPE_ATTENDANCE,
-                                                id,
-                                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
-                                                data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
-                                        ))
-                            }
-                        }
+                    range[2].split(" / ").mapNotNull {
+                        Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it)
+                    }.forEachIndexed { index, lesson ->
+                        processEntry(
+                                index,
+                                lesson,
+                                lessonDate,
+                                startTime,
+                                entry,
+                                types,
+                                typeSymbols
+                        )
                     }
                 }
             }
@@ -206,4 +159,98 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
             onSuccess()
         }
     }
+
+    private fun processEntry(
+            index: Int,
+            lesson: MatchResult,
+            lessonDate: Date,
+            startTime: Time,
+            entry: String,
+            types: Map<String?, String?>?,
+            typeSymbols: List<String>
+    ) {
+        var entry = entry
+
+        val topic = lesson[1].substringAfter(" - ", missingDelimiterValue = "").takeIf { it.isNotBlank() }
+        if (topic?.startsWith("Lekcja odwołana: ") == true || entry.isEmpty())
+            return
+        val subjectName = lesson[1].substringBefore(" - ").trim()
+        //val team = lesson[3]
+        val teacherName = lesson[3].fixName()
+
+        val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
+        val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
+
+        var typeSymbol = ""
+        for (symbol in typeSymbols) {
+            if (entry.startsWith(symbol) && symbol.length > typeSymbol.length)
+                typeSymbol = symbol
+        }
+        entry = entry.removePrefix(typeSymbol)
+
+        var isCustom = false
+        val baseType = when (typeSymbol) {
+            "." -> TYPE_PRESENT
+            "|" -> TYPE_ABSENT
+            "+" -> TYPE_ABSENT_EXCUSED
+            "s" -> TYPE_BELATED
+            "z" -> TYPE_RELEASED
+            else -> {
+                isCustom = true
+                when (typeSymbol) {
+                    "e" -> TYPE_PRESENT_CUSTOM
+                    "en" -> TYPE_ABSENT
+                    "ep" -> TYPE_PRESENT_CUSTOM
+                    "+ₑ" -> TYPE_ABSENT_EXCUSED
+                    else -> TYPE_UNKNOWN
+                }
+            }
+        }
+        val typeName = types?.get(typeSymbol) ?: ""
+        val typeColor = when (typeSymbol) {
+            "e" -> 0xff673ab7
+            "en" -> 0xffec407a
+            "ep" -> 0xff4caf50
+            "+ₑ" -> 0xff795548
+            else -> null
+        }?.toInt()
+
+        val typeShort = if (!isCustom)
+            data.app.attendanceManager.getTypeShort(baseType)
+        else
+            typeSymbol
+
+        val semester = data.profile?.dateToSemester(lessonDate) ?: 1
+
+        val id = lessonDate.combineWith(startTime) / 6L * 10L + (lesson[0].hashCode() and 0xFFFF) + index
+
+        val attendanceObject = Attendance(
+                profileId = profileId,
+                id = id,
+                baseType = baseType,
+                typeName = typeName,
+                typeShort = typeShort,
+                typeSymbol = typeSymbol,
+                typeColor = typeColor,
+                date = lessonDate,
+                startTime = startTime,
+                semester = semester,
+                teacherId = teacherId,
+                subjectId = subjectId
+        ).also {
+            it.lessonTopic = topic
+        }
+
+        data.attendanceList.add(attendanceObject)
+        if (baseType != TYPE_PRESENT) {
+            data.metadataList.add(
+                    Metadata(
+                            data.profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            id,
+                            data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
+                            data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
+                    ))
+        }
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetMessage.kt
index 105c0943..7282cc2d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetMessage.kt
@@ -74,16 +74,16 @@ class MobidziennikWebGetMessage(override val data: DataMobidziennik,
                 message.senderId = null
 
                 content.select("table.spis tr:has(td)")?.forEach { recipientEl ->
-                    val senderEl = recipientEl.select("td:eq(0)").first()
+                    val senderEl = recipientEl.select("td:eq(1)")?.first() ?: return@forEach
                     val senderName = senderEl.text().fixName()
 
                     val teacher = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }
                     val receiverId = teacher?.id ?: -1
 
                     var readDate = 0L
-                    val isReadEl = recipientEl.select("td:eq(2)").first()
-                    if (isReadEl.ownText() != "NIE") {
-                        val readDateEl = recipientEl.select("td:eq(3) small").first()
+                    val isReadEl = recipientEl.select("td:eq(4)")?.first() ?: return@forEach
+                    if (isReadEl.html().contains("tak")) {
+                        val readDateEl = recipientEl.select("td:eq(5) small")?.first() ?: return@forEach
                         Regexes.MOBIDZIENNIK_MESSAGE_SENT_READ_DATE.find(readDateEl.ownText())?.let {
                             val date = Date(
                                     it[3].toIntOrNull() ?: 2019,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetRecipientList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetRecipientList.kt
index 1118da48..0ed1e4a6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetRecipientList.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGetRecipientList.kt
@@ -56,20 +56,21 @@ class MobidziennikWebGetRecipientList(override val data: DataMobidziennik,
     }
 
     private fun processRecipient(listType: Int, listName: String, recipient: JsonObject) {
-        val id = recipient.getLong("id") ?: -1
+        val id = recipient.getString("id") ?: return
+        val idLong = id.replace(Regexes.NOT_DIGITS, "").toLongOrNull() ?: return
         // get teacher by ID or create it
-        val teacher = data.teacherList[id] ?: Teacher(data.profileId, id).apply {
+        val teacher = data.teacherList[idLong] ?: Teacher(data.profileId, idLong).apply {
             val fullName = recipient.getString("nazwa")?.fixName()
             name = fullName ?: ""
             fullName?.splitName()?.let {
                 name = it.second
                 surname = it.first
             }
-            data.teacherList[id] = this
+            data.teacherList[idLong] = this
         }
 
         teacher.apply {
-            loginId = id.toString()
+            loginId = id
             when (listType) {
                 1 -> setTeacherType(Teacher.TYPE_PRINCIPAL)
                 2 -> setTeacherType(Teacher.TYPE_TEACHER)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGrades.kt
index 9f5fab95..43b67d23 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebGrades.kt
@@ -46,7 +46,7 @@ class MobidziennikWebGrades(override val data: DataMobidziennik,
                 when (e.tagName()) {
                     "div" -> {
                         Regexes.MOBIDZIENNIK_GRADES_SUBJECT_NAME.find(e.outerHtml())?.let {
-                            subjectName = it[1]
+                            subjectName = it[1].trim()
                         }
                     }
                     "span" -> {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt
index 30da6e02..d7ec441f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt
@@ -134,7 +134,6 @@ class Podlasie(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun cancel() {
         Utils.d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt
index 9b92d541..a1e9d0eb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt
@@ -7,6 +7,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.firstlogin
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE
+import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_LOGOUT_DEVICES_ENDPOINT
 import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_USER_ENDPOINT
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieApi
@@ -22,50 +23,62 @@ class PodlasieFirstLogin(val data: DataPodlasie, val onSuccess: () -> Unit) {
     private val api = PodlasieApi(data, null)
 
     init {
+        PodlasieLoginApi(data) {
+            doLogin()
+        }
+    }
+
+    private fun doLogin() {
         val loginStoreId = data.loginStore.id
         val loginStoreType = LOGIN_TYPE_PODLASIE
 
-        PodlasieLoginApi(data) {
-            api.apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json ->
-                val uuid = json.getString("Uuid")
-                val login = json.getString("Login")
-                val firstName = json.getString("FirstName")
-                val lastName = json.getString("LastName")
-                val studentNameLong = "$firstName $lastName".fixName()
-                val studentNameShort = studentNameLong.getShortName()
-                val schoolName = json.getString("SchoolName")
-                val className = json.getString("SchoolClass")
-                val schoolYear = json.getString("ActualSchoolYear")?.replace(' ', '/')
-                val semester = json.getString("ActualTermShortcut")?.length
-                val apiUrl = json.getString("URL")
-
-                val profile = Profile(
-                        loginStoreId,
-                        loginStoreId,
-                        loginStoreType,
-                        studentNameLong,
-                        login,
-                        studentNameLong,
-                        studentNameShort,
-                        null
-                ).apply {
-                    studentData["studentId"] = uuid
-                    studentData["studentLogin"] = login
-                    studentData["schoolName"] = schoolName
-                    studentData["className"] = className
-                    studentData["schoolYear"] = schoolYear
-                    studentData["currentSemester"] = semester ?: 1
-                    studentData["apiUrl"] = apiUrl
-
-                    schoolYear?.split('/')?.get(0)?.toInt()?.let {
-                        studentSchoolYearStart = it
-                    }
-                    studentClassName = className
-                }
-
-                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(profile), data.loginStore))
-                onSuccess()
+        if (data.loginStore.getLoginData("logoutDevices", false)) {
+            data.loginStore.removeLoginData("logoutDevices")
+            api.apiGet(TAG, PODLASIE_API_LOGOUT_DEVICES_ENDPOINT) {
+                doLogin()
             }
+            return
+        }
+
+        api.apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json ->
+            val uuid = json.getString("Uuid")
+            val login = json.getString("Login")
+            val firstName = json.getString("FirstName")
+            val lastName = json.getString("LastName")
+            val studentNameLong = "$firstName $lastName".fixName()
+            val studentNameShort = studentNameLong.getShortName()
+            val schoolName = json.getString("SchoolName")
+            val className = json.getString("SchoolClass")
+            val schoolYear = json.getString("ActualSchoolYear")?.replace(' ', '/')
+            val semester = json.getString("ActualTermShortcut")?.length
+            val apiUrl = json.getString("URL")
+
+            val profile = Profile(
+                    loginStoreId,
+                    loginStoreId,
+                    loginStoreType,
+                    studentNameLong,
+                    login,
+                    studentNameLong,
+                    studentNameShort,
+                    null
+            ).apply {
+                studentData["studentId"] = uuid
+                studentData["studentLogin"] = login
+                studentData["schoolName"] = schoolName
+                studentData["className"] = className
+                studentData["schoolYear"] = schoolYear
+                studentData["currentSemester"] = semester ?: 1
+                studentData["apiUrl"] = apiUrl
+
+                schoolYear?.split('/')?.get(0)?.toInt()?.let {
+                    studentSchoolYearStart = it
+                }
+                studentClassName = className
+            }
+
+            EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(profile), data.loginStore))
+            onSuccess()
         }
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt
index 5843f927..843d36e9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt
@@ -100,7 +100,6 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
index 4b397f5d..55185745 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
@@ -4,57 +4,50 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 
+import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.crc16
 import pl.szczodrzynski.edziennik.currentTimeUnix
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
 import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Team
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.values
+import pl.szczodrzynski.fslogin.realm.RealmData
 
 class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
-
-    fun isWebMainLoginValid() = webExpiryTime-30 > currentTimeUnix()
-            && webAuthCookie.isNotNullNorEmpty()
-            && webHost.isNotNullNorEmpty()
-            && webType.isNotNullNorEmpty()
-            && symbol.isNotNullNorEmpty()
-    fun isApiLoginValid() = currentSemesterEndDate-30 > currentTimeUnix()
-            && apiFingerprint[symbol].isNotNullNorEmpty()
-            && apiPrivateKey[symbol].isNotNullNorEmpty()
+    fun isWebMainLoginValid() = symbol.isNotNullNorEmpty()
+            && (webExpiryTime[symbol]?.toLongOrNull() ?: 0) - 30 > currentTimeUnix()
+            && webAuthCookie[symbol].isNotNullNorEmpty()
+            && webRealmData != null
+    fun isHebeLoginValid() = hebePublicKey.isNotNullNorEmpty()
+            && hebePrivateKey.isNotNullNorEmpty()
             && symbol.isNotNullNorEmpty()
 
     override fun satisfyLoginMethods() {
         loginMethods.clear()
-        if (isApiLoginValid()) {
-            loginMethods += LOGIN_METHOD_VULCAN_API
+        if (isWebMainLoginValid()) {
+            loginMethods += LOGIN_METHOD_VULCAN_WEB_MAIN
         }
-    }
-
-    init {
-        // during the first sync `profile.studentClassName` is already set
-        if (teamList.values().none { it.type == Team.TYPE_CLASS }) {
-            profile?.studentClassName?.also { name ->
-                val id = Utils.crc16(name.toByteArray()).toLong()
-
-                val teamObject = Team(
-                        profileId,
-                        id,
-                        name,
-                        Team.TYPE_CLASS,
-                        "$schoolCode:$name",
-                        -1
-                )
-                teamList.put(id, teamObject)
-            }
+        if (isHebeLoginValid()) {
+            loginMethods += LOGIN_METHOD_VULCAN_HEBE
         }
     }
 
     override fun generateUserCode() = "$schoolCode:$studentId"
 
+    fun buildDeviceId(): String {
+        val deviceId = app.deviceId.padStart(16, '0')
+        val loginStoreId = loginStore.id.toString(16).padStart(4, '0')
+        val symbol = symbol?.crc16()?.toString(16)?.take(2) ?: "00"
+        return deviceId.substring(0..7) +
+                "-" + deviceId.substring(8..11) +
+                "-" + deviceId.substring(12..15) +
+                "-" + loginStoreId +
+                "-" + symbol + "6f72616e7a"
+    }
+
     /**
      * A UONET+ client symbol.
      *
@@ -139,6 +132,16 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
         set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
 
+    private var mStudentUnitId: Int? = null
+    var studentUnitId: Int
+        get() { mStudentUnitId = mStudentUnitId ?: profile?.getStudentData("studentUnitId", 0); return mStudentUnitId ?: 0 }
+        set(value) { profile?.putStudentData("studentUnitId", value) ?: return; mStudentUnitId = value }
+
+    private var mStudentConstituentId: Int? = null
+    var studentConstituentId: Int
+        get() { mStudentConstituentId = mStudentConstituentId ?: profile?.getStudentData("studentConstituentId", 0); return mStudentConstituentId ?: 0 }
+        set(value) { profile?.putStudentData("studentConstituentId", value) ?: return; mStudentConstituentId = value }
+
     private var mSemester1Id: Int? = null
     var semester1Id: Int
         get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
@@ -193,15 +196,31 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         get() { mApiPin = mApiPin ?: loginStore.getLoginData("apiPin", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPin ?: mapOf() }
         set(value) { loginStore.putLoginData("apiPin", app.gson.toJson(value)); mApiPin = value }
 
-    private var mApiFingerprint: Map<String?, String?>? = null
-    var apiFingerprint: Map<String?, String?> = mapOf()
-        get() { mApiFingerprint = mApiFingerprint ?: loginStore.getLoginData("apiFingerprint", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiFingerprint ?: mapOf() }
-        set(value) { loginStore.putLoginData("apiFingerprint", app.gson.toJson(value)); mApiFingerprint = value }
+    /*    _    _      _                     _____ _____ 
+         | |  | |    | |              /\   |  __ \_   _|
+         | |__| | ___| |__   ___     /  \  | |__) || |  
+         |  __  |/ _ \ '_ \ / _ \   / /\ \ |  ___/ | |  
+         | |  | |  __/ |_) |  __/  / ____ \| |    _| |_ 
+         |_|  |_|\___|_.__/ \___| /_/    \_\_|   |____*/
+    private var mHebePublicKey: String? = null
+    var hebePublicKey: String?
+        get() { mHebePublicKey = mHebePublicKey ?: loginStore.getLoginData("hebePublicKey", null); return mHebePublicKey }
+        set(value) { loginStore.putLoginData("hebePublicKey", value); mHebePublicKey = value }
 
-    private var mApiPrivateKey: Map<String?, String?>? = null
-    var apiPrivateKey: Map<String?, String?> = mapOf()
-        get() { mApiPrivateKey = mApiPrivateKey ?: loginStore.getLoginData("apiPrivateKey", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPrivateKey ?: mapOf() }
-        set(value) { loginStore.putLoginData("apiPrivateKey", app.gson.toJson(value)); mApiPrivateKey = value }
+    private var mHebePrivateKey: String? = null
+    var hebePrivateKey: String?
+        get() { mHebePrivateKey = mHebePrivateKey ?: loginStore.getLoginData("hebePrivateKey", null); return mHebePrivateKey }
+        set(value) { loginStore.putLoginData("hebePrivateKey", value); mHebePrivateKey = value }
+
+    private var mHebePublicHash: String? = null
+    var hebePublicHash: String?
+        get() { mHebePublicHash = mHebePublicHash ?: loginStore.getLoginData("hebePublicHash", null); return mHebePublicHash }
+        set(value) { loginStore.putLoginData("hebePublicHash", value); mHebePublicHash = value }
+
+    private var mHebeContext: String? = null
+    var hebeContext: String?
+        get() { mHebeContext = mHebeContext ?: profile?.getStudentData("hebeContext", null); return mHebeContext }
+        set(value) { profile?.putStudentData("hebeContext", value) ?: return; mHebeContext = value }
 
     val apiUrl: String?
         get() {
@@ -219,6 +238,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
                 "P01" -> "http://efeb-komunikacja.pro-hudson.win.vulcan.pl"
                 "P02" -> "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl"
                 "P90" -> "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl"
+                "KO1" -> "https://uonetplus-komunikacja.eduportal.koszalin.pl"
                 "FK1", "FS1" -> "http://api.fakelog.cf"
                 "SZ9" -> "http://hack.szkolny.eu"
                 else -> null
@@ -226,7 +246,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
             return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null)
         }
 
-    val fullApiUrl: String?
+    val fullApiUrl: String
         get() {
             return "$apiUrl$schoolSymbol/"
         }
@@ -239,49 +259,15 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
              \/  \/ \___|_.__/  |_|   |_____/  |______\___/ \__, |_|_| |_|
                                                              __/ |
                                                             |__*/
-    /**
-     * Federation Services login type.
-     * This might be one of: cufs, adfs, adfslight.
-     */
-    var webType: String?
-        get() { mWebType = mWebType ?: loginStore.getLoginData("webType", null); return mWebType }
-        set(value) { loginStore.putLoginData("webType", value); mWebType = value }
-    private var mWebType: String? = null
+    var webRealmData: RealmData?
+        get() { mWebRealmData = mWebRealmData ?: loginStore.getLoginData("webRealmData", JsonObject()).let {
+                app.gson.fromJson(it, RealmData::class.java)
+            }; return mWebRealmData }
+        set(value) { loginStore.putLoginData("webRealmData", app.gson.toJsonTree(value) as JsonObject); mWebRealmData = value }
+    private var mWebRealmData: RealmData? = null
 
-    /**
-     * Web server providing the federation services login.
-     * If this is present, WEB_MAIN login is considered as available.
-     */
-    var webHost: String?
-        get() { mWebHost = mWebHost ?: loginStore.getLoginData("webHost", null); return mWebHost }
-        set(value) { loginStore.putLoginData("webHost", value); mWebHost = value }
-    private var mWebHost: String? = null
-
-    /**
-     * An ID used in ADFS & ADFSLight login types.
-     */
-    var webAdfsId: String?
-        get() { mWebAdfsId = mWebAdfsId ?: loginStore.getLoginData("webAdfsId", null); return mWebAdfsId }
-        set(value) { loginStore.putLoginData("webAdfsId", value); mWebAdfsId = value }
-    private var mWebAdfsId: String? = null
-
-    /**
-     * A domain override for ADFS Light.
-     */
-    var webAdfsDomain: String?
-        get() { mWebAdfsDomain = mWebAdfsDomain ?: loginStore.getLoginData("webAdfsDomain", null); return mWebAdfsDomain }
-        set(value) { loginStore.putLoginData("webAdfsDomain", value); mWebAdfsDomain = value }
-    private var mWebAdfsDomain: String? = null
-
-    var webIsHttpCufs: Boolean
-        get() { mWebIsHttpCufs = mWebIsHttpCufs ?: loginStore.getLoginData("webIsHttpCufs", false); return mWebIsHttpCufs ?: false }
-        set(value) { loginStore.putLoginData("webIsHttpCufs", value); mWebIsHttpCufs = value }
-    private var mWebIsHttpCufs: Boolean? = null
-
-    var webIsScopedAdfs: Boolean
-        get() { mWebIsScopedAdfs = mWebIsScopedAdfs ?: loginStore.getLoginData("webIsScopedAdfs", false); return mWebIsScopedAdfs ?: false }
-        set(value) { loginStore.putLoginData("webIsScopedAdfs", value); mWebIsScopedAdfs = value }
-    private var mWebIsScopedAdfs: Boolean? = null
+    val webHost
+        get() = webRealmData?.host
 
     var webEmail: String?
         get() { mWebEmail = mWebEmail ?: loginStore.getLoginData("webEmail", null); return mWebEmail }
@@ -301,24 +287,24 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
      * If the time passes, the certificate needs to be POSTed again (if valid)
      * or re-generated.
      */
-    var webExpiryTime: Long
-        get() { mWebExpiryTime = mWebExpiryTime ?: profile?.getStudentData("webExpiryTime", 0L); return mWebExpiryTime ?: 0L }
-        set(value) { profile?.putStudentData("webExpiryTime", value); mWebExpiryTime = value }
-    private var mWebExpiryTime: Long? = null
+    var webExpiryTime: Map<String, String?> = mapOf()
+        get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() }
+        set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value }
+    private var mWebExpiryTime: Map<String, String?>? = null
 
     /**
      * EfebSsoAuthCookie retrieved after posting a certificate
      */
-    var webAuthCookie: String?
-        get() { mWebAuthCookie = mWebAuthCookie ?: profile?.getStudentData("webAuthCookie", null); return mWebAuthCookie }
-        set(value) { profile?.putStudentData("webAuthCookie", value); mWebAuthCookie = value }
-    private var mWebAuthCookie: String? = null
+    var webAuthCookie: Map<String, String?> = mapOf()
+        get() { mWebAuthCookie = mWebAuthCookie ?: loginStore.getLoginData("webAuthCookie", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebAuthCookie ?: mapOf() }
+        set(value) { loginStore.putLoginData("webAuthCookie", app.gson.toJson(value)); mWebAuthCookie = value }
+    private var mWebAuthCookie: Map<String, String?>? = null
 
     /**
      * Permissions needed to get JSONs from home page
      */
-    var webPermissions: String?
-        get() { mWebPermissions = mWebPermissions ?: profile?.getStudentData("webPermissions", null); return mWebPermissions }
-        set(value) { profile?.putStudentData("webPermissions", value); mWebPermissions = value }
-    private var mWebPermissions: String? = null
+    var webPermissions: Map<String, String?> = mapOf()
+        get() { mWebPermissions = mWebPermissions ?: loginStore.getLoginData("webPermissions", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebPermissions ?: mapOf() }
+        set(value) { loginStore.putLoginData("webPermissions", app.gson.toJson(value)); mWebPermissions = value }
+    private var mWebPermissions: Map<String, String?>? = null
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt
index e17d059f..d066aca0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt
@@ -10,9 +10,8 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.helper.OneDriveDownloadAttachment
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiAttachments
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiSendMessage
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMessagesChangeStatus
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeSendMessage
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
@@ -67,6 +66,11 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        if (data.loginStore.mode == LOGIN_MODE_VULCAN_API) {
+            data.error(TAG, ERROR_VULCAN_API_DEPRECATED)
+            return
+        }
+
         d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
         if (internalErrorList.isNotEmpty()) {
             d(TAG, "  - Internal errors:")
@@ -91,37 +95,21 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     override fun getMessage(message: MessageFull) {
-        login(LOGIN_METHOD_VULCAN_API) {
-            if (message.attachmentIds != null) {
-                VulcanApiMessagesChangeStatus(data, message) {
-                    completed()
-                }
+        login(LOGIN_METHOD_VULCAN_HEBE) {
+            if (message.seen) {
+                EventBus.getDefault().postSticky(MessageGetEvent(message))
+                completed()
                 return@login
             }
-            val list = data.app.db.messageDao().getAllNow(data.profileId)
-            VulcanApiAttachments(data, list, message, MessageFull::class) { _ ->
-                list.forEach {
-                    if (it.attachmentIds == null)
-                        it.attachmentIds = mutableListOf()
-                    data.messageList.add(it)
-                }
-                data.messageListReplace = true
-
-                if (message.seen) {
-                    EventBus.getDefault().postSticky(MessageGetEvent(message))
-                    completed()
-                    return@VulcanApiAttachments
-                }
-                VulcanApiMessagesChangeStatus(data, message) {
-                    completed()
-                }
+            VulcanHebeMessagesChangeStatus(data, message) {
+                completed()
             }
         }
     }
 
     override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
-        login(LOGIN_METHOD_VULCAN_API) {
-            VulcanApiSendMessage(data, recipients, subject, text) {
+        login(LOGIN_METHOD_VULCAN_HEBE) {
+            VulcanHebeSendMessage(data, recipients, subject, text) {
                 completed()
             }
         }
@@ -175,26 +163,16 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     override fun getEvent(eventFull: EventFull) {
-        login(LOGIN_METHOD_VULCAN_API) {
-            val list = data.app.db.eventDao().getAllNow(data.profileId).filter { !it.addedManually }
-            VulcanApiAttachments(data, list, eventFull, EventFull::class) { _ ->
-                list.forEach {
-                    it.homeworkBody = ""
-                    data.eventList.add(it)
-                }
-                data.eventListReplace = true
+        eventFull.homeworkBody = ""
 
-                EventBus.getDefault().postSticky(EventGetEvent(eventFull))
-                completed()
-            }
-        }
+        EventBus.getDefault().postSticky(EventGetEvent(eventFull))
+        completed()
     }
 
     override fun firstLogin() { VulcanFirstLogin(data) { completed() } }
     override fun cancel() {
         d(TAG, "Cancelled")
         data.cancel()
-        callback.onCompleted()
     }
 
     private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt
index ab032e0c..2e239a7e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt
@@ -7,58 +7,60 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.models.Feature
 
-const val ENDPOINT_VULCAN_API_UPDATE_SEMESTER     = 1000
-const val ENDPOINT_VULCAN_API_PUSH_CONFIG         = 1005
-const val ENDPOINT_VULCAN_API_DICTIONARIES        = 1010
-const val ENDPOINT_VULCAN_API_TIMETABLE           = 1020
-const val ENDPOINT_VULCAN_API_EVENTS = 1030
-const val ENDPOINT_VULCAN_API_GRADES              = 1040
-const val ENDPOINT_VULCAN_API_GRADES_SUMMARY      = 1050
-const val ENDPOINT_VULCAN_API_HOMEWORK            = 1060
-const val ENDPOINT_VULCAN_API_NOTICES             = 1070
-const val ENDPOINT_VULCAN_API_ATTENDANCE          = 1080
-const val ENDPOINT_VULCAN_API_MESSAGES_INBOX      = 1090
-const val ENDPOINT_VULCAN_API_MESSAGES_SENT       = 1100
 const val ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS       = 2010
 
+const val ENDPOINT_VULCAN_HEBE_MAIN               = 3000
+const val ENDPOINT_VULCAN_HEBE_PUSH_CONFIG        = 3005
+const val ENDPOINT_VULCAN_HEBE_ADDRESSBOOK        = 3010
+const val ENDPOINT_VULCAN_HEBE_TIMETABLE          = 3020
+const val ENDPOINT_VULCAN_HEBE_EXAMS              = 3030
+const val ENDPOINT_VULCAN_HEBE_GRADES             = 3040
+const val ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY      = 3050
+const val ENDPOINT_VULCAN_HEBE_HOMEWORK           = 3060
+const val ENDPOINT_VULCAN_HEBE_NOTICES            = 3070
+const val ENDPOINT_VULCAN_HEBE_ATTENDANCE         = 3080
+const val ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX     = 3090
+const val ENDPOINT_VULCAN_HEBE_MESSAGES_SENT      = 3100
+const val ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER       = 3200
+
 val VulcanFeatures = listOf(
         // timetable
         Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
-                ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_TIMETABLE to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // agenda
         Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
-                ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_EXAMS to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // grades
         Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
-                ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API,
-                ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_GRADES to LOGIN_METHOD_VULCAN_HEBE,
+                ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // homework
         Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
-                ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_HOMEWORK to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // behaviour
         Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf(
-                ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_NOTICES to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // attendance
         Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
-                ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_ATTENDANCE to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // messages
         Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+                ENDPOINT_VULCAN_HEBE_MESSAGES_SENT to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
 
         // push config
         Feature(LOGIN_TYPE_VULCAN, FEATURE_PUSH_CONFIG, listOf(
-                ENDPOINT_VULCAN_API_PUSH_CONFIG to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API)).withShouldSync { data ->
+                ENDPOINT_VULCAN_HEBE_PUSH_CONFIG to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)).withShouldSync { data ->
                 !data.app.config.sync.tokenVulcanList.contains(data.profileId)
         },
 
@@ -67,35 +69,20 @@ val VulcanFeatures = listOf(
          */
         Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf(
                 ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS to LOGIN_METHOD_VULCAN_WEB_MAIN
-        ), listOf(LOGIN_METHOD_VULCAN_WEB_MAIN)).withShouldSync { data -> data.shouldSyncLuckyNumber() },
+        ), listOf(LOGIN_METHOD_VULCAN_WEB_MAIN))
+                .withShouldSync { data -> data.shouldSyncLuckyNumber() }
+                .withPriority(2),
+        /**
+         * Lucky number - using Hebe API
+         */
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE))
+                .withShouldSync { data -> data.shouldSyncLuckyNumber() }
+                .withPriority(1),
 
         Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
-                ENDPOINT_VULCAN_API_UPDATE_SEMESTER to LOGIN_METHOD_VULCAN_API,
-                ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API
-        ), listOf(LOGIN_METHOD_VULCAN_API))
-        /*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_NUMBER, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_SCHOOL_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASS_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEAM_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEACHERS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_SUBJECTS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASSROOMS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),*/
-
+                ENDPOINT_VULCAN_HEBE_MAIN to LOGIN_METHOD_VULCAN_HEBE,
+                ENDPOINT_VULCAN_HEBE_ADDRESSBOOK to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE))
 )
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt
deleted file mode 100644
index c500e3e7..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import io.github.wulkanowy.signer.android.signContent
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.net.HttpURLConnection
-import java.util.*
-
-open class VulcanApi(open val data: DataVulcan, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "VulcanApi"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun apiGet(
-            tag: String,
-            endpoint: String,
-            method: Int = POST,
-            parameters: Map<String, Any> = emptyMap(),
-            baseUrl: Boolean = false,
-            onSuccess: (json: JsonObject, response: Response?) -> Unit
-    ) {
-        val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
-
-        d(tag, "Request: Vulcan/Api - $url")
-
-        val finalPayload = JsonObject()
-        parameters.map { (name, value) ->
-            when (value) {
-                is JsonObject -> finalPayload.add(name, value)
-                is JsonArray -> finalPayload.add(name, value)
-                is String -> finalPayload.addProperty(name, value)
-                is Int -> finalPayload.addProperty(name, value)
-                is Long -> finalPayload.addProperty(name, value)
-                is Float -> finalPayload.addProperty(name, value)
-                is Char -> finalPayload.addProperty(name, value)
-                is Boolean -> finalPayload.addProperty(name, value)
-            }
-        }
-        finalPayload.addProperty("RemoteMobileTimeKey", System.currentTimeMillis() / 1000)
-        finalPayload.addProperty("TimeKey", System.currentTimeMillis() / 1000 - 1)
-        finalPayload.addProperty("RequestId", UUID.randomUUID().toString())
-        finalPayload.addProperty("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
-        finalPayload.addProperty("RemoteMobileAppName", VULCAN_API_APP_NAME)
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null && response?.parserErrorBody == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (response?.code() ?: 200 != 200) {
-                    when (response?.code()) {
-                        503 -> ERROR_VULCAN_API_MAINTENANCE
-                        400 -> ERROR_VULCAN_API_BAD_REQUEST
-                        else -> ERROR_VULCAN_API_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(tag, errorCode)
-                                .withResponse(response)
-                                .withApiResponse(json?.toString() ?: response?.parserErrorBody))
-                        return
-                    }
-                }
-
-                if (json == null) {
-                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(json, response)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_VULCAN_API_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e)
-                            .withApiResponse(json))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url(url)
-                .userAgent(VULCAN_API_USER_AGENT)
-                .addHeader("RequestCertificateKey", data.apiFingerprint[data.symbol])
-                .addHeader("RequestSignatureValue",
-                        try {
-                            signContent(
-                                    data.apiPrivateKey[data.symbol] ?: "",
-                                    finalPayload.toString()
-                            )
-                        } catch (e: Exception) {e.printStackTrace();""})
-                .apply {
-                    when (method) {
-                        GET -> get()
-                        POST -> post()
-                    }
-                }
-                .setJsonBody(finalPayload)
-                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
-                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt
index 491e8ea6..0724ca46 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt
@@ -6,8 +6,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
 
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.utils.Utils
 
 class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
@@ -15,8 +16,35 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
         private const val TAG = "VulcanData"
     }
 
+    private var firstSemesterSync = false
+    private val firstSemesterSyncExclude = listOf(
+        ENDPOINT_VULCAN_HEBE_MAIN,
+        ENDPOINT_VULCAN_HEBE_PUSH_CONFIG,
+        ENDPOINT_VULCAN_HEBE_ADDRESSBOOK,
+        ENDPOINT_VULCAN_HEBE_TIMETABLE,
+        ENDPOINT_VULCAN_HEBE_EXAMS,
+        ENDPOINT_VULCAN_HEBE_HOMEWORK,
+        ENDPOINT_VULCAN_HEBE_NOTICES,
+        ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX,
+        ENDPOINT_VULCAN_HEBE_MESSAGES_SENT,
+        ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER
+    )
+
     init {
-        nextEndpoint(onSuccess)
+        if (data.studentSemesterNumber == 2 && data.profile?.empty != false) {
+            firstSemesterSync = true
+            // set to sync 1st semester first
+            data.studentSemesterId = data.semester1Id
+            data.studentSemesterNumber = 1
+        }
+        nextEndpoint {
+            if (firstSemesterSync) {
+                // at the end, set back 2nd semester
+                data.studentSemesterId = data.semester2Id
+                data.studentSemesterNumber = 2
+            }
+            onSuccess()
+        }
     }
 
     private fun nextEndpoint(onSuccess: () -> Unit) {
@@ -30,7 +58,21 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
         val id = data.targetEndpointIds.firstKey()
         val lastSync = data.targetEndpointIds.remove(id)
-        useEndpoint(id, lastSync) { endpointId ->
+        useEndpoint(id, lastSync) {
+            if (firstSemesterSync && id !in firstSemesterSyncExclude) {
+                // sync 2nd semester after every endpoint
+                data.studentSemesterId = data.semester2Id
+                data.studentSemesterNumber = 2
+                useEndpoint(id, lastSync) {
+                    // set 1st semester back for the next endpoint
+                    data.studentSemesterId = data.semester1Id
+                    data.studentSemesterNumber = 1
+                    // progress further
+                    data.progress(data.progressStep)
+                    nextEndpoint(onSuccess)
+                }
+                return@useEndpoint
+            }
             data.progress(data.progressStep)
             nextEndpoint(onSuccess)
         }
@@ -39,58 +81,71 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
     private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) {
         Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync")
         when (endpointId) {
-            ENDPOINT_VULCAN_API_UPDATE_SEMESTER -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                VulcanApiUpdateSemester(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_PUSH_CONFIG -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_push_config)
-                VulcanApiPushConfig(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_DICTIONARIES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_dictionaries)
-                VulcanApiDictionaries(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                VulcanApiGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_GRADES_SUMMARY -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                VulcanApiProposedGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_EVENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_events)
-                VulcanApiEvents(data, isHomework = false, lastSync = lastSync, onSuccess = onSuccess)
-            }
-            ENDPOINT_VULCAN_API_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                VulcanApiEvents(data, isHomework = true, lastSync = lastSync, onSuccess = onSuccess)
-            }
-            ENDPOINT_VULCAN_API_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                VulcanApiNotices(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_ATTENDANCE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                VulcanApiAttendance(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_TIMETABLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                VulcanApiTimetable(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                VulcanApiMessagesInbox(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_MESSAGES_SENT -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                VulcanApiMessagesSent(data, lastSync, onSuccess)
-            }
             ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
                 VulcanWebLuckyNumber(data, lastSync, onSuccess)
             }
+            ENDPOINT_VULCAN_HEBE_MAIN -> {
+                if (data.profile == null) {
+                    onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
+                    return
+                }
+                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
+                VulcanHebeMain(data, lastSync).getStudents(
+                    profile = data.profile,
+                    profileList = null
+                ) {
+                    onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
+                }
+            }
+            ENDPOINT_VULCAN_HEBE_PUSH_CONFIG -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_push_config)
+                VulcanHebePushConfig(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_ADDRESSBOOK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
+                VulcanHebeAddressbook(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                VulcanHebeTimetable(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_EXAMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_exams)
+                VulcanHebeExams(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                VulcanHebeGrades(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
+                VulcanHebeGradeSummary(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                VulcanHebeHomework(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                VulcanHebeNotices(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                VulcanHebeAttendance(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_RECEIVED)
+            }
+            ENDPOINT_VULCAN_HEBE_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_SENT)
+            }
+            ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                VulcanHebeLuckyNumber(data, lastSync, onSuccess)
+            }
             else -> onSuccess(endpointId)
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
new file mode 100644
index 00000000..a34e0a1b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
+
+import android.os.Build
+import androidx.core.util.set
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import io.github.wulkanowy.signer.hebe.getSignatureHeaders
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.HebeFilterType
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.data.db.entity.Subject
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.net.HttpURLConnection
+import java.net.URLEncoder
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
+    companion object {
+        const val TAG = "VulcanHebe"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun getDateTime(
+        json: JsonObject?,
+        key: String,
+        default: Long = System.currentTimeMillis()
+    ): Long {
+        val date = json.getJsonObject(key)
+        return date.getLong("Timestamp") ?: return default
+    }
+
+    fun getDate(json: JsonObject?, key: String): Date? {
+        val date = json.getJsonObject(key)
+        return date.getString("Date")?.let { Date.fromY_m_d(it) }
+    }
+
+    fun getTeacherId(json: JsonObject?, key: String): Long? {
+        val teacher = json.getJsonObject(key)
+        val teacherId = teacher.getLong("Id") ?: return null
+        if (data.teacherList[teacherId] == null) {
+            data.teacherList[teacherId] = Teacher(
+                data.profileId,
+                teacherId,
+                teacher.getString("Name") ?: "",
+                teacher.getString("Surname") ?: ""
+            )
+        }
+        return teacherId
+    }
+
+    fun getSubjectId(json: JsonObject?, key: String): Long? {
+        val subject = json.getJsonObject(key)
+        val subjectId = subject.getLong("Id") ?: return null
+        if (data.subjectList[subjectId] == null) {
+            data.subjectList[subjectId] = Subject(
+                data.profileId,
+                subjectId,
+                subject.getString("Name") ?: "",
+                subject.getString("Kod") ?: ""
+            )
+        }
+        return subjectId
+    }
+
+    fun getTeamId(json: JsonObject?, key: String): Long? {
+        val team = json.getJsonObject(key)
+        val teamId = team.getLong("Id") ?: return null
+        if (data.teamList[teamId] == null) {
+            var name = team.getString("Shortcut")
+                ?: team.getString("Name")
+                ?: ""
+            name = "${profile?.studentClassName ?: ""} $name"
+            data.teamList[teamId] = Team(
+                data.profileId,
+                teamId,
+                name,
+                Team.TYPE_VIRTUAL,
+                "${data.schoolCode}:$name",
+                -1
+            )
+        }
+        return teamId
+    }
+
+    fun getClassId(json: JsonObject?, key: String): Long? {
+        val team = json.getJsonObject(key)
+        val teamId = team.getLong("Id") ?: return null
+        if (data.teamList[teamId] == null) {
+            val name = data.profile?.studentClassName
+                ?: team.getString("Name")
+                ?: ""
+            data.teamList[teamId] = Team(
+                data.profileId,
+                teamId,
+                name,
+                Team.TYPE_CLASS,
+                "${data.schoolCode}:$name",
+                -1
+            )
+        }
+        return teamId
+    }
+
+    fun getLessonRange(json: JsonObject?, key: String): LessonRange? {
+        val timeslot = json.getJsonObject(key)
+        val position = timeslot.getInt("Position") ?: return null
+        val start = timeslot.getString("Start") ?: return null
+        val end = timeslot.getString("End") ?: return null
+        val lessonRange = LessonRange(
+            data.profileId,
+            position,
+            Time.fromH_m(start),
+            Time.fromH_m(end)
+        )
+        data.lessonRanges[position] = lessonRange
+        return lessonRange
+    }
+
+    fun getSemester(json: JsonObject?): Int {
+        val periodId = json.getInt("PeriodId") ?: return 1
+        return if (periodId == data.semester1Id)
+            1
+        else
+            2
+    }
+
+    fun isCurrentYear(date: Date): Boolean {
+        return profile?.let { profile ->
+            return@let date >= profile.dateSemester1Start
+        } ?: false
+    }
+
+    fun isCurrentYear(dateTime: Long): Boolean {
+        return profile?.let { profile ->
+            return@let dateTime >= profile.dateSemester1Start.inMillis
+        } ?: false
+    }
+
+    inline fun <reified T> apiRequest(
+        tag: String,
+        endpoint: String,
+        method: Int = GET,
+        payload: JsonElement? = null,
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
+
+        d(tag, "Request: Vulcan/Hebe - $url")
+
+        val privateKey = data.hebePrivateKey
+        val publicHash = data.hebePublicHash
+
+        if (privateKey == null || publicHash == null) {
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            return
+        }
+
+        val timestamp = ZonedDateTime.now(ZoneId.of("GMT"))
+        val timestampMillis = timestamp.toInstant().toEpochMilli()
+        val timestampIso = timestamp.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"))
+
+        val finalPayload = if (payload != null) {
+            JsonObject(
+                "AppName" to VULCAN_HEBE_APP_NAME,
+                "AppVersion" to VULCAN_HEBE_APP_VERSION,
+                "CertificateId" to publicHash,
+                "Envelope" to payload,
+                "FirebaseToken" to (firebaseToken ?: data.app.config.sync.tokenVulcanHebe),
+                "API" to 1,
+                "RequestId" to UUID.randomUUID().toString(),
+                "Timestamp" to timestampMillis,
+                "TimestampFormatted" to timestampIso
+            )
+        } else null
+        val jsonString = finalPayload?.toString()
+
+        val headers = getSignatureHeaders(
+            publicHash,
+            privateKey,
+            jsonString,
+            endpoint,
+            timestamp
+        )
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    data.error(
+                        ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response)
+                    )
+                    return
+                }
+
+                val status = json.getJsonObject("Status")
+                val statusCode = status?.getInt("Code") ?: 0
+                if (statusCode != 0) {
+                    val statusMessage = status?.getString("Message")
+                    val errorCode = when (statusCode) {
+                        -1 -> ERROR_VULCAN_HEBE_SERVER_ERROR
+                        100 -> ERROR_VULCAN_HEBE_SIGNATURE_ERROR
+                        101 -> ERROR_VULCAN_HEBE_INVALID_PAYLOAD
+                        106 -> ERROR_VULCAN_HEBE_FIREBASE_ERROR
+                        108 -> ERROR_VULCAN_HEBE_CERTIFICATE_GONE
+                        200 -> when (true) {
+                            statusMessage?.contains("Class") -> ERROR_LOGIN_VULCAN_NO_PUPILS
+                            statusMessage?.contains("Token") -> ERROR_LOGIN_VULCAN_INVALID_TOKEN
+                            else -> ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND
+                        }
+                        201 -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN
+                        203 -> when (json.getJsonObject("Envelope").getInt("AvailableRetries")) {
+                            2 -> ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING
+                            1 -> ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING
+                            else -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
+                        }
+                        204 -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
+                        else -> ERROR_VULCAN_HEBE_OTHER
+                    }
+                    data.error(
+                        ApiError(tag, errorCode)
+                            .withResponse(response)
+                            .withApiResponse(json.toString())
+                    )
+                    return
+                }
+
+                val envelope = if (json.get("Envelope").isJsonNull && null is T)
+                    null as T
+                else when (T::class.java) {
+                    JsonObject::class.java -> json.getJsonObject("Envelope") as T
+                    JsonArray::class.java -> json.getJsonArray("Envelope") as T
+                    java.lang.Boolean::class.java -> json.getBoolean("Envelope") as T
+                    else -> {
+                        data.error(
+                            ApiError(tag, ERROR_RESPONSE_EMPTY)
+                                .withResponse(response)
+                                .withApiResponse(json)
+                        )
+                        return
+                    }
+                }
+
+                try {
+                    onSuccess(envelope, response)
+                } catch (e: Exception) {
+                    data.error(
+                        ApiError(tag, EXCEPTION_VULCAN_HEBE_REQUEST)
+                            .withResponse(response)
+                            .withThrowable(e)
+                            .withApiResponse(json)
+                    )
+                }
+            }
+
+            override fun onFailure(response: Response?, throwable: Throwable?) {
+                data.error(
+                    ApiError(tag, ERROR_REQUEST_FAILURE)
+                        .withResponse(response)
+                        .withThrowable(throwable)
+                )
+            }
+        }
+
+        Request.builder()
+            .url(url)
+            .userAgent(VULCAN_HEBE_USER_AGENT)
+            .addHeader("vOS", "Android")
+            .addHeader("vDeviceModel", Build.MODEL)
+            .addHeader("vAPI", "1")
+            .apply {
+                if (data.hebeContext != null)
+                    addHeader("vContext", data.hebeContext)
+                headers.forEach {
+                    addHeader(it.key, it.value)
+                }
+                when (method) {
+                    GET -> get()
+                    POST -> {
+                        post()
+                        setTextBody(jsonString, MediaTypeUtils.APPLICATION_JSON)
+                    }
+                }
+            }
+            .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+            .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+            .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+            .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
+            .callback(callback)
+            .build()
+            .enqueue()
+    }
+
+    inline fun <reified T> apiGet(
+        tag: String,
+        endpoint: String,
+        query: Map<String, String> = mapOf(),
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        val queryPath = query.map {
+            it.key + "=" + URLEncoder.encode(it.value, "UTF-8").replace("+", "%20")
+        }.join("&")
+        apiRequest(
+            tag,
+            if (query.isNotEmpty()) "$endpoint?$queryPath" else endpoint,
+            baseUrl = baseUrl,
+            firebaseToken = firebaseToken,
+            onSuccess = onSuccess
+        )
+    }
+
+    inline fun <reified T> apiPost(
+        tag: String,
+        endpoint: String,
+        payload: JsonElement,
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        apiRequest(
+            tag,
+            endpoint,
+            method = POST,
+            payload,
+            baseUrl = baseUrl,
+            firebaseToken = firebaseToken,
+            onSuccess = onSuccess
+        )
+    }
+
+    fun apiGetList(
+        tag: String,
+        endpoint: String,
+        filterType: HebeFilterType? = null,
+        dateFrom: Date? = null,
+        dateTo: Date? = null,
+        lastSync: Long? = null,
+        folder: Int? = null,
+        params: Map<String, String> = mapOf(),
+        includeFilterType: Boolean = true,
+        onSuccess: (data: List<JsonObject>, response: Response?) -> Unit
+    ) {
+        val url = if (includeFilterType && filterType != null)
+            "$endpoint/${filterType.endpoint}"
+        else endpoint
+
+        val query = params.toMutableMap()
+
+        when (filterType) {
+            HebeFilterType.BY_PUPIL -> {
+                query["unitId"] = data.studentUnitId.toString()
+                query["pupilId"] = data.studentId.toString()
+                query["periodId"] = data.studentSemesterId.toString()
+            }
+            HebeFilterType.BY_PERSON -> {
+                query["loginId"] = data.studentLoginId.toString()
+            }
+            HebeFilterType.BY_PERIOD -> {
+                query["periodId"] = data.studentSemesterId.toString()
+                query["pupilId"] = data.studentId.toString()
+            }
+        }
+
+        if (dateFrom != null)
+            query["dateFrom"] = dateFrom.stringY_m_d
+        if (dateTo != null)
+            query["dateTo"] = dateTo.stringY_m_d
+
+        if (folder != null)
+            query["folder"] = folder.toString()
+
+        val semester1Start = profile?.dateSemester1Start?.inMillis
+
+        query["lastId"] = "-2147483648" // don't ask, it's just Vulcan
+        query["pageSize"] = "500"
+        query["lastSyncDate"] = LocalDateTime
+            .ofInstant(
+                Instant.ofEpochMilli(lastSync ?: semester1Start ?: 0),
+                ZoneId.systemDefault()
+            )
+            .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+
+        apiGet(tag, url, query) { json: JsonArray, response ->
+            onSuccess(json.map { it.asJsonObject }, response)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
index 39433657..d32161a6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
@@ -11,12 +11,11 @@ import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
 import pl.droidsonroids.jspoon.Jspoon
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.isNotNullNorBlank
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.io.File
@@ -83,10 +82,12 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                     onResult(symbol, STATE_NO_REGISTER)
                     return
                 }
-                if (!validateCallback(text, response, jsonResponse = false)) {
+                if (!validateCallback(symbol, text, response, jsonResponse = false)) {
                     return
                 }
-                data.webExpiryTime = Date.fromIso(certificate.expiryDate) / 1000L
+                data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map ->
+                    map[symbol] = (Date.fromIso(certificate.expiryDate) / 1000L).toString()
+                }
                 onResult(symbol, STATE_SUCCESS)
             }
 
@@ -120,7 +121,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
     fun getStartPage(symbol: String = data.symbol ?: "default", postErrors: Boolean = true, onSuccess: (html: String, schoolSymbols: List<String>) -> Unit) {
         val callback = object : TextCallbackHandler() {
             override fun onSuccess(text: String?, response: Response?) {
-                if (!validateCallback(text, response, jsonResponse = false) || text == null) {
+                if (!validateCallback(symbol, text, response, jsonResponse = false) || text == null) {
                     return
                 }
 
@@ -136,7 +137,30 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                     }
                 }
 
-                data.webPermissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] }
+                data.webPermissions = data.webPermissions.toMutableMap().also { map ->
+                    val permissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] }
+                    if (permissions?.isNotBlank() == true) {
+                        val studentId = permissions.split("|")
+                            .getOrNull(0)
+                            ?.base64DecodeToString()
+                            ?.toJsonObject()
+                            ?.getJsonArray("AuthInfos")
+                            ?.asJsonObjectList()
+                            ?.flatMap { authInfo ->
+                                authInfo.getJsonArray("UczenIds")
+                                    ?.map { it.asInt }
+                                    ?: listOf()
+                            }
+                            ?.firstOrNull()
+                            ?.toString()
+                        data.app.cookieJar.set(
+                            data.webHost ?: "vulcan.net.pl",
+                            "idBiezacyUczen",
+                            studentId
+                        )
+                    }
+                    map[symbol] = permissions
+                }
 
                 val schoolSymbols = mutableListOf<String>()
                 val clientUrl = "://uonetplus-uczen.${data.webHost}/$symbol/"
@@ -144,7 +168,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                 var count = 0
                 while (clientIndex != -1 && count < 100) {
                     val startIndex = clientIndex + clientUrl.length
-                    val endIndex = text.indexOf('/', startIndex = startIndex)
+                    val endIndex = text.indexOfAny(charArrayOf('"', '/'), startIndex = startIndex)
                     val schoolSymbol = text.substring(startIndex, endIndex)
                     schoolSymbols += schoolSymbol
                     clientIndex = text.indexOf(clientUrl, startIndex = endIndex)
@@ -186,7 +210,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                 .enqueue()
     }
 
-    private fun validateCallback(text: String?, response: Response?, jsonResponse: Boolean = true): Boolean {
+    private fun validateCallback(symbol: String, text: String?, response: Response?, jsonResponse: Boolean = true): Boolean {
         if (text == null) {
             data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
                     .withResponse(response))
@@ -207,11 +231,13 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
 
         val cookies = data.app.cookieJar.getAll(data.webHost ?: "vulcan.net.pl")
         val authCookie = cookies["EfebSsoAuthCookie"]
-        if ((authCookie == null || authCookie == "null") && data.webAuthCookie != null) {
-            data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie)
+        if ((authCookie == null || authCookie == "null") && data.webAuthCookie[symbol] != null) {
+            data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie[symbol])
         }
-        else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie) {
-            data.webAuthCookie = authCookie
+        else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie[symbol]) {
+            data.webAuthCookie = data.webAuthCookie.toMutableMap().also { map ->
+                map[symbol] = authCookie
+            }
         }
         return true
     }
@@ -250,7 +276,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
 
         val callback = object : TextCallbackHandler() {
             override fun onSuccess(text: String?, response: Response?) {
-                if (!validateCallback(text, response))
+                if (!validateCallback(data.symbol ?: "default", text, response))
                     return
 
                 try {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttachments.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttachments.kt
deleted file mode 100644
index a7b2b23b..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttachments.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-4-6.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.reflect.KClass
-
-class VulcanApiAttachments(override val data: DataVulcan,
-                           val list: List<*>,
-                           val owner: Any?,
-                           val ownerClass: KClass<*>,
-                           val onSuccess: (list: List<*>) -> Unit
-) : VulcanApi(data, null) {
-    companion object {
-        const val TAG = "VulcanApiAttachments"
-    }
-
-    init { run {
-        val endpoint = when (ownerClass) {
-            MessageFull::class -> VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS
-            EventFull::class -> VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS
-            else -> null
-        } ?: return@run
-
-        val idName = when (ownerClass) {
-            MessageFull::class -> "IdWiadomosc"
-            EventFull::class -> "IdZadanieDomowe"
-            else -> null
-        } ?: return@run
-
-        val startDate = profile?.getSemesterStart(profile?.currentSemester ?: 1)?.inUnix ?: 0
-        val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
-
-        apiGet(TAG, endpoint, parameters = mapOf(
-                "DataPoczatkowa" to startDate,
-                "DataKoncowa" to endDate,
-                "LoginId" to data.studentLoginId,
-                "IdUczen" to data.studentId
-        )) { json, _ ->
-
-            json.getJsonArray("Data")?.asJsonObjectList()?.forEach { attachment ->
-                val id = attachment.getLong("Id") ?: return@forEach
-                val itemId = attachment.getLong(idName) ?: return@forEach
-                val url = attachment.getString("Url") ?: return@forEach
-                val fileName = "${attachment.getString("NazwaPliku")}:$url"
-
-                list.forEach {
-                    if (it is MessageFull
-                            && it.profileId == profileId
-                            && it.id == itemId
-                            && it.attachmentIds?.contains(id) != true) {
-                        if (it.attachmentIds == null)
-                            it.attachmentIds = mutableListOf()
-                        if (it.attachmentNames == null)
-                            it.attachmentNames = mutableListOf()
-                        it.attachmentIds?.add(id)
-                        it.attachmentNames?.add(fileName)
-                    }
-
-                    if (it is EventFull
-                            && it.profileId == profileId
-                            && it.id == itemId
-                            && it.attachmentIds?.contains(id) != true) {
-                        if (it.attachmentIds == null)
-                            it.attachmentIds = mutableListOf()
-                        if (it.attachmentNames == null)
-                            it.attachmentNames = mutableListOf()
-                        it.attachmentIds?.add(id)
-                        it.attachmentNames?.add(fileName)
-                    }
-
-                    if (owner is MessageFull
-                            && it is MessageFull
-                            && owner.profileId == it.profileId
-                            && owner.id == it.id) {
-                        owner.attachmentIds = it.attachmentIds
-                        owner.attachmentNames = it.attachmentNames
-                    }
-
-                    if (owner is EventFull
-                            && it is EventFull
-                            && owner.profileId == it.profileId
-                            && owner.id == it.id) {
-                        owner.attachmentIds = it.attachmentIds
-                        owner.attachmentNames = it.attachmentNames
-                    }
-                }
-            }
-
-            /*if (owner is MessageFull) {
-                list.forEach {
-                    (it as? MessageFull)?.let { message ->
-                        data.messageList.add(message)
-                    }
-                }
-                data.messageListReplace = true
-            }
-
-            if (owner is EventFull) {
-                list.forEach {
-                    (it as? EventFull)?.let { it1 ->
-                        it1.homeworkBody = ""
-                        data.eventList.add(it1)
-                    }
-                }
-                data.eventListReplace = true
-            }*/
-
-            onSuccess(list)
-        }
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt
deleted file mode 100644
index 2814a1cf..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.isEmpty
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiAttendance(override val data: DataVulcan,
-                          override val lastSync: Long?,
-                          val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiAttendance"
-    }
-
-    init { data.profile?.also { profile ->
-        if (data.attendanceTypes.isEmpty()) {
-            data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
-        }
-
-        val semesterId = data.studentSemesterId
-        val semesterNumber = data.studentSemesterNumber
-        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
-            getAttendance(profile, semesterId - 1, semesterNumber - 1) {
-                getAttendance(profile, semesterId, semesterNumber) {
-                    finish()
-                }
-            }
-        }
-        else {
-            getAttendance(profile, semesterId, semesterNumber) {
-                finish()
-            }
-        }
-
-    } ?: onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE) }
-
-    private fun finish() {
-        data.setSyncNext(ENDPOINT_VULCAN_API_ATTENDANCE, SYNC_ALWAYS)
-        onSuccess(ENDPOINT_VULCAN_API_ATTENDANCE)
-    }
-
-    private fun getAttendance(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
-        val startDate = profile.getSemesterStart(semesterNumber).stringY_m_d
-        val endDate = profile.getSemesterEnd(semesterNumber).stringY_m_d
-
-        apiGet(TAG, VULCAN_API_ENDPOINT_ATTENDANCE, parameters = mapOf(
-                "DataPoczatkowa" to startDate,
-                "DataKoncowa" to endDate,
-                "IdOddzial" to data.studentClassId,
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to semesterId
-        )) { json, _ ->
-            json.getJsonObject("Data")?.getJsonArray("Frekwencje")?.forEach { attendanceEl ->
-                val attendance = attendanceEl.asJsonObject
-
-                val type = data.attendanceTypes.get(attendance.getLong("IdKategoria") ?: return@forEach)
-                        ?: return@forEach
-
-                val id = (attendance.getInt("Dzien") ?: 0) + (attendance.getInt("Numer") ?: 0)
-
-                val lessonDateMillis = Date.fromY_m_d(attendance.getString("DzienTekst")).inMillis
-                val lessonDate = Date.fromMillis(lessonDateMillis)
-                val startTime = data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime
-
-                val lessonSemester = semesterNumber
-
-                val attendanceObject = Attendance(
-                        profileId = profileId,
-                        id = id.toLong(),
-                        baseType = type.baseType,
-                        typeName = type.typeName,
-                        typeShort = type.typeShort,
-                        typeSymbol = type.typeSymbol,
-                        typeColor = type.typeColor,
-                        date = lessonDate,
-                        startTime = startTime,
-                        semester = lessonSemester,
-                        teacherId = -1,
-                        subjectId = attendance.getLong("IdPrzedmiot") ?: -1,
-                        addedDate = lessonDate.combineWith(startTime)
-                ).also {
-                    it.lessonNumber = attendance.getInt("Numer")
-                    it.isCounted = it.baseType != Attendance.TYPE_RELEASED
-                }
-
-                data.attendanceList.add(attendanceObject)
-                if (type.baseType != TYPE_PRESENT) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_ATTENDANCE,
-                            attendanceObject.id,
-                            profile.empty || type.baseType == Attendance.TYPE_PRESENT_CUSTOM || type.baseType == Attendance.TYPE_UNKNOWN,
-                            profile.empty || type.baseType == Attendance.TYPE_PRESENT_CUSTOM || type.baseType == Attendance.TYPE_UNKNOWN
-                    ))
-                }
-            }
-
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt
deleted file mode 100644
index 2dc9f6bc..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_DICTIONARIES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_DICTIONARIES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class VulcanApiDictionaries(override val data: DataVulcan,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiDictionaries"
-    }
-
-    init {
-        apiGet(TAG, VULCAN_API_ENDPOINT_DICTIONARIES) { json, _ ->
-            val elements = json.getJsonObject("Data")
-
-            elements?.getJsonArray("Pracownicy")?.forEach { saveTeacher(it.asJsonObject) }
-            elements?.getJsonArray("Przedmioty")?.forEach { saveSubject(it.asJsonObject) }
-            elements?.getJsonArray("PoryLekcji")?.forEach { saveLessonRange(it.asJsonObject) }
-            elements?.getJsonArray("KategorieOcen")?.forEach { saveGradeCategory(it.asJsonObject) }
-            elements?.getJsonArray("KategorieUwag")?.forEach { saveNoticeType(it.asJsonObject) }
-            elements?.getJsonArray("KategorieFrekwencji")?.forEach { saveAttendanceType(it.asJsonObject) }
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4 * DAY)
-            onSuccess(ENDPOINT_VULCAN_API_DICTIONARIES)
-        }
-    }
-
-    private fun saveTeacher(teacher: JsonObject) {
-        val id = teacher.getLong("Id") ?: return
-        val name = teacher.getString("Imie") ?: ""
-        val surname = teacher.getString("Nazwisko") ?: ""
-        val loginId = teacher.getString("LoginId") ?: "-1"
-
-        val teacherObject = Teacher(
-                profileId,
-                id,
-                name,
-                surname,
-                loginId
-        )
-
-        data.teacherList.put(id, teacherObject)
-    }
-
-    private fun saveSubject(subject: JsonObject) {
-        val id = subject.getLong("Id") ?: return
-        val longName = subject.getString("Nazwa") ?: ""
-        val shortName = subject.getString("Kod") ?: ""
-
-        val subjectObject = Subject(
-                profileId,
-                id,
-                longName,
-                shortName
-        )
-
-        data.subjectList.put(id, subjectObject)
-    }
-
-    private fun saveLessonRange(lessonRange: JsonObject) {
-        val lessonNumber = lessonRange.getInt("Numer") ?: return
-        val startTime = lessonRange.getString("PoczatekTekst")?.let { Time.fromH_m(it) } ?: return
-        val endTime = lessonRange.getString("KoniecTekst")?.let { Time.fromH_m(it) } ?: return
-
-        val lessonRangeObject = LessonRange(
-                profileId,
-                lessonNumber,
-                startTime,
-                endTime
-        )
-
-        data.lessonRanges.put(lessonNumber, lessonRangeObject)
-    }
-
-    private fun saveGradeCategory(gradeCategory: JsonObject) {
-        val id = gradeCategory.getLong("Id") ?: return
-        val name = gradeCategory.getString("Nazwa") ?: ""
-
-        val gradeCategoryObject = GradeCategory(
-                profileId,
-                id,
-                0.0f,
-                -1,
-                name
-        )
-
-        data.gradeCategories.put(id, gradeCategoryObject)
-    }
-
-    private fun saveNoticeType(noticeType: JsonObject) {
-        val id = noticeType.getLong("Id") ?: return
-        val name = noticeType.getString("Nazwa") ?: ""
-
-        val noticeTypeObject = NoticeType(
-                profileId,
-                id,
-                name
-        )
-
-        data.noticeTypes.put(id, noticeTypeObject)
-    }
-
-    private fun saveAttendanceType(attendanceType: JsonObject) {
-        val id = attendanceType.getLong("Id") ?: return
-        val typeName = attendanceType.getString("Nazwa") ?: ""
-
-        val absent = attendanceType.getBoolean("Nieobecnosc") ?: false
-        val excused = attendanceType.getBoolean("Usprawiedliwione") ?: false
-        val baseType = if (absent) {
-            if (excused)
-                Attendance.TYPE_ABSENT_EXCUSED
-            else
-                Attendance.TYPE_ABSENT
-        } else {
-            val belated = attendanceType.getBoolean("Spoznienie") ?: false
-            val released = attendanceType.getBoolean("Zwolnienie") ?: false
-            val present = attendanceType.getBoolean("Obecnosc") ?: true
-            if (belated)
-                if (excused)
-                    Attendance.TYPE_BELATED_EXCUSED
-                else
-                    Attendance.TYPE_BELATED
-            else if (released)
-                Attendance.TYPE_RELEASED
-            else if (present)
-                Attendance.TYPE_PRESENT
-            else
-                Attendance.TYPE_UNKNOWN
-        }
-
-        val (typeColor, typeSymbol) = when (id.toInt()) {
-            1 -> 0xffffffff to "●"  // obecność
-            2 -> 0xffffa687 to "—"  // nieobecność
-            3 -> 0xfffcc150 to "u"  // nieobecność usprawiedliwiona
-            4 -> 0xffede049 to "s"  // spóźnienie
-            5 -> 0xffbbdd5f to "su" // spóźnienie usprawiedliwione
-            6 -> 0xffa9c9fd to "ns" // nieobecny z przyczyn szkolnych
-            7 -> 0xffddbbe5 to "z"  // zwolniony
-            8 -> 0xffffffff to ""   // usunięty wpis
-            else -> null to "?"
-        }
-
-        val typeShort = when (id.toInt()) {
-            6 -> "ns" // nieobecny z przyczyn szkolnych
-            8 -> ""   // usunięty wpis
-            else -> data.app.attendanceManager.getTypeShort(baseType)
-        }
-
-        val attendanceTypeObject = AttendanceType(
-                profileId,
-                id,
-                baseType,
-                typeName,
-                typeShort,
-                typeSymbol,
-                typeColor?.toInt()
-        )
-
-        data.attendanceTypes.put(id, attendanceTypeObject)
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt
deleted file mode 100644
index 6f045828..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_EVENTS
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_EVENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getBoolean
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiEvents(override val data: DataVulcan,
-                      override val lastSync: Long?,
-                      private val isHomework: Boolean,
-                      val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiEvents"
-    }
-
-    init { data.profile?.also { profile ->
-
-        val semesterId = data.studentSemesterId
-        val semesterNumber = data.studentSemesterNumber
-        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
-            getEvents(profile, semesterId - 1, semesterNumber - 1) {
-                getEvents(profile, semesterId, semesterNumber) {
-                    finish()
-                }
-            }
-        }
-        else {
-            getEvents(profile, semesterId, semesterNumber) {
-                finish()
-            }
-        }
-
-    } ?: onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS) }
-
-    private fun finish() {
-        when (isHomework) {
-            true -> {
-                data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
-                data.setSyncNext(ENDPOINT_VULCAN_API_HOMEWORK, SYNC_ALWAYS)
-            }
-            false -> {
-                data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
-                data.setSyncNext(ENDPOINT_VULCAN_API_EVENTS, SYNC_ALWAYS)
-            }
-        }
-        onSuccess(if (isHomework) ENDPOINT_VULCAN_API_HOMEWORK else ENDPOINT_VULCAN_API_EVENTS)
-    }
-
-    private fun getEvents(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
-        val startDate = when (profile.empty) {
-            true -> profile.getSemesterStart(semesterNumber).stringY_m_d
-            else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
-        }
-        val endDate = profile.getSemesterEnd(semesterNumber).stringY_m_d
-
-        val endpoint = when (isHomework) {
-            true -> VULCAN_API_ENDPOINT_HOMEWORK
-            else -> VULCAN_API_ENDPOINT_EVENTS
-        }
-        apiGet(TAG, endpoint, parameters = mapOf(
-                "DataPoczatkowa" to startDate,
-                "DataKoncowa" to endDate,
-                "IdOddzial" to data.studentClassId,
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to semesterId
-        )) { json, _ ->
-            val events = json.getJsonArray("Data")
-
-            events?.forEach { eventEl ->
-                val event = eventEl.asJsonObject
-
-                val id = event?.getLong("Id") ?: return@forEach
-                val eventDate = Date.fromY_m_d(event.getString("DataTekst") ?: return@forEach)
-                val subjectId = event.getLong("IdPrzedmiot") ?: -1
-                val teacherId = event.getLong("IdPracownik") ?: -1
-                val topic = event.getString("Opis")?.trim() ?: ""
-
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
-
-                val type = when (isHomework) {
-                    true -> Event.TYPE_HOMEWORK
-                    else -> when (event.getBoolean("Rodzaj")) {
-                        false -> Event.TYPE_SHORT_QUIZ
-                        else -> Event.TYPE_EXAM
-                    }
-                }
-                val teamId = event.getLong("IdOddzial") ?: data.teamClass?.id ?: -1
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = eventDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = type,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = teamId
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        if (isHomework) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt
deleted file mode 100644
index 9a354ea5..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import java.text.DecimalFormat
-import kotlin.math.roundToInt
-
-class VulcanApiGrades(override val data: DataVulcan,
-                      override val lastSync: Long?,
-                      val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiGrades"
-    }
-
-    init { data.profile?.also { profile ->
-
-        val semesterId = data.studentSemesterId
-        val semesterNumber = data.studentSemesterNumber
-        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
-            getGrades(profile, semesterId - 1, semesterNumber - 1) {
-                getGrades(profile, semesterId, semesterNumber) {
-                    finish()
-                }
-            }
-        }
-        else {
-            getGrades(profile, semesterId, semesterNumber) {
-                finish()
-            }
-        }
-
-    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES) }
-
-    private fun finish() {
-        data.toRemove.add(DataRemoveModel.Grades.semesterWithType(data.studentSemesterNumber, TYPE_NORMAL))
-        data.setSyncNext(ENDPOINT_VULCAN_API_GRADES, SYNC_ALWAYS)
-        onSuccess(ENDPOINT_VULCAN_API_GRADES)
-    }
-
-    private fun getGrades(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
-        apiGet(TAG, VULCAN_API_ENDPOINT_GRADES, parameters = mapOf(
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to semesterId
-        )) { json, _ ->
-            val grades = json.getJsonArray("Data")
-
-            grades?.forEach { gradeEl ->
-                val grade = gradeEl.asJsonObject
-
-                val id = grade.getLong("Id") ?: return@forEach
-                val categoryId = grade.getLong("IdKategoria") ?: -1
-                val category = data.gradeCategories.singleOrNull{ it.categoryId == categoryId }?.text
-                        ?: ""
-                val teacherId = grade.getLong("IdPracownikD") ?: -1
-                val subjectId = grade.getLong("IdPrzedmiot") ?: -1
-                val description = grade.getString("Opis")
-                val comment = grade.getString("Komentarz")
-                var value = grade.getFloat("Wartosc")
-                var weight = grade.getFloat("WagaOceny") ?: 0.0f
-                val modificatorValue = grade.getFloat("WagaModyfikatora")
-                val numerator = grade.getFloat("Licznik")
-                val denominator = grade.getFloat("Mianownik")
-                val addedDate = (grade.getLong("DataModyfikacji") ?: return@forEach) * 1000
-
-                var finalDescription = ""
-
-                var name = when (numerator != null && denominator != null) {
-                    true -> {
-                        value = numerator / denominator
-                        finalDescription += DecimalFormat("#.##").format(numerator) +
-                                "/" + DecimalFormat("#.##").format(denominator)
-                        weight = 0.0f
-                        (value * 100).roundToInt().toString() + "%"
-                    }
-                    else -> {
-                        if (value != null) modificatorValue?.also { value += it }
-                        else weight = 0.0f
-
-                        grade.getString("Wpis") ?: ""
-                    }
-                }
-
-                comment?.also {
-                    if (name == "") name = it
-                    else finalDescription = (if (finalDescription == "") "" else " ") + it
-                }
-
-                description?.also {
-                    finalDescription = (if (finalDescription == "") "" else " - ") + it
-                }
-
-                val color = when (name) {
-                    "1-", "1", "1+" -> 0xffd65757
-                    "2-", "2", "2+" -> 0xff9071b3
-                    "3-", "3", "3+" -> 0xffd2ab24
-                    "4-", "4", "4+" -> 0xff50b6d6
-                    "5-", "5", "5+" -> 0xff2cbd92
-                    "6-", "6", "6+" -> 0xff91b43c
-                    else -> 0xff3D5F9C
-                }.toInt()
-
-                val gradeObject = Grade(
-                        profileId = profileId,
-                        id = id,
-                        name = name,
-                        type = TYPE_NORMAL,
-                        value = value ?: 0.0f,
-                        weight = weight,
-                        color = color,
-                        category = category,
-                        description = finalDescription,
-                        comment = null,
-                        semester = semesterNumber,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        addedDate = addedDate
-                )
-
-                data.gradeList.add(gradeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_GRADE,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt
deleted file mode 100644
index dea913c5..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-01
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_RECEIVED
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.text.replace
-
-class VulcanApiMessagesInbox(override val data: DataVulcan,
-                             override val lastSync: Long?,
-                             val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiMessagesInbox"
-    }
-
-    init {
-        data.profile?.also { profile ->
-
-            val startDate = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).inUnix
-                else -> Date.getToday().stepForward(0, -2, 0).inUnix
-            }
-            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-
-                    val senderLoginId = message.getString("NadawcaId") ?: return@forEach
-                    val senderId = data.teacherList.singleOrNull { it.loginId == senderLoginId }?.id ?: {
-
-                        val senderName = message.getString("Nadawca") ?: ""
-
-                        senderName.splitName()?.let { (senderLastName, senderFirstName) ->
-                            val teacherObject = Teacher(
-                                    profileId,
-                                    -1 * Utils.crc16(senderName.toByteArray()).toLong(),
-                                    senderFirstName,
-                                    senderLastName,
-                                    senderLoginId
-                            )
-                            data.teacherList.put(teacherObject.id, teacherObject)
-                            teacherObject.id
-                        }
-                    }.invoke()
-
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-                    val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-
-                    val messageObject = Message(
-                            profileId = profileId,
-                            id = id,
-                            type = TYPE_RECEIVED,
-                            subject = subject,
-                            body = body.replace("\n", "<br>"),
-                            senderId = senderId,
-                            addedDate = sentDate
-                    )
-
-                    val messageRecipientObject = MessageRecipient(
-                            profileId,
-                            -1,
-                            -1,
-                            readDate,
-                            id
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.messageRecipientList.add(messageRecipientObject)
-                    data.setSeenMetadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            readDate > 0,
-                            readDate > 0
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_VULCAN_API_MESSAGES_INBOX)
-            }
-        } ?: onSuccess(ENDPOINT_VULCAN_API_MESSAGES_INBOX)
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt
deleted file mode 100644
index 94cfdcba..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-5
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.text.replace
-
-class VulcanApiMessagesSent(override val data: DataVulcan,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiMessagesSent"
-    }
-
-    init {
-        data.profile?.also { profile ->
-
-            val startDate = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).inUnix
-                else -> Date.getToday().stepForward(0, -2, 0).inUnix
-            }
-            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-                    val readBy = message.getInt("Przeczytane") ?: 0
-                    val unreadBy = message.getInt("Nieprzeczytane") ?: 0
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
-
-                    message.getJsonArray("Adresaci")?.asJsonObjectList()
-                            ?.onEach { receiver ->
-
-                                val receiverLoginId = receiver.getString("LoginId")
-                                        ?: return@onEach
-                                val receiverId = data.teacherList.singleOrNull { it.loginId == receiverLoginId }?.id
-                                        ?: {
-                                            val receiverName = receiver.getString("Nazwa") ?: ""
-
-                                            receiverName.splitName()?.let { (receiverLastName, receiverFirstName) ->
-                                                val teacherObject = Teacher(
-                                                        profileId,
-                                                        -1 * Utils.crc16(receiverName.toByteArray()).toLong(),
-                                                        receiverFirstName,
-                                                        receiverLastName,
-                                                        receiverLoginId
-                                                )
-                                                data.teacherList.put(teacherObject.id, teacherObject)
-                                                teacherObject.id
-                                            }
-                                        }.invoke() ?: -1
-
-                                val readDate: Long = when (readBy) {
-                                    0 -> 0
-                                    else -> when (unreadBy) {
-                                        0 -> 1
-                                        else -> -1
-                                    }
-                                }
-
-                                val messageRecipientObject = MessageRecipient(
-                                        profileId,
-                                        receiverId,
-                                        -1,
-                                        readDate,
-                                        id
-                                )
-
-                                data.messageRecipientList.add(messageRecipientObject)
-                            }
-
-                    val messageObject = Message(
-                            profileId = profileId,
-                            id = id,
-                            type = TYPE_SENT,
-                            subject = subject,
-                            body = body.replace("\n", "<br>"),
-                            senderId = null,
-                            addedDate = sentDate
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.setSeenMetadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            true,
-                            true
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_SENT, 1 * DAY, DRAWER_ITEM_MESSAGES)
-                onSuccess(ENDPOINT_VULCAN_API_MESSAGES_SENT)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt
deleted file mode 100644
index 45155a5b..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-23
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.isEmpty
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.toSparseArray
-
-class VulcanApiNotices(override val data: DataVulcan,
-                       override val lastSync: Long?,
-                       val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiNotices"
-    }
-
-    init { data.profile?.also { profile ->
-        if (data.noticeTypes.isEmpty()) {
-            data.db.noticeTypeDao().getAllNow(profileId).toSparseArray(data.noticeTypes) { it.id }
-        }
-
-        val semesterId = data.studentSemesterId
-        val semesterNumber = data.studentSemesterNumber
-        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
-            getNotices(profile, semesterId - 1, semesterNumber - 1) {
-                getNotices(profile, semesterId, semesterNumber) {
-                    finish()
-                }
-            }
-        }
-        else {
-            getNotices(profile, semesterId, semesterNumber) {
-                finish()
-            }
-        }
-
-    } ?: onSuccess(ENDPOINT_VULCAN_API_NOTICES) }
-
-    private fun finish() {
-        data.setSyncNext(ENDPOINT_VULCAN_API_NOTICES, SYNC_ALWAYS)
-        onSuccess(ENDPOINT_VULCAN_API_NOTICES)
-    }
-
-    private fun getNotices(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
-        apiGet(TAG, VULCAN_API_ENDPOINT_NOTICES, parameters = mapOf(
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
-        )) { json, _ ->
-            json.getJsonArray("Data")?.forEach { noticeEl ->
-                val notice = noticeEl.asJsonObject
-
-                val id = notice.getLong("Id") ?: return@forEach
-                val text = notice.getString("TrescUwagi") ?: return@forEach
-                val teacherId = notice.getLong("IdPracownik") ?: -1
-                val addedDate = notice.getLong("DataModyfikacji")?.times(1000) ?: System.currentTimeMillis()
-
-                val categoryId = notice.getLong("IdKategoriaUwag") ?: -1
-                val categoryText = data.noticeTypes[categoryId]?.name ?: ""
-
-                val noticeObject = Notice(
-                        profileId = profileId,
-                        id = id,
-                        type = Notice.TYPE_NEUTRAL,
-                        semester = profile.currentSemester,
-                        text = text,
-                        category = categoryText,
-                        points = null,
-                        teacherId = teacherId,
-                        addedDate = addedDate
-                )
-
-                data.noticeList.add(noticeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_NOTICE,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt
deleted file mode 100644
index e897df92..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.HOUR
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES_SUMMARY
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class VulcanApiProposedGrades(override val data: DataVulcan,
-                              override val lastSync: Long?,
-                              val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiProposedGrades"
-    }
-
-    init { data.profile?.also { profile ->
-
-        val semesterId = data.studentSemesterId
-        val semesterNumber = data.studentSemesterNumber
-        if (semesterNumber == 2 && lastSync ?: 0 < profile.dateSemester1Start.inMillis) {
-            getProposedGrades(profile, semesterId - 1, semesterNumber - 1) {
-                getProposedGrades(profile, semesterId, semesterNumber) {
-                    finish()
-                }
-            }
-        }
-        else {
-            getProposedGrades(profile, semesterId, semesterNumber) {
-                finish()
-            }
-        }
-
-    } ?: onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY) }
-
-    private fun finish() {
-        data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR)
-        onSuccess(ENDPOINT_VULCAN_API_GRADES_SUMMARY)
-    }
-
-    private fun getProposedGrades(profile: Profile, semesterId: Int, semesterNumber: Int, onSuccess: () -> Unit) {
-        apiGet(TAG, VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS, parameters = mapOf(
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to semesterId
-        )) { json, _ ->
-            val grades = json.getJsonObject("Data")
-
-            grades.getJsonArray("OcenyPrzewidywane")?.let {
-                processGradeList(it, semesterNumber, isFinal = false)
-            }
-
-            grades.getJsonArray("OcenyKlasyfikacyjne")?.let {
-                processGradeList(it, semesterNumber, isFinal = true)
-            }
-
-            onSuccess()
-        }
-    }
-
-    private fun processGradeList(grades: JsonArray, semesterNumber: Int, isFinal: Boolean) {
-        grades.asJsonObjectList().forEach { grade ->
-            val name = grade.get("Wpis").asString
-            val value = Utils.getGradeValue(name)
-            val subjectId = grade.get("IdPrzedmiot").asLong
-
-            val id = subjectId * -100 - semesterNumber
-
-            val color = Utils.getVulcanGradeColor(name)
-
-            val gradeObject = Grade(
-                    profileId = profileId,
-                    id = id,
-                    name = name,
-                    type = if (semesterNumber == 1) {
-                        if (isFinal) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER1_PROPOSED
-                    } else {
-                        if (isFinal) TYPE_SEMESTER2_FINAL else TYPE_SEMESTER2_PROPOSED
-                    },
-                    value = value,
-                    weight = 0f,
-                    color = color,
-                    category = "",
-                    description = null,
-                    comment = null,
-                    semester = semesterNumber,
-                    teacherId = -1,
-                    subjectId = subjectId
-            )
-
-            data.gradeList.add(gradeObject)
-            data.metadataList.add(Metadata(
-                    profileId,
-                    Metadata.TYPE_GRADE,
-                    gradeObject.id,
-                    data.profile?.empty ?: false,
-                    data.profile?.empty ?: false
-            ))
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiPushConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiPushConfig.kt
deleted file mode 100644
index b7e291e2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiPushConfig.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-2-20.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_PUSH
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_PUSH_CONFIG
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-
-class VulcanApiPushConfig(override val data: DataVulcan,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiPushConfig"
-    }
-
-    init { data.app.config.sync.tokenVulcan?.also { tokenVulcan ->
-        apiGet(TAG, VULCAN_API_ENDPOINT_PUSH, parameters = mapOf(
-                "Token" to tokenVulcan,
-                "IdUczen" to data.studentId,
-                "PushOcena" to true,
-                "PushFrekwencja" to true,
-                "PushUwaga" to true,
-                "PushWiadomosc" to true
-        )) { _, _ ->
-            // sync always: this endpoint has .shouldSync set
-            data.setSyncNext(ENDPOINT_VULCAN_API_PUSH_CONFIG, SYNC_ALWAYS)
-            data.app.config.sync.tokenVulcanList =
-                    data.app.config.sync.tokenVulcanList + profileId
-            onSuccess(ENDPOINT_VULCAN_API_PUSH_CONFIG)
-        }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_PUSH_CONFIG) }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiSendMessage.kt
deleted file mode 100644
index 8c89b620..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiSendMessage.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-12-29.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_ADD
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-
-class VulcanApiSendMessage(override val data: DataVulcan,
-                           val recipients: List<Teacher>,
-                           val subject: String,
-                           val text: String,
-                           val onSuccess: () -> Unit
-) : VulcanApi(data, null) {
-    companion object {
-        private const val TAG = "VulcanApiSendMessage"
-    }
-
-    init {
-        val recipientsArray = JsonArray()
-        for (teacher in recipients) {
-            teacher.loginId?.let {
-                recipientsArray += JsonObject(
-                        "LoginId" to it,
-                        "Nazwa" to "${teacher.fullNameLastFirst} - pracownik"
-                )
-            }
-        }
-        val params = mapOf(
-                "NadawcaWiadomosci" to (profile?.accountName ?: profile?.studentNameLong ?: ""),
-                "Tytul" to subject,
-                "Tresc" to text,
-                "Adresaci" to recipientsArray,
-                "LoginId" to data.studentLoginId,
-                "IdUczen" to data.studentId
-        )
-
-        apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_ADD, parameters = params) { json, _ ->
-            val messageId = json.getJsonObject("Data").getLong("WiadomoscId")
-
-            if (messageId == null) {
-                // TODO error
-                return@apiGet
-            }
-
-            VulcanApiMessagesSent(data, null) {
-                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
-                val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == messageId }
-                val event = MessageSentEvent(data.profileId, message, message?.addedDate)
-
-                EventBus.getDefault().postSticky(event)
-                onSuccess()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt
deleted file mode 100644
index 4148be44..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-
-class VulcanApiTemplate(override val data: DataVulcan,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApi"
-    }
-
-    init {
-        /* data.profile?.also { profile ->
-            apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
-                onSuccess()
-            }
-        } */
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt
deleted file mode 100644
index 46b52de5..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-13
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.Regexes.VULCAN_SHIFT_ANNOTATION
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.utils.Utils.crc16
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class VulcanApiTimetable(override val data: DataVulcan,
-                         override val lastSync: Long?,
-                         val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiTimetable"
-    }
-
-    init { data.profile?.also { profile ->
-        val currentWeekStart = Week.getWeekStart()
-
-        if (Date.getToday().weekDay > 4) {
-            currentWeekStart.stepForward(0, 0, 7)
-        }
-
-        val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
-
-        val weekStart = Date.fromY_m_d(getDate)
-        val weekEnd = weekStart.clone().stepForward(0, 0, 6)
-
-        apiGet(TAG, VULCAN_API_ENDPOINT_TIMETABLE, parameters = mapOf(
-                "DataPoczatkowa" to weekStart.stringY_m_d,
-                "DataKoncowa" to weekEnd.stringY_m_d,
-                "IdUczen" to data.studentId,
-                "IdOddzial" to data.studentClassId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
-        )) { json, _ ->
-            val dates = mutableSetOf<Int>()
-            val lessons = mutableListOf<Lesson>()
-
-            json.getJsonArray("Data")?.asJsonObjectList()?.forEach { lesson ->
-                if (lesson.getBoolean("PlanUcznia") != true)
-                    return@forEach
-                val lessonDate = Date.fromY_m_d(lesson.getString("DzienTekst"))
-                val lessonNumber = lesson.getInt("NumerLekcji")
-                val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }
-                val startTime = lessonRange?.startTime
-                val endTime = lessonRange?.endTime
-                val teacherId = lesson.getLong("IdPracownik")
-                val classroom = lesson.getString("Sala")
-
-                val oldTeacherId = lesson.getLong("IdPracownikOld")
-
-                val changeAnnotation = lesson.getString("AdnotacjaOZmianie") ?: ""
-                val type = when {
-                    changeAnnotation.startsWith("(przeniesiona z") -> Lesson.TYPE_SHIFTED_TARGET
-                    changeAnnotation.startsWith("(przeniesiona na") -> Lesson.TYPE_SHIFTED_SOURCE
-                    changeAnnotation.startsWith("(zastępstwo") -> Lesson.TYPE_CHANGE
-                    lesson.getBoolean("PrzekreslonaNazwa") == true -> Lesson.TYPE_CANCELLED
-                    else -> Lesson.TYPE_NORMAL
-                }
-
-                val teamId = lesson.getString("PodzialSkrot")?.let { teamName ->
-                    val name = "${data.teamClass?.name} $teamName"
-                    val id = name.crc16().toLong()
-                    var team = data.teamList.singleOrNull { it.name == name }
-                    if (team == null) {
-                        team = Team(
-                                profileId,
-                                id,
-                                name,
-                                Team.TYPE_VIRTUAL,
-                                "${data.schoolCode}:$name",
-                                teacherId ?: oldTeacherId ?: -1
-                        )
-                        data.teamList[id] = team
-                    }
-                    team.id
-                } ?: data.teamClass?.id ?: -1
-
-                val subjectId = lesson.getLong("IdPrzedmiot").let { id ->
-                    // get the specified subject name
-                    val subjectName = lesson.getString("PrzedmiotNazwa") ?: ""
-
-                    val condition = when (id) {
-                        // "special" subject - e.g. one time classes, a trip, etc.
-                        0L -> { subject: Subject -> subject.longName == subjectName }
-                        // normal subject, check if it exists
-                        else -> { subject: Subject -> subject.id == id }
-                    }
-
-                    data.subjectList.singleOrNull(condition)?.id ?: {
-                        /**
-                         * CREATE A NEW SUBJECT IF IT DOESN'T EXIST
-                         */
-
-                        val subjectObject = Subject(
-                                profileId,
-                                if (id == null || id == 0L)
-                                    -1 * crc16(subjectName.toByteArray()).toLong()
-                                else
-                                    id,
-                                subjectName,
-                                subjectName
-                        )
-                        data.subjectList.put(subjectObject.id, subjectObject)
-                        subjectObject.id
-                    }()
-                }
-
-                val lessonObject = Lesson(profileId, -1).apply {
-                    this.type = type
-
-                    when (type) {
-                        Lesson.TYPE_NORMAL, Lesson.TYPE_CHANGE, Lesson.TYPE_SHIFTED_TARGET -> {
-                            this.date = lessonDate
-                            this.lessonNumber = lessonNumber
-                            this.startTime = startTime
-                            this.endTime = endTime
-                            this.subjectId = subjectId
-                            this.teacherId = teacherId
-                            this.teamId = teamId
-                            this.classroom = classroom
-
-                            this.oldTeacherId = oldTeacherId
-                        }
-
-                        Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> {
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonNumber
-                            this.oldStartTime = startTime
-                            this.oldEndTime = endTime
-                            this.oldSubjectId = subjectId
-                            this.oldTeacherId = teacherId
-                            this.oldTeamId = teamId
-                            this.oldClassroom = classroom
-                        }
-                    }
-
-                    if (type == Lesson.TYPE_SHIFTED_SOURCE || type == Lesson.TYPE_SHIFTED_TARGET) {
-                        val shift = VULCAN_SHIFT_ANNOTATION.find(changeAnnotation)
-                        val oldLessonNumber = shift?.get(2)?.toInt()
-                        val oldLessonDate = shift?.get(3)?.let { Date.fromd_m_Y(it) }
-
-                        val oldLessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == oldLessonNumber }
-                        val oldStartTime = oldLessonRange?.startTime
-                        val oldEndTime = oldLessonRange?.endTime
-
-                        when (type) {
-                            Lesson.TYPE_SHIFTED_SOURCE -> {
-                                this.lessonNumber = oldLessonNumber
-                                this.date = oldLessonDate
-                                this.startTime = oldStartTime
-                                this.endTime = oldEndTime
-                            }
-
-                            Lesson.TYPE_SHIFTED_TARGET -> {
-                                this.oldLessonNumber = oldLessonNumber
-                                this.oldDate = oldLessonDate
-                                this.oldStartTime = oldStartTime
-                                this.oldEndTime = oldEndTime
-                            }
-                        }
-                    }
-
-                    this.id = buildId()
-                }
-
-                val seen = profile.empty || lessonDate < Date.getToday()
-
-                if (type != Lesson.TYPE_NORMAL) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            lessonObject.id,
-                            seen,
-                            seen
-                    ))
-                }
-
-                dates.add(lessonDate.value)
-                lessons.add(lessonObject)
-            }
-
-            val date: Date = weekStart.clone()
-            while (date <= weekEnd) {
-                if (!dates.contains(date.value)) {
-                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
-                        this.type = Lesson.TYPE_NO_LESSONS
-                        this.date = date.clone()
-                    })
-                }
-
-                date.stepForward(0, 0, 1)
-            }
-
-            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
-
-            data.lessonList.addAll(lessons)
-            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_TIMETABLE, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_VULCAN_API_TIMETABLE)
-        }
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiUpdateSemester.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiUpdateSemester.kt
deleted file mode 100644
index 50fb178a..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiUpdateSemester.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-2-1.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_STUDENT_LIST
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_UPDATE_SEMESTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiUpdateSemester(override val data: DataVulcan,
-                              override val lastSync: Long?,
-                              val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiUpdateSemester"
-    }
-
-    init { data.profile?.also { profile ->
-        apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response ->
-            val students = json.getJsonArray("Data")
-
-            if (students == null || students.isEmpty()) {
-                data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
-                        .withResponse(response)
-                        .withApiResponse(json))
-                return@apiGet
-            }
-
-            students.asJsonObjectList().firstOrNull {
-                it.getInt("Id") == data.studentId
-            }?.let { student ->
-                val studentClassId = student.getInt("IdOddzial") ?: return@let
-                val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@let)
-                val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@let
-
-                val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@let
-                val currentSemesterEndDate = (student.getLong("OkresDataDo") ?: return@let) + 86400
-                val studentSemesterNumber = student.getInt("OkresNumer") ?: return@let
-
-                var dateSemester1Start: Date? = null
-                var dateSemester2Start: Date? = null
-                var dateYearEnd: Date? = null
-                when (studentSemesterNumber) {
-                    1 -> {
-                        dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                        dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
-                    }
-                    2 -> {
-                        dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                        dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
-                    }
-                }
-
-                data.studentClassId = studentClassId
-                data.studentSemesterId = studentSemesterId
-                data.studentSemesterNumber = studentSemesterNumber
-                data.profile.studentData["semester${studentSemesterNumber}Id"] = studentSemesterId
-                data.currentSemesterEndDate = currentSemesterEndDate
-                profile.studentClassName = studentClassName
-                dateSemester1Start?.let {
-                    profile.dateSemester1Start = it
-                    profile.studentSchoolYearStart = it.year
-                }
-                dateSemester2Start?.let { profile.dateSemester2Start = it }
-                dateYearEnd?.let { profile.dateYearEnd = it }
-            }
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_UPDATE_SEMESTER, if (data.studentSemesterNumber == 2) 7*DAY else 2*DAY)
-            onSuccess(ENDPOINT_VULCAN_API_UPDATE_SEMESTER)
-        }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_UPDATE_SEMESTER) }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt
new file mode 100644
index 00000000..a4ea84b1
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+enum class HebeFilterType(val endpoint: String) {
+    BY_PUPIL("byPupil"),
+    BY_PERSON("byPerson"),
+    BY_PERIOD("byPeriod")
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt
new file mode 100644
index 00000000..5069838e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import androidx.core.util.set
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ADDRESSBOOK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ADDRESSBOOK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_EDUCATOR
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_OTHER
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENT
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENTS_COUNCIL
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_STUDENT
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_TEACHER
+import kotlin.text.replace
+
+class VulcanHebeAddressbook(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeAddressbook"
+    }
+
+    private fun String.removeUnitName(unitName: String?): String {
+        return (unitName ?: data.schoolShort)?.let {
+            this.replace("($it)", "").trim()
+        } ?: this
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_ADDRESSBOOK,
+            HebeFilterType.BY_PERSON,
+            lastSync = lastSync,
+            includeFilterType = false
+        ) { list, _ ->
+            list.forEach { person ->
+                val id = person.getString("Id") ?: return@forEach
+                val loginId = person.getString("LoginId") ?: return@forEach
+
+                val idType = id.split("-")
+                    .getOrNull(0)
+                val idLong = id.split("-")
+                    .getOrNull(1)
+                    ?.toLongOrNull()
+                    ?: return@forEach
+
+                val typeBase = when (idType) {
+                    "e" -> TYPE_TEACHER
+                    "c" -> TYPE_PARENT
+                    "p" -> TYPE_STUDENT
+                    else -> TYPE_OTHER
+                }
+
+                val name = person.getString("Name") ?: ""
+                val surname = person.getString("Surname") ?: ""
+                val namePrefix = "$surname $name - "
+
+                val teacher = data.teacherList[idLong] ?: Teacher(
+                    data.profileId,
+                    idLong,
+                    name,
+                    surname,
+                    loginId
+                ).also {
+                    data.teacherList[idLong] = it
+                }
+
+                person.getJsonArray("Roles")?.asJsonObjectList()?.onEach { role ->
+                    var roleText: String? = null
+                    val unitName = role.getString("ConstituentUnitSymbol")
+
+                    val personType = when (role.getInt("RoleOrder")) {
+                        0 -> { /* Wychowawca */
+                            roleText = role.getString("ClassSymbol")
+                                ?.removeUnitName(unitName)
+                            TYPE_EDUCATOR
+                        }
+                        1 -> TYPE_TEACHER /* Nauczyciel */
+                        2 -> return@onEach /* Pracownik */
+                        3 -> { /* Rada rodziców */
+                            roleText = role.getString("Address")
+                                ?.removeUnitName(unitName)
+                                ?.removePrefix(namePrefix)
+                                ?.trim()
+                            TYPE_PARENTS_COUNCIL
+                        }
+                        5 -> {
+                            roleText = role.getString("RoleName")
+                                ?.plus(" - ")
+                                ?.plus(
+                                    role.getString("Address")
+                                        ?.removeUnitName(unitName)
+                                        ?.removePrefix(namePrefix)
+                                        ?.trim()
+                                )
+                            TYPE_STUDENT
+                        }
+                        else -> TYPE_OTHER
+                    }
+
+                    teacher.setTeacherType(personType)
+                    teacher.typeDescription = roleText
+                }
+
+                if (teacher.type == 0)
+                    teacher.setTeacherType(typeBase)
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, 2 * DAY)
+            onSuccess(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt
new file mode 100644
index 00000000..9e41bb6d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2021-2-21
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeAttendance(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+
+    companion object {
+        const val TAG = "VulcanHebeAttendance"
+    }
+
+    init {
+        val semesterNumber = data.studentSemesterNumber
+        val startDate = profile?.getSemesterStart(semesterNumber)
+        val endDate = profile?.getSemesterEnd(semesterNumber)
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_ATTENDANCE,
+            HebeFilterType.BY_PUPIL,
+            dateFrom = startDate,
+            dateTo = endDate,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { attendance ->
+                val id = attendance.getLong("AuxPresenceId") ?: return@forEach
+                val type = attendance.getJsonObject("PresenceType") ?: return@forEach
+                val baseType = getBaseType(type)
+                val typeName = type.getString("Name") ?: return@forEach
+                val typeCategoryId = type.getLong("CategoryId") ?: return@forEach
+                val typeSymbol = type.getString("Symbol") ?: return@forEach
+                val typeShort = when (typeCategoryId.toInt()) {
+                    6, 8 -> typeSymbol
+                    else -> data.app.attendanceManager.getTypeShort(baseType)
+                }
+                val typeColor = when (typeCategoryId.toInt()) {
+                    1 -> 0xffffffff  // obecność
+                    2 -> 0xffffa687  // nieobecność
+                    3 -> 0xfffcc150  // nieobecność usprawiedliwiona
+                    4 -> 0xffede049  // spóźnienie
+                    5 -> 0xffbbdd5f  // spóźnienie usprawiedliwione
+                    6 -> 0xffa9c9fd  // nieobecny z przyczyn szkolnych
+                    7 -> 0xffddbbe5  // zwolniony
+                    8 -> 0xffffffff  // usunięty wpis
+                    else -> null
+                }?.toInt()
+                val date = getDate(attendance, "Day") ?: return@forEach
+                val lessonRange = getLessonRange(attendance, "TimeSlot")
+                val startTime = lessonRange?.startTime
+                val semester = profile?.dateToSemester(date) ?: return@forEach
+                val teacherId = attendance.getJsonObject("TeacherPrimary")?.getLong("Id") ?: -1
+                val subjectId = attendance.getJsonObject("Subject")?.getLong("Id") ?: -1
+                val addedDate = getDateTime(attendance, "DateModify")
+                val lessonNumber = lessonRange?.lessonNumber
+                val isCounted = attendance.getBoolean("CalculatePresence")
+                    ?: (baseType != Attendance.TYPE_RELEASED)
+
+                val attendanceObject = Attendance(
+                    profileId = profileId,
+                    id = id,
+                    baseType = baseType,
+                    typeName = typeName,
+                    typeShort = typeShort,
+                    typeSymbol = typeSymbol,
+                    typeColor = typeColor,
+                    date = date,
+                    startTime = startTime,
+                    semester = semester,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    addedDate = addedDate
+                ).also {
+                    it.lessonTopic = attendance.getString("Topic")
+                    it.lessonNumber = lessonNumber
+                    it.isCounted = isCounted
+                }
+
+                data.attendanceList.add(attendanceObject)
+                if (baseType != Attendance.TYPE_PRESENT) {
+                    data.metadataList.add(
+                        Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            attendanceObject.id,
+                            profile?.empty ?: true
+                                    || baseType == Attendance.TYPE_PRESENT_CUSTOM
+                                    || baseType == Attendance.TYPE_UNKNOWN,
+                            profile?.empty ?: true
+                                    || baseType == Attendance.TYPE_PRESENT_CUSTOM
+                                    || baseType == Attendance.TYPE_UNKNOWN
+                        )
+                    )
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_ATTENDANCE, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_ATTENDANCE)
+        }
+    }
+
+    fun getBaseType(attendanceType: JsonObject): Int {
+        val absent = attendanceType.getBoolean("Absence") ?: false
+        val excused = attendanceType.getBoolean("AbsenceJustified") ?: false
+        return if (absent) {
+            if (excused)
+                Attendance.TYPE_ABSENT_EXCUSED
+            else
+                Attendance.TYPE_ABSENT
+        } else {
+            val belated = attendanceType.getBoolean("Late") ?: false
+            val released = attendanceType.getBoolean("LegalAbsence") ?: false
+            val present = attendanceType.getBoolean("Presence") ?: true
+            if (belated)
+                if (excused)
+                    Attendance.TYPE_BELATED_EXCUSED
+                else
+                    Attendance.TYPE_BELATED
+            else if (released)
+                Attendance.TYPE_RELEASED
+            else if (present)
+                if (attendanceType.getInt("CategoryId") != 1)
+                    Attendance.TYPE_PRESENT_CUSTOM
+                else
+                    Attendance.TYPE_PRESENT
+            else
+                Attendance.TYPE_UNKNOWN
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt
new file mode 100644
index 00000000..64b52e2b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeExams(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeExams"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_EXAMS,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { exam ->
+                val id = exam.getLong("Id") ?: return@forEach
+                val eventDate = getDate(exam, "Deadline") ?: return@forEach
+                val subjectId = getSubjectId(exam, "Subject") ?: -1
+                val teacherId = getTeacherId(exam, "Creator") ?: -1
+                val teamId = getTeamId(exam, "Distribution")
+                    ?: getClassId(exam, "Class")
+                    ?: data.teamClass?.id
+                    ?: -1
+                val topic = exam.getString("Content")?.trim() ?: ""
+
+                if (!isCurrentYear(eventDate)) return@forEach
+
+                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+
+                val type = when (exam.getString("Type")) {
+                    "Praca klasowa",
+                    "Sprawdzian" -> Event.TYPE_EXAM
+                    "Kartkówka" -> Event.TYPE_SHORT_QUIZ
+                    else -> Event.TYPE_DEFAULT
+                }
+
+                val eventObject = Event(
+                    profileId = profileId,
+                    id = id,
+                    date = eventDate,
+                    time = startTime,
+                    topic = topic,
+                    color = null,
+                    type = type,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    teamId = teamId
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_EXAMS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_EXAMS)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt
new file mode 100644
index 00000000..e38ac393
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanHebeGradeSummary(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeGradeSummary"
+    }
+
+    init {
+        val entries = mapOf(
+            "Entry_1" to
+                    if (data.studentSemesterNumber == 1)
+                        Grade.TYPE_SEMESTER1_PROPOSED
+                    else Grade.TYPE_SEMESTER2_PROPOSED,
+            "Entry_2" to
+                    if (data.studentSemesterNumber == 1)
+                        Grade.TYPE_SEMESTER1_FINAL
+                    else Grade.TYPE_SEMESTER2_FINAL
+        )
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { grade ->
+                val subjectId = getSubjectId(grade, "Subject") ?: return@forEach
+                val addedDate = getDateTime(grade, "DateModify")
+
+                entries.onEach { (key, type) ->
+                    val id = subjectId * -100 - type
+                    val entry = grade.getString(key) ?: return@onEach
+                    val value = Utils.getGradeValue(entry)
+                    val color = Utils.getVulcanGradeColor(entry)
+
+                    val gradeObject = Grade(
+                        profileId = profileId,
+                        id = id,
+                        name = entry,
+                        type = type,
+                        value = value,
+                        weight = 0f,
+                        color = color,
+                        category = "",
+                        description = null,
+                        comment = null,
+                        semester = data.studentSemesterNumber,
+                        teacherId = -1,
+                        subjectId = subjectId,
+                        addedDate = addedDate
+                    )
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(
+                        Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            profile?.empty ?: true,
+                            profile?.empty ?: true
+                        )
+                    )
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY, 1 * DAY)
+            onSuccess(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt
new file mode 100644
index 00000000..9c0591de
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import java.text.DecimalFormat
+import kotlin.math.roundToInt
+
+class VulcanHebeGrades(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeGrades"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_GRADES,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+
+                val column = grade.getJsonObject("Column")
+                val category = column.getJsonObject("Category")
+                val categoryText = category.getString("Name")
+
+                val teacherId = getTeacherId(grade, "Creator") ?: -1
+                val subjectId = getSubjectId(column, "Subject") ?: -1
+
+                val description = column.getString("Name")
+                val comment = grade.getString("Comment")
+                var value = grade.getFloat("Value")
+                var weight = column.getFloat("Weight") ?: 0.0f
+                val numerator = grade.getFloat("Numerator ")
+                val denominator = grade.getFloat("Denominator")
+                val addedDate = getDateTime(grade, "DateModify")
+
+                var finalDescription = ""
+
+                var name = when (numerator != null && denominator != null) {
+                    true -> {
+                        value = numerator / denominator
+                        finalDescription += DecimalFormat("#.##").format(numerator) +
+                                "/" + DecimalFormat("#.##").format(denominator)
+                        weight = 0.0f
+                        (value * 100).roundToInt().toString() + "%"
+                    }
+                    else -> {
+                        if (value == null) weight = 0.0f
+
+                        grade.getString("Content") ?: ""
+                    }
+                }
+
+                comment?.also {
+                    if (name == "") name = it
+                    else finalDescription = (if (finalDescription == "") "" else " ") + it
+                }
+
+                description?.also {
+                    finalDescription = (if (finalDescription == "") "" else " - ") + it
+                }
+
+                val columnColor = column.getInt("Color") ?: 0
+                val color = if (columnColor == 0)
+                    when (name) {
+                        "1-", "1", "1+" -> 0xffd65757
+                        "2-", "2", "2+" -> 0xff9071b3
+                        "3-", "3", "3+" -> 0xffd2ab24
+                        "4-", "4", "4+" -> 0xff50b6d6
+                        "5-", "5", "5+" -> 0xff2cbd92
+                        "6-", "6", "6+" -> 0xff91b43c
+                        else -> 0xff3D5F9C
+                    }.toInt()
+                else
+                    columnColor
+
+                val gradeObject = Grade(
+                    profileId = profileId,
+                    id = id,
+                    name = name,
+                    type = Grade.TYPE_NORMAL,
+                    value = value ?: 0.0f,
+                    weight = weight,
+                    color = color,
+                    category = categoryText,
+                    description = finalDescription,
+                    comment = null,
+                    semester = getSemester(column),
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    addedDate = addedDate
+                )
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADES, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_GRADES)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt
new file mode 100644
index 00000000..cb792e2c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanHebeHomework(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeHomework"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_HOMEWORK,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { exam ->
+                val id = exam.getLong("IdHomework") ?: return@forEach
+                val eventDate = getDate(exam, "Deadline") ?: return@forEach
+                val subjectId = getSubjectId(exam, "Subject") ?: -1
+                val teacherId = getTeacherId(exam, "Creator") ?: -1
+                val teamId = data.teamClass?.id ?: -1
+                val topic = exam.getString("Content")?.trim() ?: ""
+
+                if (!isCurrentYear(eventDate)) return@forEach
+
+                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+
+                val eventObject = Event(
+                    profileId = profileId,
+                    id = id,
+                    date = eventDate,
+                    time = startTime,
+                    topic = topic,
+                    color = null,
+                    type = Event.TYPE_HOMEWORK,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    teamId = teamId
+                )
+
+                val attachments = exam.getJsonArray("Attachments")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+
+                for (attachment in attachments) {
+                    val fileName = attachment.getString("Name") ?: continue
+                    val url = attachment.getString("Link") ?: continue
+                    val attachmentName = "$fileName:$url"
+                    val attachmentId = Utils.crc32(attachmentName.toByteArray())
+
+                    eventObject.addAttachment(
+                        id = attachmentId,
+                        name = attachmentName
+                    )
+                }
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_HOMEWORK,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_HOMEWORK, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_HOMEWORK)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt
new file mode 100644
index 00000000..8ff1631b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class VulcanHebeLuckyNumber(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeLuckyNumber"
+    }
+
+    init {
+        apiGet(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER,
+            query = mapOf(
+                "constituentId" to data.studentConstituentId.toString(),
+                "day" to Date.getToday().stringY_m_d
+            )
+        ) { lucky: JsonObject?, _ ->
+            // sync tomorrow if lucky number set or is weekend or afternoon
+            var nextSync = Date.getToday().stepForward(0, 0, 1).inMillis
+            if (lucky == null) {
+                if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour < 12) {
+                    // working days morning, sync always
+                    nextSync = SYNC_ALWAYS
+                }
+            }
+            else {
+                val luckyNumberDate = Date.fromY_m_d(lucky.getString("Day")) ?: Date.getToday()
+                val luckyNumber = lucky.getInt("Number") ?: -1
+                val luckyNumberObject = LuckyNumber(
+                    profileId = profileId,
+                    date = luckyNumberDate,
+                    number = luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_LUCKY_NUMBER,
+                        luckyNumberObject.date.value.toLong(),
+                        true,
+                        profile?.empty ?: false
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER, syncAt = nextSync)
+            onSuccess(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt
new file mode 100644
index 00000000..c017e3c9
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanHebeMain(
+    override val data: DataVulcan,
+    override val lastSync: Long? = null
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeMain"
+    }
+
+    fun getStudents(
+        profile: Profile?,
+        profileList: MutableList<Profile>?,
+        loginStoreId: Int? = null,
+        firstProfileId: Int? = null,
+        onEmpty: (() -> Unit)? = null,
+        onSuccess: () -> Unit
+    ) {
+        if (profile == null && (profileList == null || loginStoreId == null || firstProfileId == null))
+            throw IllegalArgumentException()
+
+        apiGet(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MAIN,
+            query = mapOf("lastSyncDate" to "null"),
+            baseUrl = profile == null
+        ) { students: JsonArray, _ ->
+            if (students.isEmpty()) {
+                if (onEmpty != null)
+                    onEmpty()
+                else
+                    onSuccess()
+                return@apiGet
+            }
+
+            // safe to assume this will be non-null when creating a profile
+            var profileId = firstProfileId ?: loginStoreId ?: 1
+
+            students.forEach { studentEl ->
+                val student = studentEl.asJsonObject
+
+                val pupil = student.getJsonObject("Pupil")
+                val studentId = pupil.getInt("Id") ?: return@forEach
+
+                // check the student ID in case of not first login
+                if (profile != null && data.studentId != studentId)
+                    return@forEach
+
+                val unit = student.getJsonObject("Unit")
+                val constituentUnit = student.getJsonObject("ConstituentUnit")
+                val login = student.getJsonObject("Login")
+                val periods = student.getJsonArray("Periods")?.map {
+                    it.asJsonObject
+                } ?: listOf()
+
+                val period = periods.firstOrNull {
+                    it.getBoolean("Current", false)
+                } ?: return@forEach
+
+                val periodLevel = period.getInt("Level") ?: return@forEach
+                val semester1 = periods.firstOrNull {
+                    it.getInt("Level") == periodLevel && it.getInt("Number") == 1
+                }
+                val semester2 = periods.firstOrNull {
+                    it.getInt("Level") == periodLevel && it.getInt("Number") == 2
+                }
+
+                val schoolSymbol = unit.getString("Symbol") ?: return@forEach
+                val schoolShort = constituentUnit.getString("Short") ?: return@forEach
+                val schoolCode = "${data.symbol}_$schoolSymbol"
+
+                val studentUnitId = unit.getInt("Id") ?: return@forEach
+                val studentConstituentId = constituentUnit.getInt("Id") ?: return@forEach
+                val studentLoginId = login.getInt("Id") ?: return@forEach
+                //val studentClassId = student.getInt("IdOddzial") ?: return@forEach
+                val studentClassName = student.getString("ClassDisplay") ?: return@forEach
+                val studentFirstName = pupil.getString("FirstName") ?: ""
+                val studentLastName = pupil.getString("Surname") ?: ""
+                val studentNameLong = "$studentFirstName $studentLastName".fixName()
+                val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
+                val userLogin = login.getString("Value") ?: ""
+
+                val studentSemesterId = period.getInt("Id") ?: return@forEach
+                val studentSemesterNumber = period.getInt("Number") ?: return@forEach
+
+                val hebeContext = student.getString("Context")
+
+                val isParent = login.getString("LoginRole").equals("opiekun", ignoreCase = true)
+                val accountName = if (isParent)
+                    login.getString("DisplayName")?.fixName()
+                else null
+
+                val dateSemester1Start = semester1
+                    ?.getJsonObject("Start")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+                val dateSemester2Start = semester2
+                    ?.getJsonObject("Start")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+                val dateYearEnd = semester2
+                    ?.getJsonObject("End")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+
+                val newProfile = profile ?: Profile(
+                    profileId++,
+                    loginStoreId!!,
+                    LOGIN_TYPE_VULCAN,
+                    studentNameLong,
+                    userLogin,
+                    studentNameLong,
+                    studentNameShort,
+                    accountName
+                )
+
+                newProfile.apply {
+                    this.studentClassName = studentClassName
+                    studentData["symbol"] = data.symbol
+
+                    studentData["studentId"] = studentId
+                    studentData["studentUnitId"] = studentUnitId
+                    studentData["studentConstituentId"] = studentConstituentId
+                    studentData["studentLoginId"] = studentLoginId
+                    studentData["studentSemesterId"] = studentSemesterId
+                    studentData["studentSemesterNumber"] = studentSemesterNumber
+                    studentData["semester1Id"] = semester1?.getInt("Id") ?: 0
+                    studentData["semester2Id"] = semester2?.getInt("Id") ?: 0
+                    studentData["schoolSymbol"] = schoolSymbol
+                    studentData["schoolShort"] = schoolShort
+                    studentData["schoolName"] = schoolCode
+                    studentData["hebeContext"] = hebeContext
+                }
+                dateSemester1Start?.let {
+                    newProfile.dateSemester1Start = it
+                    newProfile.studentSchoolYearStart = it.year
+                }
+                dateSemester2Start?.let { newProfile.dateSemester2Start = it }
+                dateYearEnd?.let { newProfile.dateYearEnd = it }
+
+                if (profile != null)
+                    data.setSyncNext(ENDPOINT_VULCAN_HEBE_MAIN, 1 * DAY)
+
+                profileList?.add(newProfile)
+            }
+
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt
new file mode 100644
index 00000000..eb4091e0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import androidx.core.util.set
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.navlib.crc16
+import kotlin.text.replace
+
+class VulcanHebeMessages(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeMessagesInbox"
+    }
+
+    private fun getPersonId(json: JsonObject): Long {
+        val senderLoginId = json.getInt("LoginId") ?: return -1
+        /*if (senderLoginId == data.studentLoginId)
+            return -1*/
+
+        val senderName = json.getString("Address") ?: return -1
+        val senderNameSplit = senderName.splitName()
+        val senderLoginIdStr = senderLoginId.toString()
+        val teacher = data.teacherList.singleOrNull { it.loginId == senderLoginIdStr }
+            ?: Teacher(
+                profileId,
+                -1 * crc16(senderName).toLong(),
+                senderNameSplit?.second ?: "",
+                senderNameSplit?.first ?: "",
+                senderLoginIdStr
+            ).also {
+                it.setTeacherType(Teacher.TYPE_OTHER)
+                data.teacherList[it.id] = it
+            }
+        return teacher.id
+    }
+
+    fun getMessages(messageType: Int) {
+        val folder = when (messageType) {
+            TYPE_RECEIVED -> 1
+            TYPE_SENT -> 2
+            TYPE_DELETED -> 3
+            else -> 1
+        }
+        val endpointId = when (messageType) {
+            TYPE_RECEIVED -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+            TYPE_SENT -> ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
+            else -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+        }
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MESSAGES,
+            HebeFilterType.BY_PERSON,
+            folder = folder,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { message ->
+                val id = message.getLong("Id") ?: return@forEach
+                val subject = message.getString("Subject") ?: return@forEach
+                val body = message.getString("Content") ?: return@forEach
+
+                val sender = message.getJsonObject("Sender") ?: return@forEach
+
+                val sentDate = getDateTime(message, "DateSent")
+                val readDate = getDateTime(message, "DateRead", default = 0)
+
+                if (!isCurrentYear(sentDate)) return@forEach
+
+                val messageObject = Message(
+                    profileId = profileId,
+                    id = id,
+                    type = messageType,
+                    subject = subject,
+                    body = body.replace("\n", "<br>"),
+                    senderId = if (messageType == TYPE_RECEIVED) getPersonId(sender) else null,
+                    addedDate = sentDate
+                )
+
+                val receivers = message.getJsonArray("Receiver")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+                val receiverReadDate =
+                    if (receivers.size == 1) readDate
+                    else -1
+
+                for (receiver in receivers) {
+                    val messageRecipientObject = MessageRecipient(
+                        profileId,
+                        if (messageType == TYPE_SENT) getPersonId(receiver) else -1,
+                        -1,
+                        receiverReadDate,
+                        id
+                    )
+                    data.messageRecipientList.add(messageRecipientObject)
+                }
+
+                val attachments = message.getJsonArray("Attachments")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+
+                for (attachment in attachments) {
+                    val fileName = attachment.getString("Name") ?: continue
+                    val url = attachment.getString("Link") ?: continue
+                    val attachmentName = "$fileName:$url"
+                    val attachmentId = Utils.crc32(attachmentName.toByteArray())
+
+                    messageObject.addAttachment(
+                        id = attachmentId,
+                        name = attachmentName,
+                        size = -1
+                    )
+                }
+
+                data.messageList.add(messageObject)
+                data.setSeenMetadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_MESSAGE,
+                        id,
+                        readDate > 0 || messageType == TYPE_SENT,
+                        readDate > 0 || messageType == TYPE_SENT
+                    )
+                )
+            }
+
+            data.setSyncNext(
+                endpointId,
+                if (messageType == TYPE_RECEIVED) SYNC_ALWAYS else 1 * DAY,
+                if (messageType == TYPE_RECEIVED) null else DRAWER_ITEM_MESSAGES
+            )
+            onSuccess(endpointId)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt
similarity index 50%
rename from app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt
index b0b7795d..ff5dbe4c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt
@@ -1,62 +1,65 @@
 /*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-12
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
  */
 
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
 
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS
+import pl.szczodrzynski.edziennik.JsonObject
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 
-class VulcanApiMessagesChangeStatus(override val data: DataVulcan,
-                                    private val messageObject: MessageFull,
-                                    val onSuccess: () -> Unit
-) : VulcanApi(data, null) {
+class VulcanHebeMessagesChangeStatus(
+    override val data: DataVulcan,
+    private val messageObject: MessageFull,
+    val onSuccess: () -> Unit
+) : VulcanHebe(data, null) {
     companion object {
-        const val TAG = "VulcanApiMessagesChangeStatus"
+        const val TAG = "VulcanHebeMessagesChangeStatus"
     }
 
     init {
-        apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS, parameters = mapOf(
-                "WiadomoscId" to messageObject.id,
-                "FolderWiadomosci" to "Odebrane",
-                "Status" to "Widoczna",
+        apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS,
+            payload = JsonObject(
+                "MessageId" to messageObject.id,
                 "LoginId" to data.studentLoginId,
-                "IdUczen" to data.studentId
-        )) { _, _ ->
+                "Status" to 1
+            )
+        ) { _: Boolean, _ ->
 
             if (!messageObject.seen) {
-                data.setSeenMetadataList.add(Metadata(
+                data.setSeenMetadataList.add(
+                    Metadata(
                         profileId,
                         Metadata.TYPE_MESSAGE,
                         messageObject.id,
                         true,
                         true
-                ))
-
+                    )
+                )
                 messageObject.seen = true
             }
 
-            if (messageObject.type != TYPE_SENT) {
+            if (messageObject.type != Message.TYPE_SENT) {
                 val messageRecipientObject = MessageRecipient(
-                        profileId,
-                        -1,
-                        -1,
-                        System.currentTimeMillis(),
-                        messageObject.id
+                    profileId,
+                    -1,
+                    -1,
+                    System.currentTimeMillis(),
+                    messageObject.id
                 )
-
                 data.messageRecipientList.add(messageRecipientObject)
             }
 
             EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
-
             onSuccess()
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt
new file mode 100644
index 00000000..5b67b272
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2021-2-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeNotices(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+
+    companion object {
+        const val TAG = "VulcanHebeNotices"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_NOTICES,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { notice ->
+                val id = notice.getLong("Id") ?: return@forEach
+                val type = when (notice.getBoolean("Positive")) {
+                    true -> Notice.TYPE_POSITIVE
+                    else -> Notice.TYPE_NEUTRAL
+                }
+                val date = getDate(notice, "DateValid") ?: return@forEach
+                val semester = profile?.dateToSemester(date) ?: return@forEach
+                val text = notice.getString("Content") ?: ""
+                val category = notice.getJsonObject("Category")?.getString("Name")
+                val points = notice.getFloat("Points")
+                val teacherId = getTeacherId(notice, "Creator") ?: -1
+                val addedDate = getDateTime(notice, "DateModify")
+
+                if (!isCurrentYear(date)) return@forEach
+
+                val noticeObject = Notice(
+                    profileId = profileId,
+                    id = id,
+                    type = type,
+                    semester = semester,
+                    text = text,
+                    category = category,
+                    points = points,
+                    teacherId = teacherId,
+                    addedDate = addedDate
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_NOTICES, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_NOTICES)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt
new file mode 100644
index 00000000..fdf81bcb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonPrimitive
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_PUSH_ALL
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_PUSH_CONFIG
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebePushConfig(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebePushConfig"
+    }
+
+    init {
+        apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_PUSH_ALL,
+            payload = JsonPrimitive("on")
+        ) { _: Boolean, _ ->
+            // sync always: this endpoint has .shouldSync set
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG, SYNC_ALWAYS)
+            data.app.config.sync.tokenVulcanList =
+                data.app.config.sync.tokenVulcanList + profileId
+            onSuccess(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt
new file mode 100644
index 00000000..8f5f5afa
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_SEND
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+
+class VulcanHebeSendMessage(
+    override val data: DataVulcan,
+    val recipients: List<Teacher>,
+    val subject: String,
+    val text: String,
+    val onSuccess: () -> Unit
+) : VulcanHebe(data, null) {
+    companion object {
+        const val TAG = "VulcanHebeSendMessage"
+    }
+
+    init {
+        val recipientsArray = JsonArray()
+        recipients.forEach { teacher ->
+            recipientsArray += JsonObject(
+                "Address" to teacher.fullNameLastFirst,
+                "LoginId" to (teacher.loginId?.toIntOrNull() ?: return@forEach),
+                "Initials" to teacher.initialsLastFirst,
+                "AddressHash" to teacher.fullNameLastFirst.sha1Hex()
+            )
+        }
+
+        val senderName = (profile?.accountName ?: profile?.studentNameLong)
+            ?.swapFirstLastName() ?: ""
+        val sender = JsonObject(
+            "Address" to senderName,
+            "LoginId" to data.studentLoginId.toString(),
+            "Initials" to senderName.getNameInitials(),
+            "AddressHash" to senderName.sha1Hex()
+        )
+
+        apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MESSAGES_SEND,
+            payload = JsonObject(
+                "Status" to 1,
+                "Sender" to sender,
+                "DateSent" to null,
+                "DateRead" to null,
+                "Content" to text,
+                "Receiver" to recipientsArray,
+                "Id" to 0,
+                "Subject" to subject,
+                "Attachments" to null,
+                "Self" to null
+            )
+        ) { json: JsonObject, _ ->
+            val messageId = json.getLong("Id")
+
+            if (messageId == null) {
+                // TODO error
+                return@apiPost
+            }
+
+            VulcanHebeMessages(data, null) {
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
+                val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == messageId }
+                val event = MessageSentEvent(data.profileId, message, message?.addedDate)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }.getMessages(Message.TYPE_SENT)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt
new file mode 100644
index 00000000..03a28a9e
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CANCELLED
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CHANGE
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_NORMAL
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_SOURCE
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_TARGET
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class VulcanHebeTimetable(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeTimetable"
+    }
+
+    private val lessonList = mutableListOf<Lesson>()
+    private val lessonDates = mutableSetOf<Int>()
+
+    init {
+        val previousWeekStart = Week.getWeekStart().stepForward(0, 0, -7)
+        if (Date.getToday().weekDay > 4) {
+            previousWeekStart.stepForward(0, 0, 7)
+        }
+
+        val dateFrom = data.arguments
+            ?.getString("weekStart")
+            ?.let { Date.fromY_m_d(it) }
+            ?: previousWeekStart
+        val dateTo = dateFrom.clone().stepForward(0, 0, 13)
+
+        val lastSync = null
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_TIMETABLE,
+            HebeFilterType.BY_PUPIL,
+            dateFrom = dateFrom,
+            dateTo = dateTo,
+            lastSync = lastSync
+        ) { lessons, _ ->
+            apiGetList(
+                TAG,
+                VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES,
+                HebeFilterType.BY_PUPIL,
+                dateFrom = dateFrom,
+                dateTo = dateTo,
+                lastSync = lastSync
+            ) { changes, _ ->
+                processData(lessons, changes)
+
+                // cancel lesson changes when caused by a shift
+                for (lesson in lessonList) {
+                    if (lesson.type != TYPE_SHIFTED_TARGET)
+                        continue
+                    lessonList.firstOrNull {
+                        it.oldDate == lesson.date
+                                && it.oldLessonNumber == lesson.lessonNumber
+                                && it.type == TYPE_CHANGE
+                    }?.let {
+                        it.type = TYPE_CANCELLED
+                        it.date = null
+                        it.lessonNumber = null
+                        it.startTime = null
+                        it.endTime = null
+                        it.subjectId = null
+                        it.teacherId = null
+                        it.teamId = null
+                        it.classroom = null
+                    }
+                }
+
+                // add TYPE_NO_LESSONS to empty dates
+                val date: Date = dateFrom.clone()
+                while (date <= dateTo) {
+                    if (!lessonDates.contains(date.value)) {
+                        lessonList.add(Lesson(profileId, date.value.toLong()).apply {
+                            this.type = Lesson.TYPE_NO_LESSONS
+                            this.date = date.clone()
+                        })
+                    }
+
+                    date.stepForward(0, 0, 1)
+                }
+
+                d(
+                    TAG,
+                    "Clearing lessons between ${dateFrom.stringY_m_d} and ${dateTo.stringY_m_d}"
+                )
+
+                data.lessonList.addAll(lessonList)
+
+                data.setSyncNext(ENDPOINT_VULCAN_HEBE_TIMETABLE, SYNC_ALWAYS)
+                onSuccess(ENDPOINT_VULCAN_HEBE_TIMETABLE)
+            }
+        }
+    }
+
+    private fun buildLesson(changes: List<JsonObject>, json: JsonObject): Pair<Lesson, Lesson?>? {
+        val lesson = Lesson(profileId, -1)
+        var lessonShift: Lesson? = null
+
+        val lessonDate = getDate(json, "Date") ?: return null
+        val lessonRange = getLessonRange(json, "TimeSlot")
+        val startTime = lessonRange?.startTime
+        val endTime = lessonRange?.endTime
+        val teacherId = getTeacherId(json, "TeacherPrimary")
+        val classroom = json.getJsonObject("Room").getString("Code")
+        val subjectId = getSubjectId(json, "Subject")
+
+        val teamId = getTeamId(json, "Distribution")
+            ?: getClassId(json, "Clazz")
+            ?: data.teamClass?.id
+            ?: -1
+
+        val change = json.getJsonObject("Change")
+        val changeId = change.getInt("Id")
+        val type = when (change.getInt("Type")) {
+            1 -> TYPE_CANCELLED
+            2 -> TYPE_CHANGE
+            3 -> TYPE_SHIFTED_SOURCE
+            4 -> TYPE_CANCELLED // TODO: 2021-02-21 add showing cancellation reason
+            else -> TYPE_NORMAL
+        }
+
+        lesson.type = type
+        if (type == TYPE_NORMAL) {
+            lesson.date = lessonDate
+            lesson.lessonNumber = lessonRange?.lessonNumber
+            lesson.startTime = startTime
+            lesson.endTime = endTime
+            lesson.subjectId = subjectId
+            lesson.teacherId = teacherId
+            lesson.teamId = teamId
+            lesson.classroom = classroom
+        } else {
+            lesson.oldDate = lessonDate
+            lesson.oldLessonNumber = lessonRange?.lessonNumber
+            lesson.oldStartTime = startTime
+            lesson.oldEndTime = endTime
+            lesson.oldSubjectId = subjectId
+            lesson.oldTeacherId = teacherId
+            lesson.oldTeamId = teamId
+            lesson.oldClassroom = classroom
+        }
+
+        if (type == TYPE_CHANGE || type == TYPE_SHIFTED_SOURCE) {
+            val changeJson = changes.firstOrNull {
+                it.getInt("Id") == changeId
+            } ?: return lesson to null
+
+            val changeLessonDate = getDate(changeJson, "LessonDate") ?: return lesson to null
+            val changeLessonRange = getLessonRange(changeJson, "TimeSlot") ?: lessonRange
+            val changeStartTime = changeLessonRange?.startTime
+            val changeEndTime = changeLessonRange?.endTime
+            val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId
+            val changeClassroom = changeJson.getJsonObject("Room").getString("Code") ?: classroom
+            val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId
+
+            val changeTeamId = getTeamId(json, "Distribution")
+                ?: getClassId(json, "Clazz")
+                ?: teamId
+
+            if (type != TYPE_CHANGE) {
+                /* lesson shifted */
+                lessonShift = Lesson(profileId, -1)
+                lessonShift.type = TYPE_SHIFTED_TARGET
+
+                // update source lesson with the target lesson date
+                lesson.date = changeLessonDate
+                lesson.lessonNumber = changeLessonRange?.lessonNumber
+                lesson.startTime = changeStartTime
+                lesson.endTime = changeEndTime
+                // update target lesson with the source lesson date
+                lessonShift.oldDate = lessonDate
+                lessonShift.oldLessonNumber = lessonRange?.lessonNumber
+                lessonShift.oldStartTime = startTime
+                lessonShift.oldEndTime = endTime
+            }
+
+            (if (type == TYPE_CHANGE) lesson else lessonShift)
+                ?.apply {
+                    this.date = changeLessonDate
+                    this.lessonNumber = changeLessonRange?.lessonNumber
+                    this.startTime = changeStartTime
+                    this.endTime = changeEndTime
+                    this.subjectId = changeSubjectId
+                    this.teacherId = changeTeacherId
+                    this.teamId = changeTeamId
+                    this.classroom = changeClassroom
+                }
+        }
+
+        return lesson to lessonShift
+    }
+
+    private fun processData(lessons: List<JsonObject>, changes: List<JsonObject>) {
+        lessons.forEach { lessonJson ->
+            if (lessonJson.getBoolean("Visible") != true)
+                return@forEach
+
+            val lessonPair = buildLesson(changes, lessonJson) ?: return@forEach
+            val (lessonObject, lessonShift) = lessonPair
+
+            when {
+                lessonShift != null -> lessonShift
+                lessonObject.type != TYPE_NORMAL -> lessonObject
+                else -> null
+            }?.let { lesson ->
+                val lessonDate = lesson.displayDate ?: return@let
+                val seen = profile?.empty ?: true || lessonDate < Date.getToday()
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_LESSON_CHANGE,
+                        lesson.id,
+                        seen,
+                        seen
+                    )
+                )
+            }
+
+            lessonObject.id = lessonObject.buildId()
+            lessonShift?.id = lessonShift?.buildId() ?: -1
+
+            lessonList.add(lessonObject)
+            lessonShift?.let { lessonList.add(it) }
+
+            lessonObject.displayDate?.let { lessonDates.add(it.value) }
+            lessonShift?.displayDate?.let { lessonDates.add(it.value) }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt
index ed541c69..2bf633f8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt
@@ -8,23 +8,23 @@ import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMain
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.utils.models.Date
 
 class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
     companion object {
         const val TAG = "VulcanFirstLogin"
     }
 
-    private val api = VulcanApi(data, null)
     private val web = VulcanWebMain(data, null)
+    private val hebe = VulcanHebe(data, null)
     private val profileList = mutableListOf<Profile>()
     private val loginStoreId = data.loginStore.id
     private var firstProfileId = loginStoreId
@@ -51,7 +51,7 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
             }
         }
         else {
-            registerDevice {
+            registerDeviceHebe {
                 EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
                 onSuccess()
             }
@@ -103,98 +103,25 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.apiPin = data.apiPin.toMutableMap().also {
                     it[symbol] = json.getString("PIN")
                 }
-                registerDevice(onSuccess)
+                registerDeviceHebe(onSuccess)
             }
         }
     }
 
-    private fun registerDevice(onSuccess: () -> Unit) {
-        VulcanLoginApi(data) {
-            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, _ ->
-                val students = json.getJsonArray("Data")
-
-                if (students == null || students.isEmpty()) {
-                    EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
+    private fun registerDeviceHebe(onSuccess: () -> Unit) {
+        VulcanLoginHebe(data) {
+            VulcanHebeMain(data).getStudents(
+                profile = null,
+                profileList,
+                loginStoreId,
+                firstProfileId,
+                onEmpty = {
+                    EventBus.getDefault()
+                        .postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
                     onSuccess()
-                    return@apiGet
-                }
-
-                students.forEach { studentEl ->
-                    val student = studentEl.asJsonObject
-
-                    val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach
-                    val schoolShort = student.getString("JednostkaSprawozdawczaSkrot") ?: return@forEach
-                    val schoolCode = "${data.symbol}_$schoolSymbol"
-                    val studentId = student.getInt("Id") ?: return@forEach
-                    val studentLoginId = student.getInt("UzytkownikLoginId") ?: return@forEach
-                    val studentClassId = student.getInt("IdOddzial") ?: return@forEach
-                    val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@forEach)
-                    val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@forEach
-                    val studentFirstName = student.getString("Imie") ?: ""
-                    val studentLastName = student.getString("Nazwisko") ?: ""
-                    val studentNameLong = "$studentFirstName $studentLastName".fixName()
-                    val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
-
-                    val userLogin = student.getString("UzytkownikLogin") ?: ""
-                    val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@forEach
-                    val currentSemesterEndDate = (student.getLong("OkresDataDo") ?: return@forEach) + 86400
-                    val studentSemesterNumber = student.getInt("OkresNumer") ?: return@forEach
-
-                    val isParent = student.getString("UzytkownikRola") == "opiekun"
-                    val accountName = if (isParent)
-                        student.getString("UzytkownikNazwa")?.swapFirstLastName()?.fixName()
-                    else null
-
-                    var dateSemester1Start: Date? = null
-                    var dateSemester2Start: Date? = null
-                    var dateYearEnd: Date? = null
-                    when (studentSemesterNumber) {
-                        1 -> {
-                            dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                        2 -> {
-                            dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                    }
-
-                    val profile = Profile(
-                            firstProfileId++,
-                            loginStoreId,
-                            LOGIN_TYPE_VULCAN,
-                            studentNameLong,
-                            userLogin,
-                            studentNameLong,
-                            studentNameShort,
-                            accountName
-                    ).apply {
-                        this.studentClassName = studentClassName
-                        studentData["symbol"] = data.symbol
-
-                        studentData["studentId"] = studentId
-                        studentData["studentLoginId"] = studentLoginId
-                        studentData["studentClassId"] = studentClassId
-                        studentData["studentSemesterId"] = studentSemesterId
-                        studentData["studentSemesterNumber"] = studentSemesterNumber
-                        studentData["semester${studentSemesterNumber}Id"] = studentSemesterId
-                        studentData["schoolSymbol"] = schoolSymbol
-                        studentData["schoolShort"] = schoolShort
-                        studentData["schoolName"] = schoolCode
-                        studentData["currentSemesterEndDate"] = currentSemesterEndDate
-                    }
-                    dateSemester1Start?.let {
-                        profile.dateSemester1Start = it
-                        profile.studentSchoolYearStart = it.year
-                    }
-                    dateSemester2Start?.let { profile.dateSemester2Start = it }
-                    dateYearEnd?.let { profile.dateYearEnd = it }
-
-                    profileList.add(profile)
-                }
-
-                onSuccess()
-            }
+                },
+                onSuccess = onSuccess
+            )
         }
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt
index 45c0153d..3cbb7ea7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt
@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
 
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
 import pl.szczodrzynski.edziennik.utils.Utils
@@ -50,9 +50,9 @@ class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_login_vulcan_web_main)
                 VulcanLoginWebMain(data) { onSuccess(loginMethodId) }
             }
-            LOGIN_METHOD_VULCAN_API -> {
+            LOGIN_METHOD_VULCAN_HEBE -> {
                 data.startProgress(R.string.edziennik_progress_login_vulcan_api)
-                VulcanLoginApi(data) { onSuccess(loginMethodId) }
+                VulcanLoginHebe(data) { onSuccess(loginMethodId) }
             }
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt
deleted file mode 100644
index ec84cd05..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
-
-import android.os.Build
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import io.github.wulkanowy.signer.android.getPrivateKeyFromCert
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiUpdateSemester
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.net.HttpURLConnection.HTTP_BAD_REQUEST
-import java.util.*
-import java.util.regex.Pattern
-
-class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "VulcanLoginApi"
-    }
-
-    init { run {
-        if (data.studentSemesterNumber == 1 && data.semester1Id == 0)
-            data.semester1Id = data.studentSemesterNumber
-        if (data.studentSemesterNumber == 2 && data.semester2Id == 0)
-            data.semester2Id = data.studentSemesterNumber
-
-        copyFromLoginStore()
-
-        if (data.profile != null && data.isApiLoginValid()) {
-            onSuccess()
-        }
-        else {
-            if (data.apiFingerprint[data.symbol].isNotNullNorEmpty()
-                    && data.apiPrivateKey[data.symbol].isNotNullNorEmpty()
-                    && data.symbol.isNotNullNorEmpty()) {
-                // (see data.isApiLoginValid())
-                // the semester end date is over
-                VulcanApiUpdateSemester(data, null) { onSuccess() }
-                return@run
-            }
-
-            if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
-                loginWithToken()
-            }
-            else {
-                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
-            }
-        }
-    }}
-
-    private fun copyFromLoginStore() {
-        data.loginStore.data.apply {
-            // < v4.0 - PFX to Private Key migration
-            if (has("certificatePfx")) {
-                try {
-                    val privateKey = getPrivateKeyFromCert(
-                            if (data.apiToken[data.symbol]?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
-                            getString("certificatePfx") ?: ""
-                    )
-                    data.apiPrivateKey = mapOf(
-                            data.symbol to privateKey
-                    )
-                    remove("certificatePfx")
-                } catch (e: Throwable) {
-                    e.printStackTrace()
-                }
-            }
-
-            // 4.0 - new login form - copy user input to profile
-            if (has("symbol")) {
-                data.symbol = getString("symbol")
-                remove("symbol")
-            }
-
-            // 4.0 - before Vulcan Web impl - migrate from strings to Map of Symbol to String
-            if (has("deviceSymbol")) {
-                data.symbol = getString("deviceSymbol")
-                remove("deviceSymbol")
-            }
-            if (has("certificateKey")) {
-                data.apiFingerprint = data.apiFingerprint.toMutableMap().also {
-                    it[data.symbol] = getString("certificateKey")
-                }
-                remove("certificateKey")
-            }
-            if (has("certificatePrivate")) {
-                data.apiPrivateKey = data.apiPrivateKey.toMutableMap().also {
-                    it[data.symbol] = getString("certificatePrivate")
-                }
-                remove("certificatePrivate")
-            }
-
-            // map form inputs to the symbol
-            if (has("deviceToken")) {
-                data.apiToken = data.apiToken.toMutableMap().also {
-                    it[data.symbol] = getString("deviceToken")
-                }
-                remove("deviceToken")
-            }
-            if (has("devicePin")) {
-                data.apiPin = data.apiPin.toMutableMap().also {
-                    it[data.symbol] = getString("devicePin")
-                }
-                remove("devicePin")
-            }
-        }
-    }
-
-    private fun loginWithToken() {
-        d(TAG, "Request: Vulcan/Login/Api - ${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE")
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null) {
-                    if (response?.code() == HTTP_BAD_REQUEST) {
-                        data.error(TAG, ERROR_LOGIN_VULCAN_INVALID_SYMBOL, response)
-                        return
-                    }
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                var tokenStatus = json.getString("TokenStatus")
-                if (tokenStatus == "Null" || tokenStatus == "CertGenerated")
-                    tokenStatus = null
-                val error = tokenStatus ?: json.getString("Message")
-                error?.let { code ->
-                    when (code) {
-                        "TokenNotFound" -> ERROR_LOGIN_VULCAN_INVALID_TOKEN
-                        "TokenDead" -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN
-                        "WrongPIN" -> {
-                            Pattern.compile("Liczba pozostałych prób: ([0-9])", Pattern.DOTALL).matcher(tokenStatus).let { matcher ->
-                                if (matcher.matches())
-                                    ERROR_LOGIN_VULCAN_INVALID_PIN + 1 + matcher.group(1).toInt()
-                                else
-                                    ERROR_LOGIN_VULCAN_INVALID_PIN
-                            }
-                        }
-                        "Broken" -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
-                        "OnlyKindergarten" -> ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN
-                        "NoPupils" -> ERROR_LOGIN_VULCAN_NO_PUPILS
-                        else -> ERROR_LOGIN_VULCAN_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(json)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                val cert = json.getJsonObject("TokenCert")
-                if (cert == null) {
-                    data.error(ApiError(TAG, ERROR_LOGIN_VULCAN_OTHER)
-                            .withApiResponse(json)
-                            .withResponse(response))
-                    return
-                }
-
-                val privateKey = getPrivateKeyFromCert(
-                        if (data.apiToken[data.symbol]?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD,
-                        cert.getString("CertyfikatPfx") ?: ""
-                )
-
-                data.apiFingerprint = data.apiFingerprint.toMutableMap().also {
-                    it[data.symbol] = cert.getString("CertyfikatKlucz")
-                }
-                data.apiToken = data.apiToken.toMutableMap().also {
-                    it[data.symbol] = it[data.symbol]?.substring(0, 3)
-                }
-                data.apiPrivateKey = data.apiPrivateKey.toMutableMap().also {
-                    it[data.symbol] = privateKey
-                }
-                data.loginStore.removeLoginData("certificatePfx")
-                data.loginStore.removeLoginData("apiPin")
-                onSuccess()
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        val deviceId = data.app.deviceId.padStart(16, '0')
-        val loginStoreId = data.loginStore.id.toString(16).padStart(4, '0')
-        val symbol = data.symbol?.crc16()?.toString(16)?.take(2) ?: "00"
-        val uuid =
-                deviceId.substring(0..7) +
-                        "-" + deviceId.substring(8..11) +
-                        "-" + deviceId.substring(12..15) +
-                        "-" + loginStoreId +
-                        "-" + symbol + "6f72616e7a"
-
-        val deviceNameSuffix = " - nie usuwać"
-
-        val szkolnyApi = SzkolnyApi(data.app)
-        val firebaseToken = szkolnyApi.runCatching({
-            getFirebaseToken("vulcan")
-        }, onError = {
-            // screw errors
-        }) ?: data.app.config.sync.tokenVulcan
-
-        Request.builder()
-                .url("${data.apiUrl}$VULCAN_API_ENDPOINT_CERTIFICATE")
-                .userAgent(VULCAN_API_USER_AGENT)
-                .addHeader("RequestMobileType", "RegisterDevice")
-                .addParameter("PIN", data.apiPin[data.symbol])
-                .addParameter("TokenKey", data.apiToken[data.symbol])
-                .addParameter("DeviceId", uuid)
-                .addParameter("DeviceName", VULCAN_API_DEVICE_NAME.take(50 - deviceNameSuffix.length) + deviceNameSuffix)
-                .addParameter("DeviceNameUser", "")
-                .addParameter("DeviceDescription", "")
-                .addParameter("DeviceSystemType", "Android")
-                .addParameter("DeviceSystemVersion", Build.VERSION.RELEASE)
-                .addParameter("RemoteMobileTimeKey", currentTimeUnix())
-                .addParameter("TimeKey", currentTimeUnix() - 1)
-                .addParameter("RequestId", UUID.randomUUID().toString())
-                .addParameter("AppVersion", VULCAN_API_APP_VERSION)
-                .addParameter("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
-                .addParameter("RemoteMobileAppName", VULCAN_API_APP_NAME)
-                .addParameter("FirebaseTokenKey", firebaseToken ?: "")
-                .postJson()
-                .allowErrorCode(HTTP_BAD_REQUEST)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt
new file mode 100644
index 00000000..ded6e937
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
+
+import com.google.gson.JsonObject
+import io.github.wulkanowy.signer.hebe.generateKeyPair
+import pl.szczodrzynski.edziennik.JsonObject
+import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING
+import pl.szczodrzynski.edziennik.data.api.VULCAN_API_DEVICE_NAME
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_REGISTER_NEW
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class VulcanLoginHebe(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanLoginHebe"
+    }
+
+    init { run {
+        // i'm sure this does something useful
+        // not quite sure what, though
+        if (data.studentSemesterNumber == 1 && data.semester1Id == 0)
+            data.semester1Id = data.studentSemesterNumber
+        if (data.studentSemesterNumber == 2 && data.semester2Id == 0)
+            data.semester2Id = data.studentSemesterNumber
+
+        copyFromLoginStore()
+
+        if (data.profile != null && data.isHebeLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
+                loginWithToken()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun copyFromLoginStore() {
+        data.loginStore.data.apply {
+            // map form inputs to the symbol
+            if (has("symbol")) {
+                data.symbol = getString("symbol")
+                remove("symbol")
+            }
+            if (has("deviceToken")) {
+                data.apiToken = data.apiToken.toMutableMap().also {
+                    it[data.symbol] = getString("deviceToken")
+                }
+                remove("deviceToken")
+            }
+            if (has("devicePin")) {
+                data.apiPin = data.apiPin.toMutableMap().also {
+                    it[data.symbol] = getString("devicePin")
+                }
+                remove("devicePin")
+            }
+        }
+    }
+
+    private fun loginWithToken() {
+        val szkolnyApi = SzkolnyApi(data.app)
+        val hebe = VulcanHebe(data, null)
+
+        if (data.hebePublicKey == null || data.hebePrivateKey == null || data.hebePublicHash == null) {
+            val (publicPem, privatePem, publicHash) = generateKeyPair()
+            data.hebePublicKey = publicPem
+            data.hebePrivateKey = privatePem
+            data.hebePublicHash = publicHash
+        }
+
+        val firebaseToken = szkolnyApi.runCatching({
+            getFirebaseToken("vulcan")
+        }, onError = {
+            // screw errors
+        }) ?: data.app.config.sync.tokenVulcan
+
+        hebe.apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_REGISTER_NEW,
+            payload = JsonObject(
+                "OS" to "Android",
+                "PIN" to data.apiPin[data.symbol],
+                "Certificate" to data.hebePublicKey,
+                "CertificateType" to "RSA_PEM",
+                "DeviceModel" to VULCAN_API_DEVICE_NAME,
+                "SecurityToken" to data.apiToken[data.symbol],
+                "SelfIdentifier" to data.buildDeviceId(),
+                "CertificateThumbprint" to data.hebePublicHash
+            ),
+            baseUrl = true,
+            firebaseToken = firebaseToken
+        ) { _: JsonObject, _ ->
+            data.apiToken = data.apiToken.toMutableMap().also {
+                it[data.symbol] = it[data.symbol]?.substring(0, 3)
+            }
+            data.loginStore.removeLoginData("apiPin")
+            onSuccess()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt
index 467beea3..2b62eb14 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.fslogin.FSLogin
-import pl.szczodrzynski.fslogin.realm.CufsRealm
+import pl.szczodrzynski.fslogin.realm.toRealm
 
 class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
     companion object {
@@ -30,8 +30,7 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
         else {
             if (data.symbol.isNotNullNorEmpty()
-                    && data.webType.isNotNullNorEmpty()
-                    && data.webHost.isNotNullNorEmpty()
+                    && data.webRealmData != null
                     && (data.webEmail.isNotNullNorEmpty() || data.webUsername.isNotNullNorEmpty())
                     && data.webPassword.isNotNullNorEmpty()) {
                 try {
@@ -56,32 +55,28 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.symbol = getString("symbol")
                 remove("symbol")
             }
+            // 4.6 - form inputs renamed
+            if (has("email")) {
+                data.webEmail = getString("email")
+                remove("email")
+            }
+            if (has("username")) {
+                data.webUsername = getString("username")
+                remove("username")
+            }
+            if (has("password")) {
+                data.webPassword = getString("password")
+                remove("password")
+            }
+        }
+
+        if (data.symbol == null && data.webRealmData != null) {
+            data.symbol = data.webRealmData?.symbol
         }
     }
 
     private fun loginWithCredentials(): Boolean {
-        val realm = when (data.webType) {
-            "cufs" -> CufsRealm(
-                    host = data.webHost ?: return false,
-                    symbol = data.symbol ?: "default",
-                    httpCufs = data.webIsHttpCufs
-            )
-            "adfs" -> CufsRealm(
-                    host = data.webHost ?: return false,
-                    symbol = data.symbol ?: "default",
-                    httpCufs = data.webIsHttpCufs
-            ).toAdfsRealm(id = data.webAdfsId ?: return false)
-            "adfslight" -> CufsRealm(
-                    host = data.webHost ?: return false,
-                    symbol = data.symbol ?: "default",
-                    httpCufs = data.webIsHttpCufs
-            ).toAdfsLightRealm(
-                    id = data.webAdfsId ?: return false,
-                    domain = data.webAdfsDomain ?: "adfslight",
-                    isScoped = data.webIsScopedAdfs
-            )
-            else -> return false
-        }
+        val realm = data.webRealmData?.toRealm() ?: return false
 
         val certificate = web.readCertificate()?.let { web.parseCertificate(it) }
         if (certificate != null && Date.fromIso(certificate.expiryDate) > System.currentTimeMillis()) {
@@ -89,7 +84,7 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
             return true
         }
 
-        val fsLogin = FSLogin(data.app.http, debug = App.debugMode)
+        val fsLogin = FSLogin(data.app.http, debug = App.devMode)
         fsLogin.performLogin(
                 realm = realm,
                 username = data.webUsername ?: data.webEmail ?: return false,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt
new file mode 100644
index 00000000..fe66c4b3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-3.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
+
+data class RegisterAvailabilityEvent(
+        val data: Map< String, RegisterAvailabilityStatus>
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt
index 6bd9aa83..8dda9543 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt
@@ -136,7 +136,7 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
     val db: AppDb by lazy { app.db }
 
     init {
-        if (App.devMode) {
+        if (App.debugMode) {
             fakeLogin = loginStore.hasLoginData("fakeLogin")
         }
         clear()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
index d2b4df70..e6d970b8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
@@ -12,12 +12,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
+import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.DateAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.TimeAdapter
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.SignatureInterceptor
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.WebPushResponse
 import pl.szczodrzynski.edziennik.data.db.entity.Event
@@ -86,11 +88,13 @@ class SzkolnyApi(val app: App) : CoroutineScope {
             withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) }
         }
         catch (e: Exception) {
-            ErrorDetailsDialog(
+            withContext(coroutineContext) {
+                ErrorDetailsDialog(
                     activity,
                     listOf(e.toApiError(TAG)),
                     R.string.error_occured
-            )
+                )
+            }
             null
         }
     }
@@ -112,6 +116,22 @@ class SzkolnyApi(val app: App) : CoroutineScope {
      */
     @Throws(Exception::class)
     private inline fun <reified T> parseResponse(response: Response<ApiResponse<T>>): T {
+        app.config.update = response.body()?.update?.let { update ->
+            if (update.versionCode > BuildConfig.VERSION_CODE) {
+                if (update.updateMandatory
+                        && EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
+                    EventBus.getDefault().postSticky(update)
+                }
+                update
+            }
+            else
+                null
+        }
+
+        response.body()?.registerAvailability?.let { registerAvailability ->
+            app.config.sync.registerAvailability = registerAvailability
+        }
+
         if (response.isSuccessful && response.body()?.success == true) {
             if (Unit is T) {
                 return Unit
@@ -330,8 +350,8 @@ class SzkolnyApi(val app: App) : CoroutineScope {
     }
 
     @Throws(Exception::class)
-    fun getPlatforms(registerName: String): List<LoginInfo.Platform> {
-        val response = api.appLoginPlatforms(registerName).execute()
+    fun getRealms(registerName: String): List<LoginInfo.Platform> {
+        val response = api.fsLoginRealms(registerName).execute()
 
         return parseResponse(response)
     }
@@ -341,4 +361,10 @@ class SzkolnyApi(val app: App) : CoroutineScope {
         val response = api.firebaseToken(registerName).execute()
         return parseResponse(response)
     }
+
+    @Throws(Exception::class)
+    fun getRegisterAvailability(): Map<String, RegisterAvailabilityStatus> {
+        val response = api.registerAvailability().execute()
+        return parseResponse(response)
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
index 401d8886..3fe78910 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
@@ -33,9 +33,12 @@ interface SzkolnyService {
     @POST("feedbackMessage")
     fun feedbackMessage(@Body request: FeedbackMessageRequest): Call<ApiResponse<FeedbackMessageResponse>>
 
-    @GET("appLogin/platforms/{registerName}")
-    fun appLoginPlatforms(@Path("registerName") registerName: String): Call<ApiResponse<List<LoginInfo.Platform>>>
-
     @GET("firebase/token/{registerName}")
     fun firebaseToken(@Path("registerName") registerName: String): Call<ApiResponse<String>>
+
+    @GET("registerAvailability")
+    fun registerAvailability(): Call<ApiResponse<Map<String, RegisterAvailabilityStatus>>>
+
+    @GET("fsLogin/{registerName}")
+    fun fsLoginRealms(@Path("registerName") registerName: String): Call<ApiResponse<List<LoginInfo.Platform>>>
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
index 343c0c8b..b67ef993 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MDtTu0zYCV===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDgzuDTD2K===.$param2".sha256()
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt
index ac56f53f..0987dcef 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt
@@ -10,7 +10,10 @@ data class ApiResponse<T> (
 
     val errors: List<Error>? = null,
 
-    val data: T? = null
+    val data: T? = null,
+
+    val update: Update? = null,
+    val registerAvailability: Map<String, RegisterAvailabilityStatus>? = null
 ) {
     data class Error (val code: String, val reason: String)
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt
new file mode 100644
index 00000000..82f2e050
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-2.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.szkolny.response
+
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.currentTimeUnix
+
+data class RegisterAvailabilityStatus(
+        val available: Boolean,
+        val name: String?,
+        val userMessage: Message?,
+        val nextCheckAt: Long = currentTimeUnix() + 7 * DAY,
+        val minVersionCode: Int = BuildConfig.VERSION_CODE
+) {
+    data class Message(
+            val title: String,
+            val contentShort: String,
+            val contentLong: String,
+            val icon: String?,
+            val image: String?,
+            val url: String?
+    )
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt
index a2028926..63a8ce9d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt
@@ -11,5 +11,6 @@ data class Update(
         val releaseNotes: String?,
         val releaseType: String,
         val isOnGooglePlay: Boolean,
-        val downloadUrl: String?
-)
\ No newline at end of file
+        val downloadUrl: String?,
+        val updateMandatory: Boolean
+)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt
index 333967b0..e6d7e40e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt
@@ -43,7 +43,7 @@ import pl.szczodrzynski.edziennik.data.db.migration.*
     LibrusLesson::class,
     TimetableManual::class,
     Metadata::class
-], version = 88)
+], version = 91)
 @TypeConverters(
         ConverterTime::class,
         ConverterDate::class,
@@ -173,7 +173,10 @@ abstract class AppDb : RoomDatabase() {
                 Migration85(),
                 Migration86(),
                 Migration87(),
-                Migration88()
+                Migration88(),
+                Migration89(),
+                Migration90(),
+                Migration91()
         ).allowMainThreadQueries().build()
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt
index 3225141e..6d1e799d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt
@@ -60,4 +60,10 @@ interface ProfileDao {
 
     @Query("UPDATE profiles SET empty = 0")
     fun setAllNotEmpty()
+
+    @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 1")
+    fun getArchivesOf(archiveId: Int): List<Profile>
+
+    @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 0 ORDER BY profileId DESC LIMIT 1")
+    fun getNotArchivedOf(archiveId: Int): Profile?
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt
index 9d13e883..0dcaa83e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt
@@ -93,6 +93,25 @@ open class Event(
     var attachmentIds: MutableList<Long>? = null
     var attachmentNames: MutableList<String>? = null
 
+    /**
+     * Add an attachment
+     * @param id attachment ID
+     * @param name file name incl. extension
+     * @return a Event to which the attachment has been added
+     */
+    fun addAttachment(id: Long, name: String): Event {
+        if (attachmentIds == null) attachmentIds = mutableListOf()
+        if (attachmentNames == null) attachmentNames = mutableListOf()
+        attachmentIds?.add(id)
+        attachmentNames?.add(name)
+        return this
+    }
+
+    fun clearAttachments() {
+        attachmentIds = null
+        attachmentNames = null
+    }
+
     @Ignore
     var showAsUnseen: Boolean? = null
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt
index 1ec410b5..192bd1f6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt
@@ -59,6 +59,7 @@ class LoginStore(
                 is Long -> putLoginData(key, o)
                 is Float -> putLoginData(key, o)
                 is Boolean -> putLoginData(key, o)
+                is Bundle -> putLoginData(key, o.toJsonObject())
             }
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
index 50ad82a7..9e52dc81 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
@@ -16,8 +16,7 @@ import androidx.room.Ignore
 import com.google.gson.JsonObject
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.utils.ProfileImageHolder
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
@@ -28,7 +27,7 @@ import pl.szczodrzynski.navlib.getDrawableFromRes
 @Entity(tableName = "profiles", primaryKeys = ["profileId"])
 open class Profile(
         @ColumnInfo(name = "profileId")
-        override val id: Int,
+        override var id: Int, /* needs to be var for ProfileArchiver */
         val loginStoreId: Int,
         val loginStoreType: Int,
 
@@ -64,6 +63,12 @@ open class Profile(
     var empty = true
     var archived = false
 
+    /**
+     * A unique ID matching [archived] profiles with current ones
+     * and vice-versa.
+     */
+    var archiveId: Int? = null
+
     var syncEnabled = true
     var enableSharedEvents = true
     var registration = REGISTRATION_UNSPECIFIED
@@ -85,6 +90,25 @@ open class Profile(
     @delegate:Ignore
     val currentSemester by lazy { dateToSemester(Date.getToday()) }
 
+    fun shouldArchive(): Boolean {
+        // vulcan hotfix
+        if (dateYearEnd.month > 6) {
+            dateYearEnd.month = 6
+            dateYearEnd.day = 30
+        }
+        // fix for when versions <4.3 synced 2020/2021 year dates to older profiles during 2020 Jun-Aug
+        if (dateSemester1Start.year > studentSchoolYearStart) {
+            val diff = dateSemester1Start.year - studentSchoolYearStart
+            dateSemester1Start.year -= diff
+            dateSemester2Start.year -= diff
+            dateYearEnd.year -= diff
+        }
+        return App.config.archiverEnabled
+                && Date.getToday() >= dateYearEnd
+                && Date.getToday().year > studentSchoolYearStart
+    }
+    fun isBeforeYear() = false && Date.getToday() < dateSemester1Start
+
     var disabledNotifications: List<Long>? = null
 
     var lastReceiversSync: Long = 0
@@ -105,15 +129,30 @@ open class Profile(
     val isParent
         get() = accountName != null
 
+    val registerName
+        get() = when (loginStoreType) {
+            LOGIN_TYPE_LIBRUS -> "librus"
+            LOGIN_TYPE_VULCAN -> "vulcan"
+            LOGIN_TYPE_IDZIENNIK -> "idziennik"
+            LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
+            LOGIN_TYPE_PODLASIE -> "podlasie"
+            LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
+            else -> null
+        }
+
     override fun getImageDrawable(context: Context): Drawable {
+        if (archived) {
+            return context.getDrawableFromRes(pl.szczodrzynski.edziennik.R.drawable.profile_archived).also {
+                it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER)
+            }
+        }
 
         if (!image.isNullOrEmpty()) {
             try {
-                if (image?.endsWith(".gif", true) == true) {
-                    return GifDrawable(image ?: "")
-                }
-                else {
-                    return RoundedBitmapDrawableFactory.create(context.resources, image ?: "")
+                return if (image?.endsWith(".gif", true) == true) {
+                    GifDrawable(image ?: "")
+                } else {
+                    RoundedBitmapDrawableFactory.create(context.resources, image ?: "")
                     //return Drawable.createFromPath(image ?: "") ?: throw Exception()
                 }
             }
@@ -125,9 +164,13 @@ open class Profile(
         return context.getDrawableFromRes(R.drawable.profile).also {
             it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER)
         }
-
     }
+
     override fun getImageHolder(context: Context): ImageHolder {
+        if (archived) {
+            return ImageHolder(pl.szczodrzynski.edziennik.R.drawable.profile_archived, colorFromName(name))
+        }
+
         return if (!image.isNullOrEmpty()) {
             try {
                 ProfileImageHolder(image ?: "")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt
index 27431a4f..c41b8a7a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt
@@ -11,6 +11,7 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.getNameInitials
 import pl.szczodrzynski.edziennik.join
 import java.util.*
 
@@ -180,6 +181,9 @@ open class Teacher {
     @delegate:Ignore
     val fullNameLastFirst by lazy { "$surname $name".fixName() }
 
+    @delegate:Ignore
+    val initialsLastFirst by lazy { fullNameLastFirst.getNameInitials() }
+
     val shortName: String
         get() = (if (name == null || name?.length == 0) "" else name!![0].toString()) + "." + surname
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt
new file mode 100644
index 00000000..ce665d1f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt
@@ -0,0 +1,10 @@
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration89 : Migration(88, 89) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE profiles ADD COLUMN archiveId INTEGER DEFAULT NULL;")
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt
new file mode 100644
index 00000000..7b500525
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-26.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration90 : Migration(89, 90) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // get all profiles using Vulcan/Hebe
+        database.execSQL("CREATE TABLE _90_ids (id INTEGER NOT NULL);")
+        database.execSQL("INSERT INTO _90_ids SELECT profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 4 AND loginStores.loginStoreMode != 0;")
+
+        // force full sync when updating from <4.6
+        database.execSQL("DELETE FROM endpointTimers WHERE profileId IN (SELECT id FROM _90_ids);")
+        database.execSQL("UPDATE profiles SET empty = 1 WHERE profileId IN (SELECT id FROM _90_ids);")
+        // remove messages and events to re-download attachments and remove older than current school year
+        database.execSQL("DELETE FROM messages WHERE profileId IN (SELECT id FROM _90_ids);")
+        database.execSQL("DELETE FROM events WHERE profileId IN (SELECT id FROM _90_ids) AND eventAddedManually = 0;")
+        // remove older data
+        database.execSQL("DELETE FROM notices WHERE profileId IN (SELECT id FROM _90_ids);")
+
+        // fix for v4.5 users who logged in using Vulcan/Web
+        database.execSQL("UPDATE loginStores SET loginStoreMode = 2 WHERE loginStoreType = 4 AND loginStoreMode = 1;")
+
+        database.execSQL("DROP TABLE _90_ids;")
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt
new file mode 100644
index 00000000..ffb8b093
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-26.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration91 : Migration(90, 91) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // get all profiles using Vulcan/Hebe
+        database.execSQL("CREATE TABLE _91_ids (id INTEGER NOT NULL);")
+        database.execSQL("INSERT INTO _91_ids SELECT profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 1;")
+
+        // force attendance sync - mobidziennik
+        // after enabling counting the e-attendance to statistics
+        database.execSQL("DELETE FROM endpointTimers WHERE profileId IN (SELECT id FROM _91_ids) AND endpointId = 2050;")
+        database.execSQL("UPDATE attendances SET attendanceIsCounted = 1 WHERE profileId IN (SELECT id FROM _91_ids);")
+        database.execSQL("UPDATE attendances SET attendanceBaseType = 2 WHERE profileId IN (SELECT id FROM _91_ids) AND attendanceTypeSymbol = ?;",
+            arrayOf("+ₑ"))
+
+        database.execSQL("DROP TABLE _91_ids;")
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt
index 2ebb8c66..1d563c34 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt
@@ -5,10 +5,13 @@
 package pl.szczodrzynski.edziennik.data.firebase
 
 import com.google.gson.JsonParser
+import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent
+import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.task.PostNotifications
 import pl.szczodrzynski.edziennik.data.db.entity.*
@@ -50,6 +53,16 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
                     val message = app.gson.fromJson(message.data.getString("message"), FeedbackMessage::class.java) ?: return@launch
                     feedbackMessage(message)
                 }
+                "registerAvailability" -> launch {
+                    val data = app.gson.fromJson<Map<String, RegisterAvailabilityStatus>>(
+                            message.data.getString("registerAvailability"),
+                            object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type
+                    ) ?: return@launch
+                    app.config.sync.registerAvailability = data
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(RegisterAvailabilityEvent(data))
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt
index b7d3af9e..06c2f171 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt
@@ -29,6 +29,7 @@ class SzkolnyVulcanFirebase(val app: App, val profiles: List<Profile>, val messa
         val data = message.data.getString("data")?.toJsonObject() ?: return@run
         val type = data.getString("table") ?: return@run
         val studentId = data.getInt("pupilid")
+        val loginId = data.getInt("loginid")
 
         /* pl.vulcan.uonetmobile.auxilary.enums.CDCPushEnum */
         val viewIdPair = when (type.toLowerCase(Locale.ROOT)) {
@@ -42,8 +43,9 @@ class SzkolnyVulcanFirebase(val app: App, val profiles: List<Profile>, val messa
         }
 
         val tasks = profiles.filter {
-            it.loginStoreType == LOGIN_TYPE_VULCAN &&
-                    it.getStudentData("studentId", 0) == studentId
+            it.loginStoreType == LOGIN_TYPE_VULCAN
+                    && (it.getStudentData("studentId", 0) == studentId
+                    || it.getStudentData("studentLoginId", 0) == loginId)
         }.map {
             EdziennikTask.syncProfile(it.id, listOf(viewIdPair))
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
index 377ab806..80e21e6b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
@@ -14,6 +14,7 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.work.*
 import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
@@ -76,7 +77,7 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
             try {
                 val update = overrideUpdate
                         ?: run {
-                            val updates = withContext(Dispatchers.Default) {
+                            withContext(Dispatchers.Default) {
                                 SzkolnyApi(app).runCatching({
                                     getUpdate("beta")
                                 }, {
@@ -84,15 +85,25 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
                                 })
                             } ?: return@run null
 
-                            if (updates.isEmpty()) {
+                            if (app.config.update == null
+                                    || app.config.update?.versionCode ?: BuildConfig.VERSION_CODE <= BuildConfig.VERSION_CODE) {
                                 app.config.update = null
                                 Toast.makeText(app, app.getString(R.string.notification_no_update), Toast.LENGTH_SHORT).show()
                                 return@run null
                             }
-                            updates[0]
+                            app.config.update
                         } ?: return
 
-                app.config.update = update
+                if (update.versionCode <= BuildConfig.VERSION_CODE) {
+                    app.config.update = null
+                    return
+                }
+
+                if (EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
+                    if (!update.updateMandatory) // mandatory updates are posted by the SzkolnyApi
+                        EventBus.getDefault().postSticky(update)
+                    return
+                }
 
                 val notificationIntent = Intent(app, UpdateDownloaderService::class.java)
                 val pendingIntent = PendingIntent.getService(app, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt
new file mode 100644
index 00000000..6ecd494f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs
+
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import coil.api.load
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
+import pl.szczodrzynski.edziennik.databinding.DialogRegisterUnavailableBinding
+import pl.szczodrzynski.edziennik.onClick
+import pl.szczodrzynski.edziennik.utils.Utils
+import kotlin.coroutines.CoroutineContext
+
+class RegisterUnavailableDialog(
+        val activity: AppCompatActivity,
+        val status: RegisterAvailabilityStatus,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "RegisterUnavailableDialog"
+    }
+
+    private lateinit var app: App
+    private lateinit var dialog: AlertDialog
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        if (status.available && status.minVersionCode <= BuildConfig.VERSION_CODE)
+            return@run
+        onShowListener?.invoke(TAG)
+        app = activity.applicationContext as App
+
+        if (!status.available && status.userMessage != null) {
+            val b = DialogRegisterUnavailableBinding.inflate(LayoutInflater.from(activity), null, false)
+            b.message = status.userMessage
+            if (status.userMessage.image != null)
+                b.image.load(status.userMessage.image)
+            if (status.userMessage.url != null) {
+                b.readMore.onClick {
+                    Utils.openUrl(activity, status.userMessage.url)
+                }
+            }
+            b.text.movementMethod = LinkMovementMethod.getInstance()
+            dialog = MaterialAlertDialogBuilder(activity)
+                    .setView(b.root)
+                    .setPositiveButton(R.string.close) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                    .setOnDismissListener {
+                        onDismissListener?.invoke(TAG)
+                    }
+                    .show()
+            return@run
+        }
+
+        val update = app.config.update
+        if (status.minVersionCode > BuildConfig.VERSION_CODE) {
+            if (update != null && update.versionCode >= status.minVersionCode) {
+                UpdateAvailableDialog(activity, update, true, onShowListener, onDismissListener)
+            }
+            else {
+                // this *should* never happen
+                dialog = MaterialAlertDialogBuilder(activity)
+                        .setTitle(R.string.update_available_title)
+                        .setMessage(R.string.update_available_fallback)
+                        .setPositiveButton(R.string.update_available_button) { dialog, _ ->
+                            Utils.openGooglePlay(activity)
+                            dialog.dismiss()
+                        }
+                        .setCancelable(false)
+                        .setOnDismissListener {
+                            onDismissListener?.invoke(TAG)
+                        }
+                        .show()
+            }
+            return@run
+        }
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt
index 27d11dad..cebc4e04 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt
@@ -17,7 +17,7 @@ import kotlin.coroutines.CoroutineContext
 class ServerMessageDialog(
         val activity: AppCompatActivity,
         val title: String,
-        val message: String,
+        val message: CharSequence,
         val onShowListener: ((tag: String) -> Unit)? = null,
         val onDismissListener: ((tag: String) -> Unit)? = null
 ) : CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt
new file mode 100644
index 00000000..6446170b
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs
+
+import android.text.Html
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
+import pl.szczodrzynski.edziennik.sync.UpdateDownloaderService
+import kotlin.coroutines.CoroutineContext
+
+class UpdateAvailableDialog(
+        val activity: AppCompatActivity,
+        val update: Update,
+        val mandatory: Boolean = update.updateMandatory,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "UpdateAvailableDialog"
+    }
+
+    private lateinit var app: App
+    private lateinit var dialog: AlertDialog
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        if (update.versionCode <= BuildConfig.VERSION_CODE)
+            return@run
+        onShowListener?.invoke(TAG)
+        app = activity.applicationContext as App
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.update_available_title)
+                .setMessage(
+                        R.string.update_available_format,
+                        BuildConfig.VERSION_NAME,
+                        update.versionName,
+                        update.releaseNotes?.let { Html.fromHtml(it) } ?: "---"
+                )
+                .setPositiveButton(R.string.update_available_button) { dialog, _ ->
+                    activity.startService(Intent(app, UpdateDownloaderService::class.java))
+                    dialog.dismiss()
+                }
+                .also {
+                    if (!mandatory)
+                        it.setNeutralButton(R.string.update_available_later, null)
+                }
+                .setCancelable(!mandatory)
+                .setOnDismissListener {
+                    onDismissListener?.invoke(TAG)
+                }
+                .show()
+    }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt
index b1683ac5..b41da04b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt
@@ -193,7 +193,7 @@ class EventDetailsDialog(
         b.goToTimetableButton.attachToastHint(R.string.hint_go_to_timetable)
 
         // RE-DOWNLOAD
-        b.downloadButton.isVisible = App.debugMode
+        b.downloadButton.isVisible = App.devMode
         b.downloadButton.onClick {
             EdziennikTask.eventGet(event.profileId, event).enqueue(activity)
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
index 20f3ad21..4877413f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
@@ -57,7 +57,7 @@ class GradeDetailsDialog(
         b.grade = grade
         b.weightText = manager.getWeightString(app, grade)
         b.commentVisible = false
-        b.devMode = App.debugMode
+        b.devMode = App.devMode
         b.gradeName.setTextColor(if (ColorUtils.calculateLuminance(gradeColor) > 0.3) 0xaa000000.toInt() else 0xccffffff.toInt())
         b.gradeName.background.setTintColor(gradeColor)
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt
index 14321317..1fa16230 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt
@@ -17,7 +17,8 @@ import kotlin.coroutines.CoroutineContext
 class ProfileRemoveDialog(
         val activity: MainActivity,
         val profileId: Int,
-        val profileName: String
+        val profileName: String,
+        val noProfileRemoval: Boolean = false
 ) : CoroutineScope {
     companion object {
         private const val TAG = "ProfileRemoveDialog"
@@ -52,7 +53,6 @@ class ProfileRemoveDialog(
             app.db.attendanceDao().clear(profileId)
             app.db.attendanceTypeDao().clear(profileId)
             app.db.classroomDao().clear(profileId)
-            app.db.configDao().clear(profileId)
             app.db.endpointTimerDao().clear(profileId)
             app.db.eventDao().clear(profileId)
             app.db.eventTypeDao().clear(profileId)
@@ -65,23 +65,27 @@ class ProfileRemoveDialog(
             app.db.messageRecipientDao().clear(profileId)
             app.db.noticeDao().clear(profileId)
             app.db.noticeTypeDao().clear(profileId)
-            app.db.noticeTypeDao().clear(profileId)
             app.db.notificationDao().clear(profileId)
             app.db.subjectDao().clear(profileId)
             app.db.teacherAbsenceDao().clear(profileId)
-            app.db.teacherAbsenceDao().clear(profileId)
             app.db.teacherAbsenceTypeDao().clear(profileId)
             app.db.teacherDao().clear(profileId)
             app.db.teamDao().clear(profileId)
             app.db.timetableDao().clear(profileId)
 
+            app.db.metadataDao().deleteAll(profileId)
+
+            if (noProfileRemoval)
+                return@async
+
+            app.db.configDao().clear(profileId)
+
             val loginStoreId = profileObject.loginStoreId
             val profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId)
             if (profilesUsingLoginStore.size == 1) {
                 app.db.loginStoreDao().remove(loginStoreId)
             }
             app.db.profileDao().remove(profileId)
-            app.db.metadataDao().deleteAll(profileId)
 
             if (App.profileId == profileId) {
                 app.profileLoadLast { }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
index 6dc6edb6..5896def0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
@@ -78,7 +78,7 @@ class LessonDetailsDialog(
             )
         }
 
-        if (App.debugMode)
+        if (App.devMode)
             b.lessonId.visibility = View.VISIBLE
 
         update()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt
index ce49efbd..9e6c14d6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt
@@ -55,7 +55,7 @@ class AttendanceDetailsDialog(
 
         val attendanceColor = manager.getAttendanceColor(attendance)
         b.attendance = attendance
-        b.devMode = App.debugMode
+        b.devMode = App.devMode
         b.attendanceName.setTextColor(if (ColorUtils.calculateLuminance(attendanceColor) > 0.3) 0xaa000000.toInt() else 0xccffffff.toInt())
         b.attendanceName.background.setTintColor(attendanceColor)
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt
index 3ae649f6..bf8eab06 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt
@@ -167,7 +167,7 @@ class CrashActivity : AppCompatActivity(), CoroutineScope {
         val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
         clipboard?.apply {
             val clip = ClipData.newPlainText(getString(R.string.customactivityoncrash_error_activity_error_details_clipboard_label), errorInformation)
-            primaryClip = clip
+            setPrimaryClip(clip)
             Toast.makeText(this@CrashActivity, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt
index d1543cfc..a4a332c5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt
@@ -26,6 +26,7 @@ import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
 import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonArrayViewHolder
 import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonElementViewHolder
 import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonObjectViewHolder
+import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonSubObjectViewHolder
 import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
 import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
 import kotlin.coroutines.CoroutineContext
@@ -35,14 +36,20 @@ class LabJsonAdapter(
         var onJsonElementClick: ((item: LabJsonElement) -> Unit)? = null
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), CoroutineScope {
     companion object {
-        private const val TAG = "AttendanceAdapter"
+        private const val TAG = "LabJsonAdapter"
         private const val ITEM_TYPE_OBJECT = 0
-        private const val ITEM_TYPE_ARRAY = 1
-        private const val ITEM_TYPE_ELEMENT = 2
+        private const val ITEM_TYPE_SUB_OBJECT = 1
+        private const val ITEM_TYPE_ARRAY = 2
+        private const val ITEM_TYPE_ELEMENT = 3
         const val STATE_CLOSED = 0
         const val STATE_OPENED = 1
 
         fun expand(item: Any, level: Int): MutableList<Any> {
+            val path = when (item) {
+                is LabJsonObject -> item.key + ":"
+                is LabJsonArray -> item.key + ":"
+                else -> ""
+            }
             val json = when (item) {
                 is LabJsonObject -> item.jsonObject
                 is LabJsonArray -> item.jsonArray
@@ -53,17 +60,16 @@ class LabJsonAdapter(
             }
 
             return when (json) {
-                is JsonObject -> json.entrySet().mapNotNull { wrap(it.key, it.value, level) }
-                is JsonArray -> json.mapIndexedNotNull { index, jsonElement -> wrap(index.toString(), jsonElement, level) }
-                else -> listOf(LabJsonElement("?", json, level))
+                is JsonObject -> json.entrySet().mapNotNull { wrap(path + it.key, it.value, level) }
+                is JsonArray -> json.mapIndexedNotNull { index, jsonElement -> wrap(path + index.toString(), jsonElement, level) }
+                else -> listOf(LabJsonElement("$path?", json, level))
             }.toMutableList()
         }
-        fun wrap(key: String, item: JsonElement, level: Int = 0): Any? {
+        fun wrap(key: String, item: JsonElement, level: Int = 0): Any {
             return when (item) {
                 is JsonObject -> LabJsonObject(key, item, level + 1)
                 is JsonArray -> LabJsonArray(key, item, level + 1)
-                is JsonElement -> LabJsonElement(key, item, level + 1)
-                else -> null
+                else -> LabJsonElement(key, item, level + 1)
             }
         }
     }
@@ -80,6 +86,7 @@ class LabJsonAdapter(
         val inflater = LayoutInflater.from(parent.context)
         return when (viewType) {
             ITEM_TYPE_OBJECT -> JsonObjectViewHolder(inflater, parent)
+            ITEM_TYPE_SUB_OBJECT -> JsonSubObjectViewHolder(inflater, parent)
             ITEM_TYPE_ARRAY -> JsonArrayViewHolder(inflater, parent)
             ITEM_TYPE_ELEMENT -> JsonElementViewHolder(inflater, parent)
             else -> throw IllegalArgumentException("Incorrect viewType")
@@ -87,8 +94,10 @@ class LabJsonAdapter(
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when (items[position]) {
-            is LabJsonObject -> ITEM_TYPE_OBJECT
+        return when (val item = items[position]) {
+            is LabJsonObject ->
+                if (item.level == 1) ITEM_TYPE_OBJECT
+                else ITEM_TYPE_SUB_OBJECT
             is LabJsonArray -> ITEM_TYPE_ARRAY
             is LabJsonElement -> ITEM_TYPE_ELEMENT
             else -> throw IllegalArgumentException("Incorrect viewType")
@@ -118,7 +127,7 @@ class LabJsonAdapter(
                     View.ROTATION,
                     if (model.state == STATE_CLOSED) 0f else 180f,
                     if (model.state == STATE_CLOSED) 180f else 0f
-            ).setDuration(200).start();
+            ).setDuration(200).start()
         }
 
         // hide the preview, show summary
@@ -143,7 +152,9 @@ class LabJsonAdapter(
             var end: Int = items.size
             for (i in start until items.size) {
                 val model1 = items[i]
-                val level = (model1 as? ExpandableItemModel<*>)?.level ?: 3
+                val level = (model1 as? ExpandableItemModel<*>)?.level
+                    ?: (model1 as? LabJsonElement)?.level
+                    ?: model.level
                 if (level <= model.level) {
                     end = i
                     break
@@ -170,6 +181,7 @@ class LabJsonAdapter(
 
         val viewType = when (holder) {
             is JsonObjectViewHolder -> ITEM_TYPE_OBJECT
+            is JsonSubObjectViewHolder -> ITEM_TYPE_SUB_OBJECT
             is JsonArrayViewHolder -> ITEM_TYPE_ARRAY
             is JsonElementViewHolder -> ITEM_TYPE_ELEMENT
             else -> throw IllegalArgumentException("Incorrect viewType")
@@ -180,6 +192,7 @@ class LabJsonAdapter(
 
         when {
             holder is JsonObjectViewHolder && item is LabJsonObject -> holder.onBind(activity, app, item, position, this)
+            holder is JsonSubObjectViewHolder && item is LabJsonObject -> holder.onBind(activity, app, item, position, this)
             holder is JsonArrayViewHolder && item is LabJsonArray -> holder.onBind(activity, app, item, position, this)
             holder is JsonElementViewHolder && item is LabJsonElement -> holder.onBind(activity, app, item, position, this)
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt
index bad9fd9f..29a0b2b3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt
@@ -16,7 +16,9 @@ import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
 import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 import pl.szczodrzynski.fslogin.decode
 import kotlin.coroutines.CoroutineContext
 
@@ -44,6 +46,8 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
     }
 
     override fun onPageCreated(): Boolean {
+        b.app = app
+
         b.last10unseen.onClick {
             launch(Dispatchers.Default) {
                 val events = app.db.eventDao().getAllNow(App.profileId)
@@ -57,11 +61,35 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
         b.rodo.onClick {
             app.db.teacherDao().query(SimpleSQLiteQuery("UPDATE teachers SET teacherSurname = \"\" WHERE profileId = ${App.profileId}"))
         }
+        
+        b.fullSync.onClick { 
+            app.db.query(SimpleSQLiteQuery("UPDATE profiles SET empty = 1 WHERE profileId = ${App.profileId}"))
+            app.db.query(SimpleSQLiteQuery("DELETE FROM endpointTimers WHERE profileId = ${App.profileId}"))
+        }
+
+        b.clearProfile.onClick {
+            ProfileRemoveDialog(activity, App.profileId, "FAKE", noProfileRemoval = true)
+        }
 
         b.removeHomework.onClick {
             app.db.eventDao().getRawNow("UPDATE events SET homeworkBody = NULL WHERE profileId = ${App.profileId}")
         }
 
+        b.unarchive.onClick {
+            app.profile.archived = false
+            app.profile.archiveId = null
+            app.profileSave()
+        }
+
+        val profiles = app.db.profileDao().allNow
+        b.profile.clear()
+        b.profile += profiles.map { TextInputDropDown.Item(it.id.toLong(), "${it.id} ${it.name} archived ${it.archived}", tag = it) }
+        b.profile.select(app.profileId.toLong())
+        b.profile.setOnChangeListener {
+            activity.loadProfile(it.id.toInt())
+            return@setOnChangeListener true
+        }
+
         val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
         startCoroutineTimer(500L, 300L) {
             val text = app.cookieJar.sessionCookies
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt
index cea59402..50c64762 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt
@@ -10,16 +10,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
+import com.afollestad.materialdialogs.MaterialDialog
+import com.google.gson.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.databinding.TemplateListPageFragmentBinding
-import pl.szczodrzynski.edziennik.startCoroutineTimer
 import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
@@ -38,6 +36,10 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
         get() = job + Dispatchers.Main
 
     // local/private variables go here
+    private lateinit var adapter: LabJsonAdapter
+    private val loginStore by lazy {
+        app.db.loginStoreDao().getByIdNow(app.profile.loginStoreId)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         activity = (getActivity() as MainActivity?) ?: return null
@@ -48,22 +50,96 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
     }
 
     override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
-        val adapter = LabJsonAdapter(activity)
-        val json = JsonObject().also { json ->
-            json.add("app.profile", app.profile.studentData)
-            json.add("app.config", JsonParser().parse(app.gson.toJson(app.config.values)))
-            EdziennikTask.profile?.let {
-                json.add("API.profile", it.studentData)
-            } ?: {
-                json.addProperty("API.profile", "null")
-            }()
-            EdziennikTask.loginStore?.let {
-                json.add("API.loginStore", it.data)
-            } ?: {
-                json.addProperty("API.loginStore", "null")
-            }()
-        }
-        adapter.items = LabJsonAdapter.expand(json, 0)
+        adapter = LabJsonAdapter(activity, onJsonElementClick = { item ->
+            try {
+                var parent: Any = Unit
+                var obj: Any = Unit
+                var objName: String = ""
+                item.key.split(":").forEach { el ->
+                    parent = obj
+                    obj = when (el) {
+                        "App.profile" -> app.profile
+                        "App.profile.studentData" -> app.profile.studentData
+                        "App.profile.loginStore" -> loginStore?.data ?: JsonObject()
+                        "App.config" -> app.config.values
+                        else -> when (obj) {
+                            is JsonObject -> (obj as JsonObject).get(el)
+                            is JsonArray -> (obj as JsonArray).get(el.toInt())
+                            is HashMap<*, *> -> (obj as HashMap<String, String?>)[el].toString()
+                            else -> {
+                                val field = obj::class.java.getDeclaredField(el)
+                                field.isAccessible = true
+                                field.get(obj) ?: return@forEach
+                            }
+                        }
+                    }
+                    objName = el
+                }
+
+                val objVal = obj
+                val value = when (objVal) {
+                    is JsonPrimitive -> when {
+                        objVal.isString -> objVal.asString
+                        objVal.isNumber -> objVal.asNumber.toString()
+                        objVal.isBoolean -> objVal.asBoolean.toString()
+                        else -> objVal.asString
+                    }
+                    else -> objVal.toString()
+                }
+
+                MaterialDialog.Builder(activity)
+                    .input("value", value, false) { _, input ->
+                        val input = input.toString()
+                        when (parent) {
+                            is JsonObject -> {
+                                val v = objVal as JsonPrimitive
+                                when {
+                                    v.isString -> (parent as JsonObject)[objName] = input
+                                    v.isNumber -> (parent as JsonObject)[objName] = input.toLong()
+                                    v.isBoolean -> (parent as JsonObject)[objName] = input.toBoolean()
+                                }
+                            }
+                            is JsonArray -> {
+
+                            }
+                            is HashMap<*, *> -> app.config.set(objName, input)
+                            else -> {
+                                val field = parent::class.java.getDeclaredField(objName)
+                                field.isAccessible = true
+                                val newVal = when (objVal) {
+                                    is Int -> input.toInt()
+                                    is Boolean -> input.toBoolean()
+                                    is Float -> input.toFloat()
+                                    is Char -> input.toCharArray()[0]
+                                    is String -> input
+                                    is Long -> input.toLong()
+                                    is Double -> input.toDouble()
+                                    else -> input
+                                }
+                                field.set(parent, newVal)
+                            }
+                        }
+
+                        when (item.key.substringBefore(":")) {
+                            "App.profile" -> app.profileSave()
+                            "App.profile.studentData" -> app.profileSave()
+                            "App.profile.loginStore" -> app.db.loginStoreDao().add(loginStore)
+                        }
+
+                        showJson()
+
+                    }
+                    .title(item.key)
+                    .positiveText(R.string.ok)
+                    .negativeText(R.string.cancel)
+                    .show()
+            }
+            catch (e: Exception) {
+                activity.error(ApiError.fromThrowable(TAG, e))
+            }
+        })
+
+        showJson()
 
         b.list.adapter = adapter
         b.list.apply {
@@ -79,4 +155,15 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
         b.noData.isVisible = false
 
     }; return true }
+
+    private fun showJson() {
+        val json = JsonObject().also { json ->
+            json.add("App.profile", app.gson.toJsonTree(app.profile))
+            json.add("App.profile.studentData", app.profile.studentData)
+            json.add("App.profile.loginStore", loginStore?.data ?: JsonObject())
+            json.add("App.config", JsonParser().parse(app.gson.toJson(app.config.values)))
+        }
+        adapter.items = LabJsonAdapter.expand(json, 0)
+        adapter.notifyDataSetChanged()
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt
index 08d4cd3c..56645c28 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt
@@ -13,6 +13,7 @@ import androidx.core.view.isInvisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabItemObjectBinding
+import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
 import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
 import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonArray
@@ -32,6 +33,10 @@ class JsonArrayViewHolder(
     override fun onBind(activity: AppCompatActivity, app: App, item: LabJsonArray, position: Int, adapter: LabJsonAdapter) {
         val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme)
 
+        b.root.setPadding(item.level * 8.dp + 8.dp, 8.dp, 8.dp, 8.dp)
+
+        b.type.text = "Array"
+
         b.dropdownIcon.rotation = when (item.state) {
             AttendanceAdapter.STATE_CLOSED -> 0f
             else -> 180f
@@ -39,7 +44,7 @@ class JsonArrayViewHolder(
         b.previewContainer.isInvisible = item.state != AttendanceAdapter.STATE_CLOSED
         b.summaryContainer.isInvisible = item.state == AttendanceAdapter.STATE_CLOSED
 
-        b.key.text = item.key
+        b.key.text = item.key.substringAfterLast(":")
         b.previewContainer.text = item.jsonArray.toString().take(200)
         b.summaryContainer.text = item.jsonArray.size().toString() + " elements"
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt
index 8ce6b461..20b1c2c8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt
@@ -32,6 +32,8 @@ class JsonElementViewHolder(
     override fun onBind(activity: AppCompatActivity, app: App, item: LabJsonElement, position: Int, adapter: LabJsonAdapter) {
         val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme)
 
+        b.root.setPadding(item.level * 8.dp + 8.dp, 8.dp, 8.dp, 8.dp)
+
         b.type.text = when (item.jsonElement) {
             is JsonPrimitive -> when {
                 item.jsonElement.isNumber -> "Number"
@@ -45,7 +47,9 @@ class JsonElementViewHolder(
 
         val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
         b.key.text = listOf(
-                item.key.asColoredSpannable(colorSecondary),
+                item.key
+                    .substringAfterLast(":")
+                    .asColoredSpannable(colorSecondary),
                 ": ",
                 item.jsonElement.toString().asItalicSpannable()
         ).concat("")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt
index 3131b0ea..b4de8efe 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt
@@ -13,6 +13,7 @@ import androidx.core.view.isInvisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabItemObjectBinding
+import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
 import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
 import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
@@ -32,6 +33,10 @@ class JsonObjectViewHolder(
     override fun onBind(activity: AppCompatActivity, app: App, item: LabJsonObject, position: Int, adapter: LabJsonAdapter) {
         val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme)
 
+        b.root.setPadding(item.level * 8.dp + 8.dp, 8.dp, 8.dp, 8.dp)
+
+        b.type.text = "Object"
+
         b.dropdownIcon.rotation = when (item.state) {
             AttendanceAdapter.STATE_CLOSED -> 0f
             else -> 180f
@@ -39,7 +44,7 @@ class JsonObjectViewHolder(
         b.previewContainer.isInvisible = item.state != AttendanceAdapter.STATE_CLOSED
         b.summaryContainer.isInvisible = item.state == AttendanceAdapter.STATE_CLOSED
 
-        b.key.text = item.key
+        b.key.text = item.key.substringAfterLast(":")
         b.previewContainer.text = item.jsonObject.toString().take(200)
         b.summaryContainer.text = item.jsonObject.size().toString() + " elements"
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt
new file mode 100644
index 00000000..dbc71ca2
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-26.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.debug.viewholder
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.recyclerview.widget.RecyclerView
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.databinding.LabItemSubObjectBinding
+import pl.szczodrzynski.edziennik.dp
+import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
+import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
+import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.utils.Themes
+
+class JsonSubObjectViewHolder(
+    inflater: LayoutInflater,
+    parent: ViewGroup,
+    val b: LabItemSubObjectBinding = LabItemSubObjectBinding.inflate(inflater, parent, false)
+) : RecyclerView.ViewHolder(b.root), BindableViewHolder<LabJsonObject, LabJsonAdapter> {
+    companion object {
+        private const val TAG = "JsonSubObjectViewHolder"
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBind(activity: AppCompatActivity, app: App, item: LabJsonObject, position: Int, adapter: LabJsonAdapter) {
+        val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme)
+
+        b.root.setPadding(item.level * 8.dp + 8.dp, 8.dp, 8.dp, 8.dp)
+
+        b.type.text = "Object"
+
+        b.dropdownIcon.rotation = when (item.state) {
+            AttendanceAdapter.STATE_CLOSED -> 0f
+            else -> 180f
+        }
+
+        b.key.text = item.key.substringAfterLast(":")
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt
index 36a64a3e..32ec46b9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt
@@ -45,7 +45,7 @@ class ErrorDetailsDialog(
                 listOf(
                         it.getStringReason(activity).asBoldSpannable().asColoredSpannable(R.attr.colorOnBackground.resolveAttr(activity)),
                         activity.getString(R.string.error_unknown_format, it.errorCode, it.tag),
-                        if (App.debugMode)
+                        if (App.devMode)
                             it.throwable?.stackTraceString ?: it.throwable?.localizedMessage
                         else
                             it.throwable?.localizedMessage
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
index 901ad0cf..33d69c60 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
@@ -71,9 +71,14 @@ class GradesListFragment : Fragment(), CoroutineScope {
         val adapter = GradesAdapter(activity)
         var firstRun = true
 
-        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { items -> this@GradesListFragment.launch {
+        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { grades -> this@GradesListFragment.launch {
             if (!isAdded) return@launch
 
+            val items = when {
+                app.config.forProfile().grades.hideSticksFromOld && App.devMode -> grades.filter { it.value != 1.0f }
+                else -> grades
+            }
+
             // load & configure the adapter
             adapter.items = withContext(Dispatchers.Default) { processGrades(items) }
             if (items.isNotNullNorEmpty() && b.list.adapter == null) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
index 66908998..7cfb3c2f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
@@ -33,9 +33,10 @@ class CardItemTouchHelperCallback(private val cardAdapter: HomeCardAdapter, priv
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        removeCard(viewHolder.adapterPosition)
-        cardAdapter.items.removeAt(viewHolder.adapterPosition)
-        cardAdapter.notifyItemRemoved(viewHolder.adapterPosition)
+        val position = viewHolder.adapterPosition
+        removeCard(position, cardAdapter)
+        cardAdapter.items.removeAt(position)
+        cardAdapter.notifyItemRemoved(position)
     }
 
     override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt
index 181dadc1..8afd7c04 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt
@@ -21,17 +21,11 @@ import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon
 import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import kotlinx.coroutines.*
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding
-import pl.szczodrzynski.edziennik.onClick
 import pl.szczodrzynski.edziennik.ui.dialogs.home.StudentNumberDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeEventsCard
-import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeGradesCard
-import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeLuckyNumberCard
-import pl.szczodrzynski.edziennik.ui.modules.home.cards.HomeTimetableCard
+import pl.szczodrzynski.edziennik.ui.modules.home.cards.*
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
@@ -44,8 +38,8 @@ class HomeFragment : Fragment(), CoroutineScope {
         fun swapCards(fromPosition: Int, toPosition: Int, cardAdapter: HomeCardAdapter): Boolean {
             val fromCard = cardAdapter.items[fromPosition]
             val toCard = cardAdapter.items[toPosition]
-            if (fromCard.id == 100 || toCard.id == 100) {
-                // debug card is not swappable
+            if (fromCard.id >= 100 || toCard.id >= 100) {
+                // debug & archive cards are not swappable
                 return false
             }
             cardAdapter.items[fromPosition] = cardAdapter.items[toPosition]
@@ -53,18 +47,26 @@ class HomeFragment : Fragment(), CoroutineScope {
             cardAdapter.notifyItemMoved(fromPosition, toPosition)
 
             val homeCards = App.config.forProfile().ui.homeCards.toMutableList()
-            val fromPair = homeCards[fromPosition]
-            homeCards[fromPosition] = homeCards[toPosition]
-            homeCards[toPosition] = fromPair
+            val fromIndex = homeCards.indexOfFirst { it.cardId == fromCard.id }
+            val toIndex = homeCards.indexOfFirst { it.cardId == toCard.id }
+            val fromPair = homeCards[fromIndex]
+            homeCards[fromIndex] = homeCards[toIndex]
+            homeCards[toIndex] = fromPair
             App.config.forProfile().ui.homeCards = homeCards
             return true
         }
 
-        fun removeCard(position: Int) {
+        fun removeCard(position: Int, cardAdapter: HomeCardAdapter) {
             val homeCards = App.config.forProfile().ui.homeCards.toMutableList()
             if (position >= homeCards.size)
                 return
-            homeCards.removeAt(position)
+            val card = cardAdapter.items[position]
+            if (card.id >= 100) {
+                // debug & archive cards are not removable
+                //cardAdapter.notifyDataSetChanged()
+                return
+            }
+            homeCards.removeAll { it.cardId == card.id }
             App.config.forProfile().ui.homeCards = homeCards
         }
     }
@@ -150,16 +152,26 @@ class HomeFragment : Fragment(), CoroutineScope {
 
         val items = mutableListOf<HomeCard>()
         cards.mapNotNullTo(items) {
+            @Suppress("USELESS_CAST")
             when (it.cardId) {
                 HomeCard.CARD_LUCKY_NUMBER -> HomeLuckyNumberCard(it.cardId, app, activity, this, app.profile)
                 HomeCard.CARD_TIMETABLE -> HomeTimetableCard(it.cardId, app, activity, this, app.profile)
                 HomeCard.CARD_GRADES -> HomeGradesCard(it.cardId, app, activity, this, app.profile)
                 HomeCard.CARD_EVENTS -> HomeEventsCard(it.cardId, app, activity, this, app.profile)
                 else -> null
-            }
+            } as HomeCard?
         }
         //if (App.devMode)
         //    items += HomeDebugCard(100, app, activity, this, app.profile)
+        if (app.profile.archived)
+            items.add(0, HomeArchiveCard(101, app, activity, this, app.profile))
+
+        val status = app.config.sync.registerAvailability[app.profile.registerName]
+        val update = app.config.update
+        if (update != null && update.versionCode > BuildConfig.VERSION_CODE
+                || status != null && (!status.available || status.minVersionCode > BuildConfig.VERSION_CODE)) {
+            items.add(0, HomeAvailabilityCard(102, app, activity, this, app.profile))
+        }
 
         val adapter = HomeCardAdapter(items)
         val itemTouchHelper = ItemTouchHelper(CardItemTouchHelperCallback(adapter, b.refreshLayout))
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt
new file mode 100644
index 00000000..17fc89e4
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-8-25.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home.cards
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.plusAssign
+import androidx.core.view.setMargins
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.databinding.CardHomeArchiveBinding
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import kotlin.coroutines.CoroutineContext
+
+class HomeArchiveCard(
+        override val id: Int,
+        val app: App,
+        val activity: MainActivity,
+        val fragment: HomeFragment,
+        val profile: Profile
+) : HomeCard, CoroutineScope {
+    companion object {
+        private const val TAG = "HomeArchiveCard"
+    }
+
+    private var job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) {
+        holder.root.removeAllViews()
+        val b = CardHomeArchiveBinding.inflate(LayoutInflater.from(holder.root.context))
+        b.root.layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+            setMargins(8.dp)
+        }
+        holder.root += b.root
+
+        b.homeArchiveText.setText(
+                R.string.home_archive_text,
+                profile.studentSchoolYearStart,
+                profile.studentSchoolYearStart + 1
+        )
+
+        b.homeArchiveClose.onClick {
+            launch {
+                val profile = profile.archiveId?.let {
+                    withContext(Dispatchers.IO) {
+                        app.db.profileDao().getNotArchivedOf(it)
+                    }
+                }
+                if (profile == null) {
+                    MaterialAlertDialogBuilder(activity)
+                            .setTitle(R.string.home_archive_close_no_target_title)
+                            .setMessage(R.string.home_archive_close_no_target_text, this@HomeArchiveCard.profile.name)
+                            .setPositiveButton(R.string.ok) { _, _ ->
+                                activity.drawer.profileSelectionOpen()
+                                activity.drawer.open()
+                            }
+                            .show()
+                    return@launch
+                }
+                activity.loadProfile(profile)
+            }
+        }
+
+        holder.root.onClick {
+            activity.loadTarget(MainActivity.DRAWER_ITEM_AGENDA)
+        }
+    }
+
+    override fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder) = Unit
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt
new file mode 100644
index 00000000..957dff0c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-9-3.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.home.cards
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.text.HtmlCompat
+import androidx.core.view.isVisible
+import androidx.core.view.plusAssign
+import androidx.core.view.setMargins
+import coil.api.load
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.databinding.CardHomeAvailabilityBinding
+import pl.szczodrzynski.edziennik.sync.UpdateDownloaderService
+import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import kotlin.coroutines.CoroutineContext
+
+class HomeAvailabilityCard(
+        override val id: Int,
+        val app: App,
+        val activity: MainActivity,
+        val fragment: HomeFragment,
+        val profile: Profile
+) : HomeCard, CoroutineScope {
+    companion object {
+        private const val TAG = "HomeAvailabilityCard"
+    }
+
+    private var job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) {
+        holder.root.removeAllViews()
+        val b = CardHomeAvailabilityBinding.inflate(LayoutInflater.from(holder.root.context))
+        b.root.layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+            setMargins(8.dp)
+        }
+        holder.root += b.root
+
+        val status = app.config.sync.registerAvailability[profile.registerName]
+        val update = app.config.update
+
+        if (update == null && status == null)
+            return
+
+        var onInfoClick = { _: View -> }
+
+        if (status != null && !status.available && status.userMessage != null) {
+            b.homeAvailabilityTitle.text = HtmlCompat.fromHtml(status.userMessage.title, HtmlCompat.FROM_HTML_MODE_LEGACY)
+            b.homeAvailabilityText.text = HtmlCompat.fromHtml(status.userMessage.contentShort, HtmlCompat.FROM_HTML_MODE_LEGACY)
+            b.homeAvailabilityUpdate.isVisible = false
+            b.homeAvailabilityIcon.setImageResource(R.drawable.ic_sync)
+            if (status.userMessage.icon != null)
+                b.homeAvailabilityIcon.load(status.userMessage.icon)
+            onInfoClick = {
+                RegisterUnavailableDialog(activity, status)
+            }
+        }
+        else if (update != null && update.versionCode > BuildConfig.VERSION_CODE) {
+            b.homeAvailabilityTitle.setText(R.string.home_availability_title)
+            b.homeAvailabilityText.setText(R.string.home_availability_text, update.versionName)
+            b.homeAvailabilityUpdate.isVisible = true
+            b.homeAvailabilityIcon.setImageResource(R.drawable.ic_update)
+            onInfoClick = {
+                UpdateAvailableDialog(activity, update)
+            }
+        }
+
+        b.homeAvailabilityUpdate.onClick {
+            if (update == null)
+                return@onClick
+            activity.startService(Intent(app, UpdateDownloaderService::class.java))
+        }
+
+        b.homeAvailabilityInfo.onClick(onInfoClick)
+        holder.root.onClick(onInfoClick)
+    }
+
+    override fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder) = Unit
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt
index c686b857..925b2a98 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt
@@ -25,7 +25,6 @@ import kotlin.coroutines.CoroutineContext
 class LoginActivity : AppCompatActivity(), CoroutineScope {
     companion object {
         private const val TAG = "LoginActivity"
-        var thisOneIsTricky = 0
     }
 
     private val app: App by lazy { applicationContext as App }
@@ -42,6 +41,8 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
     val profiles = mutableListOf<LoginSummaryAdapter.Item>()
     val loginStores = mutableListOf<LoginStore>()
 
+    fun getRootView() = b.root
+
     override fun onBackPressed() {
         val destination = nav.currentDestination ?: run {
             nav.navigateUp()
@@ -55,6 +56,11 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
             return
         if (destination.id == R.id.loginFinishFragment)
             return
+        // eggs
+        if (destination.id == R.id.loginPrizeFragment) {
+            finish()
+            return
+        }
         if (destination.id == R.id.loginChooserFragment && loginStores.isEmpty()) {
             setResult(Activity.RESULT_CANCELED)
             finish()
@@ -79,8 +85,6 @@ class LoginActivity : AppCompatActivity(), CoroutineScope {
         super.onCreate(savedInstanceState)
         setTheme(R.style.AppTheme_Light)
 
-        thisOneIsTricky = -1
-
         navOptions = NavOptions.Builder()
                 .setEnterAnim(R.anim.slide_in_right)
                 .setExitAnim(R.anim.slide_out_left)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt
index c9ed2d6e..704e660a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt
@@ -60,7 +60,8 @@ class LoginChooserAdapter(
 
     private val onClickListener = View.OnClickListener { view ->
         val model = view.getTag(R.string.tag_key_model)
-        if (model is LoginInfo.Register && model.loginModes.size == 1) {
+        if (model is LoginInfo.Register
+                && model.loginModes.count { App.devMode || !it.isDevOnly } == 1) {
             onModeClick?.invoke(model, model.loginModes.first())
             return@OnClickListener
         }
@@ -85,7 +86,9 @@ class LoginChooserAdapter(
 
         if (model.state == STATE_CLOSED) {
 
-            val subItems = model.items
+            val subItems = model.items.filter {
+                App.devMode || !it.isDevOnly
+            }
 
             model.state = STATE_OPENED
             items.addAll(position + 1, subItems)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt
index c25b07d1..ac1bdd3b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt
@@ -4,23 +4,28 @@
 
 package pl.szczodrzynski.edziennik.ui.modules.login
 
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.Animation
+import android.view.animation.RotateAnimation
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.Bundle
-import pl.szczodrzynski.edziennik.R
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.*
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.databinding.LoginChooserFragmentBinding
-import pl.szczodrzynski.edziennik.onClick
+import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
@@ -28,6 +33,8 @@ import kotlin.coroutines.CoroutineContext
 class LoginChooserFragment : Fragment(), CoroutineScope {
     companion object {
         private const val TAG = "LoginChooserFragment"
+        // eggs
+        var isRotated = false
     }
 
     private lateinit var app: App
@@ -49,26 +56,33 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
         return b.root
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         if (!isAdded) return
 
-        val adapter = LoginChooserAdapter(activity) { loginType, loginMode ->
-            if (loginMode.isPlatformSelection) {
-                nav.navigate(R.id.loginPlatformListFragment, Bundle(
-                        "loginType" to loginType.loginType,
-                        "loginMode" to loginMode.loginMode
-                ), activity.navOptions)
-                return@LoginChooserAdapter
-            }
-
-            nav.navigate(R.id.loginFormFragment, Bundle(
-                    "loginType" to loginType.loginType,
-                    "loginMode" to loginMode.loginMode
-            ), activity.navOptions)
-        }
+        val adapter = LoginChooserAdapter(activity, this::onLoginModeClicked)
 
         LoginInfo.chooserList = LoginInfo.chooserList
-                ?: LoginInfo.list.toMutableList<Any>()
+                ?: LoginInfo.list.toMutableList()
+
+        // eggs
+        if (isRotated) {
+            isRotated = false
+            LoginFormFragment.wantEggs = false
+            LoginInfo.chooserList = LoginInfo.list.toMutableList()
+            val anim = RotateAnimation(
+                    180f,
+                    0f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f
+            )
+            anim.interpolator = AccelerateDecelerateInterpolator()
+            anim.duration = 500
+            anim.fillAfter = true
+            activity.getRootView().startAnimation(anim)
+        }
 
         adapter.items = LoginInfo.chooserList!!
         b.list.adapter = adapter
@@ -82,6 +96,81 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
             startActivity(Intent(activity, FeedbackActivity::class.java))
         }
 
+        // eggs
+        b.footnoteText.onClick {
+            if (!LoginFormFragment.wantEggs || isRotated)
+                return@onClick
+
+            val text = b.subtitleText.text.toString()
+            if (text.endsWith(".."))
+                b.subtitleText.text = text.substring(0, text.length - 2)
+            else
+                b.subtitleText.text = "$text..."
+        }
+        var clickCount = 0
+        val color = R.color.md_blue_500.resolveColor(app)
+        val hsv = FloatArray(3)
+        Color.colorToHSV(color, hsv)
+        val hueOriginal = hsv[0]
+        b.subtitleText.onClick {
+            if (isRotated)
+                return@onClick
+            val text = b.subtitleText.text.toString()
+            if (text.endsWith("..") && !text.endsWith("...")) {
+                clickCount++
+            }
+            if (clickCount == 5) {
+                val anim = ValueAnimator.ofFloat(0f, 1f)
+                anim.duration = 5000
+                anim.addUpdateListener {
+                    hsv[0] = hueOriginal + it.animatedFraction * 3f * 360f
+                    hsv[0] = hsv[0] % 360f
+                    b.topLogo.drawable.setTintColor(Color.HSVToColor(Color.alpha(color), hsv))
+                }
+                anim.start()
+            }
+        }
+        b.topLogo.onClick {
+            if (clickCount != 5 || isRotated) {
+                clickCount = 0
+                return@onClick
+            }
+            isRotated = true
+            val anim = RotateAnimation(
+                    0f,
+                    180f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f
+            )
+            anim.interpolator = AccelerateDecelerateInterpolator()
+            anim.duration = 2000
+            anim.fillAfter = true
+            activity.getRootView().startAnimation(anim)
+
+            b.list.smoothScrollToPosition(0)
+            adapter.items.add(
+                    LoginInfo.Register(
+                            loginType = 74,
+                            internalName = "eggs",
+                            registerName = R.string.eggs,
+                            registerLogo = R.drawable.face_1,
+                            loginModes = listOf(
+                                    LoginInfo.Mode(
+                                            loginMode = 0,
+                                            name = 0,
+                                            icon = 0,
+                                            guideText = 0,
+                                            credentials = listOf(),
+                                            errorCodes = mapOf()
+                                    )
+                            )
+                    )
+            )
+            adapter.notifyItemInserted(adapter.items.size - 1)
+        }
+
         when {
             activity.loginStores.isNotEmpty() -> {
                 // we are navigated here from LoginSummary
@@ -102,4 +191,79 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
             }
         }
     }
+
+    private fun onLoginModeClicked(
+            loginType: LoginInfo.Register,
+            loginMode: LoginInfo.Mode
+    ) {
+        if (loginType.internalName == "eggs") {
+            nav.navigate(R.id.loginEggsFragment, null, activity.navOptions)
+            return
+        }
+
+        launch {
+            if (!checkAvailability(loginType.loginType))
+                return@launch
+
+            if (loginMode.isTesting || loginMode.isDevOnly) {
+                MaterialAlertDialogBuilder(activity)
+                        .setTitle(R.string.login_chooser_testing_title)
+                        .setMessage(R.string.login_chooser_testing_text)
+                        .setPositiveButton(R.string.ok) { _, _ ->
+                            navigateToLoginMode(loginType, loginMode)
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+                return@launch
+            }
+
+            navigateToLoginMode(loginType, loginMode)
+        }
+    }
+
+    private fun navigateToLoginMode(loginType: LoginInfo.Register, loginMode: LoginInfo.Mode) {
+        if (loginMode.isPlatformSelection) {
+            nav.navigate(R.id.loginPlatformListFragment, Bundle(
+                    "loginType" to loginType.loginType,
+                    "loginMode" to loginMode.loginMode
+            ), activity.navOptions)
+            return
+        }
+
+        nav.navigate(R.id.loginFormFragment, Bundle(
+                "loginType" to loginType.loginType,
+                "loginMode" to loginMode.loginMode
+        ), activity.navOptions)
+    }
+
+    private suspend fun checkAvailability(loginType: Int): Boolean {
+        when (loginType) {
+            LOGIN_TYPE_LIBRUS -> "librus"
+            LOGIN_TYPE_VULCAN -> "vulcan"
+            LOGIN_TYPE_IDZIENNIK -> "idziennik"
+            LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
+            LOGIN_TYPE_PODLASIE -> "podlasie"
+            LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
+            else -> null
+        }?.let { registerName ->
+            var status = app.config.sync.registerAvailability[registerName]
+            if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                withContext(Dispatchers.IO) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching(activity) {
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }
+                }
+            }
+
+            if (status?.available != true) {
+                if (status != null)
+                    RegisterUnavailableDialog(activity, status!!)
+                return false
+            }
+        }
+        return true
+    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt
new file mode 100644
index 00000000..0c11bb5a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-10-18.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.login
+
+import android.annotation.SuppressLint
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.Animation
+import android.view.animation.RotateAnimation
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.FrameLayout
+import androidx.fragment.app.Fragment
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.md5
+import kotlin.coroutines.CoroutineContext
+
+class LoginEggsFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "LoginEggsFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: LoginActivity
+    private lateinit var view: ViewGroup
+    private lateinit var webView: WebView
+    private val nav by lazy { activity.nav }
+
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    // local/private variables go here
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as LoginActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        webView = WebView(activity)
+        view = FrameLayout(activity)
+        view.addView(webView)
+        return view
+    }
+
+    @SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (!isAdded) return
+
+        if (!LoginChooserFragment.isRotated) {
+            nav.navigateUp()
+            return
+        }
+
+        val anim = RotateAnimation(
+                180f,
+                0f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f
+        )
+        anim.interpolator = AccelerateDecelerateInterpolator()
+        anim.duration = 10
+        anim.fillAfter = true
+        activity.getRootView().startAnimation(anim)
+
+        webView.apply {
+            settings.apply {
+                javaScriptEnabled = true
+            }
+            addJavascriptInterface(object : Any() {
+                @Suppress("NAME_SHADOWING")
+                @JavascriptInterface
+                fun getPrize() {
+                    val anim = RotateAnimation(
+                            0f,
+                            180f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f
+                    )
+                    anim.interpolator = AccelerateDecelerateInterpolator()
+                    anim.duration = 10
+                    anim.fillAfter = true
+                    activity.getRootView().startAnimation(anim)
+                    nav.navigate(R.id.loginPrizeFragment, null, activity.navOptions)
+                }
+            }, "EggInterface")
+            loadUrl("https://szkolny.eu/game/runner.html")
+            webViewClient = object : WebViewClient() {
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    super.onPageFinished(view, url)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                        val deviceId = app.deviceId.md5()
+                        val version = BuildConfig.VERSION_NAME
+                        val js = """initPage("$deviceId", true, "$version");"""
+                        webView.evaluateJavascript(js) {}
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt
index d0676105..8776f355 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt
@@ -14,7 +14,6 @@ import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
 import com.google.android.material.textfield.TextInputLayout
-import com.google.gson.JsonParser
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.utils.paddingDp
 import com.mikepenz.iconics.utils.sizeDp
@@ -22,8 +21,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.databinding.LoginFormCheckboxItemBinding
+import pl.szczodrzynski.edziennik.databinding.LoginFormFieldItemBinding
 import pl.szczodrzynski.edziennik.databinding.LoginFormFragmentBinding
-import pl.szczodrzynski.edziennik.databinding.LoginFormItemBinding
 import pl.szczodrzynski.navlib.colorAttr
 import java.util.*
 import kotlin.coroutines.CoroutineContext
@@ -31,6 +31,8 @@ import kotlin.coroutines.CoroutineContext
 class LoginFormFragment : Fragment(), CoroutineScope {
     companion object {
         private const val TAG = "LoginFormFragment"
+        // eggs
+        var wantEggs = false
     }
 
     private lateinit var app: App
@@ -69,39 +71,59 @@ class LoginFormFragment : Fragment(), CoroutineScope {
         val platformGuideText = arguments?.getString("platformGuideText")
         val platformDescription = arguments?.getString("platformDescription")
         val platformFormFields = arguments?.getString("platformFormFields")?.split(";")
-        val platformApiData = arguments?.getString("platformApiData")?.let { JsonParser().parse(it)?.asJsonObject }
+        val platformRealmData = arguments?.getString("platformRealmData")?.toJsonObject()
 
         b.title.setText(R.string.login_form_title_format, app.getString(register.registerName))
         b.subTitle.text = platformName ?: app.getString(mode.name)
         b.text.text = platformGuideText ?: app.getString(mode.guideText)
 
-        val credentials = mutableMapOf<LoginInfo.Credential, LoginFormItemBinding>()
+        val credentials = mutableMapOf<LoginInfo.BaseCredential, Any>()
 
         for (credential in mode.credentials) {
             if (platformFormFields?.contains(credential.keyName) == false)
                 continue
 
-            val b = LoginFormItemBinding.inflate(layoutInflater)
-            b.textLayout.hint = app.getString(credential.name)
-            if (credential.hideText) {
-                b.textEdit.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD
-                b.textLayout.endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
+            if (credential is LoginInfo.FormField) {
+                val b = LoginFormFieldItemBinding.inflate(layoutInflater)
+                b.textLayout.hint = app.getString(credential.name)
+                if (credential.hideText) {
+                    b.textEdit.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD
+                    b.textLayout.endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
+                }
+                b.textEdit.addTextChangedListener {
+                    b.textLayout.error = null
+                }
+
+                b.textEdit.id = credential.name
+
+                b.textEdit.setText(arguments?.getString(credential.keyName) ?: "")
+                b.textLayout.startIconDrawable = IconicsDrawable(activity)
+                        .icon(credential.icon)
+                        .sizeDp(24)
+                        .paddingDp(2)
+                        .colorAttr(activity, R.attr.colorOnBackground)
+
+                this.b.formContainer.addView(b.root)
+                credentials[credential] = b
             }
-            b.textEdit.addTextChangedListener {
-                b.textLayout.error = null
+            if (credential is LoginInfo.FormCheckbox) {
+                val b = LoginFormCheckboxItemBinding.inflate(layoutInflater)
+                b.checkbox.text = app.getString(credential.name)
+                b.checkbox.onChange { _, isChecked ->
+                    b.errorText.text = null
+
+                    // eggs
+                    if (register.internalName == "podlasie") {
+                        wantEggs = !isChecked
+                    }
+                }
+                if (arguments?.containsKey(credential.keyName) == true) {
+                    b.checkbox.isChecked = arguments?.getBoolean(credential.keyName) == true
+                }
+
+                this.b.formContainer.addView(b.root)
+                credentials[credential] = b
             }
-
-            b.textEdit.id = credential.name
-
-            b.textEdit.setText(arguments?.getString(credential.keyName) ?: "")
-            b.textLayout.startIconDrawable = IconicsDrawable(activity)
-                    .icon(credential.icon)
-                    .sizeDp(24)
-                    .paddingDp(2)
-                    .colorAttr(activity, R.attr.colorOnBackground)
-
-            this.b.formContainer.addView(b.root)
-            credentials[credential] = b
         }
 
         activity.lastError?.let { error ->
@@ -109,7 +131,12 @@ class LoginFormFragment : Fragment(), CoroutineScope {
             startCoroutineTimer(delayMillis = 200L) {
                 for (credential in credentials) {
                     credential.key.errorCodes[error.errorCode]?.let {
-                        credential.value.textLayout.error = app.getString(it)
+                        (credential.value as? LoginFormFieldItemBinding)?.let { b ->
+                            b.textLayout.error = app.getString(it)
+                        }
+                        (credential.value as? LoginFormCheckboxItemBinding)?.let { b ->
+                            b.errorText.text = app.getString(it)
+                        }
                         return@startCoroutineTimer
                     }
                 }
@@ -127,45 +154,50 @@ class LoginFormFragment : Fragment(), CoroutineScope {
                     "loginMode" to loginMode
             )
 
-            if (App.devMode && b.fakeLogin.isChecked) {
+            if (App.debugMode && b.fakeLogin.isChecked) {
                 payload.putBoolean("fakeLogin", true)
             }
 
-            platformApiData?.entrySet()?.forEach {
-                payload.putString(it.key, it.value.asString)
-            }
+            payload.putBundle("webRealmData", platformRealmData?.toBundle())
 
             var hasErrors = false
             credentials.forEach { (credential, b) ->
-                var text = b.textEdit.text?.toString() ?: return@forEach
-                if (!credential.hideText)
-                    text = text.trim()
+                if (credential is LoginInfo.FormField && b is LoginFormFieldItemBinding) {
+                    var text = b.textEdit.text?.toString() ?: return@forEach
+                    if (!credential.hideText)
+                        text = text.trim()
 
-                if (credential.caseMode == LoginInfo.Credential.CaseMode.UPPER_CASE)
-                    text = text.toUpperCase(Locale.getDefault())
-                if (credential.caseMode == LoginInfo.Credential.CaseMode.LOWER_CASE)
-                    text = text.toLowerCase(Locale.getDefault())
+                    if (credential.caseMode == LoginInfo.FormField.CaseMode.UPPER_CASE)
+                        text = text.toUpperCase(Locale.getDefault())
+                    if (credential.caseMode == LoginInfo.FormField.CaseMode.LOWER_CASE)
+                        text = text.toLowerCase(Locale.getDefault())
 
-                credential.stripTextRegex?.let {
-                    text = text.replace(it.toRegex(), "")
+                    credential.stripTextRegex?.let {
+                        text = text.replace(it.toRegex(), "")
+                    }
+
+                    b.textEdit.setText(text)
+
+                    if (credential.isRequired && text.isBlank()) {
+                        b.textLayout.error = app.getString(credential.emptyText)
+                        hasErrors = true
+                        return@forEach
+                    }
+
+                    if (!text.matches(credential.validationRegex.toRegex())) {
+                        b.textLayout.error = app.getString(credential.invalidText)
+                        hasErrors = true
+                        return@forEach
+                    }
+
+                    payload.putString(credential.keyName, text)
+                    arguments?.putString(credential.keyName, text)
                 }
-
-                b.textEdit.setText(text)
-
-                if (credential.isRequired && text.isBlank()) {
-                    b.textLayout.error = app.getString(credential.emptyText)
-                    hasErrors = true
-                    return@forEach
+                if (credential is LoginInfo.FormCheckbox && b is LoginFormCheckboxItemBinding) {
+                    val checked = b.checkbox.isChecked
+                    payload.putBoolean(credential.keyName, checked)
+                    arguments?.putBoolean(credential.keyName, checked)
                 }
-
-                if (!text.matches(credential.validationRegex.toRegex())) {
-                    b.textLayout.error = app.getString(credential.invalidText)
-                    hasErrors = true
-                    return@forEach
-                }
-
-                payload.putString(credential.keyName, text)
-                arguments?.putString(credential.keyName, text)
             }
 
             if (hasErrors)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
index 146fd05b..949848a5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
@@ -6,434 +6,414 @@ package pl.szczodrzynski.edziennik.ui.modules.login
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import com.google.gson.JsonObject
 import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.fslogin.realm.RealmData
 
 object LoginInfo {
 
-    private fun getEmailCredential(keyName: String) = Credential(
-            keyName = keyName,
-            name = R.string.login_hint_email,
-            icon = CommunityMaterial.Icon.cmd_at,
-            emptyText = R.string.login_error_no_email,
-            invalidText = R.string.login_error_incorrect_email,
-            errorCodes = mapOf(),
-            isRequired = true,
-            validationRegex = "([\\w.\\-_+]+)?\\w+@[\\w-_]+(\\.\\w+)+",
-            caseMode = Credential.CaseMode.LOWER_CASE
-    )
-    private fun getPasswordCredential(keyName: String) = Credential(
-            keyName = keyName,
-            name = R.string.login_hint_password,
-            icon = CommunityMaterial.Icon2.cmd_lock_outline,
-            emptyText = R.string.login_error_no_password,
-            invalidText = R.string.login_error_incorrect_login_or_password,
-            errorCodes = mapOf(),
-            isRequired = true,
-            validationRegex = ".*",
-            hideText = true
+    private fun getEmailCredential(keyName: String) = FormField(
+        keyName = keyName,
+        name = R.string.login_hint_email,
+        icon = CommunityMaterial.Icon.cmd_at,
+        emptyText = R.string.login_error_no_email,
+        invalidText = R.string.login_error_incorrect_email,
+        errorCodes = mapOf(),
+        isRequired = true,
+        validationRegex = "([\\w.\\-_+]+)?\\w+@[\\w-_]+(\\.\\w+)+",
+        caseMode = FormField.CaseMode.LOWER_CASE
     )
 
-    val list by lazy { listOf(
+    private fun getPasswordCredential(keyName: String) = FormField(
+        keyName = keyName,
+        name = R.string.login_hint_password,
+        icon = CommunityMaterial.Icon2.cmd_lock_outline,
+        emptyText = R.string.login_error_no_password,
+        invalidText = R.string.login_error_incorrect_login_or_password,
+        errorCodes = mapOf(),
+        isRequired = true,
+        validationRegex = ".*",
+        hideText = true
+    )
+
+    val list by lazy {
+        listOf(
             Register(
-                    loginType = LOGIN_TYPE_LIBRUS,
-                    internalName = "librus",
-                    registerName = R.string.login_register_librus,
-                    registerLogo = R.drawable.login_logo_librus,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_LIBRUS_EMAIL,
-                                    name = R.string.login_mode_librus_email,
-                                    icon = R.drawable.login_mode_librus_email,
-                                    hintText = R.string.login_mode_librus_email_hint,
-                                    guideText = R.string.login_mode_librus_email_guide,
-                                    isRecommended = true,
-                                    credentials = listOf(
-                                            getEmailCredential("email"),
-                                            getPasswordCredential("password")
+                loginType = LOGIN_TYPE_LIBRUS,
+                internalName = "librus",
+                registerName = R.string.login_register_librus,
+                registerLogo = R.drawable.login_logo_librus,
+                loginModes = listOf(
+                    Mode(
+                        loginMode = LOGIN_MODE_LIBRUS_EMAIL,
+                        name = R.string.login_mode_librus_email,
+                        icon = R.drawable.login_mode_librus_email,
+                        hintText = R.string.login_mode_librus_email_hint,
+                        guideText = R.string.login_mode_librus_email_guide,
+                        isRecommended = true,
+                        credentials = listOf(
+                            getEmailCredential("email"),
+                            getPasswordCredential("password")
+                        ),
+                        errorCodes = mapOf(
+                            ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED to R.string.login_error_account_not_activated,
+                            ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
+                            ERROR_CAPTCHA_LIBRUS_PORTAL to R.string.error_3001_reason
+                        )
+                    ),
+                    /*Mode(
+                            loginMode = LOGIN_MODE_LIBRUS_SYNERGIA,
+                            name = R.string.login_mode_librus_synergia,
+                            icon = R.drawable.login_mode_librus_synergia,
+                            hintText = R.string.login_mode_librus_synergia_hint,
+                            guideText = R.string.login_mode_librus_synergia_guide,
+                            credentials = listOf(
+                                    Credential(
+                                            keyName = "accountLogin",
+                                            name = R.string.login_hint_login,
+                                            icon = CommunityMaterial.Icon.cmd_account_outline,
+                                            emptyText = R.string.login_error_no_login,
+                                            invalidText = R.string.login_error_incorrect_login,
+                                            errorCodes = mapOf(),
+                                            isRequired = true,
+                                            validationRegex = "[A-z0-9._\\-+]+",
+                                            caseMode = Credential.CaseMode.LOWER_CASE
                                     ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED to R.string.login_error_account_not_activated,
-                                            ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
-                                            ERROR_CAPTCHA_LIBRUS_PORTAL to R.string.error_3001_reason
-                                    )
+                                    getPasswordCredential("accountPassword")
                             ),
-                            /*Mode(
-                                    loginMode = LOGIN_MODE_LIBRUS_SYNERGIA,
-                                    name = R.string.login_mode_librus_synergia,
-                                    icon = R.drawable.login_mode_librus_synergia,
-                                    hintText = R.string.login_mode_librus_synergia_hint,
-                                    guideText = R.string.login_mode_librus_synergia_guide,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "accountLogin",
-                                                    name = R.string.login_hint_login,
-                                                    icon = CommunityMaterial.Icon.cmd_account_outline,
-                                                    emptyText = R.string.login_error_no_login,
-                                                    invalidText = R.string.login_error_incorrect_login,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "[A-z0-9._\\-+]+",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            ),
-                                            getPasswordCredential("accountPassword")
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
-                                            ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST to R.string.login_error_incorrect_login_or_password
-                                    )
-                            ),*/
-                            Mode(
-                                    loginMode = LOGIN_MODE_LIBRUS_JST,
-                                    name = R.string.login_mode_librus_jst,
-                                    icon = R.drawable.login_mode_librus_jst,
-                                    hintText = R.string.login_mode_librus_jst_hint,
-                                    guideText = R.string.login_mode_librus_jst_guide,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "accountCode",
-                                                    name = R.string.login_hint_token,
-                                                    icon = CommunityMaterial.Icon.cmd_code_braces,
-                                                    emptyText = R.string.login_error_no_token,
-                                                    invalidText = R.string.login_error_incorrect_token,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "[A-Z0-9_]+",
-                                                    caseMode = Credential.CaseMode.UPPER_CASE
-                                            ),
-                                            Credential(
-                                                    keyName = "accountPin",
-                                                    name = R.string.login_hint_pin,
-                                                    icon = CommunityMaterial.Icon2.cmd_lock,
-                                                    emptyText = R.string.login_error_no_pin,
-                                                    invalidText = R.string.login_error_incorrect_pin,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "[a-z0-9_]+",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            )
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN to R.string.login_error_incorrect_code_or_pin,
-                                            ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST to R.string.login_error_incorrect_code_or_pin
-                                    )
+                            errorCodes = mapOf(
+                                    ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
+                                    ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST to R.string.login_error_incorrect_login_or_password
                             )
+                    ),*/
+                    Mode(
+                        loginMode = LOGIN_MODE_LIBRUS_JST,
+                        name = R.string.login_mode_librus_jst,
+                        icon = R.drawable.login_mode_librus_jst,
+                        hintText = R.string.login_mode_librus_jst_hint,
+                        guideText = R.string.login_mode_librus_jst_guide,
+                        credentials = listOf(
+                            FormField(
+                                keyName = "accountCode",
+                                name = R.string.login_hint_token,
+                                icon = CommunityMaterial.Icon.cmd_code_braces,
+                                emptyText = R.string.login_error_no_token,
+                                invalidText = R.string.login_error_incorrect_token,
+                                errorCodes = mapOf(),
+                                isRequired = true,
+                                validationRegex = "[A-Z0-9_]+",
+                                caseMode = FormField.CaseMode.UPPER_CASE
+                            ),
+                            FormField(
+                                keyName = "accountPin",
+                                name = R.string.login_hint_pin,
+                                icon = CommunityMaterial.Icon2.cmd_lock,
+                                emptyText = R.string.login_error_no_pin,
+                                invalidText = R.string.login_error_incorrect_pin,
+                                errorCodes = mapOf(),
+                                isRequired = true,
+                                validationRegex = "[a-z0-9_]+",
+                                caseMode = FormField.CaseMode.LOWER_CASE
+                            )
+                        ),
+                        errorCodes = mapOf(
+                            ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN to R.string.login_error_incorrect_code_or_pin,
+                            ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST to R.string.login_error_incorrect_code_or_pin
+                        )
                     )
+                )
             ),
             Register(
-                    loginType = LOGIN_TYPE_VULCAN,
-                    internalName = "vulcan",
-                    registerName = R.string.login_type_vulcan,
-                    registerLogo = R.drawable.login_logo_vulcan,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_VULCAN_API,
-                                    name = R.string.login_mode_vulcan_api,
-                                    icon = R.drawable.login_mode_vulcan_api,
-                                    hintText = R.string.login_mode_vulcan_api_hint,
-                                    guideText = R.string.login_mode_vulcan_api_guide,
-                                    isRecommended = true,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "deviceToken",
-                                                    name = R.string.login_hint_token,
-                                                    icon = CommunityMaterial.Icon.cmd_code_braces,
-                                                    emptyText = R.string.login_error_no_token,
-                                                    invalidText = R.string.login_error_incorrect_token,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_VULCAN_INVALID_TOKEN to R.string.login_error_incorrect_token
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = "[A-Z0-9]{5,12}",
-                                                    caseMode = Credential.CaseMode.UPPER_CASE
-                                            ),
-                                            Credential(
-                                                    keyName = "symbol",
-                                                    name = R.string.login_hint_symbol,
-                                                    icon = CommunityMaterial.Icon2.cmd_school,
-                                                    emptyText = R.string.login_error_no_symbol,
-                                                    invalidText = R.string.login_error_incorrect_symbol,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_VULCAN_INVALID_SYMBOL to R.string.login_error_incorrect_symbol
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = "[a-z0-9_-]+",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            ),
-                                            Credential(
-                                                    keyName = "devicePin",
-                                                    name = R.string.login_hint_pin,
-                                                    icon = CommunityMaterial.Icon2.cmd_lock,
-                                                    emptyText = R.string.login_error_no_pin,
-                                                    invalidText = R.string.login_error_incorrect_pin,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_VULCAN_INVALID_PIN to R.string.login_error_incorrect_pin
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = "[0-9]+",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            )
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token
-                                    )
-                            )/*,
-                            Mode(
-                                    loginMode = LOGIN_MODE_VULCAN_WEB,
-                                    name = R.string.login_mode_vulcan_web,
-                                    icon = R.drawable.login_mode_vulcan_web,
-                                    hintText = R.string.login_mode_vulcan_web_hint,
-                                    guideText = R.string.login_mode_vulcan_web_guide,
-                                    isTesting = true,
-                                    isPlatformSelection = true,
-                                    credentials = listOf(
-                                            getEmailCredential("webEmail"),
-                                            Credential(
-                                                    keyName = "webUsername",
-                                                    name = R.string.login_hint_username,
-                                                    icon = CommunityMaterial.Icon.cmd_account_outline,
-                                                    emptyText = R.string.login_error_no_username,
-                                                    invalidText = R.string.login_error_incorrect_username,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "[A-Z]{7}[0-9]+",
-                                                    caseMode = Credential.CaseMode.UPPER_CASE
-                                            ),
-                                            getPasswordCredential("webPassword")
-                                    ),
-                                    errorCodes = mapOf()
-                            )*/
+                loginType = LOGIN_TYPE_VULCAN,
+                internalName = "vulcan",
+                registerName = R.string.login_type_vulcan,
+                registerLogo = R.drawable.login_logo_vulcan,
+                loginModes = listOf(
+                    Mode(
+                        loginMode = LOGIN_MODE_VULCAN_HEBE,
+                        name = R.string.login_mode_vulcan_api,
+                        icon = R.drawable.login_mode_vulcan_hebe,
+                        hintText = R.string.login_mode_vulcan_api_hint,
+                        guideText = R.string.login_mode_vulcan_api_guide,
+                        isRecommended = true,
+                        credentials = listOf(
+                            FormField(
+                                keyName = "deviceToken",
+                                name = R.string.login_hint_token,
+                                icon = CommunityMaterial.Icon.cmd_code_braces,
+                                emptyText = R.string.login_error_no_token,
+                                invalidText = R.string.login_error_incorrect_token,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_VULCAN_INVALID_TOKEN to R.string.login_error_incorrect_token,
+                                    ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token
+                                ),
+                                isRequired = true,
+                                validationRegex = "[A-Z0-9]{5,12}",
+                                caseMode = FormField.CaseMode.UPPER_CASE
+                            ),
+                            FormField(
+                                keyName = "symbol",
+                                name = R.string.login_hint_symbol,
+                                icon = CommunityMaterial.Icon2.cmd_school,
+                                emptyText = R.string.login_error_no_symbol,
+                                invalidText = R.string.login_error_incorrect_symbol,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_VULCAN_INVALID_SYMBOL to R.string.login_error_incorrect_symbol
+                                ),
+                                isRequired = true,
+                                validationRegex = "[a-z0-9_-]+",
+                                caseMode = FormField.CaseMode.LOWER_CASE
+                            ),
+                            FormField(
+                                keyName = "devicePin",
+                                name = R.string.login_hint_pin,
+                                icon = CommunityMaterial.Icon2.cmd_lock,
+                                emptyText = R.string.login_error_no_pin,
+                                invalidText = R.string.login_error_incorrect_pin,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING to R.string.error_310_reason,
+                                    ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING to R.string.error_311_reason,
+                                    ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING to R.string.error_312_reason
+                                ),
+                                isRequired = true,
+                                validationRegex = "[0-9]+",
+                                caseMode = FormField.CaseMode.LOWER_CASE
+                            )
+                        ),
+                        errorCodes = mapOf()
+                    ),
+                    Mode(
+                        loginMode = LOGIN_MODE_VULCAN_WEB,
+                        name = R.string.login_mode_vulcan_web,
+                        icon = R.drawable.login_mode_vulcan_web,
+                        hintText = R.string.login_mode_vulcan_web_hint,
+                        guideText = R.string.login_mode_vulcan_web_guide,
+                        isTesting = true,
+                        isPlatformSelection = true,
+                        credentials = listOf(
+                            getEmailCredential("email"),
+                            FormField(
+                                keyName = "username",
+                                name = R.string.login_hint_username,
+                                icon = CommunityMaterial.Icon.cmd_account_outline,
+                                emptyText = R.string.login_error_no_username,
+                                invalidText = R.string.login_error_incorrect_username,
+                                errorCodes = mapOf(),
+                                isRequired = true,
+                                validationRegex = "[A-Z]{7}[0-9]+",
+                                caseMode = FormField.CaseMode.UPPER_CASE
+                            ),
+                            getPasswordCredential("password")
+                        ),
+                        errorCodes = mapOf()
                     )
+                )
             ),
             Register(
-                    loginType = LOGIN_TYPE_MOBIDZIENNIK,
-                    internalName = "mobidziennik",
-                    registerName = R.string.login_type_mobidziennik,
-                    registerLogo = R.drawable.login_logo_mobidziennik,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_MOBIDZIENNIK_WEB,
-                                    name = R.string.login_mode_mobidziennik_web,
-                                    icon = R.drawable.login_mode_mobidziennik_web,
-                                    hintText = R.string.login_mode_mobidziennik_web_hint,
-                                    guideText = R.string.login_mode_mobidziennik_web_guide,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "username",
-                                                    name = R.string.login_hint_login_email,
-                                                    icon = CommunityMaterial.Icon.cmd_account_outline,
-                                                    emptyText = R.string.login_error_no_login,
-                                                    invalidText = R.string.login_error_incorrect_login,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "^[a-z0-9_\\-@+.]+$",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            ),
-                                            Credential(
-                                                    keyName = "password",
-                                                    name = R.string.login_hint_password,
-                                                    icon = CommunityMaterial.Icon2.cmd_lock_outline,
-                                                    emptyText = R.string.login_error_no_password,
-                                                    invalidText = R.string.login_error_incorrect_login_or_password,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD to R.string.login_error_old_password
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = ".*",
-                                                    hideText = true
-                                            ),
-                                            Credential(
-                                                    keyName = "serverName",
-                                                    name = R.string.login_hint_address,
-                                                    icon = CommunityMaterial.Icon2.cmd_web,
-                                                    emptyText = R.string.login_error_no_address,
-                                                    invalidText = R.string.login_error_incorrect_address,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS to R.string.login_error_incorrect_address
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = "^[a-z0-9_\\-]+\$",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            )
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
-                                            ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED to R.string.sync_error_archived
-                                    )
+                loginType = LOGIN_TYPE_MOBIDZIENNIK,
+                internalName = "mobidziennik",
+                registerName = R.string.login_type_mobidziennik,
+                registerLogo = R.drawable.login_logo_mobidziennik,
+                loginModes = listOf(
+                    Mode(
+                        loginMode = LOGIN_MODE_MOBIDZIENNIK_WEB,
+                        name = R.string.login_mode_mobidziennik_web,
+                        icon = R.drawable.login_mode_mobidziennik_web,
+                        hintText = R.string.login_mode_mobidziennik_web_hint,
+                        guideText = R.string.login_mode_mobidziennik_web_guide,
+                        credentials = listOf(
+                            FormField(
+                                keyName = "username",
+                                name = R.string.login_hint_login_email,
+                                icon = CommunityMaterial.Icon.cmd_account_outline,
+                                emptyText = R.string.login_error_no_login,
+                                invalidText = R.string.login_error_incorrect_login,
+                                errorCodes = mapOf(),
+                                isRequired = true,
+                                validationRegex = "^[a-z0-9_\\-@+.]+$",
+                                caseMode = FormField.CaseMode.LOWER_CASE
+                            ),
+                            FormField(
+                                keyName = "password",
+                                name = R.string.login_hint_password,
+                                icon = CommunityMaterial.Icon2.cmd_lock_outline,
+                                emptyText = R.string.login_error_no_password,
+                                invalidText = R.string.login_error_incorrect_login_or_password,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD to R.string.login_error_old_password
+                                ),
+                                isRequired = true,
+                                validationRegex = ".*",
+                                hideText = true
+                            ),
+                            FormField(
+                                keyName = "serverName",
+                                name = R.string.login_hint_address,
+                                icon = CommunityMaterial.Icon2.cmd_web,
+                                emptyText = R.string.login_error_no_address,
+                                invalidText = R.string.login_error_incorrect_address,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS to R.string.login_error_incorrect_address
+                                ),
+                                isRequired = true,
+                                validationRegex = "^[a-z0-9_\\-]+\$",
+                                caseMode = FormField.CaseMode.LOWER_CASE
                             )
+                        ),
+                        errorCodes = mapOf(
+                            ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password,
+                            ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED to R.string.sync_error_archived
+                        )
                     )
+                )
             ),
             Register(
-                    loginType = LOGIN_TYPE_IDZIENNIK,
-                    internalName = "idziennik",
-                    registerName = R.string.login_type_idziennik,
-                    registerLogo = R.drawable.login_logo_iuczniowie,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_IDZIENNIK_WEB,
-                                    name = R.string.login_mode_idziennik_web,
-                                    icon = R.drawable.login_mode_idziennik_web,
-                                    hintText = R.string.login_mode_idziennik_web_hint,
-                                    guideText = R.string.login_mode_idziennik_web_guide,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "schoolName",
-                                                    name = R.string.login_hint_school_name,
-                                                    icon = CommunityMaterial.Icon2.cmd_school,
-                                                    emptyText = R.string.login_error_no_school_name,
-                                                    invalidText = R.string.login_error_incorrect_school_name,
-                                                    errorCodes = mapOf(
-                                                            ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME to R.string.login_error_incorrect_school_name
-                                                    ),
-                                                    isRequired = true,
-                                                    validationRegex = "^[a-z0-9_\\-.]+$",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            ),
-                                            Credential(
-                                                    keyName = "username",
-                                                    name = R.string.login_hint_username,
-                                                    icon = CommunityMaterial.Icon.cmd_account_outline,
-                                                    emptyText = R.string.login_error_no_username,
-                                                    invalidText = R.string.login_error_incorrect_username,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "^[a-z0-9_\\-.]+$",
-                                                    caseMode = Credential.CaseMode.LOWER_CASE
-                                            ),
-                                            getPasswordCredential("password")
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password
-                                    )
-                            )
+                loginType = LOGIN_TYPE_EDUDZIENNIK,
+                internalName = "edudziennik",
+                registerName = R.string.login_type_edudziennik,
+                registerLogo = R.drawable.login_logo_edudziennik,
+                loginModes = listOf(
+                    Mode(
+                        loginMode = LOGIN_MODE_EDUDZIENNIK_WEB,
+                        name = R.string.login_mode_edudziennik_web,
+                        icon = R.drawable.login_mode_edudziennik_web,
+                        hintText = R.string.login_mode_edudziennik_web_hint,
+                        guideText = R.string.login_mode_edudziennik_web_guide,
+                        credentials = listOf(
+                            getEmailCredential("email"),
+                            getPasswordCredential("password")
+                        ),
+                        errorCodes = mapOf(
+                            ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password
+                        )
                     )
+                )
             ),
             Register(
-                    loginType = LOGIN_TYPE_EDUDZIENNIK,
-                    internalName = "edudziennik",
-                    registerName = R.string.login_type_edudziennik,
-                    registerLogo = R.drawable.login_logo_edudziennik,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_EDUDZIENNIK_WEB,
-                                    name = R.string.login_mode_edudziennik_web,
-                                    icon = R.drawable.login_mode_edudziennik_web,
-                                    hintText = R.string.login_mode_edudziennik_web_hint,
-                                    guideText = R.string.login_mode_edudziennik_web_guide,
-                                    credentials = listOf(
-                                            getEmailCredential("email"),
-                                            getPasswordCredential("password")
-                                    ),
-                                    errorCodes = mapOf(
-                                            ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN to R.string.login_error_incorrect_login_or_password
-                                    )
-                            )
-                    )
-            ),
-            Register(
-                    loginType = LOGIN_TYPE_PODLASIE,
-                    internalName = "podlasie",
-                    registerName = R.string.login_type_podlasie,
-                    registerLogo = R.drawable.login_logo_podlasie,
-                    loginModes = listOf(
-                            Mode(
-                                    loginMode = LOGIN_MODE_PODLASIE_API,
-                                    name = R.string.login_mode_podlasie_api,
-                                    icon = R.drawable.login_mode_podlasie_api,
-                                    guideText = R.string.login_mode_podlasie_api_guide,
-                                    credentials = listOf(
-                                            Credential(
-                                                    keyName = "apiToken",
-                                                    name = R.string.login_hint_token,
-                                                    icon = CommunityMaterial.Icon2.cmd_lock_outline,
-                                                    emptyText = R.string.login_error_no_token,
-                                                    invalidText = R.string.login_error_incorrect_token,
-                                                    errorCodes = mapOf(),
-                                                    isRequired = true,
-                                                    validationRegex = "[a-zA-Z0-9]{10}",
-                                                    caseMode = Credential.CaseMode.UNCHANGED
-                                            )
-                                    ),
-                                    errorCodes = mapOf()
+                loginType = LOGIN_TYPE_PODLASIE,
+                internalName = "podlasie",
+                registerName = R.string.login_type_podlasie,
+                registerLogo = R.drawable.login_logo_podlasie,
+                loginModes = listOf(
+                    Mode(
+                        loginMode = LOGIN_MODE_PODLASIE_API,
+                        name = R.string.login_mode_podlasie_api,
+                        icon = R.drawable.login_mode_podlasie_api,
+                        guideText = R.string.login_mode_podlasie_api_guide,
+                        credentials = listOf(
+                            FormField(
+                                keyName = "apiToken",
+                                name = R.string.login_hint_token,
+                                icon = CommunityMaterial.Icon2.cmd_lock_outline,
+                                emptyText = R.string.login_error_no_token,
+                                invalidText = R.string.login_error_incorrect_token,
+                                errorCodes = mapOf(),
+                                isRequired = true,
+                                validationRegex = "[a-zA-Z0-9]{10}",
+                                caseMode = FormField.CaseMode.UNCHANGED
+                            ),
+                            FormCheckbox(
+                                keyName = "logoutDevices",
+                                name = R.string.login_podlasie_logout_devices,
+                                checked = false,
+                                errorCodes = mapOf(
+                                    ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT to R.string.error_602_reason
+                                )
                             )
+                        ),
+                        errorCodes = mapOf()
                     )
+                )
             )
-    ) }
+        )
+    }
 
     data class Register(
-            val loginType: Int,
-            val internalName: String,
-            val registerName: Int,
-            @DrawableRes
-            val registerLogo: Int,
+        val loginType: Int,
+        val internalName: String,
+        val registerName: Int,
+        @DrawableRes
+        val registerLogo: Int,
 
-            val loginModes: List<Mode>
+        val loginModes: List<Mode>
     ) : ExpandableItemModel<Mode>(loginModes.toMutableList()) {
         override var level = 1
     }
 
     data class Mode(
-            val loginMode: Int,
+        val loginMode: Int,
 
-            @StringRes
-            val name: Int,
-            @DrawableRes
-            val icon: Int,
-            @StringRes
-            val hintText: Int? = null,
-            @StringRes
-            val guideText: Int,
+        @StringRes
+        val name: Int,
+        @DrawableRes
+        val icon: Int,
+        @StringRes
+        val hintText: Int? = null,
+        @StringRes
+        val guideText: Int,
 
-            val isRecommended: Boolean = false,
-            val isTesting: Boolean = false,
-            val isPlatformSelection: Boolean = false,
+        val isRecommended: Boolean = false,
+        val isTesting: Boolean = false,
+        val isDevOnly: Boolean = false,
+        val isPlatformSelection: Boolean = false,
 
-            val credentials: List<Credential>,
-            val errorCodes: Map<Int, Int>
+        val credentials: List<BaseCredential>,
+        val errorCodes: Map<Int, Int>
     )
 
     data class Platform(
-            val id: Int,
-            val loginType: Int,
-            val loginMode: Int,
-            val name: String,
-            val description: String?,
-            val guideText: String?,
-            val icon: String,
-            val screenshot: String?,
-            val formFields: List<String>,
-            val apiData: JsonObject
+        val id: Int,
+        val name: String,
+        val description: String?,
+        val icon: String,
+        val screenshot: String?,
+        val formFields: List<String>,
+        val realmData: RealmData
     )
 
-    data class Credential(
-            val keyName: String,
+    open class BaseCredential(
+        open val keyName: String,
+        @StringRes
+        open val name: Int,
+        open val errorCodes: Map<Int, Int>
+    )
 
-            @StringRes
-            val name: Int,
-            val icon: IIcon,
-            @StringRes
-            val placeholder: Int? = null,
-            @StringRes
-            val emptyText: Int,
-            @StringRes
-            val invalidText: Int,
-            val errorCodes: Map<Int, Int>,
-            @StringRes
-            val hintText: Int? = null,
+    data class FormField(
+        override val keyName: String,
 
-            val isRequired: Boolean = true,
-            val validationRegex: String,
-            val caseMode: CaseMode = CaseMode.UNCHANGED,
-            val hideText: Boolean = false,
-            val stripTextRegex: String? = null
-    ) {
+        @StringRes
+        override val name: Int,
+        val icon: IIcon,
+        @StringRes
+        val placeholder: Int? = null,
+        @StringRes
+        val emptyText: Int,
+        @StringRes
+        val invalidText: Int,
+        override val errorCodes: Map<Int, Int>,
+        @StringRes
+        val hintText: Int? = null,
+
+        val isRequired: Boolean = true,
+        val validationRegex: String,
+        val caseMode: CaseMode = CaseMode.UNCHANGED,
+        val hideText: Boolean = false,
+        val stripTextRegex: String? = null
+    ) : BaseCredential(keyName, name, errorCodes) {
         enum class CaseMode { UNCHANGED, UPPER_CASE, LOWER_CASE }
     }
 
+    data class FormCheckbox(
+        override val keyName: String,
+        @StringRes
+        override val name: Int,
+        val checked: Boolean = false,
+        override val errorCodes: Map<Int, Int> = mapOf()
+    ) : BaseCredential(keyName, name, errorCodes)
+
     var chooserList: MutableList<Any>? = null
     var platformList: MutableMap<Int, List<Platform>> = mutableMapOf()
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt
index 9beb0860..988d1bde 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt
@@ -47,6 +47,7 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
     }
 
     private lateinit var timeoutJob: Job
+    private lateinit var adapter: LoginPlatformAdapter
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         if (!isAdded) return
@@ -57,27 +58,45 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
         val loginMode = arguments?.getInt("loginMode") ?: return
         val mode = register.loginModes.firstOrNull { it.loginMode == loginMode } ?: return
 
-        timeoutJob = startCoroutineTimer(5000L) {
-            b.timeoutText.isVisible = true
-            timeoutJob.cancel()
-        }
-
-        val adapter = LoginPlatformAdapter(activity) { platform ->
+        adapter = LoginPlatformAdapter(activity) { platform ->
             nav.navigate(R.id.loginFormFragment, Bundle(
-                    "loginType" to platform.loginType,
-                    "loginMode" to platform.loginMode,
+                    "loginType" to loginType,
+                    "loginMode" to loginMode,
                     "platformName" to platform.name,
                     "platformDescription" to platform.description,
                     "platformFormFields" to platform.formFields.joinToString(";"),
-                    "platformApiData" to platform.apiData.toString()
+                    "platformRealmData" to app.gson.toJson(platform.realmData)
             ), activity.navOptions)
         }
 
+        loadPlatforms(register, mode)
+        b.reloadButton.isVisible = App.devMode
+        b.reloadButton.onClick {
+            LoginInfo.platformList.remove(mode.name)
+            loadPlatforms(register, mode)
+        }
+
+        b.list.apply {
+            setHasFixedSize(true)
+            layoutManager = LinearLayoutManager(context)
+            addItemDecoration(SimpleDividerItemDecoration(context))
+        }
+    }
+
+    private fun loadPlatforms(register: LoginInfo.Register, mode: LoginInfo.Mode) {
         launch {
+            timeoutJob = startCoroutineTimer(5000L) {
+                b.timeoutText.isVisible = true
+                timeoutJob.cancel()
+            }
+            b.loadingLayout.isVisible = true
+            b.list.isVisible = false
+            b.reloadButton.isEnabled = false
+
             val platforms = LoginInfo.platformList[mode.name]
                     ?: run {
                         api.runCatching(activity) {
-                            getPlatforms(register.internalName)
+                            getRealms(register.internalName)
                         } ?: run {
                             nav.navigateUp()
                             return@launch
@@ -87,14 +106,11 @@ class LoginPlatformListFragment : Fragment(), CoroutineScope {
 
             adapter.items = platforms
             b.list.adapter = adapter
-            b.list.apply {
-                setHasFixedSize(true)
-                layoutManager = LinearLayoutManager(context)
-                addItemDecoration(SimpleDividerItemDecoration(context))
-            }
+
             timeoutJob.cancel()
             b.loadingLayout.isVisible = false
             b.list.isVisible = true
+            b.reloadButton.isEnabled = true
         }
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt
new file mode 100644
index 00000000..b9fdf43a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-10-18.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.login
+
+import android.os.Bundle
+import android.os.Process
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import coil.api.load
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.LoginPrizeFragmentBinding
+import pl.szczodrzynski.edziennik.onClick
+import kotlin.coroutines.CoroutineContext
+import kotlin.system.exitProcess
+
+class LoginPrizeFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "LoginPrizeFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: LoginActivity
+    private lateinit var b: LoginPrizeFragmentBinding
+    private val nav by lazy { activity.nav }
+
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    // local/private variables go here
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as LoginActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        b = LoginPrizeFragmentBinding.inflate(inflater)
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        b.button.load("https://szkolny.eu/game/button.png")
+        b.button.onClick {
+            MaterialAlertDialogBuilder(activity)
+                    .setTitle(R.string.are_you_sure)
+                    .setMessage(R.string.dev_mode_enable_warning)
+                    .setPositiveButton(R.string.yes) { _, _ ->
+                        app.config.debugMode = true
+                        App.devMode = true
+                        MaterialAlertDialogBuilder(activity)
+                                .setTitle("Restart")
+                                .setMessage("Wymagany restart aplikacji")
+                                .setPositiveButton(R.string.ok) { _, _ ->
+                                    Process.killProcess(Process.myPid())
+                                    Runtime.getRuntime().exit(0)
+                                    exitProcess(0)
+                                }
+                                .setCancelable(false)
+                                .show()
+                    }
+                    .setNegativeButton(R.string.no) { _, _ ->
+                        app.config.debugMode = false
+                        App.devMode = false
+                        activity.finish()
+                    }
+                    .show()
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt
index cdb0e7b8..6b0d20b5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt
@@ -10,7 +10,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.LoginChooserModeItemBinding
+import pl.szczodrzynski.edziennik.resolveColor
+import pl.szczodrzynski.edziennik.setTintColor
 import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserAdapter
 import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
@@ -34,6 +37,19 @@ class ModeViewHolder(
             b.description.isVisible = true
             b.description.setText(item.hintText)
         }
-        b.hint.isVisible = false
+
+        b.badge.isVisible = item.isRecommended || item.isDevOnly || item.isTesting
+        if (item.isRecommended) {
+            b.badge.setText(R.string.login_chooser_mode_recommended)
+            b.badge.background.setTintColor(R.color.md_blue_300.resolveColor(app))
+        }
+        if (item.isTesting) {
+            b.badge.setText(R.string.login_chooser_mode_testing)
+            b.badge.background.setTintColor(R.color.md_yellow_300.resolveColor(app))
+        }
+        if (item.isDevOnly) {
+            b.badge.setText(R.string.login_chooser_mode_dev_only)
+            b.badge.background.setTintColor(R.color.md_red_300.resolveColor(app))
+        }
     }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
index e8a4e343..b2623b64 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
@@ -108,7 +108,7 @@ class MessageFragment : Fragment(), CoroutineScope {
                     .setNegativeButton(R.string.cancel, null)
                     .show()
         }
-        b.downloadButton.isVisible = App.debugMode
+        b.downloadButton.isVisible = App.devMode
         b.downloadButton.onClick {
             EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
index 2c84c878..555bc3fd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
@@ -258,7 +258,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                             .setOnClickAction(() -> {
-                                new ProfileRemoveDialog(activity, app.getProfile().getId(), app.getProfile().getName());
+                                new ProfileRemoveDialog(activity, app.getProfile().getId(), app.getProfile().getName(), false);
                             })
             );
 
@@ -581,7 +581,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             syncCardIntervalItem.setChecked(app.getConfig().getSync().getEnabled());
             syncCardIntervalItem.setOnClickAction(() -> {
                 List<CharSequence> intervalNames = new ArrayList<>();
-                if (App.Companion.getDevMode() && false) {
+                if (App.Companion.getDebugMode() && false) {
                     intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_seconds, 30));
                     intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_minutes, 2));
                 }
@@ -593,7 +593,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_hours, 3));
                 intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_hours, 4));
                 List<Integer> intervals = new ArrayList<>();
-                if (App.Companion.getDevMode() && false) {
+                if (App.Companion.getDebugMode() && false) {
                     intervals.add(30);
                     intervals.add(2 * 60);
                 }
@@ -1059,6 +1059,24 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 );
             }
 
+            if (App.Companion.getDevMode()) {
+                items.add(
+                        new MaterialAboutSwitchItem(
+                                getString(R.string.settings_register_hide_sticks_from_old),
+                                null,
+                                new IconicsDrawable(activity)
+                                    .icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline)
+                                    .size(IconicsSize.dp(iconSizeDp))
+                                    .color(IconicsColor.colorInt(iconColor))
+                        )
+                        .setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld())
+                        .setOnChangeAction((isChecked, tag) -> {
+                            app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked);
+                            return true;
+                        })
+                );
+            }
+
         }
         return items;
     }
@@ -1245,7 +1263,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 })
                 .build());*/
 
-            if (App.Companion.getDebugMode()) {
+            if (App.Companion.getDevMode()) {
                 items.add(new MaterialAboutActionItem.Builder()
                         .text(R.string.settings_about_crash_text)
                         .subText(R.string.settings_about_crash_subtext)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt
index 482ab847..354a8921 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt
@@ -121,19 +121,21 @@ class AttachmentsView @JvmOverloads constructor(
             // open file by name, or first part before ':' (Vulcan OneDrive)
             Utils.openFile(context, File(Utils.getStorageDir(), attachment.name.substringBefore(":")))
             return
-        }
+        } else if (attachment.name.contains(":")) {
+            Utils.openUrl(context, attachment.name.substringAfter(":"))
+        } else {
+            attachment.isDownloading = true
+            (adapter as? AttachmentAdapter)?.let {
+                it.notifyItemChanged(it.items.indexOf(attachment))
+            }
 
-        attachment.isDownloading = true
-        (adapter as? AttachmentAdapter)?.let {
-            it.notifyItemChanged(it.items.indexOf(attachment))
-        }
-
-        EdziennikTask.attachmentGet(
+            EdziennikTask.attachmentGet(
                 attachment.profileId,
                 attachment.owner,
                 attachment.id,
                 attachment.name
-        ).enqueue(context)
+            ).enqueue(context)
+        }
     }
 
     private val lastUpdate: Long = 0
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
index 082d800d..910fc6f0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java
@@ -108,7 +108,7 @@ public class Utils {
     public static List<String> debugLog = new ArrayList<>();
 
     public static void d(String TAG, String message) {
-        if (App.Companion.getDebugMode()) {
+        if (App.Companion.getDevMode()) {
             HyperLog.d("Szkolny/"+TAG, message);
             //debugLog.add(TAG+": "+message);
         }
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
new file mode 100644
index 00000000..a61f71cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-8-25.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M54,19H10v33c0,2.209 1.791,4 4,4h36c2.209,0 4,-1.791 4,-4V19z"
+      android:fillColor="#ffb86b"/>
+  <path
+      android:pathData="m54,22h-44c-1.657,0 -3,-1.343 -3,-3v-5c0,-1.657 1.343,-3 3,-3h44c1.657,0 3,1.343 3,3v5c0,1.657 -1.343,3 -3,3z"
+      android:fillColor="#ffa54a"/>
+  <path
+      android:pathData="m37,32h-10c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h10c1.65,0 3,1.35 3,3s-1.35,3 -3,3z"
+      android:fillColor="#69707e"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
new file mode 100644
index 00000000..e059b093
--- /dev/null
+++ b/app/src/main/res/drawable/ic_update.xml
@@ -0,0 +1,11 @@
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-9-3.
+  -->
+
+<vector android:height="128dp" android:viewportHeight="64"
+    android:viewportWidth="64" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#1a6ee2" android:pathData="m29.583,48.966c1.329,1.347 3.505,1.347 4.834,0l10.917,-11.06c1.466,-1.484 0.353,-3.906 -1.795,-3.906h-5.539v-8.5c0,-1.375 -1.125,-2.5 -2.5,-2.5h-7c-1.375,0 -2.5,1.125 -2.5,2.5v8.5h-5.539c-2.147,0 -3.26,2.422 -1.795,3.906z"/>
+    <path android:fillColor="#2aa7ed" android:pathData="m28.5,12h7c1.375,0 2.5,-1.125 2.5,-2.5s-1.125,-2.5 -2.5,-2.5h-7c-1.375,0 -2.5,1.125 -2.5,2.5s1.125,2.5 2.5,2.5z"/>
+    <path android:fillColor="#2082e6" android:pathData="m28.5,20h7c1.375,0 2.5,-1.125 2.5,-2.5s-1.125,-2.5 -2.5,-2.5h-7c-1.375,0 -2.5,1.125 -2.5,2.5s1.125,2.5 2.5,2.5z"/>
+    <path android:fillColor="#1762df" android:pathData="m54,55.5c0,1.375 -1.125,2.5 -2.5,2.5h-39c-1.375,0 -2.5,-1.125 -2.5,-2.5s1.125,-2.5 2.5,-2.5h39c1.375,0 2.5,1.125 2.5,2.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/login_help_iuczniowie.webp b/app/src/main/res/drawable/login_help_iuczniowie.webp
deleted file mode 100644
index 5a163bb9..00000000
Binary files a/app/src/main/res/drawable/login_help_iuczniowie.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/login_logo_iuczniowie.png b/app/src/main/res/drawable/login_logo_iuczniowie.png
deleted file mode 100644
index 4356c305..00000000
Binary files a/app/src/main/res/drawable/login_logo_iuczniowie.png and /dev/null differ
diff --git a/app/src/main/res/drawable/login_logo_vulcan.png b/app/src/main/res/drawable/login_logo_vulcan.png
index fd7adcc8..fe00724a 100644
Binary files a/app/src/main/res/drawable/login_logo_vulcan.png and b/app/src/main/res/drawable/login_logo_vulcan.png differ
diff --git a/app/src/main/res/drawable/login_mode_vulcan_api.png b/app/src/main/res/drawable/login_mode_vulcan_api.png
deleted file mode 100644
index a8ec0993..00000000
Binary files a/app/src/main/res/drawable/login_mode_vulcan_api.png and /dev/null differ
diff --git a/app/src/main/res/drawable/login_mode_vulcan_hebe.png b/app/src/main/res/drawable/login_mode_vulcan_hebe.png
new file mode 100644
index 00000000..bea96dc7
Binary files /dev/null and b/app/src/main/res/drawable/login_mode_vulcan_hebe.png differ
diff --git a/app/src/main/res/drawable/login_mode_vulcan_web.png b/app/src/main/res/drawable/login_mode_vulcan_web.png
index 3644cd15..559b2eb5 100644
Binary files a/app/src/main/res/drawable/login_mode_vulcan_web.png and b/app/src/main/res/drawable/login_mode_vulcan_web.png differ
diff --git a/app/src/main/res/drawable/logo_idziennik.png b/app/src/main/res/drawable/logo_idziennik.png
deleted file mode 100644
index 7289caa6..00000000
Binary files a/app/src/main/res/drawable/logo_idziennik.png and /dev/null differ
diff --git a/app/src/main/res/drawable/profile_archived.xml b/app/src/main/res/drawable/profile_archived.xml
new file mode 100644
index 00000000..c816dcc8
--- /dev/null
+++ b/app/src/main/res/drawable/profile_archived.xml
@@ -0,0 +1,6 @@
+<vector android:height="136dp" android:viewportHeight="135.5"
+    android:viewportWidth="135.5" android:width="136dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="0" android:fillColor="#FF000000" android:pathData="m0,0h135.5v135.5h-135.5z"/>
+    <path android:fillAlpha="0.6902" android:fillColor="#fff"
+        android:pathData="m42.75,31.75a4,4 0,0 0,-3.453 1.984l-7,12a4,4 0,0 0,-0.547 2.016v48c0,4.372 3.628,8 8,8h56c4.372,0 8,-3.628 8,-8v-48a4,4 0,0 0,-0.547 -2.016l-7,-12a4,4 0,0 0,-3.453 -1.984zM45.047,39.75h45.406l4.664,8h-54.734zM39.75,55.75h56v40h-56zM55.75,63.75v8h24v-8z" android:strokeWidth="4"/>
+</vector>
diff --git a/app/src/main/res/layout/card_grades.xml b/app/src/main/res/layout/card_grades.xml
deleted file mode 100644
index 249a971f..00000000
--- a/app/src/main/res/layout/card_grades.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_weight="1"
-        android:fontFamily="sans-serif-medium"
-        android:text="@string/card_grades_header_title"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        app:cardElevation="4dp"
-        app:cardCornerRadius="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/cardGradesNoData"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="8dp"
-                android:text="@string/card_grades_no_data"
-                android:textSize="14sp"
-                android:textStyle="italic"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:id="@+id/cardGradesList"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:orientation="vertical"
-                android:visibility="visible">
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?android:textColorSecondary" />
-
-            <Button
-                android:id="@+id/cardGradesButton"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:gravity="center_vertical|start"
-                android:minHeight="0dp"
-                android:padding="@dimen/card_button_padding"
-                android:text="@string/card_grades_button" />
-
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_home_archive.xml b/app/src/main/res/layout/card_home_archive.xml
new file mode 100644
index 00000000..ffe979bc
--- /dev/null
+++ b/app/src/main/res/layout/card_home_archive.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-8-25.
+  -->
+
+<layout 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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        tools:layout_margin="8dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/home_archive_title"
+                android:textAppearance="@style/NavView.TextView.Title" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/homeArchiveText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="16dp"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_horizontal"
+                android:text="@string/home_archive_text"
+                android:textSize="16sp"
+                tools:text="Przeglądasz dane ucznia z roku szkolnego 2019/2020." />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/homeArchiveClose"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/home_archive_close" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            app:srcCompat="@drawable/ic_archive" />
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/card_home_availability.xml b/app/src/main/res/layout/card_home_availability.xml
new file mode 100644
index 00000000..9b4f67f5
--- /dev/null
+++ b/app/src/main/res/layout/card_home_availability.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-9-3.
+  -->
+
+<layout 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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        tools:layout_margin="8dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/homeAvailabilityTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/home_availability_title"
+                android:textAppearance="@style/NavView.TextView.Title" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/homeAvailabilityText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="16dp"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_horizontal"
+                android:text="@string/home_availability_text"
+                android:textSize="16sp"
+                tools:text="Zaktualizuj aplikację do najnowszej wersji 4.3.1." />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/homeAvailabilityUpdate"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/home_availability_update" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/homeAvailabilityInfo"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/home_availability_info" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/homeAvailabilityIcon"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            app:srcCompat="@drawable/ic_update" />
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/card_home_debug.xml b/app/src/main/res/layout/card_home_debug.xml
index b0e2f41c..18d21c02 100644
--- a/app/src/main/res/layout/card_home_debug.xml
+++ b/app/src/main/res/layout/card_home_debug.xml
@@ -30,7 +30,7 @@
             style="@style/Widget.MaterialComponents.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Librus Captcha" />
+            android:text="LIBRUS® Captcha" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/refreshWidget"
@@ -86,4 +86,4 @@
             android:text="Prune finished work" />
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index 5a1d8514..842e5b51 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -17,121 +17,130 @@
             android:id="@+id/noTimetableLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="visible">
 
-            <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                app:srcCompat="@drawable/ic_sync"/>
-
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/NavView.TextView.Title"
-                    android:text="@string/home_timetable_no_timetable" />
+                    android:text="@string/home_timetable_no_timetable"
+                    android:textAppearance="@style/NavView.TextView.Title" />
 
                 <TextView
                     android:id="@+id/noTimetableText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/home_timetable_no_timetable_text"/>
-
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    android:fontFamily="sans-serif-light"
+                    android:gravity="center_horizontal"
+                    android:text="@string/home_timetable_no_timetable_text"
+                    android:textSize="16sp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/noTimetableSync"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:text="@string/home_timetable_no_timetable_sync" />
-
             </LinearLayout>
 
+            <ImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                app:srcCompat="@drawable/ic_sync" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/noLessonsLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             android:gravity="center_vertical"
+            android:orientation="horizontal"
             android:visibility="gone"
-            tools:layout_marginTop="150dp"
+            tools:layout_marginTop="170dp"
             tools:visibility="visible">
 
-            <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                app:srcCompat="@drawable/ic_timetable"/>
-
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/NavView.TextView.Title"
-                    android:text="@string/home_timetable_no_lessons" />
+                    android:text="@string/home_timetable_no_lessons"
+                    android:textAppearance="@style/NavView.TextView.Title" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/home_timetable_no_lessons_text"/>
-
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    android:fontFamily="sans-serif-light"
+                    android:gravity="center_horizontal"
+                    android:text="@string/home_timetable_no_lessons_text"
+                    android:textSize="16sp" />
             </LinearLayout>
 
+            <ImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                app:srcCompat="@drawable/ic_timetable" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/notPublicLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone"
-            tools:layout_marginTop="220dp"
+            tools:layout_marginTop="270dp"
             tools:visibility="visible">
 
-            <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                app:srcCompat="@drawable/ic_no_timetable"/>
-
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/NavView.TextView.Title"
-                    android:text="@string/home_timetable_not_public" />
+                    android:text="@string/home_timetable_not_public"
+                    android:textAppearance="@style/NavView.TextView.Title" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="@string/home_timetable_not_public_text"/>
-
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    android:fontFamily="sans-serif-light"
+                    android:gravity="center_horizontal"
+                    android:text="@string/home_timetable_not_public_text"
+                    android:textSize="16sp" />
             </LinearLayout>
 
+            <ImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                app:srcCompat="@drawable/ic_no_timetable" />
         </LinearLayout>
 
         <LinearLayout
@@ -139,7 +148,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            tools:layout_marginTop="350dp">
+            tools:layout_marginTop="410dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -165,15 +174,14 @@
                         android:layout_height="wrap_content"
                         android:textAppearance="@style/NavView.TextView.Helper"
                         tools:text="7 lekcji - 8:10 do 14:45" />
-
                 </LinearLayout>
 
                 <ImageView
                     android:id="@+id/settings"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:padding="10dp"
                     android:background="?selectableItemBackgroundBorderless"
+                    android:padding="10dp"
                     android:visibility="gone"
                     tools:src="@sample/settings" />
 
@@ -181,16 +189,16 @@
                     android:id="@+id/bellSync"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:padding="10dp"
                     android:background="?selectableItemBackgroundBorderless"
+                    android:padding="10dp"
                     tools:src="@sample/settings" />
 
                 <ImageView
                     android:id="@+id/showCounter"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:padding="10dp"
                     android:background="?selectableItemBackgroundBorderless"
+                    android:padding="10dp"
                     tools:src="@sample/settings" />
             </LinearLayout>
 
@@ -234,10 +242,9 @@
                         android:layout_marginLeft="4dp"
                         android:layout_marginRight="4dp"
                         android:visibility="gone"
-                        tools:visibility="visible"
                         tools:max="2700"
-                        tools:progress="780" />
-
+                        tools:progress="780"
+                        tools:visibility="visible" />
                 </LinearLayout>
 
                 <TextView
@@ -247,7 +254,6 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center"
                     tools:text="zostały\n2 minuty\n35 sekund" />
-
             </LinearLayout>
 
             <View
@@ -263,8 +269,6 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/NavView.TextView.Helper"
                 tools:text="Póżniej:\n9:05 informatyka\n10:00 urządzenia techniki komputerowej\n11:00 projektowanie lokalnych sieci komputerowych\n11:55 zajęcia z wychowawcą\n13:00 język polski\n14:05 język niemiecki" />
-
         </LinearLayout>
-
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/card_lucky_number.xml b/app/src/main/res/layout/card_lucky_number.xml
deleted file mode 100644
index 233334f5..00000000
--- a/app/src/main/res/layout/card_lucky_number.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    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">
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/cardLuckyNumber"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        app:cardElevation="4dp"
-        app:cardCornerRadius="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal">
-
-                <com.mikepenz.iconics.view.IconicsTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:gravity="center"
-                    android:text="{cmd-emoticon-excited-outline}"
-                    android:textSize="26sp"
-                    app:fontFamily="sans-serif-condensed"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text=":-)" />
-
-                <TextView
-                    android:id="@+id/cardLuckyNumberTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:textSize="20sp"
-                    tools:text="%d to dzisiejszy Szczęśliwy numerek." />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/cardLuckyNumberText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginBottom="8dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                tools:text="Twój numerek to %d" />
-
-            <!--<View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/secondaryTextColor" />
-
-            <Button
-                android:id="@+id/cardLuckyNumberButton"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:gravity="center_vertical|start"
-                android:minWidth="0dp"
-                android:minHeight="0dp"
-                android:padding="@dimen/card_button_padding"
-                android:text="@string/card_login_button" />-->
-
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-</LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_timetable.xml b/app/src/main/res/layout/card_timetable.xml
deleted file mode 100644
index 463ca17b..00000000
--- a/app/src/main/res/layout/card_timetable.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/cardTimetableTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_weight="1"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/card_timetable_header_title"
-            android:textAppearance="@style/TextAppearance.AppCompat"
-            android:textSize="18sp"
-            android:textStyle="bold" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/cardTimetable"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            app:cardElevation="4dp"
-            app:cardCornerRadius="5dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/cardTimetableNoData"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/card_timetable_no_data"
-                    android:textSize="14sp"
-                    android:textStyle="italic"
-                    android:visibility="gone" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cardTimetableContent"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cardTimetableHeader"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <com.mikepenz.iconics.view.IconicsImageView
-                            android:id="@+id/cardTimetableClockIcon"
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginTop="8dp"
-                            android:padding="8dp"
-                            app:iiv_color="?android:textColorSecondary"
-                            app:iiv_icon="cmd-clock"
-                            app:iiv_size="48dp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:srcCompat="@tools:sample/avatars[0]" />
-
-                        <LinearLayout
-                            android:id="@+id/test"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            app:layout_constraintEnd_toStartOf="@+id/cardTimetableBellSync"
-                            app:layout_constraintStart_toEndOf="@+id/cardTimetableClockIcon"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <TextView
-                                android:id="@+id/cardTimetableType"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginLeft="8dp"
-                                android:layout_marginTop="8dp"
-                                android:layout_marginBottom="8dp"
-                                android:layout_weight="2"
-                                android:ellipsize="end"
-                                android:maxLines="2"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                                tools:text="Czas trwania lekcji:" />
-
-                            <TextView
-                                android:id="@+id/cardTimetableSummary"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginLeft="8dp"
-                                android:layout_marginTop="8dp"
-                                android:layout_marginEnd="8dp"
-                                android:layout_marginRight="8dp"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:fontFamily="sans-serif-medium"
-                                android:maxLines="2"
-
-                                android:text="@string/loading"
-                                android:textAllCaps="false"
-                                android:textSize="16sp"
-                                android:textStyle="bold" />
-                        </LinearLayout>
-
-                        <com.mikepenz.iconics.view.IconicsImageView
-                            android:id="@+id/cardTimetableBellSync"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginTop="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:layout_marginRight="8dp"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:padding="4dp"
-                            app:iiv_color="?android:textColorSecondary"
-                            app:iiv_icon="cmd-alarm-bell"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:srcCompat="@android:drawable/ic_partial_secure" />
-
-                        <TextView
-                            android:id="@+id/cardTimetableTimeLeft"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginLeft="8dp"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                            app:layout_constraintBottom_toBottomOf="@+id/cardTimetableFullscreenCounter"
-                            app:layout_constraintStart_toEndOf="@+id/cardTimetableClockIcon"
-                            app:layout_constraintTop_toTopOf="@+id/cardTimetableFullscreenCounter"
-                            tools:text="Zostało 25 minut" />
-
-                        <com.mikepenz.iconics.view.IconicsImageView
-                            android:id="@+id/cardTimetableFullscreenCounter"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginLeft="8dp"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:padding="8dp"
-                            app:iiv_color="?android:textColorSecondary"
-                            app:iiv_icon="cmd-fullscreen"
-                            app:layout_constraintStart_toEndOf="@+id/cardTimetableTimeLeft"
-                            app:layout_constraintTop_toBottomOf="@+id/test"
-                            tools:srcCompat="@android:drawable/ic_partial_secure" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <TextView
-                        android:id="@+id/cardTimetableLessonOverview"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:ellipsize="end"
-                        android:maxLines="3"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/cardTimetableHeader"
-                        tools:text="Następne lekcje:\n11:05 matematyka\n12:00 język polski" />
-
-                    <TextView
-                        android:id="@+id/cardTimetableEventOverview"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginBottom="8dp"
-                        android:ellipsize="end"
-                        android:maxLines="4"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/cardTimetableLessonOverview"
-                        tools:text="Wydarzenia:\n10:00 język niemiecki sprawdzianik hehehehe nie wiem co napisać\n12:55 chemia ciekawe czy zrobi te trzy kropki na końcu heh" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?android:textColorSecondary" />
-
-                <Button
-                    android:id="@+id/cardTimetableButton"
-                    style="@style/Widget.MaterialComponents.Button.TextButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackground"
-                    android:gravity="center_vertical|start"
-                    android:minHeight="0dp"
-                    android:padding="@dimen/card_button_padding"
-                    android:text="@string/card_timetable_button" />
-
-            </LinearLayout>
-        </com.google.android.material.card.MaterialCardView>
-
-    </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml
new file mode 100644
index 00000000..a47bf17c
--- /dev/null
+++ b/app/src/main/res/layout/dialog_register_unavailable.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-9-3.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="androidx.core.text.HtmlCompat" />
+        <variable
+            name="message"
+            type="pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus.Message" />
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"
+                android:visibility="@{message.image != null ? View.VISIBLE : View.GONE}"
+                tools:src="@tools:sample/backgrounds/scenic" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="24dp"
+                android:paddingTop="16dp"
+                android:paddingRight="24dp"
+                android:paddingBottom="16dp">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@{HtmlCompat.fromHtml(message.title, HtmlCompat.FROM_HTML_MODE_LEGACY)}"
+                    android:textAppearance="@style/NavView.TextView.Title"
+                    tools:text="Dziennik nie działa" />
+
+                <TextView
+                    android:id="@+id/text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@{HtmlCompat.fromHtml(message.contentLong, HtmlCompat.FROM_HTML_MODE_LEGACY)}"
+                    tools:text="Dziennik się zepsuł i nie działa, szkoda\n\n\nwiele linijek ma ten tekst" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/readMore"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/register_unavailable_read_more"
+                    android:visibility="@{message.url != null ? View.VISIBLE : View.GONE}" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml
index 279c241c..8152f917 100644
--- a/app/src/main/res/layout/lab_fragment.xml
+++ b/app/src/main/res/layout/lab_fragment.xml
@@ -7,6 +7,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     tools:ignore="HardcodedText">
 
+    <data>
+        <variable name="app" type="pl.szczodrzynski.edziennik.App"/>
+    </data>
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -41,6 +45,22 @@
                 android:text="Set last 10 as unseen"
                 android:textAllCaps="false" />
 
+            <Button
+                android:id="@+id/fullSync"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="Full sync and empty profile"
+                android:textAllCaps="false" />
+
+            <Button
+                android:id="@+id/clearProfile"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:text="Clear all profile data"
+                android:textAllCaps="false" />
+
             <Button
                 android:id="@+id/rodo"
                 android:layout_width="match_parent"
@@ -61,6 +81,26 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="monospace"
                 tools:text="Cookies:\n\nsynergia.librus.pl\n    DZIENNIKSID=L01~1234567890abcdef"/>
+
+            <Button
+                android:id="@+id/unarchive"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="Unarchive this profile"
+                android:textAllCaps="false" />
+
+            <pl.szczodrzynski.edziennik.utils.TextInputDropDown
+                android:id="@+id/profile"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+
+            <com.google.android.material.checkbox.MaterialCheckBox
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="@={app.config.archiverEnabled}"
+                android:text="Archiver enabled" />
         </LinearLayout>
     </ScrollView>
 </layout>
diff --git a/app/src/main/res/layout/lab_item_object.xml b/app/src/main/res/layout/lab_item_object.xml
index 88fc19fa..76800f1a 100644
--- a/app/src/main/res/layout/lab_item_object.xml
+++ b/app/src/main/res/layout/lab_item_object.xml
@@ -30,11 +30,12 @@
                 tools:text="lessonRanges" />
 
             <TextView
+                android:id="@+id/type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="8dp"
                 android:fontFamily="monospace"
-                android:text="JsonObject"
+                android:text="Object"
                 android:textAppearance="@style/NavView.TextView.Helper" />
 
             <com.mikepenz.iconics.view.IconicsImageView
diff --git a/app/src/main/res/layout/lab_item_sub_object.xml b/app/src/main/res/layout/lab_item_sub_object.xml
new file mode 100644
index 00000000..c0fb2f05
--- /dev/null
+++ b/app/src/main/res/layout/lab_item_sub_object.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2021-2-26.
+  -->
+
+<layout 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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="8dp">
+
+        <TextView
+            android:id="@+id/key"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:fontFamily="monospace"
+            android:maxLines="2"
+            tools:text="lessonRanges" />
+
+        <TextView
+            android:id="@+id/type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="8dp"
+            android:fontFamily="monospace"
+            android:text="Object"
+            android:textAppearance="@style/NavView.TextView.Helper" />
+
+        <com.mikepenz.iconics.view.IconicsImageView
+            android:id="@+id/dropdownIcon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:scaleType="centerInside"
+            app:iiv_color="?android:textColorSecondary"
+            app:iiv_icon="cmd-chevron-down"
+            app:iiv_size="18dp"
+            tools:src="@android:drawable/ic_menu_more" />
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/login_chooser_fragment.xml b/app/src/main/res/layout/login_chooser_fragment.xml
index 90aa1bc8..27e6f309 100644
--- a/app/src/main/res/layout/login_chooser_fragment.xml
+++ b/app/src/main/res/layout/login_chooser_fragment.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) Kuba Szczodrzyński 2020-4-9.
   -->
 
 <layout 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">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -31,6 +31,7 @@
             android:textSize="24sp" />
 
         <TextView
+            android:id="@+id/subtitleText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
@@ -46,6 +47,16 @@
             tools:itemCount="5"
             tools:listitem="@layout/login_chooser_item" />
 
+        <TextView
+            android:id="@+id/footnoteText"
+            style="@style/TextAppearance.AppCompat.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="8dp"
+            android:text="@string/login_copyright_notice"
+            android:gravity="center" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -64,7 +75,7 @@
             <Space
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"
diff --git a/app/src/main/res/layout/login_chooser_item.xml b/app/src/main/res/layout/login_chooser_item.xml
index 3486a504..8f3536dc 100644
--- a/app/src/main/res/layout/login_chooser_item.xml
+++ b/app/src/main/res/layout/login_chooser_item.xml
@@ -39,7 +39,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/NavView.TextView.Medium"
-                tools:text="Vulcan UONET+" />
+                tools:text="VULCAN® UONET+" />
 
             <TextView
                 android:id="@+id/description"
diff --git a/app/src/main/res/layout/login_chooser_mode_item.xml b/app/src/main/res/layout/login_chooser_mode_item.xml
index cbfae377..8b237795 100644
--- a/app/src/main/res/layout/login_chooser_mode_item.xml
+++ b/app/src/main/res/layout/login_chooser_mode_item.xml
@@ -36,6 +36,19 @@
             android:orientation="vertical"
             android:gravity="center_vertical">
 
+            <com.mikepenz.iconics.view.IconicsTextView
+                android:id="@+id/badge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_rounded_8dp"
+                android:minHeight="0dp"
+                android:paddingHorizontal="4dp"
+                android:paddingVertical="2dp"
+                android:textColor="@color/md_black_1000"
+                android:textSize="12sp"
+                tools:backgroundTint="@color/md_blue_300"
+                tools:text="{cmd-alert-circle-outline} Zalecane" />
+
             <TextView
                 android:id="@+id/name"
                 android:layout_width="wrap_content"
@@ -43,19 +56,12 @@
                 android:textAppearance="@style/NavView.TextView.Medium"
                 tools:text="Zaloguj używając e-maila" />
 
-            <TextView
-                android:id="@+id/hint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="bold"
-                tools:text="(zalecane)" />
-
             <TextView
                 android:id="@+id/description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/NavView.TextView.Helper"
-                tools:text="Musisz posiadać konto Librus Rodzina" />
+                tools:text="Musisz posiadać konto LIBRUS® Rodzina" />
         </LinearLayout>
     </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/login_form_checkbox_item.xml b/app/src/main/res/layout/login_form_checkbox_item.xml
new file mode 100644
index 00000000..c28e9958
--- /dev/null
+++ b/app/src/main/res/layout/login_form_checkbox_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-10-16.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingVertical="4dp">
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/checkbox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            tools:text="Text" />
+
+        <TextView
+            android:id="@+id/errorText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="32dp"
+            android:textColor="?colorError"
+            tools:text="Error text" />
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/login_form_item.xml b/app/src/main/res/layout/login_form_field_item.xml
similarity index 100%
rename from app/src/main/res/layout/login_form_item.xml
rename to app/src/main/res/layout/login_form_field_item.xml
diff --git a/app/src/main/res/layout/login_form_fragment.xml b/app/src/main/res/layout/login_form_fragment.xml
index dc6c4ffd..6bfb817f 100644
--- a/app/src/main/res/layout/login_form_fragment.xml
+++ b/app/src/main/res/layout/login_form_fragment.xml
@@ -39,7 +39,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:textSize="24sp"
-                    tools:text="Zaloguj się - Vulcan UONET+" />
+                    tools:text="Zaloguj się - VULCAN® UONET+" />
 
                 <TextView
                     android:id="@+id/subTitle"
diff --git a/app/src/main/res/layout/login_platform_list_fragment.xml b/app/src/main/res/layout/login_platform_list_fragment.xml
index ebe8c169..699177ff 100644
--- a/app/src/main/res/layout/login_platform_list_fragment.xml
+++ b/app/src/main/res/layout/login_platform_list_fragment.xml
@@ -78,6 +78,15 @@
                 tools:visibility="visible" />
         </LinearLayout>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/reloadButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/refresh"
+            android:visibility="gone" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/login_prize_fragment.xml b/app/src/main/res/layout/login_prize_fragment.xml
new file mode 100644
index 00000000..27e6bb60
--- /dev/null
+++ b/app/src/main/res/layout/login_prize_fragment.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2020-10-18.
+  -->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black">
+
+        <ImageView
+            android:id="@+id/button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="48dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            tools:src="@tools:sample/avatars" />
+    </FrameLayout>
+</layout>
diff --git a/app/src/main/res/navigation/nav_login.xml b/app/src/main/res/navigation/nav_login.xml
index 7feb8fc7..6fb5e503 100644
--- a/app/src/main/res/navigation/nav_login.xml
+++ b/app/src/main/res/navigation/nav_login.xml
@@ -18,6 +18,24 @@
         <action
             android:id="@+id/action_loginChooserFragment_to_loginFormFragment"
             app:destination="@id/loginFormFragment" />
+        <!-- eggs -->
+        <action
+            android:id="@+id/action_loginChooserFragment_to_loginEggsFragment"
+            app:destination="@id/loginEggsFragment" />
+    </fragment>
+    <!-- eggs -->
+    <fragment
+        android:id="@+id/loginEggsFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginEggsFragment"
+        android:label="LoginEggsFragment">
+        <action
+            android:id="@+id/action_loginEggsFragment_to_loginPrizeFragment"
+            app:destination="@id/loginPrizeFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/loginPrizeFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginPrizeFragment"
+        android:label="LoginPrizeFragment">
     </fragment>
     <fragment
         android:id="@+id/loginPlatformListFragment"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index da0f36cd..6e37bf58 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -310,15 +310,15 @@
     <string name="edziennik_progress_login_idziennik_api">bei iDziennik einloggen…</string>
     <string name="edziennik_progress_login_idziennik_web">bei iDziennik einloggen…</string>
     <string name="edziennik_progress_login_librus_api">Einloggen in die API…</string>
-    <string name="edziennik_progress_login_librus_messages">Einloggen bei Librus Nachrichten…</string>
-    <string name="edziennik_progress_login_librus_portal">Einloggen bei Librus Portal…</string>
-    <string name="edziennik_progress_login_librus_synergia">Einloggen bei Librus Synergia…</string>
+    <string name="edziennik_progress_login_librus_messages">Einloggen bei LIBRUS® nachrichten…</string>
+    <string name="edziennik_progress_login_librus_portal">Einloggen bei LIBRUS® Rodzina…</string>
+    <string name="edziennik_progress_login_librus_synergia">Einloggen bei LIBRUS® Synergia…</string>
     <string name="edziennik_progress_login_mobidziennik_api">Einloggen bei MobiDziennik…</string>
     <string name="edziennik_progress_login_mobidziennik_api2">Einloggen bei MobiDziennik…</string>
     <string name="edziennik_progress_login_mobidziennik_web">Einloggen bei MobiDziennik API…</string>
     <string name="edziennik_progress_login_template_api">Einloggen bei Template API…</string>
     <string name="edziennik_progress_login_template_web">Einloggen bei Template WEB…</string>
-    <string name="edziennik_progress_login_vulcan_api">Einloggen bei Vulcan</string>
+    <string name="edziennik_progress_login_vulcan_api">Einloggen bei VULCAN®</string>
     <string name="edziennik_szkolny_api_sync_title">Gemeinsame Ereignisse synchronisieren…</string>
     <string name="edziennik_szkolny_creating_notifications">Erstellen von Benachrichtigungen…</string>
     <string name="error">Fehler</string>
@@ -572,13 +572,13 @@
     <string name="login_iuczniowie_help_title">Hilfe - iDziennik Progman</string>
     <string name="login_iuczniowie_subtitle">Melden Sie sich mit den Daten an, die Sie von Ihrer Schule erhalten haben. Bei Problemen verwenden Sie die Schaltfläche unter dem Formular.</string>
     <string name="login_iuczniowie_title">Einloggen - iDziennik Progman</string>
-    <string name="login_librus_captcha_title">Librus - Einloggen</string>
-    <string name="login_librus_help_subtitle">Um die App verwenden zu können, müssen Sie über ein Librus-Konto verfügen. Sie können sie unter portal.librus.pl erstellen. Verwenden Sie die Daten, die Sie an den im Bild markierten Stellen eingeben.</string>
-    <string name="login_librus_help_title">Hilfe - Librus</string>
-    <string name="login_librus_jst_subtitle">Melden Sie sich mit dem Token und der PIN an, die Sie in der Rubrik "mobile apps" von Librus Synergia erhalten können</string>
-    <string name="login_librus_jst_title">Einloggen - Librus JST</string>
-    <string name="login_librus_subtitle">Melden Sie sich mit Ihren Librus-Kontodaten an (zuvor unter Ihrer E-Mail-Adresse erstellt). Melden Sie sich nicht mit den von Ihrer Schule erhaltenen Daten an. Bei Problemen verwenden Sie die Schaltfläche unter dem Formular.</string>
-    <string name="login_librus_title">Einloggen - Librus</string>
+    <string name="login_librus_captcha_title">LIBRUS® - Einloggen</string>
+    <string name="login_librus_help_subtitle">Um die App verwenden zu können, müssen Sie über ein LIBRUS® Rodzina-Konto verfügen. Sie können sie unter portal.librus.pl erstellen. Verwenden Sie die Daten, die Sie an den im Bild markierten Stellen eingeben.</string>
+    <string name="login_librus_help_title">Hilfe für LIBRUS® einloggen</string>
+    <string name="login_librus_jst_subtitle">Melden Sie sich mit dem Token und der PIN an, die Sie in der Rubrik "mobile apps" von LIBRUS® Synergia erhalten können</string>
+    <string name="login_librus_jst_title">Einloggen bei LIBRUS® JST</string>
+    <string name="login_librus_subtitle">Melden Sie sich mit Ihren LIBRUS® Rodzina-Konto daten an (zuvor unter Ihrer E-Mail-Adresse erstellt). Melden Sie sich nicht mit den von Ihrer Schule erhaltenen Daten an. Bei Problemen verwenden Sie die Schaltfläche unter dem Formular.</string>
+    <string name="login_librus_title">Einloggen bei LIBRUS® Synergia</string>
     <string name="login_migration_error_format">Ein Migrationsfehler ist aufgetreten. Er wurde bereits gemeldet, was bedeutet, dass ich versuchen werde, ihn zu beheben.\n\nSie können die App weiterhin verwenden. Bei Problemen versuchen Sie, das Profil zu entfernen und neu zu erstellen</string>
     <string name="login_migration_subtitle">Die App hat ein großes Update erhalten. Wenn bei der Operation Probleme auftreten, können Sie mich über die Hilfe und das Feedback im Menü kontaktieren.</string>
     <string name="login_migration_title">Szkolny.eu wurde aktualisiert</string>
@@ -604,12 +604,12 @@
     <string name="login_sync_subtitle_1_format">Profil synchronisieren</string>
     <string name="login_sync_title">Synchronisation…</string>
     <string name="login_vulcan_help_register">Geräteregistrierung:</string>
-    <string name="login_vulcan_help_subtitle">Melden Sie sich bei der Desktop-Version von Vulcan E-Klassenbuch an und wählen Sie die Option \"Dostęp mobilny\". Klicken Sie \"Zarejestruj urządzenie mobilne\". Sie können die Daten eingeben oder den QR-Code scannen und nur die PIN eingeben</string>
-    <string name="login_vulcan_help_title">Hilfe - Vulkan UONET+</string>
+    <string name="login_vulcan_help_subtitle">Melden Sie sich bei der Desktop-Version von VULCAN® E-Klassenbuch an und wählen Sie die Option \"Dostęp mobilny\". Klicken Sie \"Zarejestruj urządzenie mobilne\". Sie können die Daten eingeben oder den QR-Code scannen und nur die PIN eingeben</string>
+    <string name="login_vulcan_help_title">Hilfe - VULCAN® UONET+</string>
     <string name="login_vulcan_help_token">Erhaltene Daten:</string>
     <string name="login_vulcan_qr">QR-Code scannen</string>
     <string name="login_vulcan_subtitle">Wählen Sie \"Dostęp mobilny\" auf der E-Klassenbuch-Website, registrieren Sie ein neues Gerät und geben Sie die Daten ein.  Bei Problemen verwenden Sie die Schaltfläche unter dem Formular.</string>
-    <string name="login_vulcan_title">Einloggen - Vulkan UONET+</string>
+    <string name="login_vulcan_title">Einloggen - VULCAN® UONET+</string>
     <string name="main_menu_add">Hinzufügen…</string>
     <string name="main_menu_agenda_view_type">Ansicht ändern</string>
     <string name="main_menu_block_timetable">Generieren Sie einen Blockzeitplan</string>
@@ -803,7 +803,7 @@
     <string name="notification_updates_summary">Szkolny.eu: Update</string>
     <string name="notification_updates_text">Klicken Sie zum Herunterladen der Version %s</string>
     <string name="notification_updates_title">Update verfügbar</string>
-    <string name="notification_user_action_required_captcha_librus">Librus: erfordert eine Lösung für die Captcha-Aufgabe. Klicken Sie hier, um sich weiter im Tagebuch anzumelden.</string>
+    <string name="notification_user_action_required_captcha_librus">LIBRUS® Rodzina einloggen: erfordert eine Lösung für die Captcha-Aufgabe. Klicken Sie hier, um sich weiter im Tagebuch anzumelden.</string>
     <string name="notification_user_action_required_text">Das Problem, das die Synchronisierung verhindert, muss vom Benutzer gelöst werden. Klicken Sie für weitere Informationen</string>
     <string name="notification_user_action_required_title">Erforderliche Aktion in der App </string>
     <string name="notifications_no_data">Keine Benachrichtigungen</string>
@@ -854,7 +854,7 @@
     <string name="settings_about_licenses_text">Open-Source-Lizenzen</string>
     <string name="settings_about_privacy_policy_text">Datenschutzrichtlinie</string>
     <string name="settings_about_register_title_text">E-Klassenbuch</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;amp;&amp;amp; Kacper Ziubryniewicz\nSeptember 2018 - April 2020</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - Februar 2021</string>
     <string name="settings_about_update_subtext">Klicken Sie hier, um nach Aktualisierungen zu suchen</string>
     <string name="settings_about_update_text">Aktualisierung</string>
     <string name="settings_about_version_text">Version</string>
@@ -1049,8 +1049,8 @@
     <string name="sync_error_invalid_school_name">Ungültiger Schulname oder verbotene Zeichen</string>
     <string name="sync_error_invalid_server_address">Die Serveradresse ist ungültig. Stellen Sie sicher, dass es korrekt eingegeben wurde und keine Leerzeichen enthält.</string>
     <string name="sync_error_invalid_token">Ungültiges Token angegeben.</string>
-    <string name="sync_error_librus_disconnected">Das LIBRUS-Konto hat die Verbindung zum Synergia-Konto verloren. Melden Sie sich bei portal.librus.pl oder der offiziellen Librus App an und befolgen Sie die Anweisungen zur Reparatur Ihres Kontos.</string>
-    <string name="sync_error_librus_not_activated">Das LIBRUS-Konto wurde nicht aktiviert. Aktivieren Sie das Konto mit der E-Mail, die Sie erhalten haben.</string>
+    <string name="sync_error_librus_disconnected">Das LIBRUS® Rodzina-Konto hat die Verbindung zum LIBRUS® Synergia-Konto verloren. Melden Sie sich bei portal.librus.pl oder der offiziellen "LIBRUS®" App an und befolgen Sie die Anweisungen zur Reparatur Ihres Kontos.</string>
+    <string name="sync_error_librus_not_activated">Das LIBRUS® Rodzina-Konto wurde nicht aktiviert. Aktivieren Sie das Konto mit der E-Mail, die Sie erhalten haben.</string>
     <string name="sync_error_login_error">Anmeldefehler</string>
     <string name="sync_error_maintenance">Technische Pause\n\nVersuchen Sie es später erneut</string>
     <string name="sync_error_no_api_url">API-Adresse nicht gefunden. Versuchen Sie erneut, sich am Gerät anzumelden.</string>
@@ -1063,7 +1063,7 @@
     <string name="sync_error_register_student_not_associated_format">Student %s ist diesem Konto im Klassenbuch nicht zugeordnet (Login: %s).\n\nVersuchen Sie erneut, sich anzumelden, obwohl dies möglicherweise auf eine technische Unterbrechung im E-Klassenbuch hinweist.</string>
     <string name="sync_error_saving_data">Fehler beim Speichern der Daten. Melden Sie den Fehler.</string>
     <string name="sync_error_ssl">Fehler beim Herstellen einer sicheren Verbindung.</string>
-    <string name="sync_error_synergia_not_activated">Das Synergia-Konto wurde nicht von einem Elternteil oder Erziehungsberechtigten aktiviert.\n\nLoggen Sie sich in portal.librus.pl ein und befolgen Sie die Anweisungen, um es zu aktivieren.</string>
+    <string name="sync_error_synergia_not_activated">Das LIBRUS® Synergia-Konto wurde nicht von einem Elternteil oder Erziehungsberechtigten aktiviert.\n\nLoggen Sie sich in portal.librus.pl ein und befolgen Sie die Anweisungen, um es zu aktivieren.</string>
     <string name="sync_error_timeout">Auszeit</string>
     <string name="sync_error_unknown">Unbekannter Fehler</string>
     <string name="sync_feature_agenda">Stundenplan herunterladen</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e6d90882..ab80b93c 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -310,15 +310,15 @@
     <string name="edziennik_progress_login_idziennik_api">Logging in to iDziennik…</string>
     <string name="edziennik_progress_login_idziennik_web">Logging in to iDziennik…</string>
     <string name="edziennik_progress_login_librus_api">Logging in to the API…</string>
-    <string name="edziennik_progress_login_librus_messages">Logging in to Librus Messages…</string>
-    <string name="edziennik_progress_login_librus_portal">Logging in to Librus Portal…</string>
-    <string name="edziennik_progress_login_librus_synergia">Logging in to Librus Synergia…</string>
+    <string name="edziennik_progress_login_librus_messages">Logging in to LIBRUS® messages…</string>
+    <string name="edziennik_progress_login_librus_portal">Logging in to LIBRUS® Rodzina…</string>
+    <string name="edziennik_progress_login_librus_synergia">Logging in to LIBRUS® Synergia…</string>
     <string name="edziennik_progress_login_mobidziennik_api">Logging in to MobiDziennik…</string>
     <string name="edziennik_progress_login_mobidziennik_api2">Logging in to MobiDziennik…</string>
     <string name="edziennik_progress_login_mobidziennik_web">Logging in to MobiDziennik…</string>
     <string name="edziennik_progress_login_template_api">Logging in to Template API…</string>
     <string name="edziennik_progress_login_template_web">Logging in to Template WEB…</string>
-    <string name="edziennik_progress_login_vulcan_api">Logging in to Vulcan</string>
+    <string name="edziennik_progress_login_vulcan_api">Logging in to VULCAN®</string>
     <string name="edziennik_szkolny_api_sync_title">Syncing shared events…</string>
     <string name="edziennik_szkolny_creating_notifications">Creating notifications…</string>
     <string name="error">Error</string>
@@ -572,13 +572,13 @@
     <string name="login_iuczniowie_help_title">Help - iDziennik Progman</string>
     <string name="login_iuczniowie_subtitle">Use the data which you got from your school. In case of any problems, use the button below the form.</string>
     <string name="login_iuczniowie_title">Log in - iDziennik Progman</string>
-    <string name="login_librus_captcha_title">Librus - login</string>
-    <string name="login_librus_help_subtitle">In order to use the app you need a Librus account. You can create it on portal.librus.pl. Use the data you normally enter in the fields marked on the image.</string>
-    <string name="login_librus_help_title">Help - Librus</string>
-    <string name="login_librus_jst_subtitle">Log in with the token and PIN, which you can get from the "mobile apps" section of Librus Synergia.</string>
-    <string name="login_librus_jst_title">Log in - Librus JST</string>
-    <string name="login_librus_subtitle">Log in using your Librus account data (created before on your e-mail address). You can\'t login using the data provided by your school. In case of any problems, use the button below the form.</string>
-    <string name="login_librus_title">Log in - Librus</string>
+    <string name="login_librus_captcha_title">LIBRUS® - login</string>
+    <string name="login_librus_help_subtitle">In order to use the app you need a LIBRUS® Rodzina account. You can create it on portal.librus.pl. Use the data you normally enter in the fields marked on the image.</string>
+    <string name="login_librus_help_title">Help for LIBRUS® login</string>
+    <string name="login_librus_jst_subtitle">Log in with the token and PIN, which you can get from the "mobile apps" section of LIBRUS® Synergia.</string>
+    <string name="login_librus_jst_title">Log in to LIBRUS® JST</string>
+    <string name="login_librus_subtitle">Log in using your LIBRUS® Rodzina account data (created before on your e-mail address). You can\'t login using the data provided by your school. In case of any problems, use the button below the form.</string>
+    <string name="login_librus_title">Log in to LIBRUS® Synergia</string>
     <string name="login_migration_error_format">A migration error has occurred. It\'s already reported, which means I\'ll try to fix it.\n\nYou can continue using the app. In case of any problems try to remove the profile and create it again.</string>
     <string name="login_migration_subtitle">The app got a huge update. If you encounter any problems, feel free to contact me using the Feedback option in the menu.</string>
     <string name="login_migration_title">Szkolny.eu has been updated</string>
@@ -606,12 +606,12 @@
     <string name="login_sync_subtitle_1_format">Syncing profile</string>
     <string name="login_sync_title">Syncing…</string>
     <string name="login_vulcan_help_register">Registering the device:</string>
-    <string name="login_vulcan_help_subtitle">Login into desktop version of Vulcan e-register and select \"Dostęp mobilny\" option. Click \"Zarejestruj urządzenie mobilne\". You can type in the data or scan the QR code and type only the PIN.</string>
-    <string name="login_vulcan_help_title">Help - Vulcan UONET+</string>
+    <string name="login_vulcan_help_subtitle">Login into desktop version of VULCAN® e-register and select \"Dostęp mobilny\" option. Click \"Zarejestruj urządzenie mobilne\". You can type in the data or scan the QR code and type only the PIN.</string>
+    <string name="login_vulcan_help_title">Help - VULCAN® UONET+</string>
     <string name="login_vulcan_help_token">Obtained data:</string>
     <string name="login_vulcan_qr">Scan QR code</string>
     <string name="login_vulcan_subtitle">Choose \"Dostęp mobilny\" on e-register website, register a new device and enter the data. In case of any problems, use the button below the form.</string>
-    <string name="login_vulcan_title">Log in - Vulcan UONET+</string>
+    <string name="login_vulcan_title">Log in - VULCAN® UONET+</string>
     <string name="main_menu_add">Add…</string>
     <string name="main_menu_agenda_view_type">Change view</string>
     <string name="main_menu_block_timetable">Generate a block timetable</string>
@@ -805,7 +805,7 @@
     <string name="notification_updates_summary">Szkolny.eu: update</string>
     <string name="notification_updates_text">Click to download version %s</string>
     <string name="notification_updates_title">Update available</string>
-    <string name="notification_user_action_required_captcha_librus">Librus: Captcha verification required. Click to continue logging into the e-journal.</string>
+    <string name="notification_user_action_required_captcha_librus">LIBRUS® Rodzina login: Captcha verification required. Click to continue logging into the e-journal.</string>
     <string name="notification_user_action_required_text">The problem that prevents synchronization must be solved by the user. Click for more information.</string>
     <string name="notification_user_action_required_title">Action required in the application</string>
     <string name="notifications_no_data">No notifications.</string>
@@ -856,7 +856,7 @@
     <string name="settings_about_licenses_text">Open-source licenses</string>
     <string name="settings_about_privacy_policy_text">Privacy policy</string>
     <string name="settings_about_register_title_text">E-register</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - April 2020</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - February 2021</string>
     <string name="settings_about_update_subtext">Click to check for updates</string>
     <string name="settings_about_update_text">Update</string>
     <string name="settings_about_version_text">Version</string>
@@ -1051,8 +1051,8 @@
     <string name="sync_error_invalid_school_name">Invalid school name or forbidden characters</string>
     <string name="sync_error_invalid_server_address">Server address is invalid. Make sure it\'s entered correctly and doesn\'t contain whitespaces.</string>
     <string name="sync_error_invalid_token">Invalid token specified.</string>
-    <string name="sync_error_librus_disconnected">LIBRUS account has lost connection with the Synergia account. Login on portal.librus.pl or in the Librus mobile app and follow the instructions to fix the problem.</string>
-    <string name="sync_error_librus_not_activated">LIBRUS account is not activated. Activate it using a link in the received e-mail.</string>
+    <string name="sync_error_librus_disconnected">LIBRUS® Rodzina account has lost connection with the LIBRUS® Synergia account. Login on portal.librus.pl or in the "LIBRUS®" mobile app and follow the instructions to fix the problem.</string>
+    <string name="sync_error_librus_not_activated">LIBRUS® account is not activated. Activate it using a link in the received e-mail.</string>
     <string name="sync_error_login_error">Login error</string>
     <string name="sync_error_maintenance">Maintenance</string>
     <string name="sync_error_no_api_url">API address not found. Try to login again.</string>
@@ -1065,7 +1065,7 @@
     <string name="sync_error_register_student_not_associated_format">Student %s is not assigned to this register (login: %s).\n\nTry to log in again although this may also indicate a maintenance time.</string>
     <string name="sync_error_saving_data">Error while saving data. Report the error.</string>
     <string name="sync_error_ssl">Failed to establish a secure connection.</string>
-    <string name="sync_error_synergia_not_activated">The Synergia account hasn\'t been activated by a parent or legal guardian.\n\nLog into portal.librus.pl and follow the instructions in order to activate it.</string>
+    <string name="sync_error_synergia_not_activated">The LIBRUS® Synergia account hasn\'t been activated by a parent or legal guardian.\n\nLog into portal.librus.pl and follow the instructions in order to activate it.</string>
     <string name="sync_error_timeout">Timeout</string>
     <string name="sync_error_unknown">Unknown error</string>
     <string name="sync_feature_agenda">Syncing agenda…</string>
@@ -1233,4 +1233,5 @@
     <string name="permissions_attachment">In order to download the file, you have to grant file storage permission for the application.\n\nClick OK to grant the permission.</string>
     <string name="permissions_denied">You denied the required permissions for the application.\n\nIn order to grant the permission, open the Permissions screen for Szkolny.eu in phone settings.\n\nClick OK to open app settings now.</string>
     <string name="permissions_required">Required permissions</string>
+    <string name="settings_register_hide_sticks_from_old">Your mother won\'t see your F grades</string>
 </resources>
diff --git a/app/src/main/res/values/errors.xml b/app/src/main/res/values/errors.xml
index 0fe3df08..3dabf589 100644
--- a/app/src/main/res/values/errors.xml
+++ b/app/src/main/res/values/errors.xml
@@ -118,40 +118,30 @@
 
     <string name="error_301" translatable="false">ERROR_LOGIN_VULCAN_INVALID_SYMBOL</string>
     <string name="error_302" translatable="false">ERROR_LOGIN_VULCAN_INVALID_TOKEN</string>
-    <string name="error_309" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN</string>
     <string name="error_310" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING</string>
     <string name="error_311" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING</string>
     <string name="error_312" translatable="false">ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING</string>
     <string name="error_321" translatable="false">ERROR_LOGIN_VULCAN_EXPIRED_TOKEN</string>
-    <string name="error_322" translatable="false">ERROR_LOGIN_VULCAN_OTHER</string>
-    <string name="error_330" translatable="false">ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN</string>
     <string name="error_331" translatable="false">ERROR_LOGIN_VULCAN_NO_PUPILS</string>
-    <string name="error_340" translatable="false">ERROR_VULCAN_API_MAINTENANCE</string>
-    <string name="error_341" translatable="false">ERROR_VULCAN_API_BAD_REQUEST</string>
-    <string name="error_342" translatable="false">ERROR_VULCAN_API_OTHER</string>
     <string name="error_343" translatable="false">ERROR_VULCAN_ATTACHMENT_DOWNLOAD</string>
-
-    <string name="error_401" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN</string>
-    <string name="error_402" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME</string>
-    <string name="error_403" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
-    <string name="error_404" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE</string>
-    <string name="error_405" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR</string>
-    <string name="error_410" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_OTHER</string>
-    <string name="error_411" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS</string>
-    <string name="error_420" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION</string>
-    <string name="error_421" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH</string>
-    <string name="error_422" translatable="false">ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER</string>
-    <string name="error_430" translatable="false">ERROR_IDZIENNIK_WEB_ACCESS_DENIED</string>
-    <string name="error_431" translatable="false">ERROR_IDZIENNIK_WEB_OTHER</string>
-    <string name="error_432" translatable="false">ERROR_IDZIENNIK_WEB_MAINTENANCE</string>
-    <string name="error_433" translatable="false">ERROR_IDZIENNIK_WEB_SERVER_ERROR</string>
-    <string name="error_434" translatable="false">ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED</string>
-    <string name="error_440" translatable="false">ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR</string>
-    <string name="error_441" translatable="false">ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA</string>
-    <string name="error_450" translatable="false">ERROR_IDZIENNIK_API_ACCESS_DENIED</string>
-    <string name="error_451" translatable="false">ERROR_IDZIENNIK_API_OTHER</string>
-    <string name="error_452" translatable="false">ERROR_IDZIENNIK_API_NO_REGISTER</string>
-    <string name="error_453" translatable="false">ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION</string>
+    <string name="error_344" translatable="false">ERROR_VULCAN_WEB_DATA_MISSING</string>
+    <string name="error_345" translatable="false">ERROR_VULCAN_WEB_429</string>
+    <string name="error_346" translatable="false">ERROR_VULCAN_WEB_OTHER</string>
+    <string name="error_347" translatable="false">ERROR_VULCAN_WEB_NO_CERTIFICATE</string>
+    <string name="error_348" translatable="false">ERROR_VULCAN_WEB_NO_REGISTER</string>
+    <string name="error_349" translatable="false">ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED</string>
+    <string name="error_350" translatable="false">ERROR_VULCAN_WEB_LOGGED_OUT</string>
+    <string name="error_351" translatable="false">ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED</string>
+    <string name="error_352" translatable="false">ERROR_VULCAN_WEB_GRADUATE_ACCOUNT</string>
+    <string name="error_353" translatable="false">ERROR_VULCAN_WEB_NO_SCHOOLS</string>
+    <string name="error_354" translatable="false">ERROR_VULCAN_HEBE_OTHER</string>
+    <string name="error_360" translatable="false">ERROR_VULCAN_HEBE_SIGNATURE_ERROR</string>
+    <string name="error_361" translatable="false">ERROR_VULCAN_HEBE_INVALID_PAYLOAD</string>
+    <string name="error_362" translatable="false">ERROR_VULCAN_HEBE_FIREBASE_ERROR</string>
+    <string name="error_363" translatable="false">ERROR_VULCAN_HEBE_CERTIFICATE_GONE</string>
+    <string name="error_364" translatable="false">ERROR_VULCAN_HEBE_SERVER_ERROR</string>
+    <string name="error_365" translatable="false">ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND</string>
+    <string name="error_390" translatable="false">ERROR_VULCAN_API_DEPRECATED</string>
 
     <string name="error_501" translatable="false">ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN</string>
     <string name="error_510" translatable="false">ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER</string>
@@ -175,14 +165,10 @@
     <string name="error_904" translatable="false">EXCEPTION_LIBRUS_API_REQUEST</string>
     <string name="error_905" translatable="false">EXCEPTION_LIBRUS_SYNERGIA_REQUEST</string>
     <string name="error_906" translatable="false">EXCEPTION_MOBIDZIENNIK_WEB_REQUEST</string>
-    <string name="error_907" translatable="false">EXCEPTION_VULCAN_API_REQUEST</string>
     <string name="error_908" translatable="false">EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST</string>
     <string name="error_909" translatable="false">EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST</string>
     <string name="error_910" translatable="false">EXCEPTION_NOTIFY</string>
     <string name="error_911" translatable="false">EXCEPTION_LIBRUS_MESSAGES_REQUEST</string>
-    <string name="error_912" translatable="false">EXCEPTION_IDZIENNIK_WEB_REQUEST</string>
-    <string name="error_913" translatable="false">EXCEPTION_IDZIENNIK_WEB_API_REQUEST</string>
-    <string name="error_914" translatable="false">EXCEPTION_IDZIENNIK_API_REQUEST</string>
     <string name="error_920" translatable="false">EXCEPTION_EDUDZIENNIK_WEB_REQUEST</string>
     <string name="error_921" translatable="false">EXCEPTION_EDUDZIENNIK_FILE_REQUEST</string>
     <string name="error_930" translatable="false">ERROR_ONEDRIVE_DOWNLOAD</string>
@@ -222,7 +208,7 @@
     <string name="error_115_reason">Brak uczniów przypisanych do konta</string>
 
     <string name="error_3000_reason">Wymagane rozwiązanie zadania Captcha</string>
-    <string name="error_3001_reason">Librus: wymagane rozwiązanie zadania Captcha</string>
+    <string name="error_3001_reason">LIBRUS®️: wymagane rozwiązanie zadania Captcha</string>
 
     <string name="error_120_reason">CODE_INTERNAL_LIBRUS_ACCOUNT_410</string>
     <string name="error_121_reason">CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED</string>
@@ -232,7 +218,7 @@
     <string name="error_127_reason">Wymagana akceptacja regulaminu</string>
     <string name="error_128_reason">Błąd zmiany hasła</string>
     <string name="error_129_reason">Wymagana zmiana hasła</string>
-    <string name="error_130_reason">Librus API: nieprawidłowe dane logowania</string>
+    <string name="error_130_reason">LIBRUS® API: nieprawidłowe dane logowania</string>
     <string name="error_131_reason">Inny błąd logowania do API</string>
     <string name="error_132_reason">Brak tokenu CSRF</string>
     <string name="error_133_reason">Konto LIBRUS nie zostało aktywowane</string>
@@ -256,12 +242,12 @@
     <string name="error_155_reason">Brak dostępu do Wiadomości</string>
     <string name="error_156_reason">Brak dostępu do Synergii</string>
     <string name="error_157_reason">Brak ID sesji Wiadomości</string>
-    <string name="error_158_reason">Odmowa dostępu do Portalu Librus</string>
-    <string name="error_159_reason">API Portalu Librus wyłączone</string>
-    <string name="error_160_reason">Konto LIBRUS utraciło połączenie z kontem Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji Librus i postępuj zgodnie z instrukcją, aby naprawić konto.</string>
-    <string name="error_161_reason">Inny błąd Portalu Librus</string>
-    <string name="error_162_reason">Nie znaleziono konta Synergia. Zaloguj się na stronie portal.librus.pl, a następnie powiąż swoje konto Synergia do konta Librus Portal.</string>
-    <string name="error_163_reason">Inny błąd logowania do Portalu Librus</string>
+    <string name="error_158_reason">Odmowa dostępu do Portalu LIBRUS®</string>
+    <string name="error_159_reason">API Portalu LIBRUS® wyłączone</string>
+    <string name="error_160_reason">Konto LIBRUS® utraciło połączenie z kontem Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji LIBRUS® i postępuj zgodnie z instrukcją, aby naprawić konto.</string>
+    <string name="error_161_reason">Inny błąd Portalu LIBRUS®</string>
+    <string name="error_162_reason">Nie znaleziono konta Synergia. Zaloguj się na stronie portal.librus.pl, a następnie powiąż swoje konto Synergia do konta LIBRUS® Portal.</string>
+    <string name="error_163_reason">Inny błąd logowania do Portalu LIBRUS®</string>
     <string name="error_164_reason">ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED</string>
     <string name="error_165_reason">ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED</string>
     <string name="error_166_reason">ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID</string>
@@ -273,21 +259,21 @@
     <string name="error_172_reason">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID</string>
     <string name="error_173_reason">ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED</string>
     <string name="error_174_reason">ERROR_LIBRUS_SYNERGIA_OTHER</string>
-    <string name="error_175_reason">Librus Synergia: przerwa techniczna</string>
-    <string name="error_176_reason">Librus Wiadomości: przerwa techniczna</string>
-    <string name="error_177_reason">Librus Wiadomości: serwer zwrócił błąd. Prześlij zgłoszenie błędu.</string>
-    <string name="error_178_reason">Librus Wiadomości: serwer zwrócił nieznany błąd. Prześlij zgłoszenie błędu.</string>
-    <string name="error_179_reason">Librus Wiadomości: nieprawidłowe dane logowania</string>
-    <string name="error_180_reason">Librus Portal: nieprawidłowe dane logowania</string>
-    <string name="error_181_reason">Librus API: przerwa techniczna</string>
-    <string name="error_182_reason">Librus Portal: przerwa techniczna</string>
+    <string name="error_175_reason">LIBRUS® Synergia: przerwa techniczna</string>
+    <string name="error_176_reason">LIBRUS® Wiadomości: przerwa techniczna</string>
+    <string name="error_177_reason">LIBRUS® Wiadomości: serwer zwrócił błąd. Prześlij zgłoszenie błędu.</string>
+    <string name="error_178_reason">LIBRUS® Wiadomości: serwer zwrócił nieznany błąd. Prześlij zgłoszenie błędu.</string>
+    <string name="error_179_reason">LIBRUS® Wiadomości: nieprawidłowe dane logowania</string>
+    <string name="error_180_reason">LIBRUS® Portal: nieprawidłowe dane logowania</string>
+    <string name="error_181_reason">LIBRUS® API: przerwa techniczna</string>
+    <string name="error_182_reason">LIBRUS® Portal: przerwa techniczna</string>
     <string name="error_183_reason">Wystąpił problem z tablicą ogłoszeń</string>
-    <string name="error_184_reason">Librus: Sesja logowania wygasła. Zaloguj się ponownie.</string>
+    <string name="error_184_reason">LIBRUS®: Sesja logowania wygasła. Zaloguj się ponownie.</string>
     <string name="error_185_reason">Urządzenie jest już zarejestrowane</string>
     <string name="error_186_reason">Nie znaleziono wiadomości. Mogła zostać usunięta.</string>
     <string name="error_187_reason">Nieprawidłowe dane dostępu. Sprawdź poprawność wprowadzonych danych.</string>
     <string name="error_188_reason">Nie znaleziono załącznika. Mógł zostać usunięty.</string>
-    <string name="error_189_reason">Logowanie Librus Wiadomości: ReCaptcha przekroczono czas oczekiwania.</string>
+    <string name="error_189_reason">Logowanie LIBRUS® Wiadomości: ReCaptcha przekroczono czas oczekiwania.</string>
 
     <string name="error_201_reason">Nieprawidłowy login lub hasło</string>
     <string name="error_202_reason">Podano stare hasło</string>
@@ -306,40 +292,30 @@
 
     <string name="error_301_reason">Nieprawidłowy symbol</string>
     <string name="error_302_reason">Nieprawidłowy token</string>
-    <string name="error_309_reason">Nieprawidłowy PIN</string>
-    <string name="error_310_reason">Nieprawidłowy PIN: pozostało 0 prób</string>
+    <string name="error_310_reason">Nieprawidłowy PIN. Wygeneruj nowy token.</string>
     <string name="error_311_reason">Nieprawidłowy PIN: pozostała 1 próba</string>
     <string name="error_312_reason">Nieprawidłowy PIN: pozostały 2 próby</string>
     <string name="error_321_reason">Token wygasły, wygeneruj ponownie</string>
-    <string name="error_322_reason">Inny błąd logowania do Vulcana</string>
-    <string name="error_330_reason">Dziennik przedszkolny - logowanie niemożliwe</string>
     <string name="error_331_reason">Brak uczniów przypisanych do konta, bądź ukończyli oni już szkołę</string>
-    <string name="error_340_reason">Vulcan: przerwa techniczna</string>
-    <string name="error_341_reason">Vulcan: błąd żądania, zgłoś błąd</string>
-    <string name="error_342_reason">Vulcan: inny błąd, wyślij zgłoszenie</string>
-    <string name="error_343_reason">Vulcan: nie znaleziono adresu załącznika</string>
-
-    <string name="error_401_reason">Nieprawidłowe dane logowania</string>
-    <string name="error_402_reason">Nieprawidłowa nazwa szkoły</string>
-    <string name="error_403_reason">iDziennik: wymagana zmiana hasła. Zaloguj się na stronie iDziennika, by dokonać zmiany hasła.</string>
-    <string name="error_404_reason">Chwilowa przerwa techniczna iDziennika, lub inny problem z serwerem</string>
-    <string name="error_405_reason">Chwilowa przerwa techniczna iDziennika, lub inny problem z serwerem (serwer zwrócił błąd)</string>
-    <string name="error_410_reason">iDziennik: inny błąd logowania</string>
-    <string name="error_411_reason">iDziennik: brak dostępu do API</string>
-    <string name="error_420_reason">iDziennik: nie znaleziono sesji</string>
-    <string name="error_421_reason">iDziennik: nie znaleziono tokenu autoryzacji</string>
-    <string name="error_422_reason">iDziennik: nie znaleziono tokenu API</string>
-    <string name="error_430_reason">iDziennik: brak dostępu. Zaloguj się ponownie.</string>
-    <string name="error_431_reason">iDziennik: inny błąd synchronizacji</string>
-    <string name="error_432_reason">Chwilowa przerwa techniczna iDziennika, lub inny problem z serwerem</string>
-    <string name="error_433_reason">Chwilowa przerwa techniczna iDziennika, lub inny problem z serwerem (serwer zwrócił błąd)</string>
-    <string name="error_434_reason">iDziennik: wymagana zmiana hasła. Zaloguj się na stronie iDziennika, by dokonać zmiany hasła.</string>
-    <string name="error_440_reason">iDziennik: nie znaleziono numeru roku szkolnego. Uczeń może nie być aktywny w aktualnym roku szkolnym.</string>
-    <string name="error_441_reason">iDziennik: serwer nie zwrócił żadnych danych</string>
-    <string name="error_450_reason">Brak dostępu do API iDziennika</string>
-    <string name="error_451_reason">Inny błąd API iDziennika</string>
-    <string name="error_452_reason">iDziennik: nie znaleziono ID dziennika. Zgłoś błąd programiście.</string>
-    <string name="error_453_reason">Twoje konto nie ma uprawnień do wysyłania wiadomości (bądź wystąpił inny błąd serwera iDziennika)</string>
+    <string name="error_343_reason">VULCAN®: nie znaleziono adresu załącznika</string>
+    <string name="error_344_reason">VULCAN®: brakujące dane logowania FS. Usuń profil i zaloguj się ponownie.</string>
+    <string name="error_345_reason">VULCAN®: błąd logowania (429). Dziennik może być przeciążony.</string>
+    <string name="error_346_reason">VULCAN®: inny błąd logowania</string>
+    <string name="error_347_reason">VULCAN®: nie znaleziono zapisanego certyfikatu</string>
+    <string name="error_348_reason">VULCAN®: konto nie jest przypisane do żadnej szkoły</string>
+    <string name="error_349_reason">VULCAN®: certyfikat logowania wygasł</string>
+    <string name="error_350_reason">VULCAN®: wylogowano z konta</string>
+    <string name="error_351_reason">VULCAN®: nie udało się wysłać certyfikatu</string>
+    <string name="error_352_reason">VULCAN®: konto nie posiada już uczniów uczęszczających do szkoły</string>
+    <string name="error_353_reason">VULCAN®: nie znaleziono żadnej szkoły. Zgłoś błąd.</string>
+    <string name="error_354_reason">VULCAN®: nieznany błąd pobierania danych</string>
+    <string name="error_360_reason">Nieprawidłowy podpis zapytania. Sprawdź ustawienia daty i godziny w systemie.</string>
+    <string name="error_361_reason">VULCAN®: zapytanie zawiera niepoprawne dane</string>
+    <string name="error_362_reason">Błąd powiadomień push. Sprawdź połączenie z internetem.</string>
+    <string name="error_363_reason">VULCAN®: urządzenie usunięte. Zaloguj się ponownie do dziennika.</string>
+    <string name="error_364_reason">VULCAN®: błąd serwera. Dziennik może być przeciążony.</string>
+    <string name="error_365_reason">VULCAN®: nie znaleziono bytu</string>
+    <string name="error_390_reason">W związku z wygaszeniem aplikacji Dzienniczek+ przez firmę Vulcan, należy zalogować się ponownie.\n\nAby móc dalej korzystać z aplikacji Szkolny.eu, otwórz Ustawienia i wybierz opcję Dodaj nowego ucznia.\nNastępnie zaloguj się do dziennika Vulcan zgodnie z instrukcją.\n\nPrzepraszamy za niedogodności.</string>
 
     <string name="error_501_reason">Błędny email lub hasło</string>
     <string name="error_510_reason">Inny błąd logowania</string>
@@ -360,17 +336,13 @@
     <string name="error_901_reason">EXCEPTION_LOGIN_LIBRUS_API_TOKEN</string>
     <string name="error_902_reason">EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN</string>
     <string name="error_903_reason">EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN</string>
-    <string name="error_904_reason">Zgłoś błąd: wyjątek w API Librus</string>
+    <string name="error_904_reason">Zgłoś błąd: wyjątek w API LIBRUS®</string>
     <string name="error_905_reason">EXCEPTION_LIBRUS_SYNERGIA_REQUEST</string>
     <string name="error_906_reason">EXCEPTION_MOBIDZIENNIK_WEB_REQUEST</string>
-    <string name="error_907_reason">EXCEPTION_VULCAN_API_REQUEST</string>
     <string name="error_908_reason">EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST</string>
     <string name="error_909_reason">EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST</string>
     <string name="error_910_reason">EXCEPTION_NOTIFY</string>
-    <string name="error_911_reason">Zgłoś błąd: pobieranie wiadomości Librus</string>
-    <string name="error_912_reason">EXCEPTION_IDZIENNIK_WEB_REQUEST</string>
-    <string name="error_913_reason">EXCEPTION_IDZIENNIK_WEB_API_REQUEST</string>
-    <string name="error_914_reason">EXCEPTION_IDZIENNIK_API_REQUEST</string>
+    <string name="error_911_reason">Zgłoś błąd: pobieranie wiadomości LIBRUS®</string>
     <string name="error_920_reason">Wystąpił błąd</string>
     <string name="error_921_reason">Wystąpił błąd podczas pobierania pliku</string>
     <string name="error_930_reason">Nie udało się pobrać pliku z OneDrive</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e06adfef..a913914d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -343,15 +343,15 @@
     <string name="edziennik_progress_login_idziennik_api">Logowanie do iDziennika…</string>
     <string name="edziennik_progress_login_idziennik_web">Logowanie do iDziennika…</string>
     <string name="edziennik_progress_login_librus_api">Logowanie do API</string>
-    <string name="edziennik_progress_login_librus_messages">Logowanie do wiadomości Librus</string>
-    <string name="edziennik_progress_login_librus_portal">Logowanie do Portalu Librus</string>
-    <string name="edziennik_progress_login_librus_synergia">Logowanie do Librus Synergia</string>
+    <string name="edziennik_progress_login_librus_messages">Logowanie do wiadomości LIBRUS®</string>
+    <string name="edziennik_progress_login_librus_portal">Logowanie do Portalu LIBRUS® Rodzina</string>
+    <string name="edziennik_progress_login_librus_synergia">Logowanie do LIBRUS® Synergia</string>
     <string name="edziennik_progress_login_mobidziennik_api">Logowanie do API MobiDziennika…</string>
     <string name="edziennik_progress_login_mobidziennik_api2">Logowanie do API MobiDziennika…</string>
     <string name="edziennik_progress_login_mobidziennik_web">Logowanie do MobiDziennika…</string>
     <string name="edziennik_progress_login_template_api">Logowanie do Template API…</string>
     <string name="edziennik_progress_login_template_web">Logowanie do Template WEB…</string>
-    <string name="edziennik_progress_login_vulcan_api">Logowanie do Vulcan API…</string>
+    <string name="edziennik_progress_login_vulcan_api">Logowanie do VULCAN® API…</string>
     <string name="edziennik_szkolny_api_sync_title">Synchronizowanie udostępnionych wydarzeń…</string>
     <string name="edziennik_szkolny_creating_notifications">Tworzenie powiadomień…</string>
     <string name="ellipsis" translatable="false">…</string>
@@ -621,13 +621,13 @@
     <string name="login_iuczniowie_help_title">Pomoc - iDziennik Progman</string>
     <string name="login_iuczniowie_subtitle">Zaloguj się danymi, które otrzymałeś od swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem.</string>
     <string name="login_iuczniowie_title">Zaloguj się - iDziennik Progman</string>
-    <string name="login_librus_captcha_title">Librus - logowanie</string>
-    <string name="login_librus_help_subtitle">Aby korzystać z aplikacji musisz posiadać konto Librus. Możesz je założyć na stronie portal.librus.pl. Użyj danych, które wpisujesz w miejsca zaznaczone na obrazku.</string>
-    <string name="login_librus_help_title">Pomoc - Librus</string>
-    <string name="login_librus_jst_subtitle">Zaloguj się tokenem i kodem PIN, który można wygenerować po zalogowanu się do Synergii w zakładce Aplikacje mobilne.</string>
-    <string name="login_librus_jst_title">Zaloguj się - Librus JST</string>
-    <string name="login_librus_subtitle">Zaloguj się danymi swojego konta Librus (założonego wcześniej na swój adres e-mail). Nie należy logować się danymi otrzymanymi ze swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem.</string>
-    <string name="login_librus_title">Zaloguj się - Librus</string>
+    <string name="login_librus_captcha_title">LIBRUS® - logowanie</string>
+    <string name="login_librus_help_subtitle">Aby korzystać z aplikacji musisz posiadać konto LIBRUS® Rodzina. Możesz je założyć na stronie portal.librus.pl. Użyj danych, które wpisujesz w miejsca zaznaczone na obrazku.</string>
+    <string name="login_librus_help_title">Pomoc do logowania LIBRUS®</string>
+    <string name="login_librus_jst_subtitle">Zaloguj się tokenem i kodem PIN, który można wygenerować po zalogowanu się do LIBRUS® Synergia w zakładce Aplikacje mobilne.</string>
+    <string name="login_librus_jst_title">Zaloguj się do LIBRUS® JST</string>
+    <string name="login_librus_subtitle">Zaloguj się danymi swojego konta LIBRUS® Rodzina (założonego wcześniej na swój adres e-mail). Nie należy logować się danymi otrzymanymi ze swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem.</string>
+    <string name="login_librus_title">Zaloguj się do LIBRUS® Synergia</string>
     <string name="login_migration_error_format">Wystąpił błąd w migracji danych. Został on już zgłoszony, co oznacza, że postaram się go naprawić.\n\nMożesz zacząć korzystać z aplikacji, jednak w przypadku jakichś błędów spróbuj usunąć profil i zalogować się ponownie.</string>
     <string name="login_migration_subtitle">Aplikacja otrzymała dużą aktualizację. Jeżeli będą występować jakieś problemy w działaniu, możesz się ze mną skontaktować używając pozycji Pomoc i opinie w menu.</string>
     <string name="login_migration_title">Szkolny.eu został zaktualizowany</string>
@@ -655,12 +655,12 @@
     <string name="login_sync_subtitle_1_format">Synchronizuję profil</string>
     <string name="login_sync_title">Synchronizacja…</string>
     <string name="login_vulcan_help_register">Rejestracja urządzenia:</string>
-    <string name="login_vulcan_help_subtitle">Zaloguj się w wersji komputerowej dziennika Vulcan, a następnie wybierz opcję Dostęp mobilny. Kliknij Zarejestruj urządzenie mobilne. Możesz wpisać otrzymane dane lub zeskanować kod QR i wpisać sam kod PIN.</string>
-    <string name="login_vulcan_help_title">Pomoc - Vulcan UONET+</string>
+    <string name="login_vulcan_help_subtitle">Zaloguj się w wersji komputerowej dziennika VULCAN®, a następnie wybierz opcję Dostęp mobilny. Kliknij Zarejestruj urządzenie mobilne. Możesz wpisać otrzymane dane lub zeskanować kod QR i wpisać sam kod PIN.</string>
+    <string name="login_vulcan_help_title">Pomoc - VULCAN® UONET+</string>
     <string name="login_vulcan_help_token">Otrzymane dane:</string>
     <string name="login_vulcan_qr">Skanuj kod QR</string>
     <string name="login_vulcan_subtitle">Wybierz opcję Dostęp mobilny na stronie e-dziennika, zarejestruj nowe urządzenie i wpisz otrzymane dane. W razie problemów skorzystaj z przycisku pod formularzem.</string>
-    <string name="login_vulcan_title">Zaloguj się - Vulcan UONET+</string>
+    <string name="login_vulcan_title">Zaloguj się - VULCAN® UONET+</string>
     <string name="main_menu_add">Dodaj…</string>
     <string name="main_menu_agenda_view_type">Zmień widok</string>
     <string name="main_menu_block_timetable">Generuj blokowy plan lekcji</string>
@@ -861,7 +861,7 @@
     <string name="notification_updates_summary">Szkolny.eu: aktualizacja</string>
     <string name="notification_updates_text">Kliknij, aby pobrać wersję %s</string>
     <string name="notification_updates_title">Dostępna aktualizacja</string>
-    <string name="notification_user_action_required_captcha_librus">Librus: wymagane rozwiązanie zadania Captcha. Kliknij, aby kontynuować logowanie do dziennika.</string>
+    <string name="notification_user_action_required_captcha_librus">Logowanie do LIBRUS® Rodzina: wymagane rozwiązanie zadania Captcha. Kliknij, aby kontynuować logowanie do dziennika.</string>
     <string name="notification_user_action_required_text">Problem, który uniemożliwia synchronizację musi być rozwiązany przez użytkownika. Kliknij, aby uzyskać więcej informacji.</string>
     <string name="notification_user_action_required_title">Wymagane działanie w aplikacji</string>
     <string name="notifications_no_data">Brak powiadomień.</string>
@@ -919,7 +919,7 @@
     <string name="settings_about_licenses_text">Licencje open-source</string>
     <string name="settings_about_privacy_policy_text">Polityka prywatności</string>
     <string name="settings_about_register_title_text">E-dziennik</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - kwiecień 2020</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - luty 2021</string>
     <string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
     <string name="settings_about_update_text">Aktualizacja</string>
     <string name="settings_about_version_text">Wersja</string>
@@ -1118,8 +1118,8 @@
     <string name="sync_error_invalid_school_name">Podano nieprawidłową nazwę szkoły lub zawiera niedozwolone znaki.</string>
     <string name="sync_error_invalid_server_address">Podany adres serwera jest nieprawidłowy. Upewnij się, że jest wpisany poprawnie oraz nie zawiera żadnych spacji.\n\nWpisywany adres nie powinien zawierać części http://…mobidziennik.pl.</string>
     <string name="sync_error_invalid_token">Podano nieprawidłowy token.</string>
-    <string name="sync_error_librus_disconnected">Konto LIBRUS utraciło połączenie z kontem Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji Librus i postępuj zgodnie z instrukcją, aby naprawić konto.</string>
-    <string name="sync_error_librus_not_activated">Konto LIBRUS nie zostało aktywowane. Aktywuj konto korzystając z otrzymanego e-maila.</string>
+    <string name="sync_error_librus_disconnected">Konto LIBRUS® Rodzina utraciło połączenie z kontem LIBRUS® Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji "LIBRUS®" i postępuj zgodnie z instrukcją, aby naprawić konto.</string>
+    <string name="sync_error_librus_not_activated">Konto LIBRUS® Rodzina nie zostało aktywowane. Aktywuj konto korzystając z otrzymanego e-maila.</string>
     <string name="sync_error_login_error">Bład logowania</string>
     <string name="sync_error_maintenance">Chwilowa przerwa techniczna\n\nSpróbuj ponownie później</string>
     <string name="sync_error_no_api_url">Nie znaleziono adresu API. Spróbuj zalogować urządzenie ponownie.</string>
@@ -1132,7 +1132,7 @@
     <string name="sync_error_register_student_not_associated_format">Uczeń %s nie jest przypisany do tego konta w dzienniku (login: %s).\n\nSpróbuj zalogować się ponownie, aczkolwiek może to oznaczać przerwę techniczną e-dziennika.</string>
     <string name="sync_error_saving_data">Błąd podczas zapisywania danych. Zgłoś błąd deweloperowi.</string>
     <string name="sync_error_ssl">Nie można nawiązać bezpiecznego połączenia.</string>
-    <string name="sync_error_synergia_not_activated">Konto Synergia nie zostało potwierdzone przez rodzica/opiekuna prawnego.\n\nZaloguj się na stronie portal.librus.pl i postępuj zgodnie z instrukcjami.</string>
+    <string name="sync_error_synergia_not_activated">Konto LIBRUS® Synergia nie zostało potwierdzone przez rodzica/opiekuna prawnego.\n\nZaloguj się na stronie portal.librus.pl i postępuj zgodnie z instrukcjami.</string>
     <string name="sync_error_timeout">Przekroczono czas oczekiwania.\n\nNiewystarczająca jakość połączenia internetowego lub przerwa techniczna e-dziennika</string>
     <string name="sync_error_unknown">Nieznany błąd</string>
     <string name="sync_feature_agenda">Pobieram terminarz…</string>
@@ -1317,18 +1317,18 @@
     <string name="attendance_details_type_id">ID rodzaju podstawowego</string>
     <string name="login_chooser_title">Jaki masz e-dziennik w szkole?</string>
     <string name="login_chooser_subtitle">Wybierz z jakiego e-dziennika korzysta Twoja szkoła. Jeśli masz kilka kont w różnych dziennikach, będziesz mógł je dodać później.</string>
-    <string name="login_register_librus" translatable="false">Librus/Synergia</string>
+    <string name="login_register_librus" translatable="false">LIBRUS® Rodzina / Synergia</string>
     <string name="login_mode_librus_email">Zaloguj używając e-maila</string>
-    <string name="login_mode_librus_email_hint">Musisz posiadać konto Librus Rodzina</string>
+    <string name="login_mode_librus_email_hint">Musisz posiadać konto LIBRUS® Rodzina</string>
     <string name="login_mode_librus_synergia">Zaloguj używając loginu i hasła</string>
     <string name="login_mode_librus_synergia_hint">Użyj loginu w postaci \"9874123u\"</string>
-    <string name="login_mode_librus_jst">Logowanie przez platformę VULCAN</string>
+    <string name="login_mode_librus_jst">Logowanie przez platformę VULCAN®</string>
     <string name="login_mode_librus_jst_hint">Tylko Oświata w Radomiu oraz Innowacyjny Tarnobrzeg</string>
-    <string name="login_type_vulcan" translatable="false">Vulcan UONET+</string>
+    <string name="login_type_vulcan" translatable="false">VULCAN® UONET+</string>
     <string name="login_mode_vulcan_api">Użyj tokenu, symbolu i kodu PIN</string>
-    <string name="login_mode_vulcan_api_hint">Zarejestruj urządzenie na stronie dziennika Vulcan</string>
+    <string name="login_mode_vulcan_api_hint">Zarejestruj urządzenie na stronie dziennika VULCAN®</string>
     <string name="login_mode_vulcan_web">Użyj e-maila/nazwy użytkownika i hasła</string>
-    <string name="login_mode_vulcan_web_hint">Zaloguj danymi, które podajesz na stronie e-dziennika VULCAN</string>
+    <string name="login_mode_vulcan_web_hint">Zaloguj danymi, które podajesz na stronie e-dziennika VULCAN®</string>
     <string name="login_type_mobidziennik" translatable="false">MobiDziennik</string>
     <string name="login_mode_mobidziennik_web">Zaloguj nazwą serwera, loginem i hasłem</string>
     <string name="login_mode_mobidziennik_web_hint">Podaj dane, których używasz na stronie e-dziennika</string>
@@ -1337,13 +1337,13 @@
     <string name="login_platform_list_loading">Ładowanie listy e-dzienników…</string>
     <string name="login_platform_list_loading_timeout">Jeśli trwa to za długo, sprawdź swoje połączenie internetowe i zrestartuj aplikację.</string>
     <string name="login_form_title_format">Zaloguj się - %s</string>
-    <string name="login_mode_librus_email_guide">Zaloguj się swoim kontem Librus, które działa w oficjalnej aplikacji Librus oraz na stronie portal.librus.pl, w niebieskim formularzu.\n\nJeśli nie masz konta Librus, możesz je założyć na stronie https://portal.librus.pl/rodzina/register.</string>
-    <string name="login_mode_librus_synergia_guide">Podaj login otrzymany od szkoły, którym logujesz się do Synergii (fioletowy formularz).\n\nZalecane jest logowanie kontem Portal Librus (używając e-maila) w poprzednim kroku.</string>
-    <string name="login_mode_librus_jst_guide">Zaloguj się do Librusa na komputerze, wybierz zakładkę Aplikacje Mobilne, następnie wpisz otrzymany Token i PIN poniżej.</string>
-    <string name="login_mode_vulcan_api_guide">Zaloguj się do dziennika Vulcan na komputerze, wybierz zakładkę Dostęp Mobilny, kliknij przycisk Zarejestruj urządzenie mobilne. Podaj otrzymany Token, Symbol i PIN w polach poniżej.</string>
-    <string name="login_mode_vulcan_web_guide">Podaj dane, którymi logujesz się na stronie internetowej dziennika VULCAN lub na miejskiej platformie.</string>
+    <string name="login_mode_librus_email_guide">Zaloguj się swoim kontem LIBRUS® Rodzina, które działa w oficjalnej aplikacji "LIBRUS®" oraz na stronie portal.librus.pl, w niebieskim formularzu.\n\nJeśli nie masz konta LIBRUS® Rodzina, możesz je założyć na stronie https://portal.librus.pl/rodzina/register.</string>
+    <string name="login_mode_librus_synergia_guide">Podaj login otrzymany od szkoły, którym logujesz się do LIBRUS® Synergia (fioletowy formularz).\n\nZalecane jest logowanie kontem LIBRUS® Rodzina (używając e-maila) w poprzednim kroku.</string>
+    <string name="login_mode_librus_jst_guide">Zaloguj się do LIBRUS® Synergia na komputerze, wybierz zakładkę Aplikacje Mobilne, następnie wpisz otrzymany Token i PIN poniżej.</string>
+    <string name="login_mode_vulcan_api_guide">Zaloguj się do dziennika VULCAN® na komputerze, wybierz zakładkę Dostęp Mobilny, kliknij przycisk Zarejestruj urządzenie mobilne. Podaj otrzymany Token, Symbol i PIN w polach poniżej.</string>
+    <string name="login_mode_vulcan_web_guide">Podaj dane, którymi logujesz się na stronie internetowej dziennika VULCAN® lub na miejskiej platformie.</string>
     <string name="login_mode_mobidziennik_web_guide">Podaj dane, których używasz do logowania na stronie MobiDziennika. Jako adres serwera możesz wpisać adres strony internetowej, na której masz MobiDziennik.</string>
-    <string name="edziennik_progress_login_vulcan_web_main">Logowanie do dziennika Vulcan...</string>
+    <string name="edziennik_progress_login_vulcan_web_main">Logowanie do dziennika VULCAN®...</string>
     <string name="login_type_idziennik">iDziennik Progman / iUczniowie</string>
     <string name="login_mode_idziennik_web">Zaloguj używając nazwy użytkownika i hasła</string>
     <string name="login_mode_idziennik_web_hint">Podaj dane, których używasz na stronie internetowej e-dziennika</string>
@@ -1356,4 +1356,34 @@
     <string name="login_mode_podlasie_api">Zaloguj używając tokenu</string>
     <string name="login_mode_podlasie_api_guide">Podaj token aplikacji mobilnej.</string>
     <string name="edziennik_progress_login_podlasie_api">Logowanie do PPE…</string>
+    <string name="profile_archived_title">Profil jest archiwalny</string>
+    <string name="profile_archived_text">Przeglądasz dane ucznia z poprzedniego roku szkolnego (%d/%d). Synchronizacja oraz pobieranie wiadomości i niektórych zadań domowych zostały wyłączone.\n\nAby otworzyć profil ucznia z aktualnego roku, wybierz "Zamknij archiwum" na stronie głównej.</string>
+    <string name="profile_year_not_started_title">Wakacje ;)</string>
+    <string name="profile_year_not_started_format">Prawdopodobnie rok szkolny dla tego ucznia jeszcze się nie zaczął (zacznie się %s). Spróbuj wykonać synchronizację później.</string>
+    <string name="profile_archiving_title">Koniec roku szkolnego</string>
+    <string name="profile_archiving_format">Rok szkolny zakończył się %s. Dane ucznia z poprzedniego roku zostaną przeniesione do archiwum, aby można było je później przeglądać.</string>
+    <string name="home_archive_title">Profil archiwalny</string>
+    <string name="home_archive_text">Przeglądasz dane ucznia z roku szkolnego %d/%d.</string>
+    <string name="home_archive_close">Zamknij archiwum</string>
+    <string name="home_archive_close_no_target_title">Brak aktualnego profilu</string>
+    <string name="home_archive_close_no_target_text">Uczeń %s nie posiada profilu na tym koncie w aktualnym roku szkolnym. Prawdopodobnie ten profil został usunięty lub uczeń nie uczęszcza już do tej klasy.\n\nAby przejść do aktualnego profilu, wybierz ucznia z listy lub zaloguj się na jego konto przyciskiem Dodaj ucznia.</string>
+    <string name="login_copyright_notice">Znaki towarowe zamieszczone w tej aplikacji należą do ich prawowitych właścicieli i są używane wyłącznie w celach informacyjnych.</string>
+    <string name="update_available_title">Dostępna aktualizacja aplikacji</string>
+    <string name="update_available_format">Używasz starej wersji aplikacji Szkolny.eu (%s). Aby móc korzystać z aplikacji oraz zapewnić najlepsze działanie, zaktualizuj aplikację do wersji %s.\n\nDziennik zmian:\n%s</string>
+    <string name="update_available_fallback">Posiadasz nieaktualną wersję aplikacji Szkolny.eu. Aby móc dalej synchronizować dane, musisz zaktualizować aplikację.</string>
+    <string name="update_available_button">Aktualizuj</string>
+    <string name="update_available_later">Nie teraz</string>
+    <string name="home_availability_title">Dostępna aktualizacja</string>
+    <string name="home_availability_text">Zaktualizuj aplikację do najnowszej wersji %s.</string>
+    <string name="home_availability_info">Zobacz więcej</string>
+    <string name="home_availability_update">Aktualizuj</string>
+    <string name="register_unavailable_read_more">Dowiedz się więcej</string>
+    <string name="settings_register_hide_sticks_from_old">Stara nie zobaczy pał</string>
+    <string name="login_podlasie_logout_devices">Wyloguj z pozostałych urządzeń</string>
+    <string name="login_chooser_testing_title">Wersja testowa</string>
+    <string name="login_chooser_testing_text">Wybrany sposób logowania jest jeszcze w fazie testów i może nie działać poprawnie.\n\nJeśli masz problemy z aplikacją, wybierz zalecany sposób logowania.</string>
+    <string name="login_chooser_mode_recommended">{cmd-information-outline} Zalecane</string>
+    <string name="login_chooser_mode_testing">{cmd-alert-circle-outline} Wersja testowa</string>
+    <string name="login_chooser_mode_dev_only">{cmd-android-studio} Wersja deweloperska</string>
+    <string name="eggs">\???</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 6224a05e..7e2c6a5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,43 +2,43 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.61'
+        kotlin_version = '1.4.30'
 
         release = [
-                versionName: "4.2.1",
-                versionCode: 4020199
+                versionName: "4.6",
+                versionCode: 4060099
         ]
 
         setup = [
-                compileSdk: 28,
+                compileSdk: 30,
                 buildTools: "28.0.3",
                 minSdk    : 16,
-                targetSdk : 28
+                targetSdk : 30
         ]
 
         versions = [
-                gradleAndroid    : '4.0.0-beta05',
+                gradleAndroid    : '4.2.0-beta04',
 
                 kotlin           : ext.kotlin_version,
-                ktx              : "1.2.0",
+                ktx              : "1.3.2",
 
                 androidX         : '1.0.0',
                 annotation       : '1.1.0',
-                recyclerView     : '1.2.0-alpha01',
-                material         : '1.2.0-alpha05',
-                appcompat        : '1.2.0-alpha02',
-                constraintLayout : '2.0.0-beta4',
+                recyclerView     : '1.2.0-beta01',
+                material         : '1.3.0',
+                appcompat        : '1.3.0-beta01',
+                constraintLayout : '2.1.0-alpha2',
                 cardview         : '1.0.0',
                 gridLayout       : '1.0.0',
                 navigation       : "2.0.0",
                 navigationFragment: "1.0.0",
                 legacy           : "1.0.0",
 
-                room             : "2.2.5",
-                lifecycle        : "2.2.0",
-                work             : "2.3.4",
+                room             : "2.2.6",
+                lifecycle        : "2.3.0",
+                work             : "2.5.0",
 
-                firebase         : '17.2.2',
+                firebase         : '18.0.2',
                 firebasemessaging: "20.1.3",
                 play_services    : "17.0.0",
 
@@ -53,12 +53,11 @@ buildscript {
 
                 retrofit         : "2.6.4"
         ]
+        versions.kotlin = '1.4.0'
+        versions.kotlin = '1.4.0'
     }
 
     repositories {
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
         google()
         jcenter()
     }
@@ -66,11 +65,8 @@ buildscript {
         classpath "com.android.tools.build:gradle:${versions.gradleAndroid}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath 'me.tatarka:gradle-retrolambda:3.7.0'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.28.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 13fc0f92..8de50581 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
-android.enableR8=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4331d8b..1a62f29e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 06 18:23:03 CET 2019
+#Wed Feb 17 14:04:38 CET 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java b/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java
index 70b59853..847fe87e 100644
--- a/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java
+++ b/mhttp/src/main/java/im/wangchao/mhttp/internal/Version.java
@@ -1,7 +1,5 @@
 package im.wangchao.mhttp.internal;
 
-import im.wangchao.mhttp.BuildConfig;
-
 /**
  * <p>Description  : Version.</p>
  * <p>Author       : wangchao.</p>
@@ -14,7 +12,7 @@ public class Version {
     }
 
     public static String userAgent() {
-        return moduleName().concat(BuildConfig.VERSION_NAME);
+        return moduleName().concat("1.10.1");
     }
 
     public static String moduleName() {
diff --git a/settings.gradle b/settings.gradle
index 3625fac9..b43e4d66 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
+include ':wear'
+include ':wear'
 include ':codegen'
 include ':annotation'
 rootProject.name='Szkolny.eu'
diff --git a/wear/.gitignore b/wear/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/wear/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/wear/build.gradle b/wear/build.gradle
index 6e4aa162..5b531ae4 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,37 +1,53 @@
-apply plugin: 'com.android.application'
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-9-17
+ */
+
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "pl.szczodrzynski.edziennik"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        multiDexEnabled true
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
+    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation 'com.google.android.support:wearable:2.4.0'
-    implementation 'com.google.android.gms:play-services-wearable:16.0.1'
-    implementation 'androidx.percentlayout:percentlayout:1.0.0-beta01'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01'
-    implementation 'androidx.wear:wear:1.0.0-beta01'
-    compileOnly 'com.google.android.wearable:wearable:2.4.0'
+    implementation 'androidx.wear:wear:1.0.0'
+    implementation 'com.google.android.support:wearable:2.7.0'
+    compileOnly 'com.google.android.wearable:wearable:2.7.0'
+
+    implementation "com.google.android.gms:play-services-wearable:${versions.play_services}"
 }
diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/wear/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/wear/src/androidTest/java/pl/szczodrzynski/edziennik/ExampleInstrumentedTest.kt b/wear/src/androidTest/java/pl/szczodrzynski/edziennik/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..84289796
--- /dev/null
+++ b/wear/src/androidTest/java/pl/szczodrzynski/edziennik/ExampleInstrumentedTest.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-9-17
+ */
+
+package pl.szczodrzynski.edziennik
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("pl.szczodrzynski.edziennik", appContext.packageName)
+    }
+}
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 8148e132..803bc28d 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -1,44 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="pl.szczodrzynski.edziennik">
 
-    <uses-feature android:name="android.hardware.type.watch" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <!-- Required to act as a custom watch face. -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- Required for complications to receive complication data and open the provider chooser. -->
-    <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.DeviceDefault">
-        <meta-data
-            android:name="com.google.android.wearable.standalone"
-            android:value="false" />
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
+        android:theme="@style/Theme.Szkolnyeu">
         <uses-library
             android:name="com.google.android.wearable"
             android:required="true" />
 
+        <!--
+               Set to true if your app is Standalone, that is, it does not require the handheld
+               app to run.
+        -->
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppThemeDark">
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="android.support.wearable.activity.ConfirmationActivity">
-        </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java b/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java
deleted file mode 100644
index b96fff96..00000000
--- a/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import androidx.wear.widget.drawer.WearableDrawerLayout;
-import androidx.wear.widget.drawer.WearableDrawerView;
-import androidx.wear.widget.drawer.WearableNavigationDrawerView;
-import android.support.wearable.activity.WearableActivity;
-import android.util.Log;
-import android.view.View;
-import android.widget.ProgressBar;
-
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.wearable.CapabilityClient;
-import com.google.android.gms.wearable.CapabilityInfo;
-import com.google.android.gms.wearable.DataEvent;
-import com.google.android.gms.wearable.DataItem;
-import com.google.android.gms.wearable.Node;
-import com.google.android.gms.wearable.PutDataMapRequest;
-import com.google.android.gms.wearable.PutDataRequest;
-import com.google.android.gms.wearable.Wearable;
-
-import java.util.Arrays;
-import java.util.Set;
-
-public class MainActivity extends WearableActivity {
-
-    private static final String TAG = "MainActivity";
-    private ProgressBar progressBar;
-    private WearableDrawerLayout wearableDrawerLayout;
-    private WearableNavigationDrawerView mWearableNavigationDrawer;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        // Enables Always-on
-        setAmbientEnabled();
-
-        progressBar = findViewById(R.id.progressBar);
-
-        wearableDrawerLayout = findViewById(R.id.drawer_layout);
-        wearableDrawerLayout.setDrawerStateCallback(new WearableDrawerLayout.DrawerStateCallback() {
-            @Override
-            public void onDrawerOpened(WearableDrawerLayout layout, WearableDrawerView drawerView) {
-                super.onDrawerOpened(layout, drawerView);
-            }
-
-            @Override
-            public void onDrawerClosed(WearableDrawerLayout layout, WearableDrawerView drawerView) {
-                super.onDrawerClosed(layout, drawerView);
-                progressBar.setVisibility(View.GONE);
-            }
-        });
-
-        mWearableNavigationDrawer = (WearableNavigationDrawerView) findViewById(R.id.top_navigation_drawer);
-        WearableNavigationDrawerView.WearableNavigationDrawerAdapter navigationDrawerAdapter = new NavigationDrawerAdapter(this);
-        mWearableNavigationDrawer.setAdapter(navigationDrawerAdapter);
-        mWearableNavigationDrawer.addOnItemSelectedListener(new WearableNavigationDrawerView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(int i) {
-                //Toast.makeText(MainActivity.this, "Selected item "+i, Toast.LENGTH_SHORT).show();
-                progressBar.setVisibility(View.VISIBLE);
-            }
-        });
-        // Peeks navigation drawer on the top.
-        mWearableNavigationDrawer.getController().peekDrawer();
-
-        Wearable.getMessageClient(this).addListener(messageEvent -> {
-            Log.d(TAG, messageEvent.getPath()+" :: "+ Arrays.toString(messageEvent.getData()));
-        });
-
-        Task<CapabilityInfo> capabilityInfoTask =
-                Wearable.getCapabilityClient(this)
-                        .getCapability("edziennik_phone_app", CapabilityClient.FILTER_REACHABLE);
-        capabilityInfoTask.addOnCompleteListener((task) -> {
-            if (task.isSuccessful()) {
-                CapabilityInfo capabilityInfo = task.getResult();
-                assert capabilityInfo != null;
-                Set<Node> nodes;
-                nodes = capabilityInfo.getNodes();
-                Log.d(TAG, "Nodes "+nodes);
-            } else {
-                Log.d(TAG, "Capability request failed to return any results.");
-            }
-        });
-
-        Wearable.getDataClient(this).addListener(dataEventBuffer -> {
-            Log.d(TAG, "onDataChanged(): " + dataEventBuffer);
-
-            for (DataEvent event : dataEventBuffer) {
-                if (event.getType() == DataEvent.TYPE_CHANGED) {
-                    String path = event.getDataItem().getUri().getPath();
-                    Log.d(TAG, "Data "+path+ " :: "+Arrays.toString(event.getDataItem().getData()));
-                }
-            }
-        });
-
-        findViewById(R.id.test).setOnClickListener((v -> {
-            PutDataMapRequest putDataMapRequest = PutDataMapRequest.create("/ping");
-            putDataMapRequest.getDataMap().putLong("millis", System.currentTimeMillis());
-
-            PutDataRequest request = putDataMapRequest.asPutDataRequest();
-            request.setData("Hello".getBytes());
-            request.setUrgent();
-
-            Log.d(TAG, "Generating DataItem: " + request);
-
-            Task<DataItem> dataItemTask =
-                    Wearable.getDataClient(getApplicationContext()).putDataItem(request);
-            dataItemTask.addOnCompleteListener(task -> {
-                if (task.isSuccessful()) {
-
-                    Log.d(TAG, "success");
-                } else {
-                    Log.d(TAG, "Capability request failed to return any results.");
-                }
-            });
-        }));
-
-
-
-        // Block on a task and get the result synchronously (because this is on a background
-        // thread).
-        //DataItem dataItem = dataItemTask.getResult();
-
-        //Log.d(TAG, "DataItem saved: " + dataItem);
-
-    }
-
-
-    private class NavigationDrawerAdapter extends WearableNavigationDrawerView.WearableNavigationDrawerAdapter {
-        public NavigationDrawerAdapter(Activity activity) {
-
-        }
-
-        @Override
-        public CharSequence getItemText(int i) {
-            return "Item "+i;
-        }
-
-        @Override
-        public Drawable getItemDrawable(int i) {
-            return null;
-        }
-
-        @Override
-        public int getCount() {
-            return 5;
-        }
-    }
-}
diff --git a/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
new file mode 100644
index 00000000..ed694372
--- /dev/null
+++ b/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-9-17
+ */
+
+package pl.szczodrzynski.edziennik
+
+import android.os.Bundle
+import android.support.wearable.activity.WearableActivity
+import com.google.android.gms.wearable.*
+
+class MainActivity : WearableActivity(), DataClient.OnDataChangedListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        // Enables Always-on
+        setAmbientEnabled()
+    }
+
+    override fun onDataChanged(dataEvents: DataEventBuffer) {
+        dataEvents.forEach { event ->
+            if (event.type == DataEvent.TYPE_CHANGED) {
+                event.dataItem.also { item ->
+                    if (item?.uri?.path?.compareTo("/test") == 0) {
+                        DataMapItem.fromDataItem(item).dataMap.apply {
+                            getInt("test")
+                        }
+                    }
+                }
+            } else if (event.type == DataEvent.TYPE_DELETED) {
+                // DataItem deleted
+            }
+
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        Wearable.getDataClient(this).addListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Wearable.getDataClient(this).removeListener(this)
+    }
+}
diff --git a/wear/src/main/res/drawable-v24/ic_launcher_foreground.xml b/wear/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000..d36dec1a
--- /dev/null
+++ b/wear/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/wear/src/main/res/drawable/ic_launcher_background.xml b/wear/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..f14b2240
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 83b1a1ef..8d270149 100644
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -1,47 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.drawer.WearableDrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<androidx.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:padding="@dimen/box_inset_layout_padding"
+    tools:context=".MainActivity"
+    tools:deviceIds="wear">
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:padding="@dimen/inner_frame_layout_padding"
+        app:boxedEdges="all"
+        tools:ignore="MissingPrefix">
 
-        <ScrollView
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:nestedScrollingEnabled="true">
-
-            <LinearLayout
-                android:id="@+id/linear_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <Button
-                    android:id="@+id/test"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Send"/>
-            </LinearLayout>
-        </ScrollView>
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyle"
+        <TextView
+            android:id="@+id/text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+            android:text="@string/hello_world" />
 
     </FrameLayout>
-
-    <androidx.wear.widget.drawer.WearableNavigationDrawerView
-        android:id="@+id/top_navigation_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
-        app:navigationStyle="multiPage"/>
-</androidx.wear.widget.drawer.WearableDrawerLayout>
\ No newline at end of file
+</androidx.wear.widget.BoxInsetLayout>
diff --git a/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..16e1857e
--- /dev/null
+++ b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..16e1857e
--- /dev/null
+++ b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png
index 898f3ed5..a571e600 100644
Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher.png and b/wear/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..61da551c
Binary files /dev/null and b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/src/main/res/mipmap-mdpi/ic_launcher.png
index 64ba76f7..c41dd285 100644
Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher.png and b/wear/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..db5080a7
Binary files /dev/null and b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png
index e5ed4659..6dba46da 100644
Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..da31a871
Binary files /dev/null and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b0907cac..15ac6817 100644
Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..b216f2d3
Binary files /dev/null and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..f25a4197
Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..e96783cc
Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/values-night/themes.xml b/wear/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000..ad19c38e
--- /dev/null
+++ b/wear/src/main/res/values-night/themes.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Szkolnyeu" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
diff --git a/wear/src/main/res/values-round/strings.xml b/wear/src/main/res/values-round/strings.xml
index 452e3358..62eacd26 100644
--- a/wear/src/main/res/values-round/strings.xml
+++ b/wear/src/main/res/values-round/strings.xml
@@ -1,3 +1,7 @@
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
 <resources>
     <string name="hello_world">Hello Round World!</string>
 </resources>
diff --git a/wear/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml
index 5414ec56..a7c719f0 100644
--- a/wear/src/main/res/values/colors.xml
+++ b/wear/src/main/res/values/colors.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
 <resources>
-    <color name="colorPrimary">#2196F3</color>
-    <color name="colorPrimaryDark">#1976D2</color>
-    <color name="colorAccent">#FF5722</color>
-    <color name="colorSection">#4CAF50</color>
-    <color name="background">#000000</color>
-    <color name="digital_text">#ffffff</color>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
 </resources>
diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
index e865b412..2e76f3e3 100644
--- a/wear/src/main/res/values/dimens.xml
+++ b/wear/src/main/res/values/dimens.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
 <resources>
     <!--
     Because the window insets on round devices are larger than 15dp, this padding only applies
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 678046f9..bbaabade 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -1,3 +1,7 @@
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
 <resources>
     <string name="app_name">Szkolny.eu</string>
     <!--
diff --git a/wear/src/main/res/values/styles.xml b/wear/src/main/res/values/styles.xml
deleted file mode 100644
index 29c82a5d..00000000
--- a/wear/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppThemeDark" parent="android:Theme.Material.NoActionBar" >
-        <item name="android:colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorAccent</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/wear/src/main/res/values/themes.xml b/wear/src/main/res/values/themes.xml
new file mode 100644
index 00000000..58cc0c22
--- /dev/null
+++ b/wear/src/main/res/values/themes.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (c) Kacper Ziubryniewicz 2020-9-17
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Szkolnyeu" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
diff --git a/wear/src/main/res/values/wear.xml b/wear/src/main/res/values/wear.xml
deleted file mode 100644
index 2c5371af..00000000
--- a/wear/src/main/res/values/wear.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="android_wear_capabilities">
-        <item>edziennik_wear_app</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/wear/src/test/java/pl/szczodrzynski/edziennik/ExampleUnitTest.kt b/wear/src/test/java/pl/szczodrzynski/edziennik/ExampleUnitTest.kt
new file mode 100644
index 00000000..affae81c
--- /dev/null
+++ b/wear/src/test/java/pl/szczodrzynski/edziennik/ExampleUnitTest.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-9-17
+ */
+
+package pl.szczodrzynski.edziennik
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}